diff --git a/Cargo.lock b/Cargo.lock index 65a8ff0872..a3db0732fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2709,12 +2709,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "generic-array" version = "0.12.4" @@ -4777,20 +4771,16 @@ dependencies = [ [[package]] name = "merkletree" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2202d6eb93a775e0a619fc08924b341d0cf12d6e0f064ee52d24311de45b925b" +version = "0.22.0" +source = "git+https://github.com/filecoin-project/merkletree?rev=05dd6de235e0dc36dbe05cb0849f35957fdca5be#05dd6de235e0dc36dbe05cb0849f35957fdca5be" dependencies = [ "anyhow", "arrayref", "log 0.4.17", "memmap", "positioned-io", - "rand 0.7.3", "rayon", - "rust-crypto", "serde 1.0.140", - "tempdir", "tempfile", "typenum", ] @@ -7312,29 +7302,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.6.5" @@ -7895,19 +7862,6 @@ dependencies = [ "crossbeam-utils 0.8.11", ] -[[package]] -name = "rust-crypto" -version = "0.2.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -dependencies = [ - "gcc", - "libc", - "rand 0.3.23", - "rustc-serialize", - "time 0.1.44", -] - [[package]] name = "rust-embed" version = "6.4.0" @@ -11050,16 +11004,6 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - [[package]] name = "tempfile" version = "3.3.0" diff --git a/cmd/merkle-generator/Cargo.toml b/cmd/merkle-generator/Cargo.toml index 91c9f2ad37..4afe526a52 100644 --- a/cmd/merkle-generator/Cargo.toml +++ b/cmd/merkle-generator/Cargo.toml @@ -14,7 +14,7 @@ serde_json = { version = "~1", features = ["arbitrary_precision"] } anyhow = "~1" hex = "~0.4" bcs-ext = { package = "bcs-ext", path = "../../commons/bcs_ext" } -merkletree = { version = "0.21.0", features = ["chaincore"] } +merkletree = { git = "https://github.com/filecoin-project/merkletree", rev = "05dd6de235e0dc36dbe05cb0849f35957fdca5be" } starcoin-vm-types = { path = "../../vm/types" } starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc" } clap = { version = "3", features = ["derive"] }