refactor: MerkleContext nullifier_queue_pubkey -> queue_pubkey (#1688)

Author: ananas-block

examples/anchor/token-escrow/tests/test.rs

@@ -264,7 +264,7 @@ pub async fn perform_escrow<R: RpcConnection, I: Indexer<R> + TestIndexerExtensi
                 .merkle_context
                 .leaf_index,
             merkle_tree_pubkey: env.merkle_tree_pubkey,
-            nullifier_queue_pubkey: env.nullifier_queue_pubkey,
+            queue_pubkey: env.nullifier_queue_pubkey,
             prove_by_index: false,
             tree_type: TreeType::StateV1,
         }],
@@ -426,7 +426,7 @@ pub async fn perform_withdrawal<R: RpcConnection, I: Indexer<R> + TestIndexerExt
                 .merkle_context
                 .leaf_index,
             merkle_tree_pubkey: env.merkle_tree_pubkey,
-            nullifier_queue_pubkey: env.nullifier_queue_pubkey,
+            queue_pubkey: env.nullifier_queue_pubkey,
             prove_by_index: false,
             tree_type: TreeType::StateV1,
         }],

examples/anchor/token-escrow/tests/test_compressed_pda.rs

@@ -270,7 +270,7 @@ async fn create_escrow_ix<R: RpcConnection + MerkleTreeExt>(
                 .merkle_context
                 .leaf_index,
             merkle_tree_pubkey: env.merkle_tree_pubkey,
-            nullifier_queue_pubkey: env.nullifier_queue_pubkey,
+            queue_pubkey: env.nullifier_queue_pubkey,
             prove_by_index: false,
             tree_type: TreeType::StateV1,
         }],
