chore: cherry-pick non-token diffs onto main by SwenSchaeferjohann · Pull Request #1953 · Lightprotocol/light-protocol

SwenSchaeferjohann · 2025-10-01T13:49:44Z

No description provided.

coderabbitai · 2025-10-01T13:49:51Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🏷️ Required labels (at least one) (1)

ai-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch swen/selected-changes-no-ctoken

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

ananas-block · 2025-10-01T22:02:49Z

thanks lets merge this one first #1946
It contains a part of the changes of this pr already.

ananas-block · 2025-10-01T23:04:15Z

    };
 }
+
+pub fn get_light_cpi_signer_seeds(program_id: &Pubkey) -> (Vec<Vec<u8>>, Pubkey) {


ananas-block · 2025-10-01T23:05:17Z

this exists in a different way now

ananas-block · 2025-10-01T23:05:35Z

+    fn get_packed_account_metas(&self) -> Result<Vec<AccountMeta>>;
+}
+
+impl CpiAccountsExt for CpiAccounts<'_, '_> {


ananas-block · 2025-10-01T23:06:03Z

+    /// account exists but is empty (data: [], data_hash: [0, 1, 1, 1, 1, 1, 1,
+    /// 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /// 1]).
+    pub fn new_mut_without_data(


exists but with zeroed 32 bytes array

ananas-block · 2025-10-01T23:06:33Z

+use crate::CpiSigner;
+// TODO: move to ctoken types
+#[derive(Clone, Debug)]
+pub struct CpiContextWriteAccounts<'a, T: AccountInfoTrait + Clone> {


ananas-block · 2025-10-01T23:06:43Z

ananas-block · 2025-10-01T23:06:49Z

+    pub fn to_account_infos(&self) -> Vec<T> {
+        // Skip system light program
+        let refs = &self.account_infos()[1..];
+        let mut account_infos = Vec::with_capacity(1 + refs.len());


ananas-block · 2025-10-01T23:06:55Z

+            .iter()
+            .map(|x| x.pubkey())
+            .collect::<Vec<T::Pubkey>>())
+    }


ananas-block · 2025-10-01T23:07:06Z

 }

-impl<'a, T: AccountInfoTrait> CpiAccounts<'a, T> {
+impl<'a, T: AccountInfoTrait + Clone> CpiAccounts<'a, T> {


ananas-block · 2025-10-01T23:07:21Z

+pub const COMPRESSED_TOKEN_PROGRAM_ID: [u8; 32] =
+    pubkey_array!("cTokenmWW8bLPjZEBAUgYy3zKxQZW6VKi7bqNFEVv3m");
+
+/// ID of the compressed token program CPI authority PDA.
+pub const COMPRESSED_TOKEN_PROGRAM_CPI_AUTHORITY: [u8; 32] =
+    pubkey_array!("GXtd2izAiMJPwMEjfgTRH3d7k9mjn4Jq3JrWFv9gySYy");


ananas-block · 2025-10-01T23:07:37Z

pick all changes from this file

ananas-block · 2025-10-01T23:07:49Z

        options: Option<GetCompressedTokenAccountsByOwnerOrDelegateOptions>,
        config: Option<IndexerRpcConfig>,
-    ) -> Result<Response<ItemsWithCursor<TokenAccount>>, IndexerError> {
+    ) -> Result<Response<ItemsWithCursor<CompressedTokenAccount>>, IndexerError> {


pick TokenAccount -> CompressedTokenAccount

ananas-block · 2025-10-01T23:08:01Z

+                message.account_keys[..num_required_signatures].to_vec()
+            );
+            RpcError::CustomError(e.to_string())
+        })?;


ananas-block · 2025-10-01T23:08:26Z

-impl From<litesvm::error::LiteSVMError> for RpcError {
-    fn from(e: litesvm::error::LiteSVMError) -> Self {
-        RpcError::LiteSvmError(e.to_string())
-    }


don't pick we need these changes

ananas-block · 2025-10-01T23:08:32Z

+                    next_tree_info: None,
+                    tree_type: TreeType::StateV2,
+                },
+            ];


