cleanup

Author: ananas-block

cli/accounts/group_pda_G6iaDqLrGGjrPXgsyV2NmcRjzAQzWWiaVyAaixbLCNNu.json

@@ -88,22 +88,3 @@ pub struct AccountOptions {
     pub cpi_context_account: bool,
     pub write_to_cpi_context: bool,
 }
-
-impl AccountOptions {
-    pub fn get_num_expected_accounts(&self) -> usize {
-        let mut num = 3;
-        if !self.write_to_cpi_context {
-            num += 1;
-        }
-        if self.sol_pool_pda {
-            num += 1;
-        }
-        if self.decompression_recipient {
-            num += 1;
-        }
-        if self.cpi_context_account {
-            num += 1;
-        }
-        num
-    }
-}

program-libs/compressed-account/src/instruction_data/traits.rs

@@ -17,7 +17,7 @@ use rand::{rngs::StdRng, Rng, SeedableRng};
 
 /// Tests for account_option_config() implementations
 /// Structs tested:
-/// 1. ZInstructionDataInvokeCpi - 4 tests for lamports/compress/context combinations  
+/// 1. ZInstructionDataInvokeCpi - 4 tests for lamports/compress/context combinations
 /// 2. ZInstructionDataInvokeCpiWithReadOnly - 4 tests for write_to_cpi_context logic
 /// 3. ZInstructionDataInvokeCpiWithAccountInfo - 2 tests for full config scenarios
 /// 4. AccountOptions::get_num_expected_accounts - 6 tests for account counting
@@ -380,89 +380,6 @@ fn test_account_info_compress_mode() {
     assert_eq!(options, expected);
 }
 
-// =============================================================================
-// AccountOptions::get_num_expected_accounts Tests
-// =============================================================================
-
-#[test]
-fn test_get_num_accounts_base() {
-    // All flags false
-    let options = AccountOptions {
-        sol_pool_pda: false,
-        decompression_recipient: false,
-        cpi_context_account: false,
-        write_to_cpi_context: false,
-    };
-
-    // Base=3, +1 for !write_to_cpi_context = 4
-    assert_eq!(options.get_num_expected_accounts(), 4);
-}
-
-#[test]
-fn test_get_num_accounts_sol_pool() {
-    let options = AccountOptions {
-        sol_pool_pda: true,
-        decompression_recipient: false,
-        cpi_context_account: false,
-        write_to_cpi_context: false,
-    };
-
-    // Base=3, +1 for !write_to_cpi_context, +1 for sol_pool = 5
-    assert_eq!(options.get_num_expected_accounts(), 5);
-}
-
-#[test]
-fn test_get_num_accounts_decompression() {
-    let options = AccountOptions {
-        sol_pool_pda: false,
-        decompression_recipient: true,
-        cpi_context_account: false,
-        write_to_cpi_context: false,
-    };
-
-    // Base=3, +1 for !write_to_cpi_context, +1 for decompression = 5
-    assert_eq!(options.get_num_expected_accounts(), 5);
-}
-
-#[test]
-fn test_get_num_accounts_cpi_context() {
-    let options = AccountOptions {
-        sol_pool_pda: false,
-        decompression_recipient: false,
-        cpi_context_account: true,
-        write_to_cpi_context: false,
-    };
-
-    // Base=3, +1 for !write_to_cpi_context, +1 for cpi_context = 5
-    assert_eq!(options.get_num_expected_accounts(), 5);
-}
-
-#[test]
-fn test_get_num_accounts_write_context() {
-    let options = AccountOptions {
-        sol_pool_pda: false,
-        decompression_recipient: false,
-        cpi_context_account: false,
-        write_to_cpi_context: true,
-    };
-
-    // Base=3 only (no +1 because write_to_cpi_context=true)
-    assert_eq!(options.get_num_expected_accounts(), 3);
-}
-
-#[test]
-fn test_get_num_accounts_all_flags() {
-    let options = AccountOptions {
-        sol_pool_pda: true,
-        decompression_recipient: true,
-        cpi_context_account: true,
-        write_to_cpi_context: false,
-    };
-
-    // Base=3, +1 for !write_to_cpi_context, +3 for other flags = 7
-    assert_eq!(options.get_num_expected_accounts(), 7);
-}
-
 // =============================================================================
 // Randomized Property Tests
 // =============================================================================

program-libs/compressed-account/tests/account_option_config.rs

@@ -1,3 +1,5 @@
+use std::panic::Location;
+
 use light_compressed_account::{
     hash_to_bn254_field_size_be,
     instruction_data::{
@@ -84,6 +86,7 @@ impl SystemContext<'_> {
 }
 
 impl<'info> SystemContext<'info> {
+    #[track_caller]
     pub fn get_index_or_insert(
         &mut self,
         ix_data_index: u8,
@@ -102,7 +105,15 @@ impl<'info> SystemContext<'info> {
                     &remaining_accounts
                         .get(ix_data_index as usize)
                         .ok_or_else(|| {
-                            msg!("Index: {}, account name: {}", ix_data_index, name);
+                            let location = Location::caller();
+                            msg!(
+                                "Index: {}, account name: {} {}:{}:{}",
+                                ix_data_index,
+                                name,
+                                location.file(),
+                                location.line(),
+                                location.column()
+                            );
                             SystemProgramError::PackedAccountIndexOutOfBounds
                         })?;
                 self.accounts.push(AccountMeta {

programs/system/src/context.rs

@@ -2,9 +2,14 @@ use std::slice;
 
 use borsh::BorshDeserialize;
 use light_account_checks::{checks::check_owner, discriminator::Discriminator};
-use light_compressed_account::instruction_data::{
-    data::OutputCompressedAccountWithPackedContext,
-    zero_copy::{ZPackedMerkleContext, ZPackedReadOnlyAddress, ZPackedReadOnlyCompressedAccount},
+use light_compressed_account::{
+    instruction_data::{
+        data::OutputCompressedAccountWithPackedContext,
+        zero_copy::{
+            ZPackedMerkleContext, ZPackedReadOnlyAddress, ZPackedReadOnlyCompressedAccount,
+        },
+    },
+    Pubkey as LightPubkey,
 };
 use light_program_profiler::profile;
 use light_zero_copy::{errors::ZeroCopyError, slice_mut::ZeroCopySliceMut, vec::ZeroCopyVecU8};
@@ -283,7 +288,7 @@ fn deserialize_cpi_context_account_inner<'a, const CLEARED: bool>(
         msg!("Invalid cpi context account discriminator.");
         return Err(SystemProgramError::InvalidCpiContextDiscriminator.into());
     }
-    let (fee_payer, data) =
+    let (mut fee_payer, data) =
         Ref::<&'a mut [u8], light_compressed_account::pubkey::Pubkey>::from_prefix(data)
             .map_err(ZeroCopyError::from)?;
 
@@ -305,6 +310,7 @@ fn deserialize_cpi_context_account_inner<'a, const CLEARED: bool>(
     let (mut output_data_len, mut data) =
         Ref::<&'a mut [u8], U16>::from_prefix(data).map_err(ZeroCopyError::from)?;
     let output_data = if CLEARED {
+        *fee_payer = LightPubkey::default();
         new_addresses.zero_out();
         readonly_addresses.zero_out();
         readonly_accounts.zero_out();