From cd6a8777e09b9579de8774a13487e84e9dc074ab Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 22 Sep 2023 23:45:23 +0100 Subject: [PATCH] Migrate to latest RC of Rust crates --- backend-lib/Cargo.lock | 28 ++++++++++++++++++---------- backend-lib/Cargo.toml | 12 ++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/backend-lib/Cargo.lock b/backend-lib/Cargo.lock index 708f5b55..5fdc3425 100644 --- a/backend-lib/Cargo.lock +++ b/backend-lib/Cargo.lock @@ -465,7 +465,8 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "equihash" version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5" dependencies = [ "blake2b_simd", "byteorder", @@ -501,7 +502,8 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75" dependencies = [ "blake2b_simd", ] @@ -2099,7 +2101,8 @@ dependencies = [ [[package]] name = "zcash_address" version = "0.3.0" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8944af5c206cf2e37020ad54618e1825501b98548d35a638b73e0ec5762df8d5" dependencies = [ "bech32", "bs58", @@ -2109,8 +2112,9 @@ dependencies = [ [[package]] name = "zcash_client_backend" -version = "0.10.0-rc.3" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +version = "0.10.0-rc.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc33f71747a93d509f7e1c047961e359a271bdf4869cc07f7f65ee1ba7df8c2" dependencies = [ "base64", "bech32", @@ -2143,8 +2147,9 @@ dependencies = [ [[package]] name = "zcash_client_sqlite" -version = "0.8.0-rc.4" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +version = "0.8.0-rc.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a6c73b247bc22b6d3d4a46333a0720a24d0357636d3ebc265e4f16f1280f3d" dependencies = [ "bs58", "byteorder", @@ -2170,7 +2175,8 @@ dependencies = [ [[package]] name = "zcash_encoding" version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03391b81727875efa6ac0661a20883022b6fba92365dc121c48fa9b00c5aac0" dependencies = [ "byteorder", "nonempty", @@ -2192,7 +2198,8 @@ dependencies = [ [[package]] name = "zcash_primitives" version = "0.13.0-rc.1" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0" dependencies = [ "aes", "bip0039", @@ -2227,7 +2234,8 @@ dependencies = [ [[package]] name = "zcash_proofs" version = "0.13.0-rc.1" -source = "git+https://github.com/zcash/librustzcash?rev=b69d80f25d583ae9084b29c1a94ee451954997ab#b69d80f25d583ae9084b29c1a94ee451954997ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2" dependencies = [ "bellman", "blake2b_simd", diff --git a/backend-lib/Cargo.toml b/backend-lib/Cargo.toml index ec48209d..4b21563e 100644 --- a/backend-lib/Cargo.toml +++ b/backend-lib/Cargo.toml @@ -22,8 +22,8 @@ schemer = "0.2" secp256k1 = "0.26" secrecy = "0.8" zcash_address = "0.3" -zcash_client_backend = { version = "=0.10.0-rc.3", features = ["transparent-inputs", "unstable"] } -zcash_client_sqlite = { version = "=0.8.0-rc.4", features = ["transparent-inputs", "unstable"] } +zcash_client_backend = { version = "=0.10.0-rc.4", features = ["transparent-inputs", "unstable"] } +zcash_client_sqlite = { version = "=0.8.0-rc.5", features = ["transparent-inputs", "unstable"] } zcash_primitives = "=0.13.0-rc.1" zcash_proofs = "=0.13.0-rc.1" orchard = { version = "0.6", default-features = false } @@ -66,11 +66,3 @@ name = "zcashwalletsdk" path = "src/main/rust/lib.rs" crate-type = ["staticlib", "cdylib"] -[patch.crates-io] -zcash_address = { git = "https://github.com/zcash/librustzcash", rev = "b69d80f25d583ae9084b29c1a94ee451954997ab" } -zcash_encoding = { git = "https://github.com/zcash/librustzcash", rev = "b69d80f25d583ae9084b29c1a94ee451954997ab" } -zcash_client_backend = { git = "https://github.com/zcash/librustzcash", rev = "b69d80f25d583ae9084b29c1a94ee451954997ab" } -zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash", rev = "b69d80f25d583ae9084b29c1a94ee451954997ab" } -zcash_primitives = { git = "https://github.com/zcash/librustzcash", rev = "b69d80f25d583ae9084b29c1a94ee451954997ab" } -zcash_proofs = { git = "https://github.com/zcash/librustzcash", rev = "b69d80f25d583ae9084b29c1a94ee451954997ab" } -