switch to cpiaccountsSmall

Author: SwenSchaeferjohann

sdk-libs/light-compressible-client/src/lib.rs

@@ -203,7 +203,7 @@ impl CompressibleInstruction {
         // Create system accounts internally (same pattern as decompress_accounts_idempotent)
         let mut remaining_accounts = PackedAccounts::default();
         let system_config = SystemAccountMetaConfig::new(*program_id);
-        let _ = remaining_accounts.add_system_accounts(system_config);
+        let _ = remaining_accounts.add_system_accounts_small(system_config);
 
         // Pack tree infos into remaining accounts
         let packed_tree_infos =
@@ -301,7 +301,7 @@ impl CompressibleInstruction {
         // Setup remaining accounts to get tree infos
         let mut remaining_accounts = PackedAccounts::default();
         let system_config = SystemAccountMetaConfig::new(*program_id);
-        let _ = remaining_accounts.add_system_accounts(system_config);
+        let _ = remaining_accounts.add_system_accounts_small(system_config);
 
         for pda in solana_accounts {
             remaining_accounts.add_pre_accounts_meta(AccountMeta::new(*pda, false));
@@ -381,6 +381,8 @@ impl CompressibleInstruction {
         data.extend_from_slice(discriminator);
         data.extend_from_slice(&serialized_data);
 
+        println!("client: all accounts len: {:?}", accounts.len());
+        println!("client: all accounts: {:?}", accounts);
         Ok(Instruction {
             program_id: *program_id,
             accounts,

sdk-libs/macros/src/compressible.rs

@@ -291,11 +291,11 @@ pub(crate) fn add_compressible_instructions(
                 return err!(ErrorCode::InvalidAccountCount);
             }
 
-            let cpi_accounts = light_sdk::cpi::CpiAccounts::new(
-                &ctx.accounts.fee_payer,
-                &ctx.remaining_accounts[system_accounts_offset as usize..],
-                LIGHT_CPI_SIGNER,
-            );
+                            let cpi_accounts = light_sdk::cpi::CpiAccountsSmall::new(
+                    &ctx.accounts.fee_payer,
+                    &ctx.remaining_accounts[system_accounts_offset as usize..],
+                    LIGHT_CPI_SIGNER,
+                );
 
             // Get address space from config checked.
             let config = light_sdk::compressible::CompressibleConfig::load_checked(&ctx.accounts.config, &super::ID)?;
@@ -346,7 +346,7 @@ pub(crate) fn add_compressible_instructions(
                 msg!("No compressed accounts to decompress");
             } else {
                 let cpi_inputs = light_sdk::cpi::CpiInputs::new(proof, all_compressed_infos);
-                cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+                cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
             }
 
             Ok(())
@@ -433,7 +433,7 @@ pub(crate) fn add_compressible_instructions(
                     return err!(ErrorCode::InvalidRentRecipient);
                 }
 
-                let cpi_accounts = light_sdk::cpi::CpiAccounts::new(
+                let cpi_accounts = light_sdk::cpi::CpiAccountsSmall::new(
                     &ctx.accounts.user,
                     &ctx.remaining_accounts[..],
                     LIGHT_CPI_SIGNER,

sdk-libs/sdk-types/src/instruction/tree_info.rs

@@ -1,7 +1,7 @@
 use light_account_checks::AccountInfoTrait;
 use light_compressed_account::instruction_data::data::NewAddressParamsPacked;
 
-use crate::{AnchorDeserialize, AnchorSerialize, CpiAccounts};
+use crate::{AnchorDeserialize, AnchorSerialize, CpiAccounts, CpiAccountsSmall};
 
 #[derive(Debug, Clone, Copy, AnchorDeserialize, AnchorSerialize, PartialEq, Default)]
 pub struct PackedStateTreeInfo {
@@ -37,4 +37,13 @@ impl PackedAddressTreeInfo {
             cpi_accounts.get_tree_account_info(self.address_merkle_tree_pubkey_index as usize)?;
         Ok(account.pubkey())
     }
+
+    pub fn get_tree_pubkey_small<T: AccountInfoTrait + Clone>(
+        &self,
+        cpi_accounts: &CpiAccountsSmall<'_, T>,
+    ) -> Result<T::Pubkey, crate::error::LightSdkTypesError> {
+        let account =
+            cpi_accounts.get_tree_account_info(self.address_merkle_tree_pubkey_index as usize)?;
+        Ok(account.pubkey())
+    }
 }

sdk-libs/sdk/src/compressible/compress_account.rs

@@ -12,7 +12,7 @@ use crate::compressible::compression_info::CompressAs;
 use crate::{
     account::sha::LightAccount,
     compressible::{compress_account_on_init::close, compression_info::HasCompressionInfo},
-    cpi::{CpiAccounts, CpiInputs},
+    cpi::{CpiAccountsSmall, CpiInputs},
     error::LightSdkError,
     instruction::{account_meta::CompressedAccountMeta, ValidityProof},
     AnchorDeserialize, AnchorSerialize, LightDiscriminator,
@@ -47,7 +47,7 @@ pub fn compress_account<'info, A>(
     solana_account: &mut Account<'info, A>,
     compressed_account_meta: &CompressedAccountMeta,
     proof: ValidityProof,
-    cpi_accounts: CpiAccounts<'_, 'info>,
+    cpi_accounts: CpiAccountsSmall<'_, 'info>,
     rent_recipient: &AccountInfo<'info>,
     compression_delay: &u32,
 ) -> Result<(), crate::ProgramError>
@@ -101,7 +101,7 @@ where
     let cpi_inputs = CpiInputs::new(proof, vec![compressed_account.to_account_info()?]);
 
     // Invoke light system program to create the compressed account
-    cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+    cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
 
     // Close the PDA account using Anchor's close method
     solana_account.close(rent_recipient.clone())?;
@@ -136,7 +136,7 @@ pub fn compress_pda_native<'info, A>(
     pda_account_data: &mut A,
     compressed_account_meta: &CompressedAccountMeta,
     proof: ValidityProof,
-    cpi_accounts: CpiAccounts<'_, 'info>,
+    cpi_accounts: CpiAccountsSmall<'_, 'info>,
     rent_recipient: &AccountInfo<'info>,
     compression_delay: &u32,
 ) -> Result<(), crate::ProgramError>
@@ -176,7 +176,7 @@ where
     let cpi_inputs = CpiInputs::new(proof, vec![compressed_account.to_account_info()?]);
 
     // Invoke light system program to create the compressed account
-    cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+    cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
     // Close PDA account manually
     close(pda_account_info, rent_recipient.clone())?;
     Ok(())

sdk-libs/sdk/src/compressible/compress_account_on_init.rs

@@ -12,7 +12,7 @@ use crate::{
     account::sha::LightAccount,
     address::PackedNewAddressParams,
     compressible::HasCompressionInfo,
-    cpi::{CpiAccounts, CpiInputs},
+    cpi::{CpiAccountsSmall, CpiInputs},
     error::{LightSdkError, Result},
     instruction::ValidityProof,
     light_account_checks::AccountInfoTrait,
@@ -31,7 +31,7 @@ pub fn compress_account_on_init<'info, A>(
     address: &[u8; 32],
     new_address_param: &PackedNewAddressParams,
     output_state_tree_index: u8,
-    cpi_accounts: CpiAccounts<'_, 'info>,
+    cpi_accounts: CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
     rent_recipient: &AccountInfo<'info>,
     proof: ValidityProof,
@@ -62,9 +62,18 @@ where
         rent_recipient,
     )?;
 
-    let cpi_inputs = CpiInputs::new_with_address(proof, compressed_infos, vec![*new_address_param]);
+    let cpi_inputs = CpiInputs::new_with_assigned_address(
+        proof,
+        compressed_infos,
+        vec![
+            light_compressed_account::instruction_data::data::NewAddressParamsAssignedPacked::new(
+                *new_address_param,
+                None,
+            ),
+        ],
+    );
 
-    cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+    cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
 
     Ok(())
 }
@@ -97,7 +106,7 @@ pub fn prepare_accounts_for_compression_on_init<'info, A>(
     addresses: &[[u8; 32]],
     new_address_params: &[PackedNewAddressParams],
     output_state_tree_indices: &[u8],
-    cpi_accounts: &CpiAccounts<'_, 'info>,
+    cpi_accounts: &CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
     rent_recipient: &AccountInfo<'info>,
 ) -> Result<Vec<light_compressed_account::instruction_data::with_account_info::CompressedAccountInfo>>
@@ -203,7 +212,7 @@ pub fn compress_empty_account_on_init<'info, A>(
     address: &[u8; 32],
     new_address_param: &PackedNewAddressParams,
     output_state_tree_index: u8,
-    cpi_accounts: CpiAccounts<'_, 'info>,
+    cpi_accounts: CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
     proof: ValidityProof,
 ) -> Result<()>
@@ -232,9 +241,18 @@ where
         address_space,
     )?;
 
-    let cpi_inputs = CpiInputs::new_with_address(proof, compressed_infos, vec![*new_address_param]);
+    let cpi_inputs = CpiInputs::new_with_assigned_address(
+        proof,
+        compressed_infos,
+        vec![
+            light_compressed_account::instruction_data::data::NewAddressParamsAssignedPacked::new(
+                *new_address_param,
+                None,
+            ),
+        ],
+    );
 
-    cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+    cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
 
     Ok(())
 }
@@ -268,7 +286,7 @@ pub fn prepare_empty_compressed_accounts_on_init<'info, A>(
     addresses: &[[u8; 32]],
     new_address_params: &[PackedNewAddressParams],
     output_state_tree_indices: &[u8],
-    cpi_accounts: &CpiAccounts<'_, 'info>,
+    cpi_accounts: &CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
 ) -> Result<Vec<light_compressed_account::instruction_data::with_account_info::CompressedAccountInfo>>
 where
@@ -395,7 +413,7 @@ pub fn compress_account_on_init_native<'info, A>(
     address: &[u8; 32],
     new_address_param: &PackedNewAddressParams,
     output_state_tree_index: u8,
-    cpi_accounts: CpiAccounts<'_, 'info>,
+    cpi_accounts: CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
     rent_recipient: &AccountInfo<'info>,
     proof: ValidityProof,
@@ -427,9 +445,18 @@ where
         rent_recipient,
     )?;
 
