From 3ac019d817ddf0c38b8f0192dbc34f59e37e57fb Mon Sep 17 00:00:00 2001 From: Arya Date: Fri, 24 Feb 2023 13:58:59 -0500 Subject: [PATCH] build(deps): Bump zcash_script version and update deny.toml (#6214) * Bump zcash_script version and updates deny.toml * Uses zcash_script 0.1.10 and removes bindgen from deny.toml * bumps zcash_script version * Update Cargo.lock --------- Co-authored-by: teor --- Cargo.lock | 72 +++++++++-------------------------------- deny.toml | 3 +- zebra-script/Cargo.toml | 2 +- 3 files changed, 18 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf5ad2e6..d00a50e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,29 +333,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "clap 3.2.20", - "env_logger 0.9.1", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.47", - "quote 1.0.20", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bindgen" version = "0.64.0" @@ -367,6 +344,7 @@ dependencies = [ "clang-sys", "lazy_static", "lazycell", + "log", "peeking_take_while", "proc-macro2 1.0.47", "quote 1.0.20", @@ -374,6 +352,7 @@ dependencies = [ "rustc-hash", "shlex", "syn 1.0.104", + "which", ] [[package]] @@ -745,12 +724,9 @@ version = "3.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" dependencies = [ - "atty", "bitflags", "clap_lex", "indexmap", - "strsim 0.10.0", - "termcolor", "textwrap 0.15.0", ] @@ -993,7 +969,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.5", - "rand_core 0.6.4", "typenum", ] @@ -1023,9 +998,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" +checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" dependencies = [ "cc", "cxxbridge-flags", @@ -1047,15 +1022,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" +checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" [[package]] name = "cxxbridge-macro" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" +checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", @@ -1276,19 +1251,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "equihash" version = "0.2.0" @@ -2213,7 +2175,7 @@ version = "0.10.0+7.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" dependencies = [ - "bindgen 0.64.0", + "bindgen", "bzip2-sys", "cc", "glob", @@ -3227,7 +3189,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", "rand 0.7.3", "rand_core 0.5.1", @@ -5358,9 +5320,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2e24cb5e3352f751c699f47d363279178871b126d23f49d9018f6bae49219a" +checksum = "0f9a45953c4ddd81d68f45920955707f45c8926800671f354dd13b97507edf28" dependencies = [ "aes", "bip0039", @@ -5368,9 +5330,7 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "bls12_381", - "bs58", "byteorder", - "chacha20poly1305", "equihash", "ff", "fpe", @@ -5452,11 +5412,11 @@ dependencies = [ [[package]] name = "zcash_script" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4696f0dcc0d9dd4d9d4a8fa5009caa85cfad93faca63164cd02e5a2c6757ac27" +checksum = "bd2f9cb33d1244816179614fcd76d62df2d9b3e76e5513e70186c96650eba3c6" dependencies = [ - "bindgen 0.60.1", + "bindgen", "blake2b_simd", "cc", "cxx", @@ -5469,7 +5429,7 @@ dependencies = [ "tracing", "zcash_encoding", "zcash_note_encryption", - "zcash_primitives 0.8.1", + "zcash_primitives 0.9.1", ] [[package]] diff --git a/deny.toml b/deny.toml index 418817e0..34d8103f 100644 --- a/deny.toml +++ b/deny.toml @@ -51,8 +51,7 @@ skip-tree = [ # wait for zcash_script to upgrade # https://github.com/ZcashFoundation/zcash_script/pulls - { name = "zcash_primitives", version = "=0.8.1" }, - { name = "bindgen", version = "=0.60.1" }, + { name = "zcash_primitives", version = "=0.9.1" }, # wait for ed25519-zebra, indexmap, metrics-util, and metrics to upgrade # ed25519-zebra/hashbrown: https://github.com/ZcashFoundation/ed25519-zebra/pull/63 diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 6e07242d..c6314572 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zcash_script = "0.1.8" +zcash_script = "0.1.11" zebra-chain = { path = "../zebra-chain" }