implement feedback

Author: ananas-block

SECURITY_REVIEW_CPI_CONTEXT.md

@@ -56,7 +56,7 @@ impl ZInAccountMut<'_> {
         merkle_context: &<PackedMerkleContext as ZeroCopyAt>::ZeroCopyAt,
         root_index: U16,
         lamports: u64,
-        address: Option<&[u8]>,
+        address: Option<&[u8; 32]>,
     ) -> Result<(), CompressedAccountError> {
         self.discriminator = discriminator;
         // Set merkle context fields manually due to mutability constraints
@@ -168,6 +168,9 @@ impl ZNewAddressParamsAssignedPackedMut<'_> {
         if let Some(assigned_account_index) = assigned_account_index {
             self.assigned_account_index = assigned_account_index;
             self.assigned_to_account = 1; // set to true
+        } else {
+            self.assigned_account_index = 0;
+            self.assigned_to_account = 0; // set to false
         }
         // Note we can skip address derivation since we are assigning it to the account in index 0.
         self.address_merkle_tree_account_index = address_merkle_tree_account_index;

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

@@ -92,9 +92,9 @@ impl From<CompressedAccountError> for u32 {
             CompressedAccountError::InstructionDataExpectedAddress => 12018,
             CompressedAccountError::CompressedAccountDataNotInitialized => 12019,
             CompressedAccountError::ExpectedDiscriminator => 12020,
-            CompressedAccountError::ExpectedDataHash => 12020,
             CompressedAccountError::InstructionDataExpectedProof => 12021,
             CompressedAccountError::ZeroCopyExpectedProof => 12022,
+            CompressedAccountError::ExpectedDataHash => 12023,
             CompressedAccountError::HasherError(e) => u32::from(e),
         }
     }

program-libs/compressed-account/src/lib.rs

@@ -78,13 +78,13 @@ pub enum CTokenError {
     #[error("Instruction data expected mint authority")]
     InstructionDataExpectedMintAuthority,
 
-    #[error("Instruction data expected freeze authority")]
+    #[error("Zero-copy expected mint authority")]
     ZeroCopyExpectedMintAuthority,
 
     #[error("Instruction data expected freeze authority")]
     InstructionDataExpectedFreezeAuthority,
 
-    #[error("Instruction data expected freeze authority")]
+    #[error("Zero-copy expected mint authority")]
     ZeroCopyExpectedFreezeAuthority,
 
     #[error("Invalid authority type provided")]

program-libs/ctoken-types/src/error.rs

@@ -126,10 +126,18 @@ pub struct CpiContext {
 
 impl CompressedCpiContextTrait for ZCpiContext<'_> {
     fn first_set_context(&self) -> u8 {
-        self.first_set_context() as u8
+        if self.first_set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 
     fn set_context(&self) -> u8 {
-        self.set_context() as u8
+        if self.set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 }

program-libs/ctoken-types/src/instructions/create_compressed_mint.rs

@@ -72,10 +72,7 @@ impl ZExtensionInstructionData<'_> {
                             "TokenMetadata hash version not supported {} (0 Poseidon, 1 Sha256 are supported).",
                             token_metadata.version
                         );
-                        unimplemented!(
-                            "TokenMetadata hash version not supported {}",
-                            token_metadata.version
-                        )
+                        Err(CTokenError::UnsupportedExtension)
                     } // Version::Keccak256 => <Self as DataHasher>::hash::<Keccak>(self),
                       // Version::Sha256Flat => self.sha_flat(),
                 }

program-libs/ctoken-types/src/instructions/extensions/mod.rs

@@ -123,10 +123,18 @@ pub struct CpiContext {
 }
 impl CompressedCpiContextTrait for ZCpiContext<'_> {
     fn first_set_context(&self) -> u8 {
-        self.first_set_context() as u8
+        if self.first_set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 
     fn set_context(&self) -> u8 {
-        self.set_context() as u8
+        if self.set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 }

program-libs/ctoken-types/src/instructions/mint_actions.rs

@@ -59,10 +59,18 @@ pub struct CpiContext {
 }
 impl CompressedCpiContextTrait for ZCpiContext<'_> {
     fn first_set_context(&self) -> u8 {
-        self.first_set_context() as u8
+        if self.first_set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 
     fn set_context(&self) -> u8 {
-        self.set_context() as u8
+        if self.set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 }

program-libs/ctoken-types/src/instructions/mint_to_compressed.rs

@@ -283,13 +283,13 @@ impl ZCompression<'_> {
                 // Compress: add to balance (tokens are being added to compressed pool)
                 current_balance
                     .checked_sub((*self.amount).into())
-                    .ok_or(CTokenError::ArithmeticOverflow)
+                    .ok_or(CTokenError::InsufficientSupply)
             }
             CompressionMode::Decompress => {
                 // Decompress: subtract from balance (tokens are being removed from compressed pool)
                 current_balance
                     .checked_add((*self.amount).into())
-                    .ok_or(CTokenError::CompressInsufficientFunds)
+                    .ok_or(CTokenError::ArithmeticOverflow)
             } //     CompressionMode::CompressFull => {
               //        // CompressFull: subtract entire amount from solana account (amount will be set to actual balance in preprocessing)
               //        current_balance

program-libs/ctoken-types/src/instructions/transfer2.rs

@@ -61,10 +61,18 @@ pub struct UpdateMintCpiContext {
 
 impl CompressedCpiContextTrait for ZUpdateMintCpiContext<'_> {
     fn first_set_context(&self) -> u8 {
-        self.first_set_context() as u8
+        if self.first_set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 
     fn set_context(&self) -> u8 {
-        self.set_context() as u8
+        if self.set_context == 0 {
+            0
+        } else {
+            1
+        }
     }
 }