From ca44fbd7b8381cba58068039d8fc55437bfa31e7 Mon Sep 17 00:00:00 2001
From: Alfredo Garcia <oxarbitrage@gmail.com>
Date: Tue, 2 Mar 2021 04:45:55 -0300
Subject: [PATCH] upgrade ed25519-zebra to v2 (#1811)

This implements ZIP-215
---
 Cargo.lock             | 18 ++----------------
 zebra-chain/Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c45886a61..9bd084f40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -918,20 +918,6 @@ dependencies = [
  "syn 1.0.60",
 ]
 
-[[package]]
-name = "ed25519-zebra"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85a1fff1b329c96789427b09d4d5949b2d2f717851fd1e65a18878bee19d1ff"
-dependencies = [
- "curve25519-dalek",
- "hex",
- "rand_core 0.5.1",
- "serde",
- "sha2",
- "thiserror",
-]
-
 [[package]]
 name = "ed25519-zebra"
 version = "2.2.0"
@@ -3391,7 +3377,7 @@ name = "tower-batch"
 version = "0.2.1"
 dependencies = [
  "color-eyre",
- "ed25519-zebra 2.2.0",
+ "ed25519-zebra",
  "futures 0.3.13",
  "futures-core",
  "pin-project 0.4.27",
@@ -3976,7 +3962,7 @@ dependencies = [
  "chrono",
  "color-eyre",
  "displaydoc",
- "ed25519-zebra 1.0.1",
+ "ed25519-zebra",
  "equihash",
  "futures 0.3.13",
  "hex",
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
index 037134c64..930ceae5a 100644
--- a/zebra-chain/Cargo.toml
+++ b/zebra-chain/Cargo.toml
@@ -39,7 +39,7 @@ proptest-derive = { version = "0.3.0", optional = true }
 
 # ZF deps
 displaydoc = "0.1.7"
-ed25519-zebra = "1"
+ed25519-zebra = "2"
 equihash = "0.1"
 redjubjub = "0.2"
 bitflags = "1.2.1"