-    let cpi_inputs = CpiInputs::new_with_address(proof, compressed_infos, vec![*new_address_param]);
+    let cpi_inputs = CpiInputs::new_with_assigned_address(
+        proof,
+        compressed_infos,
+        vec![
+            light_compressed_account::instruction_data::data::NewAddressParamsAssignedPacked::new(
+                *new_address_param,
+                None,
+            ),
+        ],
+    );
 
-    cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+    cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
 
     Ok(())
 }
@@ -466,7 +493,7 @@ pub fn prepare_accounts_for_compression_on_init_native<'info, A>(
     addresses: &[[u8; 32]],
     new_address_params: &[PackedNewAddressParams],
     output_state_tree_indices: &[u8],
-    cpi_accounts: &CpiAccounts<'_, 'info>,
+    cpi_accounts: &CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
     rent_recipient: &AccountInfo<'info>,
 ) -> Result<Vec<light_compressed_account::instruction_data::with_account_info::CompressedAccountInfo>>
@@ -581,7 +608,7 @@ pub fn compress_empty_account_on_init_native<'info, A>(
     address: &[u8; 32],
     new_address_param: &PackedNewAddressParams,
     output_state_tree_index: u8,
-    cpi_accounts: CpiAccounts<'_, 'info>,
+    cpi_accounts: CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
     proof: ValidityProof,
 ) -> Result<()>
