From 6bb5220b13d5dce210045bdafdb7ac9e7db7c369 Mon Sep 17 00:00:00 2001
From: Deirdre Connolly <deirdre@zfnd.org>
Date: Sat, 3 Apr 2021 11:09:14 -0400
Subject: [PATCH] Bump redjubjub to 0.4.0 (#1975)

---
 Cargo.lock             | 52 +++++++++++++++---------------------------
 zebra-chain/Cargo.toml | 10 ++++----
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bed69be0104..bac4b41239f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -384,15 +384,6 @@ dependencies = [
  "byte-tools",
 ]
 
-[[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"
@@ -926,29 +917,29 @@ dependencies = [
 [[package]]
 name = "ed25519-zebra"
 version = "2.2.0"
-source = "git+https://github.com/ZcashFoundation/ed25519-zebra?rev=539fad040c443302775b0f508e616418825e6c22#539fad040c443302775b0f508e616418825e6c22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
 dependencies = [
  "curve25519-dalek",
  "hex",
- "rand_core 0.6.2",
+ "rand_core 0.5.1",
  "serde",
  "sha2",
  "thiserror",
- "zeroize",
 ]
 
 [[package]]
 name = "ed25519-zebra"
 version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
+source = "git+https://github.com/ZcashFoundation/ed25519-zebra?rev=539fad040c443302775b0f508e616418825e6c22#539fad040c443302775b0f508e616418825e6c22"
 dependencies = [
  "curve25519-dalek",
  "hex",
- "rand_core 0.5.1",
+ "rand_core 0.6.2",
  "serde",
  "sha2",
  "thiserror",
+ "zeroize",
 ]
 
 [[package]]
@@ -1074,9 +1065,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "funty"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
 [[package]]
 name = "futures"
@@ -1618,16 +1609,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jubjub"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaacc6b2b5fa79a5bd49de8439534b1f98886f06b88da02afeb968d60678b978"
-dependencies = [
- "bls12_381 0.1.1",
- "subtle",
-]
-
 [[package]]
 name = "jubjub"
 version = "0.6.0"
@@ -1635,7 +1616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d7e7fef85ae7b26dd89f34175b7f3c5ace64067a110c2ac86cf92407a6666ca"
 dependencies = [
  "bitvec 0.20.1",
- "bls12_381 0.4.0",
+ "bls12_381",
  "ff",
  "group",
  "rand_core 0.6.2",
@@ -2490,16 +2471,19 @@ dependencies = [
 
 [[package]]
 name = "redjubjub"
-version = "0.2.2"
-source = "git+https://github.com/ZcashFoundation/redjubjub?rev=8101eaff1cb2fca45334f77a65caa4c46e3d545b#8101eaff1cb2fca45334f77a65caa4c46e3d545b"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dcf30702f15c157e348b4ccef28b1224fc7da8f8430d553bdc47b2d6599107b"
 dependencies = [
  "blake2b_simd",
  "byteorder",
  "digest 0.9.0",
- "jubjub 0.3.0",
+ "funty",
+ "jubjub",
  "rand_core 0.6.2",
  "serde",
  "thiserror",
+ "zeroize",
 ]
 
 [[package]]
@@ -4076,7 +4060,7 @@ dependencies = [
  "equihash",
  "futures 0.3.13",
  "hex",
- "jubjub 0.6.0",
+ "jubjub",
  "lazy_static",
  "primitive-types",
  "proptest",
@@ -4105,13 +4089,13 @@ version = "1.0.0-alpha.5"
 dependencies = [
  "bellman",
  "blake2b_simd",
- "bls12_381 0.4.0",
+ "bls12_381",
  "chrono",
  "color-eyre",
  "displaydoc",
  "futures 0.3.13",
  "futures-util",
- "jubjub 0.6.0",
+ "jubjub",
  "lazy_static",
  "metrics",
  "once_cell",
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
index d6ee332d547..9fe6242721f 100644
--- a/zebra-chain/Cargo.toml
+++ b/zebra-chain/Cargo.toml
@@ -14,12 +14,15 @@ proptest-impl = ["proptest", "proptest-derive"]
 
 [dependencies]
 bech32 = "0.8.0"
+bitflags = "1.2.1"
 bitvec = "0.17.4"
 blake2b_simd = "0.5.11"
 blake2s_simd = "0.5.11"
 bs58 = { version = "0.4", features = ["check"] }
 byteorder = "1.4"
 chrono = { version = "0.4", features = ["serde"] }
+displaydoc = "0.2.1"
+equihash = "0.1"
 futures = "0.3"
 hex = "0.4"
 jubjub = "0.6.0"
@@ -38,14 +41,9 @@ proptest = { version = "0.10", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 
 # ZF deps
-
-displaydoc = "0.2.1"
 # TODO: upgrade ed25510-zebra to 3 when released: https://github.com/ZcashFoundation/ed25519-zebra/issues/45
 ed25519-zebra = {git = "https://github.com/ZcashFoundation/ed25519-zebra", rev = "539fad040c443302775b0f508e616418825e6c22"}
-equihash = "0.1"
-#redjubjub = "0.2"
-redjubjub = {git = "https://github.com/ZcashFoundation/redjubjub", rev = "8101eaff1cb2fca45334f77a65caa4c46e3d545b"}
-bitflags = "1.2.1"
+redjubjub = "0.4"
 
 [dev-dependencies]
 bincode = "1"