fix: tests

ananas-block · ananas-block · commit a9b1d479494f · 2025-07-07T21:05:27.000+01:00
diff --git a/sdk-libs/sdk-types/src/cpi_accounts.rs b/sdk-libs/sdk-types/src/cpi_accounts.rs
@@ -200,7 +200,13 @@ impl<'a, T: AccountInfoTrait> CpiAccounts<'a, T> {
     }
 
     pub fn cpi_context(&self) -> Result<&'a T> {
-        let index = CompressionCpiAccountIndex::CpiContext as usize;
+        let mut index = CompressionCpiAccountIndex::CpiContext as usize;
+        if !self.config.sol_pool_pda {
+            index -= 1;
+        }
+        if !self.config.sol_compression_recipient {
+            index -= 1;
+        }
         self.accounts
             .get(index)
             .ok_or(LightSdkTypesError::CpiAccountsIndexOutOfBounds(index))
diff --git a/sdk-libs/sdk/src/cpi/accounts.rs b/sdk-libs/sdk/src/cpi/accounts.rs
@@ -75,8 +75,8 @@ pub fn get_account_metas_from_config(config: CpiInstructionConfig<'_, '_>) -> Ve
         is_writable: false,
     });
 
-    // 8. Light System Program (readonly)
-    let light_system_program_meta = AccountMeta {
+    // 8. Light System Program (readonly) - reused for optional accounts
+    let create_light_system_meta = || AccountMeta {
         pubkey: Pubkey::from(LIGHT_SYSTEM_PROGRAM_ID),
         is_signer: false,
         is_writable: false,
@@ -90,7 +90,7 @@ pub fn get_account_metas_from_config(config: CpiInstructionConfig<'_, '_>) -> Ve
             is_writable: true,
         });
     } else {
-        account_metas.push(light_system_program_meta.clone());
+        account_metas.push(create_light_system_meta());
     }
 
     // 10. Sol Compression Recipient (writable) OR Light System Program (readonly)
@@ -101,7 +101,7 @@ pub fn get_account_metas_from_config(config: CpiInstructionConfig<'_, '_>) -> Ve
             is_writable: true,
         });
     } else {
-        account_metas.push(light_system_program_meta.clone());
+        account_metas.push(create_light_system_meta());
     }
 
     // 11. System Program (readonly) - always default pubkey
@@ -119,7 +119,7 @@ pub fn get_account_metas_from_config(config: CpiInstructionConfig<'_, '_>) -> Ve
             is_writable: true,
         });
     } else {
-        account_metas.push(light_system_program_meta);
+        account_metas.push(create_light_system_meta());
     }
 
     for acc in config.packed_accounts {
