From 7c32197564dd0f76d78c4c24f5cbc542b1a57cb3 Mon Sep 17 00:00:00 2001 From: JC Date: Wed, 27 Sep 2023 09:23:32 -0600 Subject: [PATCH] fix: new zingolib version --- native/Cargo.lock | 89 +++++++++++++++++++++-------------------------- native/Cargo.toml | 4 --- 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 52d76e53..929fb267 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -250,7 +250,7 @@ dependencies = [ "hmac", "pbkdf2", "rand", - "sha2 0.10.7", + "sha2 0.10.8", "unicode-normalization", "zeroize", ] @@ -353,14 +353,14 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", "tinyvec", ] [[package]] name = "build_utils" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#7aef7439bbc63b07768f19a4da1a0405273108c7" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#6e0db92780be2169ddf7661fb5e03ff3459758b5" [[package]] name = "bumpalo" @@ -671,7 +671,7 @@ dependencies = [ [[package]] name = "equihash" version = "0.2.0" -source = "git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a#669e0797bff3b506984bd2851b22d9eae40a758a" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "blake2b_simd", "byteorder", @@ -707,16 +707,16 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.0" -source = "git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a#669e0797bff3b506984bd2851b22d9eae40a758a" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "blake2b_simd", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -2326,7 +2326,7 @@ version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", "walkdir", ] @@ -2342,7 +2342,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.19", ] [[package]] @@ -2504,9 +2504,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "semver-parser" @@ -2594,9 +2594,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2764,18 +2764,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", @@ -2805,9 +2805,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "serde", @@ -2816,9 +2816,9 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tinyvec" @@ -2972,9 +2972,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1" +checksum = "c9d37bb15da06ae9bb945963066baca6561b505af93a52e949a85d28558459a2" dependencies = [ "prettyplease 0.2.15", "proc-macro2", @@ -3538,18 +3538,18 @@ dependencies = [ [[package]] name = "zcash_address" version = "0.3.0" -source = "git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a#669e0797bff3b506984bd2851b22d9eae40a758a" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "bech32", "bs58", "f4jumble", - "zcash_encoding 0.2.0 (git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a)", + "zcash_encoding", ] [[package]] name = "zcash_client_backend" -version = "0.10.0-rc.2" -source = "git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a#669e0797bff3b506984bd2851b22d9eae40a758a" +version = "0.10.0-rc.4" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "base64 0.21.4", "bech32", @@ -3571,11 +3571,11 @@ dependencies = [ "shardtree", "subtle", "time", - "tonic-build 0.10.0", + "tonic-build 0.10.1", "tracing", "which", "zcash_address", - "zcash_encoding 0.2.0 (git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a)", + "zcash_encoding", "zcash_note_encryption", "zcash_primitives", ] @@ -3583,17 +3583,7 @@ dependencies = [ [[package]] name = "zcash_encoding" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03391b81727875efa6ac0661a20883022b6fba92365dc121c48fa9b00c5aac0" -dependencies = [ - "byteorder", - "nonempty", -] - -[[package]] -name = "zcash_encoding" -version = "0.2.0" -source = "git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a#669e0797bff3b506984bd2851b22d9eae40a758a" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "byteorder", "nonempty", @@ -3615,7 +3605,7 @@ dependencies = [ [[package]] name = "zcash_primitives" version = "0.13.0-rc.1" -source = "git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a#669e0797bff3b506984bd2851b22d9eae40a758a" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "aes", "bip0039", @@ -3640,18 +3630,17 @@ dependencies = [ "rand_core", "ripemd", "secp256k1", - "sha2 0.10.7", + "sha2 0.10.8", "subtle", "zcash_address", - "zcash_encoding 0.2.0 (git+https://github.com/nuttycom/librustzcash.git?rev=669e0797bff3b506984bd2851b22d9eae40a758a)", + "zcash_encoding", "zcash_note_encryption", ] [[package]] name = "zcash_proofs" version = "0.13.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zingo_rc.1#30c58ebfb2f5a2c78e6d94232fed17f0a00fa536" dependencies = [ "bellman", "blake2b_simd", @@ -3691,11 +3680,11 @@ dependencies = [ [[package]] name = "zingo-memo" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#7aef7439bbc63b07768f19a4da1a0405273108c7" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#6e0db92780be2169ddf7661fb5e03ff3459758b5" dependencies = [ "zcash_address", "zcash_client_backend", - "zcash_encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zcash_encoding", "zcash_note_encryption", "zcash_primitives", ] @@ -3703,7 +3692,7 @@ dependencies = [ [[package]] name = "zingoconfig" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#7aef7439bbc63b07768f19a4da1a0405273108c7" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#6e0db92780be2169ddf7661fb5e03ff3459758b5" dependencies = [ "dirs", "http", @@ -3716,7 +3705,7 @@ dependencies = [ [[package]] name = "zingolib" version = "0.2.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#7aef7439bbc63b07768f19a4da1a0405273108c7" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#6e0db92780be2169ddf7661fb5e03ff3459758b5" dependencies = [ "append-only-vec", "base58", @@ -3772,7 +3761,7 @@ dependencies = [ "webpki-roots 0.21.1", "zcash_address", "zcash_client_backend", - "zcash_encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zcash_encoding", "zcash_note_encryption", "zcash_primitives", "zcash_proofs", diff --git a/native/Cargo.toml b/native/Cargo.toml index 0562e3e1..98c592fa 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -21,7 +21,3 @@ lazy_static = "1.4.0" version = "0.10" default-features = false features = ["napi-6", "promise-api", "channel-api"] - -[patch.crates-io] -zcash_primitives = { git = "https://github.com/nuttycom/librustzcash.git", rev = "669e0797bff3b506984bd2851b22d9eae40a758a" } -zcash_address = { git = "https://github.com/nuttycom/librustzcash.git", rev = "669e0797bff3b506984bd2851b22d9eae40a758a" } \ No newline at end of file