small fixes

Author: ananas-block

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

@@ -12,7 +12,6 @@ use crate::{compressed_account::CompressedAccountData, pubkey::Pubkey, Compresse
 pub trait InstructionData<'a> {
     fn owner(&self) -> Pubkey;
     fn new_addresses(&self) -> &[impl NewAddress<'a>];
-    fn new_address_owner(&self) -> Vec<Option<Pubkey>>;
     fn input_accounts(&self) -> &[impl InputAccount<'a>];
     fn output_accounts(&self) -> &[impl OutputAccount<'a>];
     fn read_only_accounts(&self) -> Option<&[ZPackedReadOnlyCompressedAccount]>;
@@ -35,6 +34,9 @@ where
     fn address_merkle_tree_account_index(&self) -> u8;
     fn address_merkle_tree_root_index(&self) -> u16;
     fn assigned_compressed_account_index(&self) -> Option<usize>;
+    fn owner(&self) -> Option<&[u8; 32]> {
+        None
+    }
 }
 
 pub trait InputAccount<'a>

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

@@ -347,10 +347,6 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvokeCpiWithAccountInfo<'a> {
         self.new_address_params.as_slice()
     }
 
-    fn new_address_owner(&self) -> Vec<Option<Pubkey>> {
-        vec![Some(self.invoking_program_id); self.new_address_params.len()]
-    }
-
     fn proof(&self) -> Option<Ref<&'a [u8], CompressedProof>> {
         self.proof
     }

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

@@ -305,12 +305,6 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvokeCpiWithReadOnly<'a> {
         self.new_address_params.as_slice()
     }
 
-    fn new_address_owner(&self) -> Vec<Option<Pubkey>> {
-        // Return one owner per address
-        (0..self.new_address_params.len())
-            .map(|_| Some(self.invoking_program_id))
-            .collect()
-    }
     fn proof(&self) -> Option<Ref<&'a [u8], CompressedProof>> {
         self.proof
     }

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

@@ -475,10 +475,6 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvoke<'a> {
         self.new_address_params.as_slice()
     }
 
-    fn new_address_owner(&self) -> Vec<Option<Pubkey>> {
-        vec![None; self.new_address_params.len()]
-    }
-
     fn input_accounts(&self) -> &[impl InputAccount<'a>] {
         self.input_compressed_accounts_with_merkle_context
             .as_slice()
@@ -608,10 +604,6 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvokeCpi<'a> {
         self.new_address_params.as_slice()
     }
 
-    fn new_address_owner(&self) -> Vec<Option<Pubkey>> {
-        vec![None; self.new_address_params.len()]
-    }
-
     fn output_accounts(&self) -> &[impl OutputAccount<'a>] {
         self.output_compressed_accounts.as_slice()
     }

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

@@ -144,6 +144,8 @@ impl ZInstructionDataInvokeCpiWithReadOnlyMut<'_> {
         if self.proof.is_none() && input_proof.is_some() {
             return Err(CompressedAccountError::ZeroCopyExpectedProof);
         }
