octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Deirdre Connolly 2021-10-12 19:42:44 -04:00 committed by GitHub
parent a393720560
commit e36ec346e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -1156,8 +1156,9 @@ dependencies = [
[[package]] [[package]]
name = "ed25519-zebra" name = "ed25519-zebra"
version = "2.2.0" version = "3.0.0"
source = "git+https://github.com/ZcashFoundation/ed25519-zebra?rev=539fad040c443302775b0f508e616418825e6c22#539fad040c443302775b0f508e616418825e6c22" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
dependencies = [ dependencies = [
"curve25519-dalek", "curve25519-dalek",
"hex", "hex",

3
Cargo.toml
View File

@ -22,9 +22,6 @@ panic = "abort"
[patch.crates-io] [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 # awaiting stable versions which all depend on tokio 1.0, see #1086 for details
hyper = { git = "https://github.com/hyperium/hyper", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" } hyper = { git = "https://github.com/hyperium/hyper", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" }
metrics = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" } metrics = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }

5
tower-batch/Cargo.toml
View File

@ -16,7 +16,7 @@ tracing-futures = "0.2.5"
[dev-dependencies] [dev-dependencies]
color-eyre = "0.5.11" color-eyre = "0.5.11"
ed25519-zebra = "2.2.0" ed25519-zebra = "3.0.0"
rand = "0.8" rand = "0.8"
tokio = { version = "0.3.6", features = ["full"]} tokio = { version = "0.3.6", features = ["full"]}
tokio-test = "0.4.2" tokio-test = "0.4.2"
@ -24,6 +24,3 @@ tower-fallback = { path = "../tower-fallback/" }
tower-test = "0.4.0" tower-test = "0.4.0"
tracing = "0.1.29" tracing = "0.1.29"
zebra-test = { path = "../zebra-test/" } zebra-test = { path = "../zebra-test/" }

2
zebra-chain/Cargo.toml
View File

@ -53,7 +53,7 @@ rand = { version = "0.8", optional = true }
rand_chacha = { version = "0.3", optional = true } rand_chacha = { version = "0.3", optional = true }
# ZF deps # ZF deps
ed25519-zebra = "2" ed25519-zebra = "3.0.0"
equihash = "0.1" equihash = "0.1"
# TODO: Update to 0.5 release when published # TODO: Update to 0.5 release when published
redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub.git", rev = "f772176560b0b7daf25eff2460e08dc127ac8407" } redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub.git", rev = "f772176560b0b7daf25eff2460e08dc127ac8407" }