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.

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

chore(deps): bump some breaking deps #11388

Merged
merged 2 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
213 changes: 115 additions & 98 deletions Cargo.lock

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,10 @@ op-alloy-consensus = "0.3.2"
# misc
aquamarine = "0.5"
auto_impl = "1"
backon = "0.4"
backon = { version = "1.2", default-features = false, features = [
"std-blocking-sleep",
"tokio-sleep",
] }
bincode = "1.3"
bitflags = "2.4"
boyer-moore-magiclen = "0.2.16"
Expand Down Expand Up @@ -577,14 +580,14 @@ toml = "0.8"
arbitrary = "1.3"
assert_matches = "1.5.0"
criterion = "0.5"
iai-callgrind = "0.11"
iai-callgrind = "0.13"
pprof = "0.13"
proptest = "1.4"
proptest-derive = "0.5"
serial_test = { default-features = false, version = "3" }
similar-asserts = { default-features = false, version = "1.5.0" }
tempfile = "3.8"
test-fuzz = "5"
test-fuzz = "6"

tikv-jemalloc-ctl = "0.6"
tikv-jemallocator = "0.6"
Expand Down
4 changes: 2 additions & 2 deletions bin/reth/src/commands/debug_cmd/in_memory_merkle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
let header = (move || {
get_single_header(client.clone(), BlockHashOrNumber::Number(target_block_number))
})
.retry(&backoff)
.retry(backoff)
.notify(|err, _| warn!(target: "reth::cli", "Error requesting header: {err}. Retrying..."))
.await?;

let client = fetch_client.clone();
let chain = provider_factory.chain_spec();
let block = (move || get_single_body(client.clone(), Arc::clone(&chain), header.clone()))
.retry(&backoff)
.retry(backoff)
.notify(
|err, _| warn!(target: "reth::cli", "Error requesting body: {err}. Retrying..."),
)
Expand Down
2 changes: 1 addition & 1 deletion bin/reth/src/commands/debug_cmd/merkle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
let to_header = (move || {
get_single_header(client.clone(), BlockHashOrNumber::Number(self.to))
})
.retry(&backoff)
.retry(backoff)
.notify(|err, _| warn!(target: "reth::cli", "Error requesting header: {err}. Retrying..."))
.await?;
info!(target: "reth::cli", target_block_number=self.to, "Finished downloading tip of block range");
Expand Down
12 changes: 8 additions & 4 deletions crates/cli/commands/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,20 @@ serde.workspace = true
serde_json.workspace = true
tracing.workspace = true
backon.workspace = true
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
secp256k1 = { workspace = true, features = [
"global-context",
"rand-std",
"recovery",
] }

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

# tui
comfy-table = "7.0"
crossterm = "0.27.0"
ratatui = { version = "0.27", default-features = false, features = [
crossterm = "0.28.0"
ratatui = { version = "0.28", default-features = false, features = [
"crossterm",
] }

Expand All @@ -88,5 +92,5 @@ dev = [
"dep:arbitrary",
"dep:proptest-arbitrary-interop",
"reth-primitives/arbitrary",
"reth-db-api/arbitrary"
"reth-db-api/arbitrary",
]
2 changes: 1 addition & 1 deletion crates/cli/commands/src/db/tui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ where
let outer_chunks = Layout::default()
.direction(Direction::Vertical)
.constraints([Constraint::Percentage(95), Constraint::Percentage(5)].as_ref())
.split(f.size());
.split(f.area());

// Columns
{
Expand Down
6 changes: 3 additions & 3 deletions crates/cli/commands/src/p2p/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
match self.command {
Subcommands::Header { id } => {
let header = (move || get_single_header(fetch_client.clone(), id))
.retry(&backoff)
.retry(backoff)
.notify(|err, _| println!("Error requesting header: {err}. Retrying..."))
.await?;
println!("Successfully downloaded header: {header:?}");
Expand All @@ -132,7 +132,7 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
let header = (move || {
get_single_header(client.clone(), BlockHashOrNumber::Number(number))
})
.retry(&backoff)
.retry(backoff)
.notify(|err, _| println!("Error requesting header: {err}. Retrying..."))
.await?;
header.hash()
Expand All @@ -142,7 +142,7 @@ impl<C: ChainSpecParser<ChainSpec: EthChainSpec + EthereumHardforks>> Command<C>
let client = fetch_client.clone();
client.get_block_bodies(vec![hash])
})
.retry(&backoff)
.retry(backoff)
.notify(|err, _| println!("Error requesting block: {err}. Retrying..."))
.await?
.split();
Expand Down
2 changes: 1 addition & 1 deletion crates/consensus/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ revm-primitives.workspace = true
[dev-dependencies]
reth-storage-api.workspace = true
rand.workspace = true
mockall = "0.12"
mockall = "0.13"

alloy-consensus.workspace = true
2 changes: 1 addition & 1 deletion crates/node/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ procfs = "0.16.0"
[dev-dependencies]
reqwest.workspace = true
reth-chainspec.workspace = true
socket2 = { version = "0.4", default-features = false }
socket2 = { version = "0.5", default-features = false }
reth-provider = { workspace = true, features = ["test-utils"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/optimism/bin/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
#![allow(missing_docs, rustdoc::missing_crate_level_docs)]
// The `optimism` feature must be enabled to use this crate.
#![cfg(feature = "optimism")]
#![cfg_attr(not(test), warn(unused_crate_dependencies))]

use clap::Parser;
use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};
Expand Down
4 changes: 2 additions & 2 deletions crates/storage/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ metrics = { workspace = true, optional = true }

# misc
bytes.workspace = true
page_size = { version = "0.6.0", optional = true }
page_size = { version = "0.6.0", optional = true }
thiserror.workspace = true
tempfile = { workspace = true, optional = true }
derive_more.workspace = true
paste.workspace = true
rustc-hash = { workspace = true, optional = true }
sysinfo = { version = "0.30", default-features = false }
sysinfo = { version = "0.31", default-features = false, features = ["system"] }

# arbitrary utils
strum = { workspace = true, features = ["derive"], optional = true }
Expand Down
5 changes: 4 additions & 1 deletion crates/storage/db/src/lockfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ impl ProcessUID {
fn new(pid: usize) -> Option<Self> {
let mut system = System::new();
let pid2 = sysinfo::Pid::from(pid);
system.refresh_process_specifics(pid2, ProcessRefreshKind::new());
system.refresh_processes_specifics(
sysinfo::ProcessesToUpdate::Some(&[pid2]),
ProcessRefreshKind::new(),
);
system.process(pid2).map(|process| Self { pid, start_time: process.start_time() })
}

Expand Down
Loading