Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump the prod group with 6 updates #8125

Merged
merged 6 commits into from
Jan 2, 2024
Merged

build(deps): bump the prod group with 6 updates #8125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
113235a
build(deps): bump the prod group with 6 updates
dependabot[bot] Dec 25, 2023
0436a11
update all metric macros
oxarbitrage Dec 27, 2023
0076dbe
fix deprecated function
oxarbitrage Dec 27, 2023
29cce63
fix duplicated deps
oxarbitrage Dec 27, 2023
99ca0dd
Fix an incorrect gauge method call
teor2345 Jan 1, 2024
217f17e
Expand documentation and error messages for best chain length
teor2345 Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 57 additions & 41 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ dependencies = [
"eyre",
"indenter",
"once_cell",
"owo-colors",
"owo-colors 3.5.0",
"tracing-error",
"url",
]
Expand All @@ -837,7 +837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
dependencies = [
"once_cell",
"owo-colors",
"owo-colors 3.5.0",
"tracing-core",
"tracing-error",
]
Expand Down Expand Up @@ -1491,9 +1491,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"

[[package]]
name = "futures"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
dependencies = [
"futures-channel",
"futures-core",
Expand All @@ -1506,25 +1506,25 @@ dependencies = [

[[package]]
name = "futures-channel"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
dependencies = [
"futures-core",
"futures-sink",
]

[[package]]
name = "futures-core"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"

[[package]]
name = "futures-executor"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
dependencies = [
"futures-core",
"futures-task",
Expand All @@ -1533,15 +1533,15 @@ dependencies = [

[[package]]
name = "futures-io"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"

[[package]]
name = "futures-macro"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -1550,21 +1550,21 @@ dependencies = [

[[package]]
name = "futures-sink"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"

[[package]]
name = "futures-task"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"

[[package]]
name = "futures-util"
version = "0.3.29"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
dependencies = [
"futures-channel",
"futures-core",
Expand Down Expand Up @@ -2496,17 +2496,27 @@ dependencies = [
"portable-atomic",
]

[[package]]
name = "metrics"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77b9e10a211c839210fd7f99954bda26e5f8e26ec686ad68da6a32df7c80e782"
dependencies = [
"ahash",
"portable-atomic",
]

[[package]]
name = "metrics-exporter-prometheus"
version = "0.12.2"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950"
checksum = "83a4c4718a371ddfb7806378f23617876eea8b82e5ff1324516bcd283249d9ea"
dependencies = [
"base64 0.21.5",
"hyper",
"indexmap 1.9.3",
"ipnet",
"metrics",
"metrics 0.22.0",
"metrics-util",
"quanta",
"thiserror",
Expand All @@ -2526,14 +2536,14 @@ dependencies = [

[[package]]
name = "metrics-util"
version = "0.15.1"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e"
checksum = "2670b8badcc285d486261e2e9f1615b506baff91427b61bd336a472b65bbf5ed"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
"hashbrown 0.13.1",
"metrics",
"metrics 0.22.0",
"num_cpus",
"quanta",
"sketches-ddsketch",
Expand Down Expand Up @@ -2789,6 +2799,12 @@ version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"

[[package]]
name = "owo-colors"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"

[[package]]
name = "pairing"
version = "0.23.0"
Expand Down Expand Up @@ -3245,9 +3261,9 @@ dependencies = [

[[package]]
name = "quanta"
version = "0.11.1"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
checksum = "577c55a090a94ed7da0e6580cc38a553558e2d736398b5d8ebf81bc9880f8acd"
dependencies = [
"crossbeam-utils",
"libc",
Expand Down Expand Up @@ -3394,11 +3410,11 @@ dependencies = [

[[package]]
name = "raw-cpuid"
version = "10.7.0"
version = "11.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.1",
]

[[package]]
Expand Down Expand Up @@ -3527,9 +3543,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

[[package]]
name = "reqwest"
version = "0.11.22"
version = "0.11.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
dependencies = [
"async-compression",
"base64 0.21.5",
Expand Down Expand Up @@ -4405,9 +4421,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

[[package]]
name = "tokio"
version = "1.35.0"
version = "1.35.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
dependencies = [
"backtrace",
"bytes",
Expand Down Expand Up @@ -5669,7 +5685,7 @@ dependencies = [
"jubjub",
"libc",
"memuse",
"metrics",
"metrics 0.21.1",
"orchard",
"rand 0.8.5",
"rand_core 0.6.4",
Expand Down Expand Up @@ -5762,7 +5778,7 @@ dependencies = [
"howudoin",
"jubjub",
"lazy_static",
"metrics",
"metrics 0.22.0",
"num-integer",
"once_cell",
"orchard",
Expand Down Expand Up @@ -5807,7 +5823,7 @@ dependencies = [
"indexmap 2.1.0",
"itertools 0.12.0",
"lazy_static",
"metrics",
"metrics 0.22.0",
"num-integer",
"ordered-map",
"pin-project",
Expand Down Expand Up @@ -5938,7 +5954,7 @@ dependencies = [
"itertools 0.12.0",
"jubjub",
"lazy_static",
"metrics",
"metrics 0.22.0",
"mset",
"once_cell",
"proptest",
Expand Down Expand Up @@ -5975,7 +5991,7 @@ dependencies = [
"itertools 0.12.0",
"lazy_static",
"once_cell",
"owo-colors",
"owo-colors 4.0.0",
"proptest",
"rand 0.8.5",
"regex",
Expand Down Expand Up @@ -6039,7 +6055,7 @@ dependencies = [
"jsonrpc-core",
"lazy_static",
"log",
"metrics",
"metrics 0.22.0",
"metrics-exporter-prometheus",
"num-integer",
"once_cell",
Expand Down
6 changes: 6 additions & 0 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,17 @@ skip-tree = [
# wait for `parking_lot` crate inside `jsonrpc-http-server` to upgrade
{ name = "redox_syscall", version = "=0.2.16" },

# wait for `color-eyre` to upgrade
{ name = "owo-colors", version = "=3.5.0" },

# ZF crates

# wait for indexmap, toml_edit, serde_json, tower to upgrade
{ name = "hashbrown", version = "=0.12.3" },

# wait for zcash_script to upgrade
{ name = "metrics", version = "=0.21.1" },

# ECC crates

# wait for hdwallet to upgrade
Expand Down
6 changes: 3 additions & 3 deletions tower-batch-control/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ keywords = ["tower", "batch"]
categories = ["algorithms", "asynchronous"]

[dependencies]
futures = "0.3.29"
futures = "0.3.30"
futures-core = "0.3.28"
pin-project = "1.1.3"
rayon = "1.7.0"
tokio = { version = "1.34.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.35.1", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.10"
tower = { version = "0.4.13", features = ["util", "buffer"] }
tracing = "0.1.39"
Expand All @@ -41,7 +41,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
ed25519-zebra = "4.0.3"
rand = "0.8.5"

tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.35.1", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.3"
tower-fallback = { path = "../tower-fallback/" }
tower-test = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion tower-fallback/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ futures-core = "0.3.28"
tracing = "0.1.39"

[dev-dependencies]
tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.35.1", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/" }
6 changes: 3 additions & 3 deletions zebra-chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ serde_with = "3.4.0"
serde-big-array = "0.5.1"

# Processing
futures = "0.3.29"
futures = "0.3.30"
itertools = "0.12.0"
rayon = "1.7.0"

Expand All @@ -114,7 +114,7 @@ reddsa = "0.5.1"
serde_json = { version = "1.0.108", optional = true }

# Production feature async-error and testing feature proptest-impl
tokio = { version = "1.34.0", optional = true }
tokio = { version = "1.35.1", optional = true }

# Experimental feature getblocktemplate-rpcs
zcash_address = { version = "0.3.0", optional = true }
Expand Down Expand Up @@ -147,7 +147,7 @@ proptest-derive = "0.4.0"
rand = "0.8.5"
rand_chacha = "0.3.1"

tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.35.1", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/" }

Expand Down
8 changes: 4 additions & 4 deletions zebra-consensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ lazy_static = "1.4.0"
once_cell = "1.18.0"
serde = { version = "1.0.193", features = ["serde_derive"] }

futures = "0.3.29"
futures = "0.3.30"
futures-util = "0.3.28"
metrics = "0.21.1"
metrics = "0.22.0"
thiserror = "1.0.51"
tokio = { version = "1.34.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tokio = { version = "1.35.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
tracing = "0.1.39"
tracing-futures = "0.2.5"
Expand Down Expand Up @@ -90,7 +90,7 @@ proptest = "1.4.0"
proptest-derive = "0.4.0"
spandoc = "0.2.2"

tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.35.1", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.0"
tracing-subscriber = "0.3.18"

Expand Down
Loading
Loading