From e36ec346e80c5bf82f8791ceb12e4bb31a5165f7 Mon Sep 17 00:00:00 2001
From: Deirdre Connolly <deirdre@zfnd.org>
Date: Tue, 12 Oct 2021 19:42:44 -0400
Subject: [PATCH] Upgrade to ed25519-zebra 3.0.0 (#2864)

* Upgrade to ed25519-zebra 3.0.0

* Revert unrelated extra space

Co-authored-by: teor <teor@riseup.net>
---
 Cargo.lock             | 5 +++--
 Cargo.toml             | 3 ---
 tower-batch/Cargo.toml | 5 +----
 zebra-chain/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d40b3c97a0b..56511a075b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1156,8 +1156,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-zebra"
-version = "2.2.0"
-source = "git+https://github.com/ZcashFoundation/ed25519-zebra?rev=539fad040c443302775b0f508e616418825e6c22#539fad040c443302775b0f508e616418825e6c22"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
 dependencies = [
  "curve25519-dalek",
  "hex",
diff --git a/Cargo.toml b/Cargo.toml
index b0532219d10..ff18db1154c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,9 +22,6 @@ panic = "abort"
 
 [patch.crates-io]
 
-# 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"}
-
 # awaiting stable versions which all depend on tokio 1.0, see #1086 for details
 hyper = { git = "https://github.com/hyperium/hyper", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" }
 metrics = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }
diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml
index 12c93481acd..bc598f0a8a5 100644
--- a/tower-batch/Cargo.toml
+++ b/tower-batch/Cargo.toml
@@ -16,7 +16,7 @@ tracing-futures = "0.2.5"
 
 [dev-dependencies]
 color-eyre = "0.5.11"
-ed25519-zebra = "2.2.0"
+ed25519-zebra = "3.0.0"
 rand = "0.8"
 tokio = { version = "0.3.6", features = ["full"]}
 tokio-test = "0.4.2"
@@ -24,6 +24,3 @@ tower-fallback = { path = "../tower-fallback/" }
 tower-test = "0.4.0"
 tracing = "0.1.29"
 zebra-test = { path = "../zebra-test/" }
-
-
-
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
index 9ff65e9c549..6bf3fabae58 100644
--- a/zebra-chain/Cargo.toml
+++ b/zebra-chain/Cargo.toml
@@ -53,7 +53,7 @@ rand = { version = "0.8", optional = true }
 rand_chacha = { version = "0.3", optional = true }
 
 # ZF deps
-ed25519-zebra = "2"
+ed25519-zebra = "3.0.0"
 equihash = "0.1"
 # TODO: Update to 0.5 release when published
 redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub.git", rev = "f772176560b0b7daf25eff2460e08dc127ac8407" }