From 638ff8d7f89b7a8de9eacfb12afae1c3d74af4ad Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Sun, 4 Apr 2021 21:41:34 -0400 Subject: [PATCH] Bump redjubjub --- Cargo.lock | 11 +---------- zebra-chain/Cargo.toml | 11 ++++------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dce30cd7d..475205b5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,15 +454,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "bls12_381" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c116dad307b68138cc2e2f3a699c16f52faa47c65f98fc6de1dea9a097ee1e" -dependencies = [ - "subtle", -] - [[package]] name = "bls12_381" version = "0.4.0" @@ -2793,7 +2784,7 @@ checksum = "5dcf30702f15c157e348b4ccef28b1224fc7da8f8430d553bdc47b2d6599107b" dependencies = [ "blake2b_simd", "byteorder", - "digest", + "digest 0.9.0", "funty", "jubjub", "rand_core 0.6.2", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 8658f2797..e02dc24b3 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] - default = [] proptest-impl = ["proptest", "proptest-derive", "itertools"] bench = ["zebra-test"] @@ -24,8 +23,9 @@ bs58 = { version = "0.4", features = ["check"] } byteorder = "1.4" chrono = { version = "0.4", features = ["serde"] } displaydoc = "0.2.1" -equihash = "0.1" fpe = "0.4" +# Temporary workaround for https://github.com/myrrlyn/funty/issues/3 +funty = "=1.1.0" futures = "0.3" group = "0.9" halo2 = { git = "https://github.com/zcash/halo2.git", branch = "main" } @@ -47,13 +47,10 @@ proptest-derive = { version = "0.3.0", optional = true } itertools = { version = "0.10.0", optional = true } # ZF deps -ed25519-zebra = "2.2.0" +ed25519-zebra = "2" +equihash = "0.1" redjubjub = "0.4" -zebra-test = { path = "../zebra-test/", optional = true } - -# Temporary workaround for https://github.com/myrrlyn/funty/issues/3 -funty = "=1.1.0" [dev-dependencies] bincode = "1"