refactor: instruction data field is_decompress -> is_compress

Author: sergeytimoshin

anchor-programs/system/src/errors.rs

@@ -83,4 +83,7 @@ pub enum SystemProgramError {
     NewAddressAssignedIndexOutOfBounds,
     AddressIsNone,
     AddressDoesNotMatch,
+    CpiContextAlreadySet,
+    InvalidTreeHeight,
+    TooManyOutputAccounts,
 }

program-libs/compressed-account/src/indexer_event/parse.rs

@@ -338,7 +338,7 @@ fn deserialize_instruction<'a>(
                 if data.compress_or_decompress_lamports > 0 {
                     len += 1;
                 }
-                if data.is_decompress {
+                if !data.is_compress && data.compress_or_decompress_lamports > 0 {
                     len += 1;
                 }
                 if data.with_cpi_context {
@@ -359,7 +359,7 @@ fn deserialize_instruction<'a>(
                         )
                     })
                     .collect::<Vec<_>>(),
-                is_compress: !data.is_decompress && data.compress_or_decompress_lamports > 0,
+                is_compress: data.is_compress && data.compress_or_decompress_lamports > 0,
                 relay_fee: None,
                 compress_or_decompress_lamports: if data.compress_or_decompress_lamports == 0 {
                     None
@@ -385,7 +385,7 @@ fn deserialize_instruction<'a>(
                 if data.compress_or_decompress_lamports > 0 {
                     len += 1;
                 }
-                if data.is_decompress {
+                if !data.is_compress && data.compress_or_decompress_lamports > 0 {
                     len += 1;
                 }
                 if data.with_cpi_context {
@@ -440,7 +440,7 @@ fn deserialize_instruction<'a>(
                         }
                     })
                     .collect::<Vec<_>>(),
