feat: use new merkle tree

Cargo.toml

@@ -49,7 +49,6 @@ members = [
     "util/logger",
     "util/hash",
     "util/merkle-tree",
-    "util/merkle-root",
     "util/jsonrpc-types",
     "util/crypto",
     "util/dir",

core/Cargo.toml

@@ -17,5 +17,5 @@ bit-vec = "0.5.0"
 crossbeam-channel = "0.3"
 ckb-util = { path = "../util" }
 fnv = "1.0.3"
-merkle-root = {path = "../util/merkle-root"}
+ckb-merkle-tree = {path = "../util/merkle-tree"}
 faster-hex = "0.3"

core/src/block.rs

@@ -1,8 +1,8 @@
 use crate::header::{Header, HeaderBuilder};
 use crate::transaction::{ProposalShortId, Transaction};
 use crate::uncle::{uncles_hash, UncleBlock};
+use ckb_merkle_tree::merkle_root;
 use fnv::FnvHashSet;
-use merkle_root::merkle_root;
 use numext_fixed_hash::H256;
 use serde_derive::{Deserialize, Serialize};
 

protocol/Cargo.toml

@@ -14,5 +14,4 @@ hash = { path = "../util/hash"}
 siphasher = "0.3.0"
 rand = "0.6"
 ckb-util = { path = "../util" }
-merkle-tree = { path = "../util/merkle-tree"}
-merkle-root = { path = "../util/merkle-root"}
+ckb-merkle-tree = { path = "../util/merkle-tree"}

protocol/src/builder.rs

@@ -17,9 +17,8 @@ use ckb_core::header::{BlockNumber, Header};
 use ckb_core::script::Script;
 use ckb_core::transaction::{CellInput, CellOutput, OutPoint, ProposalShortId, Transaction};
 use ckb_core::uncle::UncleBlock;
+use ckb_merkle_tree::build_merkle_proof;
 use flatbuffers::{FlatBufferBuilder, WIPOffset};
-use merkle_root::H256Sha3;
-use merkle_tree::Tree;
 use numext_fixed_hash::H256;
 use numext_fixed_uint::U256;
 use rand::{thread_rng, Rng};
@@ -385,16 +384,16 @@ impl<'a> FilteredBlock<'a> {
                 })
                 .collect::<Vec<_>>();
 
-            let tree = Tree::<H256Sha3>::new(
+            let proof = build_merkle_proof(
                 &block
                     .commit_transactions()
                     .iter()
                     .map(|tx| tx.hash())
                     .collect::<Vec<_>>(),
+                transactions_index,
             );
-            let lemmas = tree
-                .get_proof(transactions_index)
-                .map(|proof| proof.lemmas)
+            let lemmas = proof
+                .map(|proof| proof.lemmas().to_vec())
                 .unwrap_or_else(Vec::new);
 
             let header = FbsHeader::build(fbb, &block.header());

util/merkle-tree/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "merkle-tree"
+name = "ckb-merkle-tree"
 version = "0.5.0-pre"
 license = "MIT"
 authors = ["Nervos Core Dev <[email protected]>"]
 edition = "2018"
 
-[dev-dependencies]
-proptest = "0.8"
+[dependencies]
+merkle-cbt = { version="0.1", features = ["sha3"] }

util/merkle-tree/src/lib.rs

@@ -1,7 +1,13 @@
-mod hash;
-mod proof;
-mod tree;
+use merkle_cbt::{MerkleProof, MerkleTree, CBMT, H256};
 
-pub use crate::hash::Merge;
-pub use crate::proof::Proof;
-pub use crate::tree::Tree;
+pub fn merkle_root(leaves: &[H256]) -> H256 {
+    CBMT::build_merkle_root(leaves)
+}
+
+pub fn build_merkle_tree(leaves: Vec<H256>) -> MerkleTree<H256> {
+    CBMT::build_merkle_tree(leaves)
+}
+
+pub fn build_merkle_proof(leaves: &[H256], indices: &[usize]) -> Option<MerkleProof<H256>> {
+    CBMT::build_merkle_proof(leaves, indices)
+}