cleanup

Author: ananas-block

Cargo.lock

@@ -1,11 +1,11 @@
-// #![cfg(feature = "test-sbf")]
+#![cfg(feature = "test-sbf")]
 
 use anchor_lang::{AccountDeserialize, InstructionData};
 use anchor_spl::token::TokenAccount;
 use light_compressed_token_sdk::{
     instruction::{get_transfer_instruction_account_metas, TokenAccountsMetaConfig},
     token_pool::get_token_pool_pda,
-    InputTokenDataWithContext, PackedMerkleContext,
+    InputTokenDataWithContext,
 };
 use light_program_test::{Indexer, LightProgramTest, ProgramTestConfig, Rpc};
 use light_sdk::instruction::PackedAccounts;
@@ -219,7 +219,6 @@ async fn test() {
         &transfer_recipient,
         recipient_compressed_account,
         decompress_token_account_keypair.pubkey(),
-        decompress_amount,
     )
     .await
     .unwrap();
@@ -354,19 +353,13 @@ async fn transfer_compressed_tokens(
     let token_data = vec![InputTokenDataWithContext {
         amount: compressed_account.token.amount,
         delegate_index: None,
-        merkle_context: PackedMerkleContext {
-            merkle_tree_pubkey_index: tree_info.merkle_tree_pubkey_index,
-            nullifier_queue_pubkey_index: tree_info.queue_pubkey_index,
-            leaf_index: tree_info.leaf_index,
-            proof_by_index: tree_info.prove_by_index,
-        },
-        root_index: tree_info.root_index,
+        packed_tree_info: tree_info,
         lamports: None,
         tlv: None,
     }];
 
     let (remaining_accounts, _, _) = remaining_accounts.to_account_metas();
-    println!("remaining_accounts {:?}", remaining_accounts);
+
     let instruction = Instruction {
         program_id: sdk_token_test::ID,
         accounts: [remaining_accounts].concat(),
@@ -389,7 +382,6 @@ async fn decompress_compressed_tokens(
     payer: &Keypair,
     compressed_account: &CompressedTokenAccount,
     decompress_token_account: Pubkey,
-    decompress_amount: u64,
 ) -> Result<Signature, RpcError> {
     let mut remaining_accounts = PackedAccounts::default();
     let token_pool_pda = get_token_pool_pda(&compressed_account.token.mint);
@@ -423,13 +415,7 @@ async fn decompress_compressed_tokens(
     let token_data = vec![InputTokenDataWithContext {
         amount: compressed_account.token.amount,
         delegate_index: None,
-        merkle_context: PackedMerkleContext {
-            merkle_tree_pubkey_index: tree_info.merkle_tree_pubkey_index,
-            nullifier_queue_pubkey_index: tree_info.queue_pubkey_index,
-            leaf_index: tree_info.leaf_index,
-            proof_by_index: tree_info.prove_by_index,
-        },
-        root_index: tree_info.root_index,
+        packed_tree_info: tree_info,
         lamports: None,
         tlv: None,
     }];

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

@@ -108,7 +108,9 @@ pub fn create_compressed_token_instruction(
 
     for token_account in cpi_inputs.token_accounts {
         let (inputs, output) = token_account.into_inputs_and_outputs();
-        input_token_data_with_context.extend(inputs);
+        for input in inputs {
+            input_token_data_with_context.push(input.into());
+        }
         if output.amount == 0 && cpi_inputs.filter_zero_amount_outputs {
         } else {
             output_compressed_accounts.push(output);

sdk-libs/compressed-token-sdk/src/cpi/invoke.rs

@@ -4,12 +4,17 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-anchor = ["anchor-lang", "light-compressed-account/anchor"]
+anchor = [
+    "anchor-lang",
+    "light-compressed-account/anchor",
+    "light-sdk-types/anchor",
+]
 
 [dependencies]
 borsh = { workspace = true }
 light-macros = { workspace = true }
 anchor-lang = { workspace = true, optional = true }
+light-sdk-types = { workspace = true }
 light-account-checks = { workspace = true }
 light-compressed-account = { workspace = true }
 thiserror = { workspace = true }

sdk-libs/compressed-token-types/Cargo.toml

@@ -1,5 +1,6 @@
 use crate::{AnchorDeserialize, AnchorSerialize};
 pub use light_compressed_account::instruction_data::compressed_proof::CompressedProof;
+use light_sdk_types::instruction::PackedStateTreeInfo;
 
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, PartialEq)]
 pub struct PackedMerkleContext {
@@ -19,6 +20,16 @@ pub struct CompressedCpiContext {
 
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, PartialEq)]
 pub struct InputTokenDataWithContext {
+    pub amount: u64,
+    pub delegate_index: Option<u8>,
+    pub packed_tree_info: PackedStateTreeInfo,
+    pub lamports: Option<u64>,
+    /// Placeholder for TokenExtension tlv data (unimplemented)
+    pub tlv: Option<Vec<u8>>,
+}
+
+#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, PartialEq)]
+pub struct InputTokenDataWithContextOnchain {
     pub amount: u64,
     pub delegate_index: Option<u8>,
     pub merkle_context: PackedMerkleContext,
@@ -28,6 +39,24 @@ pub struct InputTokenDataWithContext {
     pub tlv: Option<Vec<u8>>,
 }
 
+impl From<InputTokenDataWithContext> for InputTokenDataWithContextOnchain {
+    fn from(input: InputTokenDataWithContext) -> Self {
+        Self {
+            amount: input.amount,
+            delegate_index: input.delegate_index,
+            merkle_context: PackedMerkleContext {
+                merkle_tree_pubkey_index: input.packed_tree_info.merkle_tree_pubkey_index,
+                nullifier_queue_pubkey_index: input.packed_tree_info.queue_pubkey_index,
+                leaf_index: input.packed_tree_info.leaf_index,
+                proof_by_index: input.packed_tree_info.prove_by_index,
+            },
+            root_index: input.packed_tree_info.root_index,
+            lamports: input.lamports,
+            tlv: input.tlv,
+        }
+    }
+}
+
 /// Struct to provide the owner when the delegate is signer of the transaction.
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize)]
 pub struct DelegatedTransfer {
@@ -47,7 +76,7 @@ pub struct CompressedTokenInstructionDataTransfer {
     /// -> delegate is authority account,
     /// owner = Some(owner) is the owner of the token account.
     pub delegated_transfer: Option<DelegatedTransfer>,
-    pub input_token_data_with_context: Vec<InputTokenDataWithContext>,
+    pub input_token_data_with_context: Vec<InputTokenDataWithContextOnchain>,
     pub output_compressed_accounts: Vec<PackedTokenTransferOutputData>,
     pub is_compress: bool,
     pub compress_or_decompress_amount: Option<u64>,