-                is_compress: !data.is_decompress && data.compress_or_decompress_lamports > 0,
+                is_compress: data.is_compress && data.compress_or_decompress_lamports > 0,
                 relay_fee: None,
                 compress_or_decompress_lamports: if data.compress_or_decompress_lamports == 0 {
                     None

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

@@ -289,7 +289,7 @@ pub struct InstructionDataInvokeCpiWithAccountInfo {
     /// If compress_or_decompress_lamports > 0 -> expect sol_pool_pda
     pub compress_or_decompress_lamports: u64,
     /// -> expect account decompression_recipient
-    pub is_decompress: bool,
+    pub is_compress: bool,
     pub with_cpi_context: bool,
     pub with_transaction_hash: bool,
     pub cpi_context: CompressedCpiContext,
@@ -351,7 +351,7 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvokeCpiWithAccountInfo<'a> {
     }
 
     fn is_compress(&self) -> bool {
-        !self.meta.is_decompress()
+        self.meta.is_compress()
     }
 
     fn input_accounts(&self) -> &[impl InputAccount<'a>] {
@@ -457,7 +457,7 @@ pub mod test {
             bump: rng.gen(),
             invoking_program_id: Pubkey::new_unique(),
             compress_or_decompress_lamports: rng.gen(),
-            is_decompress: rng.gen(),
+            is_compress: rng.gen(),
             with_cpi_context: rng.gen(),
             with_transaction_hash: rng.gen(),
             cpi_context: get_rnd_cpi_context(rng),
@@ -580,7 +580,7 @@ pub mod test {
         {
             return Err(CompressedAccountError::InvalidArgument);
         }
-        if reference.is_decompress != z_copy.meta.is_decompress() {
+        if reference.is_compress != z_copy.meta.is_compress() {
             return Err(CompressedAccountError::InvalidArgument);
         }
         if reference.with_cpi_context != z_copy.meta.with_cpi_context() {
@@ -749,7 +749,7 @@ pub mod test {
 
         // Test is_compress
         let expected_is_compress =
-            !reference.is_decompress && reference.compress_or_decompress_lamports > 0;
+            reference.is_compress && reference.compress_or_decompress_lamports > 0;
         assert_eq!(z_copy.is_compress(), expected_is_compress);
 
         // Test cpi_context

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

@@ -202,7 +202,7 @@ pub struct InstructionDataInvokeCpiWithReadOnly {
     /// If compress_or_decompress_lamports > 0 -> expect sol_pool_pda
     pub compress_or_decompress_lamports: u64,
     /// -> expect account decompression_recipient
-    pub is_decompress: bool,
+    pub is_compress: bool,
     pub with_cpi_context: bool,
     pub with_transaction_hash: bool,
     pub cpi_context: CompressedCpiContext,
@@ -227,15 +227,15 @@ pub struct ZInstructionDataInvokeCpiWithReadOnlyMeta {
     /// If compress_or_decompress_lamports > 0 -> expect sol_pool_pda
     pub compress_or_decompress_lamports: U64,
     /// -> expect account decompression_recipient
-    is_decompress: u8,
+    is_compress: u8,
     with_cpi_context: u8,
     with_transaction_hash: u8,
     pub cpi_context: ZCompressedCpiContext,
 }
 
 impl ZInstructionDataInvokeCpiWithReadOnlyMeta {
-    pub fn is_decompress(&self) -> bool {
-        self.is_decompress > 0
+    pub fn is_compress(&self) -> bool {
+        self.is_compress > 0
     }
     pub fn with_cpi_context(&self) -> bool {
         self.with_cpi_context > 0
@@ -306,7 +306,7 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvokeCpiWithReadOnly<'a> {
     }
 
     fn is_compress(&self) -> bool {
-        !self.meta.is_decompress() && self.compress_or_decompress_lamports().is_some()
+        self.meta.is_compress() && self.compress_or_decompress_lamports().is_some()
     }
 
     fn input_accounts(&self) -> &[impl InputAccount<'a>] {
@@ -392,7 +392,7 @@ impl PartialEq<InstructionDataInvokeCpiWithReadOnly> for ZInstructionDataInvokeC
             || self.invoking_program_id != other.invoking_program_id
             || u64::from(self.compress_or_decompress_lamports)
                 != other.compress_or_decompress_lamports
-            || self.is_decompress() != other.is_decompress
+            || self.is_compress() != other.is_compress
             || self.with_cpi_context() != other.with_cpi_context
         {
             return false;
@@ -435,7 +435,7 @@ fn test_read_only_zero_copy() {
         bump: 0,
         invoking_program_id: Pubkey::default(),
         compress_or_decompress_lamports: 0,
-        is_decompress: false,
+        is_compress: false,
         with_cpi_context: false,
         with_transaction_hash: true,
         cpi_context: CompressedCpiContext {
@@ -533,7 +533,7 @@ mod test {
         {
             return Err(CompressedAccountError::InvalidArgument);
         }
-        if reference.is_decompress != z_copy.meta.is_decompress() {
+        if reference.is_compress != z_copy.meta.is_compress() {
             return Err(CompressedAccountError::InvalidArgument);
         }
         if reference.with_cpi_context != z_copy.meta.with_cpi_context() {
@@ -608,7 +608,7 @@ mod test {
 
         assert_eq!(
             z_copy.is_compress(),
-            !reference.is_decompress && reference.compress_or_decompress_lamports > 0
+            reference.is_compress && reference.compress_or_decompress_lamports > 0
         );
 
         // For cpi_context, the trait adds a layer of conditional return
@@ -630,7 +630,7 @@ mod test {
             bump: rng.gen(),
             invoking_program_id: Pubkey::new_unique(),
             compress_or_decompress_lamports: rng.gen(),
-            is_decompress: rng.gen(),
+            is_compress: rng.gen(),
             with_cpi_context: rng.gen(),
             with_transaction_hash: rng.gen(),
             cpi_context: CompressedCpiContext {

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

@@ -558,7 +558,7 @@ impl<'a> InstructionData<'a> for ZInstructionDataInvokeCpi<'a> {
 
     fn account_option_config(&self) -> AccountOptions {
         AccountOptions {
-            sol_pool_pda: self.is_compress(),
+            sol_pool_pda: self.compress_or_decompress_lamports().is_some(),
             decompression_recipient: self.compress_or_decompress_lamports().is_some()
                 && !self.is_compress(),
             cpi_context_account: self.cpi_context().is_some(),

program-tests/system-cpi-test/src/create_pda.rs

@@ -390,7 +390,7 @@ fn cpi_compressed_pda_transfer_as_program<'info>(
                 .map(|(i, x)| NewAddressParamsAssignedPacked::new(*x, Some(i as u8)))
                 .collect::<Vec<_>>(),
             cpi_context: inputs_struct.cpi_context.unwrap_or_default(),
-            is_decompress: !inputs_struct.is_compress,
+            is_compress: inputs_struct.is_compress,
             compress_or_decompress_lamports: inputs_struct
                 .compress_or_decompress_lamports
                 .unwrap_or_default(),

program-tests/system-cpi-test/tests/event.rs

@@ -687,7 +687,7 @@ pub async fn perform_test_transaction<R: RpcConnection>(
         invoking_program_id: create_address_test_program::ID.into(),
         proof,
         new_address_params: packed_new_address_params,
-        is_decompress: false,
+        is_compress: false,
         compress_or_decompress_lamports: 0,
         output_compressed_accounts: output_compressed_accounts.clone(),
         input_compressed_accounts: packed_inputs