ananas-block · 2025-10-01T23:08:55Z

+                    account.merkle_context.tree
+                );
+                IndexerError::InvalidResponseData
+            })?;


ananas-block · 2025-10-01T23:09:00Z

+                    tree_pubkey.to_string()
+                );
+                IndexerError::InvalidResponseData
+            })?;


ananas-block · 2025-10-01T23:09:06Z

+                tree_type: TreeType::StateV2,
+                next_tree_info: None,
+            },
+        );


ananas-block · 2025-10-01T23:09:20Z

+                tree_type: TreeType::StateV2,
+                next_tree_info: None,
+            },
+        );


ananas-block · 2025-10-01T23:09:36Z

+///   --upgradeable-program <your_program_id> <your_program_path> ~/.config/solana/id.json"
+///
+/// ```
+pub const LOOKUP_TABLE_ADDRESS: Pubkey = pubkey!("9NYFyEqPkyXUhkerbGHXUXkvb4qpzeEdHuGpgbgpH1NJ");


ananas-block · 2025-10-01T23:09:55Z

+#[cfg(feature = "solana")]
+#[cfg(not(feature = "anchor"))]
+impl From<solana_pubkey::Pubkey> for Pubkey {
+    fn from(pubkey: solana_pubkey::Pubkey) -> Self {
+        Self::new_from_array(pubkey.to_bytes())
+    }
+}
+
+#[cfg(feature = "solana")]
+#[cfg(not(feature = "anchor"))]
+impl From<&solana_pubkey::Pubkey> for Pubkey {
+    fn from(pubkey: &solana_pubkey::Pubkey) -> Self {
+        Self::new_from_array(pubkey.to_bytes())
+    }
+}
+


ananas-block · 2025-10-01T23:10:23Z

+export function deriveAddressV2(
+    seed: Uint8Array,
+    addressMerkleTreePubkey: Uint8Array,
+    programIdBytes: Uint8Array,
+): Uint8Array {
+    const slices = [seed, addressMerkleTreePubkey, programIdBytes];
+
+    return hashVWithBumpSeed(slices);
+}
+
+export function hashVWithBumpSeed(bytes: Uint8Array[]): Uint8Array {
+    const HASH_TO_FIELD_SIZE_SEED = 255; // u8::MAX
+
+    const hasher = keccak_256.create();
+
+    // Hash all input bytes
+    for (const input of bytes) {
+        hasher.update(input);
+    }
+
+    // Add the bump seed (just like Rust version)
+    hasher.update(new Uint8Array([HASH_TO_FIELD_SIZE_SEED]));
+
+    const hash = hasher.digest();
+
+    // Truncate to BN254 field size (just like Rust version)
+    hash[0] = 0;
+
+    return hash;
+}


don't pick already on main

wip

503b13e

SwenSchaeferjohann requested review from ananas-block and sergeytimoshin as code owners October 1, 2025 13:49

SwenSchaeferjohann added 5 commits October 1, 2025 11:12

clean

42eed72

revert photon_indexer

83d2fb2

build

6255d20

fix map err

47e6df6

fix lint

0493702

ananas-block reviewed Oct 1, 2025

View reviewed changes

Comment thread sdk-libs/sdk/src/cpi/invoke.rs

Copy link
Copy Markdown

Contributor

ananas-block Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this exists in a different way now

ananas-block reviewed Oct 1, 2025

View reviewed changes

Comment thread sdk-libs/sdk-types/src/cpi_accounts_small.rs

Copy link
Copy Markdown

Contributor

ananas-block Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exists

ananas-block reviewed Oct 1, 2025

View reviewed changes

Comment thread sdk-libs/program-test/src/utils/setup_light_programs.rs

Copy link
Copy Markdown

Contributor

ananas-block Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pick all changes from this file

ananas-block reviewed Oct 1, 2025

View reviewed changes

SwenSchaeferjohann closed this Oct 6, 2025

Conversation

SwenSchaeferjohann commented Oct 1, 2025

Uh oh!

coderabbitai Bot commented Oct 1, 2025

Review skipped

Uh oh!

ananas-block commented Oct 1, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants