fix

Author: ananas-block

Cargo.lock

@@ -22,7 +22,7 @@ v2 = ["light-sdk-types/v2"]
 cpi-context = ["light-sdk-types/cpi-context"]
 devnet = []
 poseidon = ["light-hasher/poseidon", "light-compressed-account/poseidon"]
-merkle-tree = ["light-concurrent-merkle-tree", "account-compression"]
+merkle-tree = ["light-concurrent-merkle-tree/solana"]
 
 
 [dependencies]
@@ -47,7 +47,6 @@ light-hasher = { workspace = true, features = ["std"] }
 light-account-checks = { workspace = true, features = ["solana"] }
 light-zero-copy = { workspace = true }
 light-concurrent-merkle-tree = { workspace = true, optional = true }
-account-compression = { workspace = true, features = ["cpi"], optional = true }
 
 [dev-dependencies]
 num-bigint = { workspace = true }

sdk-libs/sdk/Cargo.toml

@@ -49,7 +49,9 @@ mod system_accounts;
 mod tree_info;
 
 /// Zero-knowledge proof to prove the validity of existing compressed accounts and new addresses.
-pub use light_compressed_account::instruction_data::compressed_proof::ValidityProof;
+pub use light_compressed_account::instruction_data::compressed_proof::{
+    CompressedProof, ValidityProof,
+};
 pub use light_sdk_types::instruction::*;
 pub use pack_accounts::*;
 pub use system_accounts::*;

sdk-libs/sdk/src/instruction/mod.rs

@@ -1,48 +1,53 @@
-use account_compression::state_merkle_tree_from_bytes_zero_copy;
 use solana_account_info::AccountInfo;
 use solana_msg::msg;
 use solana_program_error::ProgramError;
 
-use crate::error::LightSdkError;
 pub mod v1 {
+    use super::*;
     use light_account_checks::checks::check_owner;
+    use light_concurrent_merkle_tree::zero_copy::ConcurrentMerkleTreeZeroCopy;
+    use light_hasher::Poseidon;
     use light_sdk_types::ACCOUNT_COMPRESSION_PROGRAM_ID;
 
-    use super::*;
-
     /// StateMerkleTreeAccount discriminator
     pub const STATE_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [172, 43, 172, 186, 29, 73, 219, 84];
+    pub const STATE_MERKLE_TREE_ACCOUNT_METADATA_LEN: usize = 224;
 
     /// Reads a root from the concurrent state merkle tree by index
     pub fn read_state_merkle_tree_root(
         account_info: &AccountInfo,
         root_index: u16,
-    ) -> Result<[u8; 32], LightSdkError> {
+    ) -> Result<[u8; 32], ProgramError> {
         if root_index as usize >= 2400 {
             msg!(
                 "Invalid root index: {} greater than max root index {}",
                 root_index,
                 2400
             );
-            return Err(LightSdkError::from(ProgramError::InvalidArgument));
+            return Err(ProgramError::InvalidArgument);
         }
         check_owner(&ACCOUNT_COMPRESSION_PROGRAM_ID, account_info)?;
         let account_data = account_info.try_borrow_data()?;
 
         // Check discriminator
         if account_data.len() < 8 {
             msg!("StateMerkleTreeAccount data too short for discriminator");
-            return Err(LightSdkError::from(ProgramError::InvalidAccountData));
+            return Err(ProgramError::InvalidAccountData);
         }
 
         let discriminator = &account_data[0..8];
         if discriminator != STATE_MERKLE_TREE_DISCRIMINATOR {
             msg!("Invalid StateMerkleTreeAccount discriminator");
-            return Err(LightSdkError::from(ProgramError::InvalidAccountData));
+            return Err(ProgramError::InvalidAccountData);
+        }
+        let required_size = STATE_MERKLE_TREE_ACCOUNT_METADATA_LEN;
+        if account_data.len() < required_size {
+            msg!("StateMerkleTreeAccount data too short for discriminator");
+            return Err(ProgramError::InvalidAccountData);
         }
 
-        let merkle_tree = state_merkle_tree_from_bytes_zero_copy(&account_data)
-            .map_err(|_| LightSdkError::from(ProgramError::InvalidAccountData))?;
+        let data = &account_data[required_size..];
+        let merkle_tree = ConcurrentMerkleTreeZeroCopy::<Poseidon, 26>::from_bytes_zero_copy(data)?;
 
         Ok(merkle_tree.roots[root_index as usize])
     }