+        // self.cpi_context is constant, always allocated
+        //      -> no reverse ok_or check necessary
         if let Some(cpi_context) = cpi_context {
             self.with_cpi_context = 1;
             self.cpi_context.cpi_context_account_index = 0;

program-tests/system-test/tests/test_re_init_cpi_account.rs

@@ -8,7 +8,7 @@ use light_program_test::{
     ProgramTestConfig,
 };
 use light_sdk::constants::{
-    CPI_CONTEXT_ACCOUNT_2_DISCRIMINATOR, CPI_CONTEXT_ACCOUNT_DISCRIMINATOR,
+    CPI_CONTEXT_ACCOUNT_1_DISCRIMINATOR, CPI_CONTEXT_ACCOUNT_2_DISCRIMINATOR,
 };
 use light_system_program_pinocchio::cpi_context::state::deserialize_cpi_context_account;
 use light_test_utils::{legacy_cpi_context_account::get_legacy_cpi_context_account, Rpc};
@@ -63,7 +63,7 @@ async fn test_re_init_cpi_account() {
             .unwrap();
         assert_eq!(
             &pre_account.data[0..8],
-            &CPI_CONTEXT_ACCOUNT_2_DISCRIMINATOR,
+            &CPI_CONTEXT_ACCOUNT_1_DISCRIMINATOR,
             "Account should have legacy discriminator"
         );
         assert_eq!(
@@ -89,7 +89,7 @@ async fn test_re_init_cpi_account() {
             .unwrap();
         assert_eq!(
             &post_account.data[0..8],
-            &CPI_CONTEXT_ACCOUNT_DISCRIMINATOR,
+            &CPI_CONTEXT_ACCOUNT_2_DISCRIMINATOR,
             "Account should have new discriminator after reinit"
         );
 

programs/compressed-token/src/process_transfer.rs

@@ -502,7 +502,17 @@ pub fn cpi_execute_compressed_transaction_transfer<
             is_signer: false,
             is_writable: false,
         });
-        let mut remaining_accounts_index = 4;
+        account_metas.push(AccountMeta {
+            pubkey: account_infos[4].key(),
+            is_signer: false,
+            is_writable: false,
+        });
+        account_metas.push(AccountMeta {
+            pubkey: account_infos[5].key(),
+            is_signer: false,
+            is_writable: false,
+        });
+        let mut remaining_accounts_index = 6;
 
         if let Some(account_info) = cpi_context_account {
             account_infos.push(account_info);

programs/system/src/accounts/init_context_account.rs

@@ -60,7 +60,7 @@ pub fn init_cpi_context_account(accounts: &[AccountInfo]) -> Result<()> {
     let ctx = InitializeCpiContextAccount::from_account_infos(accounts)?;
     let params: CpiContextAccountInitParams =
         CpiContextAccountInitParams::new(*ctx.associated_merkle_tree.key());
-    cpi_context_account_new::<false>(ctx.cpi_context_account, params).map(|_| ())?;
+    cpi_context_account_new::<false>(ctx.cpi_context_account, params)?;
 
     Ok(())
 }
@@ -79,7 +79,7 @@ pub fn reinit_cpi_context_account(accounts: &[AccountInfo]) -> Result<()> {
     };
     let params: CpiContextAccountInitParams =
         CpiContextAccountInitParams::new(associated_merkle_tree);
-    cpi_context_account_new::<true>(cpi_context_account, params).map(|_| ())?;
+    cpi_context_account_new::<true>(cpi_context_account, params)?;
 
     Ok(())
 }

programs/system/src/constants.rs

@@ -11,8 +11,8 @@ pub const INVOKE_INSTRUCTION: [u8; 8] = [26, 16, 169, 7, 21, 202, 242, 25];
 pub const INVOKE_CPI_INSTRUCTION: [u8; 8] = [49, 212, 191, 129, 39, 194, 43, 196];
 pub const INVOKE_CPI_WITH_READ_ONLY_INSTRUCTION: [u8; 8] = [86, 47, 163, 166, 21, 223, 92, 8];
 // discriminator of CpiContextAccount2
-pub const CPI_CONTEXT_ACCOUNT_DISCRIMINATOR: [u8; 8] = [34, 184, 183, 14, 100, 80, 183, 124];
-pub const CPI_CONTEXT_ACCOUNT_2_DISCRIMINATOR: [u8; 8] = [22, 20, 149, 218, 74, 204, 128, 166];
+pub const CPI_CONTEXT_ACCOUNT_2_DISCRIMINATOR: [u8; 8] = [34, 184, 183, 14, 100, 80, 183, 124];
+pub const CPI_CONTEXT_ACCOUNT_1_DISCRIMINATOR: [u8; 8] = [22, 20, 149, 218, 74, 204, 128, 166];
 pub const INVOKE_CPI_WITH_ACCOUNT_INFO_INSTRUCTION: [u8; 8] = [228, 34, 128, 84, 47, 139, 86, 240];
 pub const RE_INIT_CPI_CONTEXT_ACCOUNT_INSTRUCTION: [u8; 8] =
     [187, 147, 22, 142, 104, 180, 136, 190];

programs/system/src/context.rs

@@ -8,6 +8,7 @@ use light_compressed_account::{
 };
 use light_program_profiler::profile;
 use pinocchio::{account_info::AccountInfo, instruction::AccountMeta, pubkey::Pubkey};
+use solana_msg::msg;
 
 use crate::{
     cpi_context::state::ZCpiContextAccount2, errors::SystemProgramError,
@@ -87,23 +88,30 @@ impl<'info> SystemContext<'info> {
         &mut self,
         ix_data_index: u8,
         remaining_accounts: &'info [AccountInfo],
-    ) -> u8 {
+        name: &str,
+    ) -> std::result::Result<u8, SystemProgramError> {
         let queue_index = self
             .account_indices
             .iter()
             .position(|a| *a == ix_data_index);
         match queue_index {
-            Some(index) => index as u8,
+            Some(index) => Ok(index as u8),
             None => {
                 self.account_indices.push(ix_data_index);
-                let account_info = &remaining_accounts[ix_data_index as usize];
+                let account_info =
+                    &remaining_accounts
+                        .get(ix_data_index as usize)
+                        .ok_or_else(|| {
+                            msg!("Index: {}, account name: {}", ix_data_index, name);
+                            SystemProgramError::PackedAccountIndexOutOfBounds
+                        })?;
                 self.accounts.push(AccountMeta {
                     pubkey: account_info.key(),
                     is_signer: false,
                     is_writable: true,
                 });
                 self.account_infos.push(account_info);
-                self.account_indices.len() as u8 - 1
+                Ok(self.account_indices.len() as u8 - 1)
             }
         }
     }
@@ -308,18 +316,6 @@ impl<'a, T: InstructionData<'a>> WrappedInstructionData<'a, T> {
         }
     }
 
-    pub fn new_addresses_owners(&self) -> Vec<Option<light_compressed_account::Pubkey>> {
-        if let Some(cpi_context) = &self.cpi_context {
-            [
-                cpi_context.new_address_owner(),
-                self.instruction_data.new_address_owner(),
-            ]
-            .concat()
-        } else {
-            self.instruction_data.new_address_owner()
-        }
-    }
-
     pub fn output_accounts<'b>(&'b self) -> impl Iterator<Item = &'b dyn OutputAccount<'a>> {
         if let Some(cpi_context) = &self.cpi_context {
             chain_outputs(