cleanup

Author: ananas-block

programs/system/src/context.rs

@@ -261,7 +261,6 @@ where
     }
 
     pub fn with_transaction_hash(&self) -> bool {
-        // TODO: if any cpi context invocation requires transaction hash it should be set.
         self.instruction_data.with_transaction_hash()
     }
 
@@ -293,7 +292,6 @@ where
     }
 }
 
-// TODO: add read only cpi context accounts
 impl<'a, T: InstructionData<'a>> WrappedInstructionData<'a, T> {
     pub fn owner(&self) -> light_compressed_account::pubkey::Pubkey {
         self.instruction_data.owner()

programs/system/src/cpi_context/process_cpi_context.rs

@@ -56,7 +56,6 @@ pub fn process_cpi_context<'a, 'info, T: InstructionData<'a>>(
         msg!("cpi context account is some but cpi context is none");
         return Err(SystemProgramError::CpiContextMissing.into());
     }
-
     if let Some(cpi_context) = cpi_context {
         let cpi_context_account_info = match cpi_context_account_info {
             Some(cpi_context_account_info) => cpi_context_account_info,
@@ -68,18 +67,18 @@ pub fn process_cpi_context<'a, 'info, T: InstructionData<'a>>(
             return Ok(None);
         } else {
             let cpi_context_account = deserialize_cpi_context_account(cpi_context_account_info)?;
+            validate_cpi_context_associated_with_merkle_tree(
+                &instruction_data,
+                &cpi_context_account,
+                remaining_accounts,
+            )?;
             if cpi_context_account.is_empty() {
                 return Err(SystemProgramError::CpiContextEmpty.into());
             }
             if (*cpi_context_account.fee_payer).to_bytes() != fee_payer {
                 msg!(format!(" {:?} != {:?}", fee_payer, cpi_context_account.fee_payer).as_str());
                 return Err(SystemProgramError::CpiContextFeePayerMismatch.into());
             }
-            validate_cpi_context_associated_with_merkle_tree(
-                &instruction_data,
-                &cpi_context_account,
-                remaining_accounts,
-            )?;
 
             instruction_data.set_cpi_context(cpi_context_account)?;
             return Ok(Some((1, instruction_data)));
@@ -120,10 +119,16 @@ pub fn set_cpi_context<'a, 'info, T: InstructionData<'a>>(
     } else {
         let mut cpi_context_account = deserialize_cpi_context_account(cpi_context_account_info)?;
 
-        if *cpi_context_account.fee_payer == fee_payer {
+        if *cpi_context_account.fee_payer == fee_payer && !cpi_context_account.is_empty() {
             cpi_context_account.store_data(&instruction_data)?;
         } else {
-            msg!(format!(" {:?} != {:?}", fee_payer, cpi_context_account.fee_payer).as_str());
+            msg!(format!(
+                " {:?} != {:?} or cpi context account empty {}",
+                fee_payer,
+                cpi_context_account.fee_payer,
+                cpi_context_account.is_empty()
+            )
+            .as_str());
             return Err(SystemProgramError::CpiContextFeePayerMismatch.into());
         }
     }

programs/system/src/cpi_context/state.rs

@@ -13,7 +13,8 @@ use light_compressed_account::{
 };
 use light_program_profiler::profile;
 use light_zero_copy::{errors::ZeroCopyError, slice_mut::ZeroCopySliceMut, vec::ZeroCopyVecU8};
-use pinocchio::{account_info::AccountInfo, msg, program_error::ProgramError, pubkey::Pubkey};
+use pinocchio::{account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey};
+use solana_msg::msg;
 use zerocopy::{little_endian::U16, Ref};
 
 use crate::{
@@ -175,19 +176,33 @@ impl<'a> ZCpiContextAccount2<'a> {
             };
             self.in_accounts.push(in_account)?;
         }
+        // Note: if any cpi context invocation requires transaction hash it should be set.
+        // Currently only the executing cpi can enforce the transaction hash
+        if instruction_data.with_transaction_hash() {
+            msg!("with_transaction_hash is not supported when writing into cpi context account");
+            return Err(SystemProgramError::Unimplemented)?;
+        }
 
         // Store read-only addresses if any
         if let Some(readonly_addresses) = instruction_data.read_only_addresses() {
-            for readonly_address in readonly_addresses {
-                self.readonly_addresses.push(*readonly_address)?;
+            if !readonly_addresses.is_empty() {
+                msg!("readonly_addresses are not supported when writing into cpi context account");
+                return Err(SystemProgramError::Unimplemented)?;
             }
+            // for readonly_address in readonly_addresses {
+            //    self.readonly_addresses.push(*readonly_address)?;
+            //}
         }
 
         // Store read-only accounts if any
         if let Some(readonly_accounts) = instruction_data.read_only_accounts() {
-            for readonly_account in readonly_accounts {
-                self.readonly_accounts.push(*readonly_account)?;
+            if !readonly_accounts.is_empty() {
+                msg!("read_only_accounts are not supported when writing into cpi context account");
+                return Err(SystemProgramError::Unimplemented)?;
             }
+            // for readonly_account in readonly_accounts {
+            //     self.readonly_accounts.push(*readonly_account)?;
+            // }
         }
         // Store output accounts
         for output in instruction_data.output_accounts() {

programs/system/src/errors.rs

@@ -134,6 +134,8 @@ pub enum SystemProgramError {
     OutputMerkleTreeIndexOutOfBounds,
     #[error("Packed Account index out of bounds index.")]
     PackedAccountIndexOutOfBounds,
+    #[error("Unimplemented.")]
+    Unimplemented,
     #[error("Batched Merkle tree error {0}")]
     BatchedMerkleTreeError(#[from] BatchedMerkleTreeError),
     #[error("Concurrent Merkle tree error {0}")]
@@ -214,6 +216,7 @@ impl From<SystemProgramError> for u32 {
             SystemProgramError::AddressAssignedAccountIndexOutOfBounds => 6060,
             SystemProgramError::OutputMerkleTreeIndexOutOfBounds => 6061,
             SystemProgramError::PackedAccountIndexOutOfBounds => 6062,
+            SystemProgramError::Unimplemented => 6063,
             SystemProgramError::BatchedMerkleTreeError(e) => e.into(),
             SystemProgramError::IndexedMerkleTreeError(e) => e.into(),
             SystemProgramError::ConcurrentMerkleTreeError(e) => e.into(),