Merge branch 'main' into fix-ligtwalletd-test-log

deny.toml

@@ -32,10 +32,10 @@ skip = [
 # by default infinite
 skip-tree = [
     # ticket #2983: criterion dependencies
-    { name = "criterion", version = "=0.3.4" },
+    { name = "criterion", version = "=0.3.5" },
 
     # ticket #3000: tower-fallback dependencies
-    { name = "pin-project", version = "=0.4.28" },
+    { name = "pin-project", version = "=0.4.29" },
 
     # ticket #3063: redjubjub dependencies
     { name = "redjubjub", version = "=0.4.0" },
@@ -46,34 +46,27 @@ skip-tree = [
     # ticket #2984: owo-colors dependencies
     { name = "color-eyre", version = "=0.5.11" },
 
-    # ticket #3061: reqwest and minreq dependencies
-    { name = "webpki-roots", version = "=0.18.0" },
-
     # ticket #2980: inferno and orchard/cryptographic dependencies
     { name = "orchard", version = "=0.0.0" },
 
     # upgrade orchard from deprecated `bigint` to `uint`: https://github.com/zcash/orchard/issues/219
-    # alternative: downgrade Zebra to `bigint`
     { name = "bigint", version = "=4.4.3" },
 
     # upgrade sentry, metrics-exporter-prometheus, reqwest, hyper,
     # which needs #2953: upgrade tracing to the latest major version
     #
     # also wait for tower-test and tokio-test to upgrade
     { name = "tokio-util", version = "=0.6.9" },
+    { name = "tracing-subscriber", version = "=0.1.6" },
+
+    # upgrade abscissa and arti
+    { name = "darling", version = "=0.10.2" },
 
     # recent major version bumps
     # we should re-check these dependencies in February 2022
 
     # wait for lots of crates in the cryptographic ecosystem to upgrade
     { name = "rand", version = "=0.7.3" },
-    { name = "rustls", version = "=0.19.1" },
-
-    # wait for lots of crates in the tokio ecosystem to upgrade
-    { name = "socket2", version = "=0.3.16" },
-
-    # wait for arti to stabilise
-    { name = "arti-client" },
 ]
 
 # This section is considered when running `cargo deny check sources`.

tower-batch/Cargo.toml

@@ -7,20 +7,20 @@ edition = "2021"
 
 [dependencies]
 futures = "0.3.21"
-futures-core = "0.3.19"
-pin-project = "1.0.7"
-tokio = { version = "1.16.1", features = ["time", "sync", "tracing", "macros"] }
+futures-core = "0.3.21"
+pin-project = "1.0.10"
+tokio = { version = "1.17.0", features = ["time", "sync", "tracing", "macros"] }
 tower = { version = "0.4.12", features = ["util", "buffer"] }
-tracing = "0.1.29"
+tracing = "0.1.31"
 tracing-futures = "0.2.5"
 
 [dev-dependencies]
-color-eyre = "0.5.11"
+color-eyre = "0.6.0"
 ed25519-zebra = "3.0.0"
-rand = "0.8"
-tokio = { version = "1.16.1", features = ["full"]}
+rand = { version = "0.8.5", package = "rand" }
+tokio = { version = "1.17.0", features = ["full"] }
 tokio-test = "0.4.2"
 tower-fallback = { path = "../tower-fallback/" }
 tower-test = "0.4.0"
-tracing = "0.1.29"
+tracing = "0.1.31"
 zebra-test = { path = "../zebra-test/" }

tower-fallback/Cargo.toml

@@ -6,11 +6,11 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-tower = "0.4"
-futures-core = "0.3.19"
-pin-project = "0.4.27"
-tracing = "0.1"
+pin-project = "0.4.29"
+tower = "0.4.12"
+futures-core = "0.3.21"
+tracing = "0.1.31"
 
 [dev-dependencies]
 zebra-test = { path = "../zebra-test/" }
-tokio = { version = "1.16.1", features = ["full"]}
+tokio = { version = "1.17.0", features = ["full"] }

zebra-chain/Cargo.toml

@@ -16,33 +16,33 @@ bench = ["zebra-test"]
 aes = "0.7.5"
 bech32 = "0.8.1"
 bigint = "4.4.3"
-bitflags = "1.2.1"
 bitvec = "0.22"
-blake2b_simd = "0.5.11"
+bitflags = "1.3.2"
+blake2b_simd = "1.0.0"
 blake2s_simd = "0.5.11"
 bls12_381 = "0.6.0"
-bs58 = { version = "0.4", features = ["check"] }
-byteorder = "1.4"
-chrono = { version = "0.4", features = ["serde"] }
-displaydoc = "0.2.2"
+bs58 = { version = "0.4.0", features = ["check"] }
+byteorder = "1.4.3"
+chrono = { version = "0.4.19", features = ["serde"] }
+displaydoc = "0.2.3"
 fpe = "0.5.1"
-futures = "0.3"
+futures = "0.3.21"
 group = "0.11.0"
 halo2 = "=0.1.0-beta.1"
-hex = "0.4"
-incrementalmerkletree = "0.1.0"
+hex = "0.4.3"
+incrementalmerkletree = "0.2.0"
 itertools = "0.10.3"
 jubjub = "0.8.0"
 lazy_static = "1.4.0"
-rand_core = "0.6"
+rand_core = "0.6.3"
 ripemd160 = "0.9"
+serde = { version = "1.0.136", features = ["serde_derive", "rc"] }
 secp256k1 = { version = "0.21.3", features = ["serde"] }
-serde = { version = "1", features = ["serde_derive", "rc"] }
 serde-big-array = "0.3.2"
 sha2 = { version = "0.9.9", features=["compress"] }
 static_assertions = "1.1.0"
-subtle = "2.4"
-thiserror = "1"
+subtle = "2.4.1"
+thiserror = "1.0.30"
 uint = "0.9.3"
 x25519-dalek = { version = "1.2.0", features = ["serde"] }
 
@@ -58,9 +58,9 @@ zcash_history = { git = "https://github.com/ZcashFoundation/librustzcash.git", t
 proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 
-rand = { version = "0.8", optional = true }
-rand_chacha = { version = "0.3", optional = true }
-tokio = { version = "1.16.1", optional = true }
+rand = { version = "0.8.5", optional = true, package = "rand" }
+rand_chacha = { version = "0.3.1", optional = true }
+tokio = { version = "1.17.0", optional = true }
 
 # ZF deps
 ed25519-zebra = "3.0.0"
@@ -70,18 +70,18 @@ redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub.git", rev = "a
 zebra-test = { path = "../zebra-test/", optional = true }
 
 [dev-dependencies]
-color-eyre = "0.5.11"
-criterion = { version = "0.3", features = ["html_reports"] }
+color-eyre = "0.6.0"
+criterion = { version = "0.3.5", features = ["html_reports"] }
 itertools = "0.10.3"
-spandoc = "0.2"
-tracing = "0.1.29"
+spandoc = "0.2.1"
+tracing = "0.1.31"
 
 proptest = "0.10.1"
 proptest-derive = "0.3.0"
-rand = "0.8"
-rand_chacha = "0.3"
+rand = { version = "0.8.5", package = "rand" }
+rand_chacha = "0.3.1"
 
-tokio = "1.16.1"
+tokio = "1.17.0"
 
 zebra-test = { path = "../zebra-test/" }
 

zebra-chain/src/parameters/network_upgrade.rs

@@ -187,20 +187,23 @@ impl NetworkUpgrade {
     /// and it's a test build, this returns a list of fake activation heights
     /// used by some tests.
     pub(crate) fn activation_list(network: Network) -> BTreeMap<block::Height, NetworkUpgrade> {
-        println!(
-            "activation_list called {:?}",
-            std::env::var_os("TEST_FAKE_ACTIVATION_HEIGHTS")
-        );
         let (mainnet_heights, testnet_heights) = {
             #[cfg(not(feature = "zebra-test"))]
             {
                 (MAINNET_ACTIVATION_HEIGHTS, TESTNET_ACTIVATION_HEIGHTS)
             }
+
             // To prevent accidentally setting this somehow, only check the env var
             // when being compiled for tests. We can't use cfg(test) since the
             // test that uses this is in zebra-state, and cfg(test) is not
             // set for dependencies. However, zebra-state does set the
             // zebra-test feature of zebra-chain if it's a dev dependency.
+            //
+            // Cargo features are additive, so all test binaries built along with
+            // zebra-state will have this feature enabled. But we are using
+            // Rust Edition 2021 and Cargo resolver version 2, so the "zebra-test"
+            // feature should only be enabled for tests:
+            // https://doc.rust-lang.org/cargo/reference/features.html#resolver-version-2-command-line-flags
             #[cfg(feature = "zebra-test")]
             if std::env::var_os("TEST_FAKE_ACTIVATION_HEIGHTS").is_some() {
                 (

zebra-consensus/Cargo.toml

@@ -10,28 +10,28 @@ default = []
 proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]
 
 [dependencies]
-blake2b_simd = "0.5.11"
+blake2b_simd = "1.0.0"
 bellman = "0.11.1"
 bls12_381 = "0.6.0"
 jubjub = "0.8.0"
-rand = "0.8"
+rand = { version = "0.8.5", package = "rand" }
 
 halo2 = "=0.1.0-beta.1"
 
 chrono = "0.4.19"
 dirs = "4.0.0"
-displaydoc = "0.2.2"
+displaydoc = "0.2.3"
 lazy_static = "1.4.0"
-once_cell = "1.9"
-serde = { version = "1", features = ["serde_derive"] }
+once_cell = "1.9.0"
+serde = { version = "1.0.136", features = ["serde_derive"] }
 
 futures = "0.3.21"
-futures-util = "0.3.19"
+futures-util = "0.3.21"
 metrics = "0.17.1"
 thiserror = "1.0.30"
-tokio = { version = "1.16.1", features = ["time", "sync", "tracing"] }
+tokio = { version = "1.17.0", features = ["time", "sync", "tracing"] }
 tower = { version = "0.4.12", features = ["timeout", "util", "buffer"] }
-tracing = "0.1.29"
+tracing = "0.1.31"
 tracing-futures = "0.2.5"
 
 # TODO: replace with upstream orchard (#3056)
@@ -51,13 +51,13 @@ proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
-color-eyre = "0.5.11"
+color-eyre = "0.6.0"
 hex = "0.4.3"
 proptest = "0.10.1"
 proptest-derive = "0.3.0"
 rand07 = { package = "rand", version = "0.7" }
-spandoc = "0.2"
-tokio = { version = "1.16.1", features = ["full"] }
+spandoc = "0.2.1"
+tokio = { version = "1.17.0", features = ["full"] }
 tracing-error = "0.1.2"
 tracing-subscriber = "0.2.25"
 

zebra-network/Cargo.toml

@@ -13,29 +13,29 @@ tor = ["arti-client", "tor-rtcompat"]
 proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]
 
 [dependencies]
-bitflags = "1.2"
-byteorder = "1.4"
+bitflags = "1.3.2"
+byteorder = "1.4.3"
 bytes = "1.1.0"
-chrono = "0.4"
-hex = "0.4"
+chrono = "0.4.19"
+hex = "0.4.3"
 lazy_static = "1.4.0"
 ordered-map = "0.4.2"
-pin-project = "1.0.7"
-rand = "0.8"
-regex = "1"
-serde = { version = "1", features = ["serde_derive"] }
-thiserror = "1"
-
-futures = "0.3"
-tokio = { version = "1.16.1", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.7", features = ["sync", "time"] }
+pin-project = "1.0.10"
+rand = { version = "0.8.5", package = "rand" }
+regex = "1.5.4"
+serde = { version = "1.0.136", features = ["serde_derive"] }
+thiserror = "1.0.30"
+
+futures = "0.3.21"
+tokio = { version = "1.17.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
+tokio-stream = { version = "0.1.8", features = ["sync", "time"] }
 tokio-util = { version = "0.7.0", features = ["codec"] }
 tower = { version = "0.4.12", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }
 
 metrics = "0.17.1"
-tracing = "0.1"
-tracing-futures = "0.2"
+tracing-futures = "0.2.5"
 tracing-error = { version = "0.1.2", features = ["traced-error"] }
+tracing = "0.1.31"
 
 # tor dependencies
 arti-client = { version = "0.0.2", optional = true }
@@ -52,8 +52,8 @@ proptest = "0.10.1"
 proptest-derive = "0.3.0"
 
 static_assertions = "1.1.0"
-tokio = { version = "1.16.1", features = ["test-util"] }
-toml = "0.5"
+tokio = { version = "1.17.0", features = ["test-util"] }
+toml = "0.5.8"
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-test = { path = "../zebra-test/" }

zebra-rpc/Cargo.toml

@@ -13,7 +13,7 @@ zebra-node-services = { path = "../zebra-node-services" }
 
 zebra-network = { path = "../zebra-network" }
 
-futures = "0.3"
+futures = "0.3.21"
 
 # lightwalletd sends JSON-RPC requests over HTTP 1.1
 hyper = { version = "0.14.17", features = ["http1", "server"] }
@@ -22,14 +22,14 @@ jsonrpc-core = "18.0.0"
 jsonrpc-derive = "18.0.0"
 jsonrpc-http-server = "18.0.0"
 
-tokio = { version = "1.16.1", features = ["time", "rt-multi-thread", "macros", "tracing"] }
+tokio = { version = "1.17.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
 tower = "0.4.12"
 
-tracing = "0.1"
-tracing-futures = "0.2"
+tracing = "0.1.31"
+tracing-futures = "0.2.5"
 
+serde = { version = "1.0.136", features = ["serde_derive"] }
 hex = "0.4.3"
-serde = { version = "1", features = ["serde_derive"] }
 
 [dev-dependencies]
 proptest = "0.10.1"

zebra-script/Cargo.toml

@@ -13,7 +13,7 @@ zcash_script = { git = "https://github.com/ZcashFoundation/zcash_script.git", re
 zebra-chain = { path = "../zebra-chain" }
 
 thiserror = "1.0.30"
-displaydoc = "0.2.2"
+displaydoc = "0.2.3"
 
 [dev-dependencies]
 hex = "0.4.3"