From 12d0e698cd51f693a28b32da45f432e80df77d57 Mon Sep 17 00:00:00 2001 From: nemo Date: Fri, 17 Jul 2020 14:40:00 -0400 Subject: [PATCH] fix: point to latest merkle_light release --- fil-proofs-tooling/Cargo.toml | 3 +-- filecoin-proofs/Cargo.toml | 3 +-- storage-proofs/core/Cargo.toml | 3 +-- storage-proofs/porep/Cargo.toml | 3 +-- storage-proofs/post/Cargo.toml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/fil-proofs-tooling/Cargo.toml b/fil-proofs-tooling/Cargo.toml index 1ddc32891..cccc3963c 100644 --- a/fil-proofs-tooling/Cargo.toml +++ b/fil-proofs-tooling/Cargo.toml @@ -39,8 +39,7 @@ blake2s_simd = "0.5.6" fil_logger = "0.1" log = "0.4.8" uom = "0.28" -#merkletree = "0.20.0" -merkletree = { git = "https://github.com/filecoin-project/merkle_light", branch = "update-discard-rows" } +merkletree = "0.21.0" bincode = "1.1.2" anyhow = "1.0.23" ff = { version = "0.2.0", package = "fff" } diff --git a/filecoin-proofs/Cargo.toml b/filecoin-proofs/Cargo.toml index b43892a17..3b1c5487a 100644 --- a/filecoin-proofs/Cargo.toml +++ b/filecoin-proofs/Cargo.toml @@ -40,8 +40,7 @@ blake2s_simd = "0.5.8" hex = "0.4.0" tee = "0.1.0" os_pipe = "0.9.1" -#merkletree = "0.20.0" -merkletree = { git = "https://github.com/filecoin-project/merkle_light", branch = "update-discard-rows" } +merkletree = "0.21.0" bincode = "1.1.2" anyhow = "1.0.23" rand_xorshift = "0.2.0" diff --git a/storage-proofs/core/Cargo.toml b/storage-proofs/core/Cargo.toml index bf81651d5..a6342dbe3 100644 --- a/storage-proofs/core/Cargo.toml +++ b/storage-proofs/core/Cargo.toml @@ -13,8 +13,7 @@ bench = false [dependencies] rand = "0.7" -#merkletree = "0.20.0" -merkletree = { git = "https://github.com/filecoin-project/merkle_light", branch = "update-discard-rows" } +merkletree = "0.21.0" byteorder = "1" config = { version = "0.10.1", default-features = false, features = ["toml"] } itertools = "0.9" diff --git a/storage-proofs/porep/Cargo.toml b/storage-proofs/porep/Cargo.toml index bf0a82751..fa0bace7c 100644 --- a/storage-proofs/porep/Cargo.toml +++ b/storage-proofs/porep/Cargo.toml @@ -12,8 +12,7 @@ readme = "README.md" storage-proofs-core = { path = "../core", version = "4.0.1" } sha2raw = { path = "../../sha2raw", version = "1.0.0" } rand = "0.7" -#merkletree = "0.20.0" -merkletree = { git = "https://github.com/filecoin-project/merkle_light", branch = "update-discard-rows" } +merkletree = "0.21.0" memmap = "0.7" num-bigint = "0.2" num-traits = "0.2" diff --git a/storage-proofs/post/Cargo.toml b/storage-proofs/post/Cargo.toml index 1a08bbe5f..994de2495 100644 --- a/storage-proofs/post/Cargo.toml +++ b/storage-proofs/post/Cargo.toml @@ -11,8 +11,7 @@ readme = "README.md" [dependencies] storage-proofs-core = { path = "../core", version = "4.0.1" } rand = "0.7" -#merkletree = "0.20.0" -merkletree = { git = "https://github.com/filecoin-project/merkle_light", branch = "update-discard-rows" } +merkletree = "0.21.0" byteorder = "1" crossbeam = "0.7.3" sha2 = { version = "0.8.3", package = "sha2ni" }