Skip to content

Commit fbc01d6

Browse files
authored
chore(deps): bump some breaking deps (paradigmxyz#11388)
1 parent 707067a commit fbc01d6

File tree

13 files changed

+166
-121
lines changed

13 files changed

+166
-121
lines changed

Cargo.lock

Lines changed: 135 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,10 @@ op-alloy-consensus = "0.3.2"
469469
# misc
470470
aquamarine = "0.5"
471471
auto_impl = "1"
472-
backon = "0.4"
472+
backon = { version = "1.2", default-features = false, features = [
473+
"std-blocking-sleep",
474+
"tokio-sleep",
475+
] }
473476
bincode = "1.3"
474477
bitflags = "2.4"
475478
boyer-moore-magiclen = "0.2.16"
@@ -577,14 +580,14 @@ toml = "0.8"
577580
arbitrary = "1.3"
578581
assert_matches = "1.5.0"
579582
criterion = "0.5"
580-
iai-callgrind = "0.11"
583+
iai-callgrind = "0.13"
581584
pprof = "0.13"
582585
proptest = "1.4"
583586
proptest-derive = "0.5"
584587
serial_test = { default-features = false, version = "3" }
585588
similar-asserts = { default-features = false, version = "1.5.0" }
586589
tempfile = "3.8"
587-
test-fuzz = "5"
590+
test-fuzz = "6"
588591

589592
tikv-jemalloc-ctl = "0.6"
590593
tikv-jemallocator = "0.6"

bin/reth/src/commands/debug_cmd/in_memory_merkle.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
118118
let header = (move || {
119119
get_single_header(client.clone(), BlockHashOrNumber::Number(target_block_number))
120120
})
121-
.retry(&backoff)
121+
.retry(backoff)
122122
.notify(|err, _| warn!(target: "reth::cli", "Error requesting header: {err}. Retrying..."))
123123
.await?;
124124

125125
let client = fetch_client.clone();
126126
let chain = provider_factory.chain_spec();
127127
let block = (move || get_single_body(client.clone(), Arc::clone(&chain), header.clone()))
128-
.retry(&backoff)
128+
.retry(backoff)
129129
.notify(
130130
|err, _| warn!(target: "reth::cli", "Error requesting body: {err}. Retrying..."),
131131
)

bin/reth/src/commands/debug_cmd/merkle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
113113
let to_header = (move || {
114114
get_single_header(client.clone(), BlockHashOrNumber::Number(self.to))
115115
})
116-
.retry(&backoff)
116+
.retry(backoff)
117117
.notify(|err, _| warn!(target: "reth::cli", "Error requesting header: {err}. Retrying..."))
118118
.await?;
119119
info!(target: "reth::cli", target_block_number=self.to, "Finished downloading tip of block range");

crates/cli/commands/Cargo.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,20 @@ serde.workspace = true
6060
serde_json.workspace = true
6161
tracing.workspace = true
6262
backon.workspace = true
63-
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
63+
secp256k1 = { workspace = true, features = [
64+
"global-context",
65+
"rand-std",
66+
"recovery",
67+
] }
6468

6569
# io
6670
fdlimit.workspace = true
6771
toml = { workspace = true, features = ["display"] }
6872

6973
# tui
7074
comfy-table = "7.0"
71-
crossterm = "0.27.0"
72-
ratatui = { version = "0.27", default-features = false, features = [
75+
crossterm = "0.28.0"
76+
ratatui = { version = "0.28", default-features = false, features = [
7377
"crossterm",
7478
] }
7579

@@ -88,5 +92,5 @@ dev = [
8892
"dep:arbitrary",
8993
"dep:proptest-arbitrary-interop",
9094
"reth-primitives/arbitrary",
91-
"reth-db-api/arbitrary"
95+
"reth-db-api/arbitrary",
9296
]

crates/cli/commands/src/db/tui.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ where
347347
let outer_chunks = Layout::default()
348348
.direction(Direction::Vertical)
349349
.constraints([Constraint::Percentage(95), Constraint::Percentage(5)].as_ref())
350-
.split(f.size());
350+
.split(f.area());
351351

352352
// Columns
353353
{

crates/cli/commands/src/p2p/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
118118
match self.command {
119119
Subcommands::Header { id } => {
120120
let header = (move || get_single_header(fetch_client.clone(), id))
121-
.retry(&backoff)
121+
.retry(backoff)
122122
.notify(|err, _| println!("Error requesting header: {err}. Retrying..."))
123123
.await?;
124124
println!("Successfully downloaded header: {header:?}");
@@ -132,7 +132,7 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
132132
let header = (move || {
133133
get_single_header(client.clone(), BlockHashOrNumber::Number(number))
134134
})
135-
.retry(&backoff)
135+
.retry(backoff)
136136
.notify(|err, _| println!("Error requesting header: {err}. Retrying..."))
137137
.await?;
138138
header.hash()
@@ -142,7 +142,7 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
142142
let client = fetch_client.clone();
143143
client.get_block_bodies(vec![hash])
144144
})
145-
.retry(&backoff)
145+
.retry(backoff)
146146
.notify(|err, _| println!("Error requesting block: {err}. Retrying..."))
147147
.await?
148148
.split();

crates/consensus/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ revm-primitives.workspace = true
2323
[dev-dependencies]
2424
reth-storage-api.workspace = true
2525
rand.workspace = true
26-
mockall = "0.12"
26+
mockall = "0.13"
2727

2828
alloy-consensus.workspace = true

crates/node/metrics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ procfs = "0.16.0"
3636
[dev-dependencies]
3737
reqwest.workspace = true
3838
reth-chainspec.workspace = true
39-
socket2 = { version = "0.4", default-features = false }
39+
socket2 = { version = "0.5", default-features = false }
4040
reth-provider = { workspace = true, features = ["test-utils"] }
4141

4242
[lints]

crates/optimism/bin/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
21
#![allow(missing_docs, rustdoc::missing_crate_level_docs)]
32
// The `optimism` feature must be enabled to use this crate.
43
#![cfg(feature = "optimism")]
4+
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
55

66
use clap::Parser;
77
use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};

crates/storage/db/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ metrics = { workspace = true, optional = true }
4343

4444
# misc
4545
bytes.workspace = true
46-
page_size = { version = "0.6.0", optional = true }
46+
page_size = { version = "0.6.0", optional = true }
4747
thiserror.workspace = true
4848
tempfile = { workspace = true, optional = true }
4949
derive_more.workspace = true
5050
paste.workspace = true
5151
rustc-hash = { workspace = true, optional = true }
52-
sysinfo = { version = "0.30", default-features = false }
52+
sysinfo = { version = "0.31", default-features = false, features = ["system"] }
5353

5454
# arbitrary utils
5555
strum = { workspace = true, features = ["derive"], optional = true }

crates/storage/db/src/lockfile.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ impl ProcessUID {
104104
fn new(pid: usize) -> Option<Self> {
105105
let mut system = System::new();
106106
let pid2 = sysinfo::Pid::from(pid);
107-
system.refresh_process_specifics(pid2, ProcessRefreshKind::new());
107+
system.refresh_processes_specifics(
108+
sysinfo::ProcessesToUpdate::Some(&[pid2]),
109+
ProcessRefreshKind::new(),
110+
);
108111
system.process(pid2).map(|process| Self { pid, start_time: process.start_time() })
109112
}
110113

crates/storage/libmdbx-rs/mdbx-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ repository.workspace = true
1010

1111
[build-dependencies]
1212
cc = "1.0"
13-
bindgen = { version = "0.69", default-features = false, features = ["runtime"] }
13+
bindgen = { version = "0.70", default-features = false, features = ["runtime"] }

0 commit comments

Comments
 (0)