test: compress and close sdk

stash

Author: ananas-block

Cargo.lock

@@ -235,6 +235,8 @@ rand = "0.8.5"
 
 [patch.crates-io]
 # Profiling logs and state is handled here
-solana-program-runtime = { path = "../agave/program-runtime" }
+solana-program-runtime = { git = "https://github.com/Lightprotocol/agave", rev = "580e29f03e4176a4a5525abc188a948c6595c47f" }
 # Profiling syscalls are defined here
-solana-bpf-loader-program = { path = "../agave/programs/bpf_loader" }
+solana-bpf-loader-program = { git = "https://github.com/Lightprotocol/agave", rev = "580e29f03e4176a4a5525abc188a948c6595c47f" }
+# Patch solana-program-memory to use older version where is_nonoverlapping is public
+solana-program-memory = { git = "https://github.com/anza-xyz/solana-sdk", rev = "1c1d667f161666f12f5a43ebef8eda9470a8c6ee" }

Cargo.toml

@@ -134,6 +134,7 @@ impl Compression {
         source_or_recipient: u8,
         authority: u8,
         rent_recipient_index: u8,
+        compressed_account_index: u8,
     ) -> Self {
         Compression {
             amount, // the full balance of the ctoken account to be compressed
@@ -142,7 +143,7 @@ impl Compression {
             source_or_recipient,
             authority,
             pool_account_index: rent_recipient_index,
-            pool_index: 0,
+            pool_index: compressed_account_index,
             bump: 0,
         }
     }

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

@@ -174,6 +174,15 @@ fn validate_compressed_token_account(
             .get_u8(compressed_token_account.owner, "CompressAndClose: owner")?
             .key()
     {
+        msg!(
+            "*compressed_token.owner {:?} packed_accounts owner: {:?}",
+            solana_pubkey::Pubkey::new_from_array(compressed_token.owner.to_bytes()),
+            solana_pubkey::Pubkey::new_from_array(
+                *packed_accounts
+                    .get_u8(compressed_token_account.owner, "CompressAndClose: owner")?
+                    .key()
+            )
+        );
         return Err(ErrorCode::CompressAndCloseInvalidOwner.into());
     }
     // Compression amount must match the output amount

programs/compressed-token/program/src/transfer2/native_compression/native.rs

@@ -27,6 +27,7 @@ solana-clock = { workspace = true }
 solana-signature = { workspace = true }
 solana-commitment-config = { workspace = true }
 solana-account = { workspace = true }
+solana-signer = { workspace = true }
 solana-epoch-info = { workspace = true }
 solana-keypair = { workspace = true }
 solana-compute-budget-interface = { workspace = true }

sdk-libs/client/Cargo.toml

@@ -14,6 +14,7 @@ use solana_keypair::Keypair;
 use solana_pubkey::Pubkey;
 use solana_rpc_client_api::config::RpcSendTransactionConfig;
 use solana_signature::Signature;
+use solana_signer::Signer;
 use solana_transaction::Transaction;
 use solana_transaction_status_client_types::TransactionStatus;
 
@@ -170,9 +171,21 @@ pub trait Rpc: Send + Sync + Debug + 'static {
     ) -> Result<Signature, RpcError> {
         let blockhash = self.get_latest_blockhash().await?.0;
         let mut transaction = Transaction::new_with_payer(instructions, Some(payer));
-        transaction
-            .try_sign(signers, blockhash)
-            .map_err(|e| RpcError::CustomError(e.to_string()))?;
+        transaction.try_sign(signers, blockhash).map_err(|e| {
+            println!(
+                "Provided signers: {:?}",
+                signers.iter().map(|s| s.pubkey()).collect::<Vec<_>>()
+            );
+
+            let message = transaction.message();
+            let num_required_signatures = message.header.num_required_signatures as usize;
+            println!(
+                "Expected signers (first {} accounts in message): {:?}",
+                num_required_signatures,
+                message.account_keys[..num_required_signatures].to_vec()
+            );
+            RpcError::CustomError(e.to_string())
+        })?;
         self.process_transaction(transaction).await
     }
 

sdk-libs/client/src/rpc/rpc_trait.rs

@@ -6,6 +6,16 @@ edition = { workspace = true }
 [features]
 
 anchor = ["anchor-lang", "light-compressed-token-types/anchor"]
+profile-program = [
+    "light-profiler/profile-program",
+    "light-compressed-account/profile-program",
+    "light-ctoken-types/profile-program",
+]
+profile-heap = [
+    "light-profiler/profile-heap",
+    "light-compressed-account/profile-heap",
+    "light-ctoken-types/profile-heap",
+]
 
 [dependencies]
 # Light Protocol dependencies
@@ -30,6 +40,7 @@ spl-pod = { workspace = true }
 light-account-checks = { workspace = true, features = ["solana"] }
 light-sdk-types = { workspace = true }
 light-zero-copy = { workspace = true }
+light-profiler = { workspace = true }
 
 # Optional Anchor dependency
 anchor-lang = { workspace = true, optional = true }
@@ -38,3 +49,11 @@ anchor-lang = { workspace = true, optional = true }
 light-account-checks = { workspace = true, features = ["test-only", "solana"] }
 anchor-lang = { workspace = true }
 light-compressed-token = { workspace = true }
+
+
+[lints.rust.unexpected_cfgs]
+level = "allow"
+check-cfg = [
+    'cfg(target_os, values("solana"))',
+    'cfg(feature, values("frozen-abi", "no-entrypoint"))',
+]