diff --git a/.cargo/config.offline b/.cargo/config.offline index 4cf297a1b..a6339df37 100644 --- a/.cargo/config.offline +++ b/.cargo/config.offline @@ -1,10 +1,5 @@ [source.crates-io] replace-with = "vendored-sources" -[source."https://github.com/ebfull/ed25519-zebra"] -git = "https://github.com/ebfull/ed25519-zebra" -rev = "8c97acde89b6446f7f2505069fc7b9ac3a541417" -replace-with = "vendored-sources" - [source.vendored-sources] # The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am diff --git a/Cargo.lock b/Cargo.lock index e62b446e1..7c53cc712 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -295,8 +295,9 @@ dependencies = [ [[package]] name = "ed25519-zebra" -version = "0.4.1" -source = "git+https://github.com/ebfull/ed25519-zebra?rev=8c97acde89b6446f7f2505069fc7b9ac3a541417#8c97acde89b6446f7f2505069fc7b9ac3a541417" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beeba2b02b91dc7cc2d1f42c96b9e82db4cd20ad1c326f1dbf64ac8943c7bf32" dependencies = [ "curve25519-dalek", "hex 0.4.2", diff --git a/Cargo.toml b/Cargo.toml index b1eb20184..16b8615c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ rand_core = "0.5.1" zcash_history = "0.2" zcash_primitives = "0.2" zcash_proofs = "0.2" -ed25519-zebra = { git = "https://github.com/ebfull/ed25519-zebra", rev = "8c97acde89b6446f7f2505069fc7b9ac3a541417" } +ed25519-zebra = "2.0.0" [profile.release] lto = true diff --git a/depends/packages/crate_ed25519_zebra.mk b/depends/packages/crate_ed25519_zebra.mk index 96938e3bc..7eada7b4b 100644 --- a/depends/packages/crate_ed25519_zebra.mk +++ b/depends/packages/crate_ed25519_zebra.mk @@ -1,16 +1,15 @@ package=crate_ed25519_zebra $(package)_crate_name=ed25519-zebra -$(package)_download_path=https://github.com/ebfull/$($(package)_crate_name)/archive/ -$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz -$(package)_download_file=$($(package)_git_commit).tar.gz -$(package)_sha256_hash=e0b432e0161abe9cb27cf96dd42c1486d32297e2fdbf725b70e7ae1f5b53d052 -$(package)_git_commit=8c97acde89b6446f7f2505069fc7b9ac3a541417 +$(package)_version=2.0.0 +$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name) +$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate +$(package)_sha256_hash=beeba2b02b91dc7cc2d1f42c96b9e82db4cd20ad1c326f1dbf64ac8943c7bf32 $(package)_crate_versioned_name=$($(package)_crate_name) define $(package)_preprocess_cmds - $(call generate_unpackaged_crate_checksum,$(package)) + $(call generate_crate_checksum,$(package)) endef define $(package)_stage_cmds $(call vendor_crate_source,$(package)) -endef \ No newline at end of file +endef