diff --git a/Cargo.lock b/Cargo.lock index 413174c856f..287749c4d18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "termcolor", "toml 0.5.11", "tracing", - "tracing-log", + "tracing-log 0.1.4", "tracing-subscriber", "wait-timeout", ] @@ -2156,6 +2156,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -3158,9 +3167,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -3190,9 +3199,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", @@ -4672,11 +4681,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] @@ -4755,11 +4765,22 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -4770,7 +4791,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", ] [[package]] @@ -5604,7 +5625,7 @@ dependencies = [ "hex", "humantime", "incrementalmerkletree", - "itertools 0.11.0", + "itertools 0.12.0", "jubjub", "lazy_static", "num-integer", @@ -5701,7 +5722,7 @@ dependencies = [ "howudoin", "humantime-serde", "indexmap 2.1.0", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "metrics", "num-integer", @@ -5823,7 +5844,7 @@ dependencies = [ "humantime-serde", "indexmap 2.1.0", "insta", - "itertools 0.11.0", + "itertools 0.12.0", "jubjub", "lazy_static", "metrics", @@ -5860,7 +5881,7 @@ dependencies = [ "humantime", "indexmap 2.1.0", "insta", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "once_cell", "owo-colors", @@ -5884,7 +5905,7 @@ version = "1.0.0-beta.31" dependencies = [ "color-eyre", "hex", - "itertools 0.11.0", + "itertools 0.12.0", "regex", "reqwest", "serde_json", diff --git a/deny.toml b/deny.toml index 47466dc8c3d..44a6abcb756 100644 --- a/deny.toml +++ b/deny.toml @@ -86,6 +86,12 @@ skip-tree = [ { name = "clap", version = "=2.34.0" }, { name = "heck", version = "=0.3.3" }, + # wait for abscissa_core to upgrade + {name = "tracing-log", version = "=0.1.4" }, + + # wait for prost to upgrade + {name = "itertools", version = "=0.11.0" }, + # Test-only dependencies # wait for tokio-test -> tokio-stream to upgrade diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 4a0735c3a5f..9c24524e26e 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -102,7 +102,7 @@ serde-big-array = "0.5.1" # Processing futures = "0.3.29" -itertools = "0.11.0" +itertools = "0.12.0" rayon = "1.7.0" # ZF deps diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index d998f8145a9..37bb6dc2529 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -92,7 +92,7 @@ spandoc = "0.2.2" tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" -tracing-subscriber = "0.3.17" +tracing-subscriber = "0.3.18" zebra-state = { path = "../zebra-state", features = ["proptest-impl"] } zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 3d8ef372ab6..149322e7801 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -48,7 +48,7 @@ dirs = "5.0.1" hex = "0.4.3" humantime-serde = "1.1.1" indexmap = { version = "2.0.1", features = ["serde"] } -itertools = "0.11.0" +itertools = "0.12.0" lazy_static = "1.4.0" num-integer = "0.1.45" ordered-map = "0.4.2" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 697d117078f..aa3601ec1cd 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -51,7 +51,7 @@ hex = "0.4.3" hex-literal = "0.4.1" humantime-serde = "1.1.1" indexmap = "2.0.1" -itertools = "0.11.0" +itertools = "0.12.0" lazy_static = "1.4.0" metrics = "0.21.1" mset = "0.1.1" diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 128d872d30b..6fd05c515f8 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -19,7 +19,7 @@ hex = "0.4.3" indexmap = "2.0.1" lazy_static = "1.4.0" insta = "1.33.0" -itertools = "0.11.0" +itertools = "0.12.0" proptest = "1.4.0" once_cell = "1.18.0" rand = "0.8.5" @@ -39,7 +39,7 @@ owo-colors = "3.5.0" spandoc = "0.2.2" thiserror = "1.0.48" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-error = "0.2.0" tracing = "0.1.39" diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index a5d9ab1a6ec..19f5f01cd6f 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -71,7 +71,7 @@ structopt = "0.3.26" hex = "0.4.3" serde_json = "1.0.108" tracing-error = "0.2.0" -tracing-subscriber = "0.3.17" +tracing-subscriber = "0.3.18" thiserror = "1.0.48" zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.31" } @@ -81,7 +81,7 @@ zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.31" } zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.31", optional = true } # These crates are needed for the zebra-checkpoints binary -itertools = { version = "0.11.0", optional = true } +itertools = { version = "0.12.0", optional = true } # These crates are needed for the search-issue-refs binary regex = { version = "1.10.2", optional = true } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index df89a0f8604..fdfbbd7def9 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -185,8 +185,8 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } thiserror = "1.0.48" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -tracing-appender = "0.2.2" +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } +tracing-appender = "0.2.3" tracing-error = "0.2.0" tracing-futures = "0.2.5" tracing = "0.1.39" @@ -258,7 +258,7 @@ tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.14" # test feature lightwalletd-grpc-tests -prost = "0.12.1" +prost = "0.12.2" tonic = "0.10.2" proptest = "1.4.0"