@@ -475,15 +475,15 @@ pub async fn perform_withdrawal<R: RpcConnection + MerkleTreeExt>(
         input_token_escrow_merkle_context: MerkleContext {
             leaf_index: token_escrow_account.merkle_context.leaf_index,
             merkle_tree_pubkey: env.merkle_tree_pubkey,
-            nullifier_queue_pubkey: env.nullifier_queue_pubkey,
+            queue_pubkey: env.nullifier_queue_pubkey,
             prove_by_index: false,
             tree_type: TreeType::StateV1,
         },
 
         input_cpda_merkle_context: MerkleContext {
             leaf_index: compressed_escrow_pda.merkle_context.leaf_index,
             merkle_tree_pubkey: env.merkle_tree_pubkey,
-            nullifier_queue_pubkey: env.nullifier_queue_pubkey,
+            queue_pubkey: env.nullifier_queue_pubkey,
             prove_by_index: false,
             tree_type: TreeType::StateV1,
         },

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

@@ -114,8 +114,8 @@ impl CompressedAccountWithMerkleContext {
                     &self.merkle_context.merkle_tree_pubkey,
                     remaining_accounts,
                 ),
-                nullifier_queue_pubkey_index: pack_account(
-                    &self.merkle_context.nullifier_queue_pubkey,
+                queue_pubkey_index: pack_account(
+                    &self.merkle_context.queue_pubkey,
                     remaining_accounts,
                 ),
                 leaf_index: self.merkle_context.leaf_index,
@@ -143,7 +143,7 @@ pub struct PackedReadOnlyCompressedAccount {
 #[derive(Debug, Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Default)]
 pub struct MerkleContext {
     pub merkle_tree_pubkey: Pubkey,
-    pub nullifier_queue_pubkey: Pubkey,
+    pub queue_pubkey: Pubkey,
     pub leaf_index: u32,
     pub prove_by_index: bool,
     pub tree_type: TreeType,
@@ -152,7 +152,7 @@ pub struct MerkleContext {
 #[derive(Debug, Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Default)]
 pub struct PackedMerkleContext {
     pub merkle_tree_pubkey_index: u8,
-    pub nullifier_queue_pubkey_index: u8,
+    pub queue_pubkey_index: u8,
     pub leaf_index: u32,
     pub prove_by_index: bool,
 }
@@ -211,10 +211,7 @@ pub fn pack_merkle_context(
                 &merkle_context.merkle_tree_pubkey,
                 remaining_accounts,
             ),
-            nullifier_queue_pubkey_index: pack_account(
-                &merkle_context.nullifier_queue_pubkey,
-                remaining_accounts,
-            ),
+            queue_pubkey_index: pack_account(&merkle_context.queue_pubkey, remaining_accounts),
             prove_by_index: merkle_context.prove_by_index,
         })
         .collect::<Vec<_>>()

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

@@ -443,7 +443,7 @@ fn test_read_only_zero_copy() {
             data_hash: [10; 32],
             merkle_context: PackedMerkleContext {
                 merkle_tree_pubkey_index: 1,
-                nullifier_queue_pubkey_index: 2,
+                queue_pubkey_index: 2,
                 leaf_index: 3,
                 prove_by_index: false,
             },
@@ -473,7 +473,7 @@ fn test_read_only_zero_copy() {
             account_hash: [80; 32],
             merkle_context: PackedMerkleContext {
                 merkle_tree_pubkey_index: 5,
-                nullifier_queue_pubkey_index: 6,
+                queue_pubkey_index: 6,
                 leaf_index: 7,
                 prove_by_index: false,
             },

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

@@ -90,7 +90,7 @@ impl From<&ZNewAddressParamsPacked> for NewAddressParamsPacked {
 )]
 pub struct ZPackedMerkleContext {
     pub merkle_tree_pubkey_index: u8,
-    pub nullifier_queue_pubkey_index: u8,
+    pub queue_pubkey_index: u8,
     pub leaf_index: U32,
     prove_by_index: u8,
 }
@@ -318,7 +318,7 @@ impl From<ZPackedMerkleContext> for PackedMerkleContext {
     fn from(merkle_context: ZPackedMerkleContext) -> Self {
         PackedMerkleContext {
             merkle_tree_pubkey_index: merkle_context.merkle_tree_pubkey_index,
-            nullifier_queue_pubkey_index: merkle_context.nullifier_queue_pubkey_index,
+            queue_pubkey_index: merkle_context.queue_pubkey_index,
             leaf_index: merkle_context.leaf_index.into(),
             prove_by_index: merkle_context.prove_by_index == 1,
         }
@@ -1073,7 +1073,7 @@ mod test {
             },
             merkle_context: PackedMerkleContext {
                 merkle_tree_pubkey_index: 1,
-                nullifier_queue_pubkey_index: 2,
+                queue_pubkey_index: 2,
                 leaf_index: 3,
                 prove_by_index: true,
             },
@@ -1092,7 +1092,7 @@ mod test {
             },
             merkle_context: PackedMerkleContext {
                 merkle_tree_pubkey_index: rng.gen(),
-                nullifier_queue_pubkey_index: rng.gen(),
+                queue_pubkey_index: rng.gen(),
                 leaf_index: rng.gen(),
                 prove_by_index: rng.gen(),
             },
@@ -1300,7 +1300,7 @@ mod test {
         if reference.merkle_tree_pubkey_index != z_copy.merkle_tree_pubkey_index {
             return Err(CompressedAccountError::InvalidArgument);
         }
-        if reference.nullifier_queue_pubkey_index != z_copy.nullifier_queue_pubkey_index {
+        if reference.queue_pubkey_index != z_copy.queue_pubkey_index {
             return Err(CompressedAccountError::InvalidArgument);
         }
         if reference.leaf_index != u32::from(z_copy.leaf_index) {

program-tests/compressed-token-test/tests/test.rs

@@ -3096,7 +3096,7 @@ async fn test_burn() {
             let invalid_change_account_merkle_tree = input_compressed_accounts[0]
                 .compressed_account
                 .merkle_context
-                .nullifier_queue_pubkey;
+                .queue_pubkey;
             let mut additional_token_pool_accounts = (0..4)
                 .map(|x| get_token_pool_pda_with_index(&mint, x))
                 .collect::<Vec<_>>();
@@ -3416,7 +3416,7 @@ async fn failing_tests_burn() {
             let invalid_change_account_merkle_tree = input_compressed_accounts[0]
                 .compressed_account
                 .merkle_context
-                .nullifier_queue_pubkey;
+                .queue_pubkey;
             let (_, _, _, _, instruction) = create_burn_test_instruction(
                 &sender,
                 &mut rpc,
@@ -3451,7 +3451,7 @@ async fn failing_tests_burn() {
             let invalid_change_account_merkle_tree = input_compressed_accounts[0]
                 .compressed_account
                 .merkle_context
-                .nullifier_queue_pubkey;
+                .queue_pubkey;
             let (_, _, _, _, instruction) = create_burn_test_instruction(
                 &sender,
                 &mut rpc,
@@ -3481,7 +3481,7 @@ async fn failing_tests_burn() {
             let invalid_change_account_merkle_tree = input_compressed_accounts[0]
                 .compressed_account
                 .merkle_context
-                .nullifier_queue_pubkey;
+                .queue_pubkey;
             let (_, _, _, _, mut instruction) = create_burn_test_instruction(
                 &sender,
                 &mut rpc,
@@ -5368,7 +5368,7 @@ async fn perform_transfer_failing_test<R: RpcConnection>(
             .iter()
             .map(|x| MerkleContext {
                 merkle_tree_pubkey: *merkle_tree_pubkey,
-                nullifier_queue_pubkey: *nullifier_queue_pubkey,
+                queue_pubkey: *nullifier_queue_pubkey,
                 leaf_index: x.merkle_context.leaf_index,
                 prove_by_index: false,
                 tree_type: TreeType::StateV1,

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

@@ -327,9 +327,7 @@ fn cpi_compressed_pda_transfer_as_program<'info>(
             match mode {
                 CreatePdaMode::InvalidReadOnlyAccountMerkleTree => {
                     read_only_account[0].merkle_context.merkle_tree_pubkey_index =
-                        read_only_account[0]
-                            .merkle_context
-                            .nullifier_queue_pubkey_index;
+                        read_only_account[0].merkle_context.queue_pubkey_index;
                 }
                 CreatePdaMode::InvalidReadOnlyAccountRootIndex => {
                     let init_value = read_only_account[0].root_index;
@@ -350,9 +348,7 @@ fn cpi_compressed_pda_transfer_as_program<'info>(
                     inputs_struct.proof = Some(CompressedProof::default());
                 }
                 CreatePdaMode::InvalidReadOnlyAccountOutputQueue => {
-                    read_only_account[0]
-                        .merkle_context
-                        .nullifier_queue_pubkey_index =
+                    read_only_account[0].merkle_context.queue_pubkey_index =
                         read_only_account[0].merkle_context.merkle_tree_pubkey_index;
                 }
                 CreatePdaMode::AccountNotInValueVecMarkedProofByIndex => {

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

@@ -125,7 +125,7 @@ async fn parse_batched_event_functional() {
                     leaf_index: i,
                     merkle_tree_pubkey: env.batched_state_merkle_tree,
                     prove_by_index: true,
-                    nullifier_queue_pubkey: env.batched_output_queue,
+                    queue_pubkey: env.batched_output_queue,
                     tree_type: light_compressed_account::TreeType::StateV2,
                 })
             })
@@ -276,7 +276,7 @@ async fn parse_batched_event_functional() {
                     leaf_index: i,
                     merkle_tree_pubkey: env.batched_state_merkle_tree,
                     prove_by_index: true,
-                    nullifier_queue_pubkey: env.batched_output_queue,
+                    queue_pubkey: env.batched_output_queue,
                     tree_type: light_compressed_account::TreeType::StateV2,
                 })
             })

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

@@ -1915,7 +1915,7 @@ pub async fn perform_with_input_accounts<
         );
     }
     let merkle_tree_pubkey = compressed_account.merkle_context.merkle_tree_pubkey;
-    let nullifier_pubkey = compressed_account.merkle_context.nullifier_queue_pubkey;
+    let nullifier_pubkey = compressed_account.merkle_context.queue_pubkey;
     let cpi_context = match mode {
         WithInputAccountsMode::Freeze
         | WithInputAccountsMode::Thaw
@@ -1970,7 +1970,7 @@ pub async fn perform_with_input_accounts<
                 merkle_context: PackedMerkleContext {
                     leaf_index: token_account.compressed_account.merkle_context.leaf_index,
                     merkle_tree_pubkey_index: 0,
-                    nullifier_queue_pubkey_index: 1,
+                    queue_pubkey_index: 1,
                     prove_by_index: false,
                 },
                 lamports: if token_account.compressed_account.compressed_account.lamports != 0 {
@@ -2000,7 +2000,7 @@ pub async fn perform_with_input_accounts<
             merkle_context: PackedMerkleContext {
                 leaf_index: compressed_account.merkle_context.leaf_index,
                 merkle_tree_pubkey_index: 0,
-                nullifier_queue_pubkey_index: 1,
+                queue_pubkey_index: 1,
                 prove_by_index: false,
             },
             root_index: rpc_result.root_indices[0].unwrap(),