Bump sparse-merkle-tree

darwinia-network · Feb 14, 2022 · 396a5ad · 396a5ad
1 parent 634553c
commit 396a5ad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/beefy-mmr/Cargo.toml b/frame/beefy-mmr/Cargo.toml
@@ -29,7 +29,7 @@ beefy-merkle-tree = { version = "4.0.0-dev", path = "./primitives", default-feat
 beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy", default-features = false }
 pallet-beefy = { version = "4.0.0-dev", path = "../beefy", default-features = false }
 
-sparse-merkle-tree = { git = "https://github.com/darwinia-network/sparse-merkle-tree" }
+sparse-merkle-tree = { git = "https://github.com/darwinia-network/sparse-merkle-tree", features = ["keccak"] }
 
 [dev-dependencies]
 sp-staking = { version = "4.0.0-dev", path = "../../primitives/staking" }
@@ -55,4 +55,5 @@ std = [
     "sp-io/std",
     "sp-runtime/std",
     "sp-std/std",
+	"sparse-merkle-tree/debug"
 ]
diff --git a/frame/beefy-mmr/src/lib.rs b/frame/beefy-mmr/src/lib.rs
@@ -228,12 +228,14 @@ where
 			.collect::<Vec<_>>();
 		let len = beefy_addresses.len() as u32;
 		// let root = beefy_merkle_tree::merkle_root::<Self, _, _>(beefy_addresses).into();
-		let root = sparse_merkle_tree::SparseMerkleTree::new(
-			beefy_addresses,
-			sp_io::hashing::keccak_256,
-		)
-		.root()
-		.into();
+		use sparse_merkle_tree::{
+			hash::{Hasher, Keccak256},
+			SparseMerkleTree,
+		};
+		let root =
+			SparseMerkleTree::new::<_, Keccak256>(beefy_addresses.into_iter().map(Keccak256::hash))
+				.root()
+				.into();
 		let next_set = BeefyNextAuthoritySet { id, len, root };
 		// cache the result
 		BeefyNextAuthorities::<T>::put(&next_set);