Skip to content

Commit f21d7c6

Browse files
dependabot[bot]oxarbitrageteor2345
authored
build(deps): bump the prod group with 6 updates (#8125)
* build(deps): bump the prod group with 6 updates Bumps the prod group with 6 updates: | Package | From | To | | --- | --- | --- | | [futures](https://github.com/rust-lang/futures-rs) | `0.3.29` | `0.3.30` | | [tokio](https://github.com/tokio-rs/tokio) | `1.35.0` | `1.35.1` | | [metrics](https://github.com/metrics-rs/metrics) | `0.21.1` | `0.22.0` | | [metrics-exporter-prometheus](https://github.com/metrics-rs/metrics) | `0.12.2` | `0.13.0` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.11.22` | `0.11.23` | | [owo-colors](https://github.com/jam1garner/owo-colors) | `3.5.0` | `4.0.0` | Updates `futures` from 0.3.29 to 0.3.30 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](rust-lang/futures-rs@0.3.29...0.3.30) Updates `tokio` from 1.35.0 to 1.35.1 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-1.35.0...tokio-1.35.1) Updates `metrics` from 0.21.1 to 0.22.0 - [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml) - [Commits](metrics-rs/metrics@metrics-v0.21.1...metrics-v0.22.0) Updates `metrics-exporter-prometheus` from 0.12.2 to 0.13.0 - [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml) - [Commits](metrics-rs/metrics@metrics-exporter-prometheus-v0.12.2...metrics-exporter-prometheus-v0.13.0) Updates `reqwest` from 0.11.22 to 0.11.23 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](seanmonstar/reqwest@v0.11.22...v0.11.23) Updates `owo-colors` from 3.5.0 to 4.0.0 - [Commits](owo-colors/owo-colors@v3.5.0...v4.0.0) --- updated-dependencies: - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: metrics dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: metrics-exporter-prometheus dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: owo-colors dependency-type: direct:production update-type: version-update:semver-major dependency-group: prod ... Signed-off-by: dependabot[bot] <[email protected]> * update all metric macros * fix deprecated function * fix duplicated deps * Fix an incorrect gauge method call * Expand documentation and error messages for best chain length --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alfredo Garcia <[email protected]> Co-authored-by: teor <[email protected]>
1 parent c0f88ed commit f21d7c6

File tree

45 files changed

+327
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+327
-373
lines changed

Cargo.lock

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ dependencies = [
825825
"eyre",
826826
"indenter",
827827
"once_cell",
828-
"owo-colors",
828+
"owo-colors 3.5.0",
829829
"tracing-error",
830830
"url",
831831
]
@@ -837,7 +837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
837837
checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
838838
dependencies = [
839839
"once_cell",
840-
"owo-colors",
840+
"owo-colors 3.5.0",
841841
"tracing-core",
842842
"tracing-error",
843843
]
@@ -1491,9 +1491,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
14911491

14921492
[[package]]
14931493
name = "futures"
1494-
version = "0.3.29"
1494+
version = "0.3.30"
14951495
source = "registry+https://github.com/rust-lang/crates.io-index"
1496-
checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
1496+
checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
14971497
dependencies = [
14981498
"futures-channel",
14991499
"futures-core",
@@ -1506,25 +1506,25 @@ dependencies = [
15061506

15071507
[[package]]
15081508
name = "futures-channel"
1509-
version = "0.3.29"
1509+
version = "0.3.30"
15101510
source = "registry+https://github.com/rust-lang/crates.io-index"
1511-
checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
1511+
checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
15121512
dependencies = [
15131513
"futures-core",
15141514
"futures-sink",
15151515
]
15161516

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

15231523
[[package]]
15241524
name = "futures-executor"
1525-
version = "0.3.29"
1525+
version = "0.3.30"
15261526
source = "registry+https://github.com/rust-lang/crates.io-index"
1527-
checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
1527+
checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
15281528
dependencies = [
15291529
"futures-core",
15301530
"futures-task",
@@ -1533,15 +1533,15 @@ dependencies = [
15331533

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

15401540
[[package]]
15411541
name = "futures-macro"
1542-
version = "0.3.29"
1542+
version = "0.3.30"
15431543
source = "registry+https://github.com/rust-lang/crates.io-index"
1544-
checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
1544+
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
15451545
dependencies = [
15461546
"proc-macro2",
15471547
"quote",
@@ -1550,21 +1550,21 @@ dependencies = [
15501550

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

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

15631563
[[package]]
15641564
name = "futures-util"
1565-
version = "0.3.29"
1565+
version = "0.3.30"
15661566
source = "registry+https://github.com/rust-lang/crates.io-index"
1567-
checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
1567+
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
15681568
dependencies = [
15691569
"futures-channel",
15701570
"futures-core",
@@ -2496,17 +2496,27 @@ dependencies = [
24962496
"portable-atomic",
24972497
]
24982498

2499+
[[package]]
2500+
name = "metrics"
2501+
version = "0.22.0"
2502+
source = "registry+https://github.com/rust-lang/crates.io-index"
2503+
checksum = "77b9e10a211c839210fd7f99954bda26e5f8e26ec686ad68da6a32df7c80e782"
2504+
dependencies = [
2505+
"ahash",
2506+
"portable-atomic",
2507+
]
2508+
24992509
[[package]]
25002510
name = "metrics-exporter-prometheus"
2501-
version = "0.12.2"
2511+
version = "0.13.0"
25022512
source = "registry+https://github.com/rust-lang/crates.io-index"
2503-
checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950"
2513+
checksum = "83a4c4718a371ddfb7806378f23617876eea8b82e5ff1324516bcd283249d9ea"
25042514
dependencies = [
25052515
"base64 0.21.5",
25062516
"hyper",
25072517
"indexmap 1.9.3",
25082518
"ipnet",
2509-
"metrics",
2519+
"metrics 0.22.0",
25102520
"metrics-util",
25112521
"quanta",
25122522
"thiserror",
@@ -2526,14 +2536,14 @@ dependencies = [
25262536

25272537
[[package]]
25282538
name = "metrics-util"
2529-
version = "0.15.1"
2539+
version = "0.16.0"
25302540
source = "registry+https://github.com/rust-lang/crates.io-index"
2531-
checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e"
2541+
checksum = "2670b8badcc285d486261e2e9f1615b506baff91427b61bd336a472b65bbf5ed"
25322542
dependencies = [
25332543
"crossbeam-epoch",
25342544
"crossbeam-utils",
25352545
"hashbrown 0.13.1",
2536-
"metrics",
2546+
"metrics 0.22.0",
25372547
"num_cpus",
25382548
"quanta",
25392549
"sketches-ddsketch",
@@ -2789,6 +2799,12 @@ version = "3.5.0"
27892799
source = "registry+https://github.com/rust-lang/crates.io-index"
27902800
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
27912801

2802+
[[package]]
2803+
name = "owo-colors"
2804+
version = "4.0.0"
2805+
source = "registry+https://github.com/rust-lang/crates.io-index"
2806+
checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
2807+
27922808
[[package]]
27932809
name = "pairing"
27942810
version = "0.23.0"
@@ -3245,9 +3261,9 @@ dependencies = [
32453261

32463262
[[package]]
32473263
name = "quanta"
3248-
version = "0.11.1"
3264+
version = "0.12.1"
32493265
source = "registry+https://github.com/rust-lang/crates.io-index"
3250-
checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
3266+
checksum = "577c55a090a94ed7da0e6580cc38a553558e2d736398b5d8ebf81bc9880f8acd"
32513267
dependencies = [
32523268
"crossbeam-utils",
32533269
"libc",
@@ -3394,11 +3410,11 @@ dependencies = [
33943410

33953411
[[package]]
33963412
name = "raw-cpuid"
3397-
version = "10.7.0"
3413+
version = "11.0.1"
33983414
source = "registry+https://github.com/rust-lang/crates.io-index"
3399-
checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
3415+
checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1"
34003416
dependencies = [
3401-
"bitflags 1.3.2",
3417+
"bitflags 2.4.1",
34023418
]
34033419

34043420
[[package]]
@@ -3527,9 +3543,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
35273543

35283544
[[package]]
35293545
name = "reqwest"
3530-
version = "0.11.22"
3546+
version = "0.11.23"
35313547
source = "registry+https://github.com/rust-lang/crates.io-index"
3532-
checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
3548+
checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
35333549
dependencies = [
35343550
"async-compression",
35353551
"base64 0.21.5",
@@ -4405,9 +4421,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
44054421

44064422
[[package]]
44074423
name = "tokio"
4408-
version = "1.35.0"
4424+
version = "1.35.1"
44094425
source = "registry+https://github.com/rust-lang/crates.io-index"
4410-
checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
4426+
checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
44114427
dependencies = [
44124428
"backtrace",
44134429
"bytes",
@@ -5669,7 +5685,7 @@ dependencies = [
56695685
"jubjub",
56705686
"libc",
56715687
"memuse",
5672-
"metrics",
5688+
"metrics 0.21.1",
56735689
"orchard",
56745690
"rand 0.8.5",
56755691
"rand_core 0.6.4",
@@ -5762,7 +5778,7 @@ dependencies = [
57625778
"howudoin",
57635779
"jubjub",
57645780
"lazy_static",
5765-
"metrics",
5781+
"metrics 0.22.0",
57665782
"num-integer",
57675783
"once_cell",
57685784
"orchard",
@@ -5807,7 +5823,7 @@ dependencies = [
58075823
"indexmap 2.1.0",
58085824
"itertools 0.12.0",
58095825
"lazy_static",
5810-
"metrics",
5826+
"metrics 0.22.0",
58115827
"num-integer",
58125828
"ordered-map",
58135829
"pin-project",
@@ -5938,7 +5954,7 @@ dependencies = [
59385954
"itertools 0.12.0",
59395955
"jubjub",
59405956
"lazy_static",
5941-
"metrics",
5957+
"metrics 0.22.0",
59425958
"mset",
59435959
"once_cell",
59445960
"proptest",
@@ -5975,7 +5991,7 @@ dependencies = [
59755991
"itertools 0.12.0",
59765992
"lazy_static",
59775993
"once_cell",
5978-
"owo-colors",
5994+
"owo-colors 4.0.0",
59795995
"proptest",
59805996
"rand 0.8.5",
59815997
"regex",
@@ -6039,7 +6055,7 @@ dependencies = [
60396055
"jsonrpc-core",
60406056
"lazy_static",
60416057
"log",
6042-
"metrics",
6058+
"metrics 0.22.0",
60436059
"metrics-exporter-prometheus",
60446060
"num-integer",
60456061
"once_cell",

deny.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,17 @@ skip-tree = [
7070
# wait for `parking_lot` crate inside `jsonrpc-http-server` to upgrade
7171
{ name = "redox_syscall", version = "=0.2.16" },
7272

73+
# wait for `color-eyre` to upgrade
74+
{ name = "owo-colors", version = "=3.5.0" },
75+
7376
# ZF crates
7477

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

81+
# wait for zcash_script to upgrade
82+
{ name = "metrics", version = "=0.21.1" },
83+
7884
# ECC crates
7985

8086
# wait for hdwallet to upgrade

tower-batch-control/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ keywords = ["tower", "batch"]
2222
categories = ["algorithms", "asynchronous"]
2323

2424
[dependencies]
25-
futures = "0.3.29"
25+
futures = "0.3.30"
2626
futures-core = "0.3.28"
2727
pin-project = "1.1.3"
2828
rayon = "1.7.0"
29-
tokio = { version = "1.34.0", features = ["time", "sync", "tracing", "macros"] }
29+
tokio = { version = "1.35.1", features = ["time", "sync", "tracing", "macros"] }
3030
tokio-util = "0.7.10"
3131
tower = { version = "0.4.13", features = ["util", "buffer"] }
3232
tracing = "0.1.39"
@@ -41,7 +41,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
4141
ed25519-zebra = "4.0.3"
4242
rand = "0.8.5"
4343

44-
tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
44+
tokio = { version = "1.35.1", features = ["full", "tracing", "test-util"] }
4545
tokio-test = "0.4.3"
4646
tower-fallback = { path = "../tower-fallback/" }
4747
tower-test = "0.4.0"

tower-fallback/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ futures-core = "0.3.28"
2222
tracing = "0.1.39"
2323

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

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

zebra-chain/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ serde_with = "3.4.0"
101101
serde-big-array = "0.5.1"
102102

103103
# Processing
104-
futures = "0.3.29"
104+
futures = "0.3.30"
105105
itertools = "0.12.0"
106106
rayon = "1.7.0"
107107

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

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

119119
# Experimental feature getblocktemplate-rpcs
120120
zcash_address = { version = "0.3.0", optional = true }
@@ -147,7 +147,7 @@ proptest-derive = "0.4.0"
147147
rand = "0.8.5"
148148
rand_chacha = "0.3.1"
149149

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

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

zebra-consensus/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ lazy_static = "1.4.0"
4949
once_cell = "1.18.0"
5050
serde = { version = "1.0.193", features = ["serde_derive"] }
5151

52-
futures = "0.3.29"
52+
futures = "0.3.30"
5353
futures-util = "0.3.28"
54-
metrics = "0.21.1"
54+
metrics = "0.22.0"
5555
thiserror = "1.0.51"
56-
tokio = { version = "1.34.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
56+
tokio = { version = "1.35.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
5757
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
5858
tracing = "0.1.39"
5959
tracing-futures = "0.2.5"
@@ -90,7 +90,7 @@ proptest = "1.4.0"
9090
proptest-derive = "0.4.0"
9191
spandoc = "0.2.2"
9292

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

0 commit comments

Comments
 (0)