Merge branch 'main' into halo2-verifier

ZcashFoundation · Oct 14, 2021 · 97d2c19 · 97d2c19
2 parents 8e73a0b + 002c533
commit 97d2c19
Show file tree

Hide file tree

Showing 56 changed files with 5,796 additions and 774 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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" }