From fc3e8cb7dc2eb11446e1452fef319994cc678543 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Mon, 30 Nov 2020 11:26:34 +0100 Subject: [PATCH 1/2] feat: update bellperson using new blstrs release --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 7dd54e317..f5c61442e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,3 +12,6 @@ members = [ "phase2", "filecoin-hashers", ] + +[patch.crates-io] +bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "feat-update-blstrs" } \ No newline at end of file From 71dcf498a19a92a980f1e55f2726c8e08bc3d237 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Mon, 30 Nov 2020 16:37:38 +0100 Subject: [PATCH 2/2] use released version --- Cargo.toml | 2 -- fil-proofs-param/Cargo.toml | 2 +- fil-proofs-tooling/Cargo.toml | 2 +- filecoin-hashers/Cargo.toml | 2 +- filecoin-proofs/Cargo.toml | 2 +- phase2/Cargo.toml | 2 +- storage-proofs/core/Cargo.toml | 2 +- storage-proofs/porep/Cargo.toml | 2 +- storage-proofs/post/Cargo.toml | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f5c61442e..d8b97bc55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,5 +13,3 @@ members = [ "filecoin-hashers", ] -[patch.crates-io] -bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "feat-update-blstrs" } \ No newline at end of file diff --git a/fil-proofs-param/Cargo.toml b/fil-proofs-param/Cargo.toml index 49ad6e9a6..666d747c5 100644 --- a/fil-proofs-param/Cargo.toml +++ b/fil-proofs-param/Cargo.toml @@ -23,7 +23,7 @@ serde = { version = "1.0", features = ["rc", "derive"] } serde_json = "1.0" ff = { version = "0.2.3", package = "fff" } blake2b_simd = "0.5" -bellperson = { version = "0.12", default-features = false } +bellperson = { version = "0.12.3", default-features = false } log = "0.4.7" fil_logger = "0.1" env_proxy = "0.4" diff --git a/fil-proofs-tooling/Cargo.toml b/fil-proofs-tooling/Cargo.toml index b57e72ec0..2b8d69669 100644 --- a/fil-proofs-tooling/Cargo.toml +++ b/fil-proofs-tooling/Cargo.toml @@ -23,7 +23,7 @@ regex = "1.3.7" commandspec = "0.12.2" chrono = { version = "0.4.7", features = ["serde"] } memmap = "0.7.0" -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } rand = "0.7" tempfile = "3.0.8" cpu-time = "1.0.0" diff --git a/filecoin-hashers/Cargo.toml b/filecoin-hashers/Cargo.toml index a7b559ad6..2ab90a33c 100644 --- a/filecoin-hashers/Cargo.toml +++ b/filecoin-hashers/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs" readme = "README.md" [dependencies] -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } generic-array = "0.14.4" merkletree = "0.21.0" ff = { version = "0.2.3", package = "fff" } diff --git a/filecoin-proofs/Cargo.toml b/filecoin-proofs/Cargo.toml index c13ac4157..63c341361 100644 --- a/filecoin-proofs/Cargo.toml +++ b/filecoin-proofs/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["rc", "derive"] } serde_json = "1.0" ff = { version = "0.2.3", package = "fff" } blake2b_simd = "0.5" -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } log = "0.4.7" fil_logger = "0.1" rayon = "1.1.0" diff --git a/phase2/Cargo.toml b/phase2/Cargo.toml index cb21d0774..e61b54c2d 100644 --- a/phase2/Cargo.toml +++ b/phase2/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" [dependencies] -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } filecoin-proofs = { version = "5.4.0", path = "../filecoin-proofs", default-features = false } storage-proofs = { version = "5.4.0", path = "../storage-proofs", default-features = false } filecoin-hashers = { version = "1.0.0", path = "../filecoin-hashers", default-features = false, features = ["sha256"] } diff --git a/storage-proofs/core/Cargo.toml b/storage-proofs/core/Cargo.toml index 1970d80b6..ceedb395c 100644 --- a/storage-proofs/core/Cargo.toml +++ b/storage-proofs/core/Cargo.toml @@ -31,7 +31,7 @@ blake2b_simd = "0.5" blake2s_simd = "0.5" toml = "0.5" ff = { version = "0.2.3", package = "fff" } -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } serde_json = "1.0" log = "0.4.7" rand_chacha = "0.2.1" diff --git a/storage-proofs/porep/Cargo.toml b/storage-proofs/porep/Cargo.toml index 45c0f3c87..44d3fa4c1 100644 --- a/storage-proofs/porep/Cargo.toml +++ b/storage-proofs/porep/Cargo.toml @@ -24,7 +24,7 @@ rayon = "1.0.0" serde = { version = "1.0", features = ["derive"]} serde_json = "1.0" ff = { version = "0.2.3", package = "fff" } -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } log = "0.4.7" pretty_assertions = "0.6.1" generic-array = "0.14.4" diff --git a/storage-proofs/post/Cargo.toml b/storage-proofs/post/Cargo.toml index cdc5bf16d..2d56e5fdd 100644 --- a/storage-proofs/post/Cargo.toml +++ b/storage-proofs/post/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"]} blake2b_simd = "0.5" blake2s_simd = "0.5" ff = { version = "0.2.3", package = "fff" } -bellperson = { version = "0.12.2", default-features = false } +bellperson = { version = "0.12.3", default-features = false } log = "0.4.7" hex = "0.4.0" generic-array = "0.14.4"