@@ -609,9 +636,18 @@ where
         address_space,
     )?;
 
-    let cpi_inputs = CpiInputs::new_with_address(proof, compressed_infos, vec![*new_address_param]);
+    let cpi_inputs = CpiInputs::new_with_assigned_address(
+        proof,
+        compressed_infos,
+        vec![
+            light_compressed_account::instruction_data::data::NewAddressParamsAssignedPacked::new(
+                *new_address_param,
+                None,
+            ),
+        ],
+    );
 
-    cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+    cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
 
     Ok(())
 }
@@ -640,7 +676,7 @@ pub fn prepare_empty_compressed_accounts_on_init_native<'info, A>(
     addresses: &[[u8; 32]],
     new_address_params: &[PackedNewAddressParams],
     output_state_tree_indices: &[u8],
-    cpi_accounts: &CpiAccounts<'_, 'info>,
+    cpi_accounts: &CpiAccountsSmall<'_, 'info>,
     address_space: &[Pubkey],
 ) -> Result<Vec<light_compressed_account::instruction_data::with_account_info::CompressedAccountInfo>>
 where

sdk-libs/sdk/src/compressible/decompress_idempotent.rs

@@ -12,7 +12,8 @@ use solana_sysvar::Sysvar;
 
 use crate::{
     account::sha::LightAccount, compressible::compression_info::HasCompressionInfo,
-    cpi::CpiAccounts, error::LightSdkError, AnchorDeserialize, AnchorSerialize, LightDiscriminator,
+    cpi::CpiAccountsSmall, error::LightSdkError, AnchorDeserialize, AnchorSerialize,
+    LightDiscriminator,
 };
 
 /// Helper function to decompress multiple compressed accounts into PDAs
