add mint-to-compressed

Author: ananas-block

program-tests/sdk-token-test/tests/test_4_transfer2.rs

@@ -151,7 +151,7 @@ async fn create_compressed_mint_helper(
 ) -> (Pubkey, Pubkey) {
     let mint_authority = payer.pubkey();
     let mint_signer = Keypair::new();
-    let address_tree_pubkey = rpc.get_address_merkle_tree_v2();
+    let address_tree_pubkey = rpc.get_address_tree_v2().tree;
     let output_queue = rpc.get_random_state_tree_info().unwrap().queue;
 
     // Find mint PDA
@@ -186,6 +186,7 @@ async fn create_compressed_mint_helper(
 
     // Create compressed mint
     let instruction = create_compressed_mint(CreateCompressedMintInputs {
+        version: 0,
         decimals,
         mint_authority,
         freeze_authority: None,
@@ -197,7 +198,8 @@ async fn create_compressed_mint_helper(
         address_tree_pubkey,
         output_queue,
         extensions: None,
-    });
+    })
+    .unwrap();
 
     rpc.create_and_send_transaction(&[instruction], &payer.pubkey(), &[payer, &mint_signer])
         .await
@@ -239,16 +241,11 @@ async fn mint_compressed_tokens(
 
     let mint_to_instruction = create_mint_to_compressed_instruction(MintToCompressedInputs {
         compressed_mint_inputs: CompressedMintInputs {
-            merkle_context: light_compressed_account::compressed_account::PackedMerkleContext {
-                merkle_tree_pubkey_index: 0,
-                queue_pubkey_index: 1,
-                leaf_index: compressed_mint_account.leaf_index,
-                prove_by_index: true,
-            },
+            prove_by_index: true,
+            leaf_index: compressed_mint_account.leaf_index,
             root_index: 0,
             address: compressed_mint_account.address.unwrap(),
             compressed_mint_input: expected_compressed_mint,
-            output_merkle_tree_index: 3,
         },
         recipients: vec![Recipient {
             recipient: payer.pubkey().into(),

program-tests/sdk-token-test/tests/test_compress_full_and_close.rs

@@ -73,6 +73,7 @@ async fn test_compress_full_and_close() {
     let address_merkle_tree_root_index = rpc_result.addresses[0].root_index;
 
     let instruction = create_compressed_mint(CreateCompressedMintInputs {
+        version: 0,
         decimals,
         mint_authority,
         freeze_authority: Some(freeze_authority),
@@ -84,7 +85,8 @@ async fn test_compress_full_and_close() {
         address_tree_pubkey,
         output_queue,
         extensions: None,
-    });
+    })
+    .unwrap();
 
     rpc.create_and_send_transaction(&[instruction], &payer.pubkey(), &[&payer, &mint_signer])
         .await
@@ -121,16 +123,11 @@ async fn test_compress_full_and_close() {
     let state_output_queue = state_tree_info.queue;
 
     let compressed_mint_inputs = CompressedMintInputs {
-        merkle_context: light_compressed_account::compressed_account::PackedMerkleContext {
-            merkle_tree_pubkey_index: 0,
-            queue_pubkey_index: 1,
-            leaf_index: compressed_mint_account.leaf_index,
-            prove_by_index: true,
-        },
+        prove_by_index: true,
+        leaf_index: compressed_mint_account.leaf_index,
         root_index: 0,
         address: compressed_mint_address,
         compressed_mint_input: expected_compressed_mint,
-        output_merkle_tree_index: 3,
     };
 
     let mint_instruction = create_mint_to_compressed_instruction(MintToCompressedInputs {

programs/compressed-token/program/src/mint_to_compressed/input_compressed_mint.rs

@@ -380,19 +380,15 @@ fn test_rnd_create_compressed_mint_account() {
                 version,
                 extensions: expected_extensions.clone(),
             },
-            merkle_context: PackedMerkleContext {
-                merkle_tree_pubkey_index,
-                queue_pubkey_index,
-                leaf_index,
-                prove_by_index,
-            },
+            leaf_index,
+            prove_by_index,
             root_index,
             address: compressed_account_address,
-            output_merkle_tree_index,
         };
 
         let update_instruction_data = light_ctoken_types::instructions::create_compressed_mint::UpdateCompressedMintInstructionData {
-            merkle_context: input_compressed_mint.merkle_context,
+            leaf_index: input_compressed_mint.leaf_index,
+            prove_by_index: input_compressed_mint.prove_by_index,
             root_index: input_compressed_mint.root_index,
             address: input_compressed_mint.address,
             proof: None,
@@ -418,6 +414,12 @@ fn test_rnd_create_compressed_mint_account() {
             &mut context,
             &z_update_instruction_data,
             &hashed_mint_authority,
+            PackedMerkleContext {
+                merkle_tree_pubkey_index: input_account.merkle_context.merkle_tree_pubkey_index,
+                queue_pubkey_index: input_account.merkle_context.queue_pubkey_index,
+                leaf_index: input_account.merkle_context.leaf_index.into(),
+                prove_by_index: input_account.merkle_context.prove_by_index(),
+            },
         )
         .unwrap();