remove hard dep on solana program

saber-hq · Nov 22, 2021 · 888bcd3 · 888bcd3
1 parent eb0e491
commit 888bcd3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/merkle-distributor/Cargo.toml b/programs/merkle-distributor/Cargo.toml
@@ -23,9 +23,8 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.17.0"
-anchor-spl = "0.17.0"
-solana-program = "1.7.11"
+anchor-lang = ">=0.17.0"
+anchor-spl = ">=0.17.0"
 spl-associated-token-account = { version = "1.0.3", features = [
     "no-entrypoint"
 ] }

diff --git a/programs/merkle-distributor/src/lib.rs b/programs/merkle-distributor/src/lib.rs
@@ -59,7 +59,7 @@ pub mod merkle_distributor {
         require!(claimant_account.is_signer, Unauthorized);
 
         // Verify the merkle proof.
-        let node = solana_program::keccak::hashv(&[
+        let node = anchor_lang::solana_program::keccak::hashv(&[
             &index.to_le_bytes(),
             &claimant_account.key().to_bytes(),
             &amount.to_le_bytes(),

diff --git a/programs/merkle-distributor/src/merkle_proof.rs b/programs/merkle-distributor/src/merkle_proof.rs
@@ -10,10 +10,12 @@ pub fn verify(proof: Vec<[u8; 32]>, root: [u8; 32], leaf: [u8; 32]) -> bool {
     for proof_element in proof.into_iter() {
         if computed_hash <= proof_element {
             // Hash(current computed hash + current element of the proof)
-            computed_hash = solana_program::keccak::hashv(&[&computed_hash, &proof_element]).0;
+            computed_hash =
+                anchor_lang::solana_program::keccak::hashv(&[&computed_hash, &proof_element]).0;
         } else {
             // Hash(current element of the proof + current computed hash)
-            computed_hash = solana_program::keccak::hashv(&[&proof_element, &computed_hash]).0;
+            computed_hash =
+                anchor_lang::solana_program::keccak::hashv(&[&proof_element, &computed_hash]).0;
         }
     }
     // Check if the computed hash (root) is equal to the provided root