@@ -39,7 +40,7 @@ pub fn prepare_accounts_for_decompress_idempotent<'info, T>(
     solana_accounts: &[&AccountInfo<'info>],
     compressed_accounts: Vec<LightAccount<'_, T>>,
     solana_accounts_signer_seeds: &[&[&[u8]]],
-    cpi_accounts: &CpiAccounts<'_, 'info>,
+    cpi_accounts: &CpiAccountsSmall<'_, 'info>,
     rent_payer: &AccountInfo<'info>,
     address_space: Pubkey,
 ) -> Result<Vec<CompressedAccountInfo>, LightSdkError>

sdk-libs/sdk/src/cpi/mod.rs

@@ -8,12 +8,11 @@
 //! pub const LIGHT_CPI_SIGNER: CpiSigner =
 //!   derive_light_cpi_signer!("2tzfijPBGbrR5PboyFUFKzfEoLTwdDSHUjANCw929wyt");
 //!
-//! let light_cpi_accounts = CpiAccounts::new(
+//! let light_cpi_accounts = CpiAccountsSmall::new(
 //!     ctx.accounts.fee_payer.as_ref(),
 //!     ctx.remaining_accounts,
 //!     crate::LIGHT_CPI_SIGNER,
-//! )
-//! .map_err(ProgramError::from)?;
+//! );
 //!
 //! let (address, address_seed) = derive_address(
 //!     &[b"compressed", name.as_bytes()],
@@ -43,8 +42,7 @@
 //! );
 //!
 //! cpi_inputs
-//!     .invoke_light_system_program(light_cpi_accounts)
-//!     .map_err(ProgramError::from)?;
+//!     .invoke_light_system_program_small(light_cpi_accounts)?;
 //! ```
 
 mod accounts;

sdk-tests/anchor-compressible-derived/src/lib.rs

@@ -11,7 +11,7 @@ use light_sdk::{
         compress_account_on_init, prepare_accounts_for_compression_on_init, CompressibleConfig,
         HasCompressionInfo,
     },
-    cpi::{CpiAccounts, CpiInputs},
+    cpi::{CpiAccountsSmall, CpiInputs},
     derive_light_cpi_signer,
     instruction::{PackedAddressTreeInfo, ValidityProof},
 };
@@ -53,8 +53,9 @@ pub mod anchor_compressible_derived {
         }
 
         // 3. Create CPI accounts
+        let user_account_info = ctx.accounts.user.to_account_info();
         let cpi_accounts =
-            CpiAccounts::new(&ctx.accounts.user, ctx.remaining_accounts, LIGHT_CPI_SIGNER);
+            CpiAccountsSmall::new(&user_account_info, ctx.remaining_accounts, LIGHT_CPI_SIGNER);
 
         let new_address_params =
             address_tree_info.into_new_address_params_packed(user_record.key().to_bytes());
@@ -114,8 +115,9 @@ pub mod anchor_compressible_derived {
         game_session.score = 0;
 
         // Create CPI accounts.
+        let user_account_info = ctx.accounts.user.to_account_info();
         let cpi_accounts =
-            CpiAccounts::new(&ctx.accounts.user, ctx.remaining_accounts, LIGHT_CPI_SIGNER);
+            CpiAccountsSmall::new(&user_account_info, ctx.remaining_accounts, LIGHT_CPI_SIGNER);
 
         // Prepare new address params. One per pda account.
         let user_new_address_params = compression_params
@@ -170,7 +172,7 @@ pub mod anchor_compressible_derived {
 
         // Invoke light system program to create all compressed accounts in one
         // CPI. Call at the end of your init instruction.
-        cpi_inputs.invoke_light_system_program(cpi_accounts)?;
+        cpi_inputs.invoke_light_system_program_small(cpi_accounts)?;
 
         Ok(())
     }