From c9a348dd2ccbcb7e1f7553dc6b19776bbe85b70a Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:36:15 +0100 Subject: [PATCH] chore(deps): bump breaking deps (#14570) Co-authored-by: Matthias Seitz --- Cargo.lock | 426 ++++++++++-------- Cargo.toml | 20 +- crates/cli/commands/Cargo.toml | 4 +- crates/net/discv4/Cargo.toml | 2 +- crates/net/discv4/src/proto.rs | 4 +- crates/net/discv5/Cargo.toml | 2 +- crates/net/discv5/src/lib.rs | 8 +- crates/net/dns/Cargo.toml | 4 +- crates/net/ecies/Cargo.toml | 2 +- crates/net/ecies/src/algorithm.rs | 4 +- crates/net/eth-wire/Cargo.toml | 2 +- crates/net/network/Cargo.toml | 3 +- crates/node/builder/Cargo.toml | 2 +- crates/node/core/Cargo.toml | 2 +- crates/node/metrics/Cargo.toml | 5 +- crates/optimism/chainspec/src/lib.rs | 4 +- .../primitives/src/transaction/signed.rs | 1 + crates/primitives-traits/src/crypto.rs | 4 +- crates/storage/codecs/derive/Cargo.toml | 2 +- crates/storage/db/Cargo.toml | 2 +- crates/storage/db/src/lockfile.rs | 10 +- crates/storage/libmdbx-rs/Cargo.toml | 1 - .../storage/libmdbx-rs/benches/transaction.rs | 11 +- crates/trie/db/src/prefix_set.rs | 6 +- examples/bsc-p2p/Cargo.toml | 2 +- examples/manual-p2p/Cargo.toml | 2 +- examples/polygon-p2p/Cargo.toml | 2 +- 27 files changed, 304 insertions(+), 233 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 087209916..93cec435c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ "num_enum", "proptest", "serde", - "strum", + "strum 0.26.3", ] [[package]] @@ -133,7 +133,7 @@ dependencies = [ "arbitrary", "auto_impl", "c-kzg", - "derive_more", + "derive_more 1.0.0", "rand 0.8.5", "serde", "serde_with", @@ -184,7 +184,7 @@ dependencies = [ "alloy-sol-type-parser", "alloy-sol-types", "const-hex", - "derive_more", + "derive_more 1.0.0", "itoa", "serde", "serde_json", @@ -228,7 +228,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", - "derive_more", + "derive_more 1.0.0", "k256", "rand 0.8.5", "serde", @@ -250,7 +250,7 @@ dependencies = [ "arbitrary", "auto_impl", "c-kzg", - "derive_more", + "derive_more 1.0.0", "ethereum_ssz", "ethereum_ssz_derive", "once_cell", @@ -388,7 +388,7 @@ dependencies = [ "cfg-if", "const-hex", "derive_arbitrary", - "derive_more", + "derive_more 1.0.0", "foldhash", "getrandom 0.2.15", "hashbrown 0.15.2", @@ -601,14 +601,14 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-serde", - "derive_more", + "derive_more 1.0.0", "ethereum_ssz", "ethereum_ssz_derive", "jsonrpsee-types", "jsonwebtoken", "rand 0.8.5", "serde", - "strum", + "strum 0.26.3", ] [[package]] @@ -871,7 +871,7 @@ dependencies = [ "arbitrary", "arrayvec", "derive_arbitrary", - "derive_more", + "derive_more 1.0.0", "nybbles", "proptest", "proptest-derive", @@ -1375,6 +1375,22 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -1759,6 +1775,20 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cargo_metadata" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.25", + "serde", + "serde_json", + "thiserror 2.0.11", +] + [[package]] name = "cassowary" version = "0.3.0" @@ -2135,9 +2165,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" dependencies = [ "unicode-segmentation", ] @@ -2305,7 +2335,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.8.0", "crossterm_winapi", - "mio 1.0.3", + "mio", "parking_lot", "rustix", "signal-hook", @@ -2603,7 +2633,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl", + "derive_more-impl 1.0.0", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl 2.0.1", ] [[package]] @@ -2611,6 +2650,18 @@ name = "derive_more-impl" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", + "unicode-xid", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ "convert_case", "proc-macro2", @@ -2690,9 +2741,9 @@ dependencies = [ [[package]] name = "discv5" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e6b70634e26c909d1edbb3142b3eaf3b89da0e52f284f00ca7c80d9901ad9e" +checksum = "c4b4e7798d2ff74e29cee344dc490af947ae657d6ab5273dde35d58ce06a4d71" dependencies = [ "aes", "aes-gcm", @@ -2849,19 +2900,19 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "enr" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972070166c68827e64bd1ebc8159dd8e32d9bc2da7ebe8f20b61308f7974ad30" +checksum = "851bd664a3d3a3c175cff92b2f0df02df3c541b4895d0ae307611827aae46152" dependencies = [ "alloy-rlp", - "base64 0.21.7", + "base64 0.22.1", "bytes", "ed25519-dalek", "hex", "k256", "log", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "sha3", "zeroize", @@ -3025,7 +3076,7 @@ dependencies = [ "reth-network-peers", "reth-primitives", "reth-tracing", - "secp256k1", + "secp256k1 0.30.0", "serde_json", "tokio", "tokio-stream", @@ -3196,7 +3247,7 @@ dependencies = [ "reth-network", "reth-network-peers", "reth-primitives", - "secp256k1", + "secp256k1 0.30.0", "tokio", ] @@ -3267,7 +3318,7 @@ dependencies = [ "reth-network-api", "reth-primitives", "reth-tracing", - "secp256k1", + "secp256k1 0.30.0", "serde_json", "tokio", "tokio-stream", @@ -3857,6 +3908,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hickory-proto" version = "0.25.0-alpha.5" @@ -4387,11 +4447,11 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.8.0", "inotify-sys", "libc", ] @@ -5115,7 +5175,7 @@ dependencies = [ "mach2", "metrics", "once_cell", - "procfs 0.17.0", + "procfs", "rlimit", "windows 0.58.0", ] @@ -5204,18 +5264,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.3" @@ -5337,9 +5385,9 @@ dependencies = [ [[package]] name = "notify" -version = "6.1.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" dependencies = [ "bitflags 2.8.0", "filetime", @@ -5348,10 +5396,19 @@ dependencies = [ "kqueue", "libc", "log", - "mio 0.8.11", - "serde", + "mio", + "notify-types", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "notify-types" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" +dependencies = [ + "serde", ] [[package]] @@ -5555,7 +5612,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "arbitrary", - "derive_more", + "derive_more 1.0.0", "serde", "serde_with", "thiserror 2.0.11", @@ -5604,7 +5661,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", - "derive_more", + "derive_more 1.0.0", "op-alloy-consensus", "serde", "serde_json", @@ -5621,7 +5678,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", "alloy-serde", - "derive_more", + "derive_more 1.0.0", "ethereum_ssz", "op-alloy-consensus", "serde", @@ -6083,42 +6140,18 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "procfs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" -dependencies = [ - "bitflags 2.8.0", - "chrono", - "flate2", - "hex", - "lazy_static", - "procfs-core 0.16.0", - "rustix", -] - [[package]] name = "procfs" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" -dependencies = [ - "bitflags 2.8.0", - "hex", - "procfs-core 0.17.0", - "rustix", -] - -[[package]] -name = "procfs-core" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ "bitflags 2.8.0", "chrono", + "flate2", "hex", + "procfs-core", + "rustix", ] [[package]] @@ -6128,6 +6161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ "bitflags 2.8.0", + "chrono", "hex", ] @@ -6412,23 +6446,23 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ "bitflags 2.8.0", "cassowary", "compact_str", "crossterm", + "indoc", "instability", "itertools 0.13.0", "lru 0.12.5", "paste", - "strum", - "strum_macros", + "strum 0.26.3", "unicode-segmentation", "unicode-truncate", - "unicode-width 0.1.14", + "unicode-width 0.2.0", ] [[package]] @@ -6750,7 +6784,7 @@ dependencies = [ "alloy-primitives", "alloy-signer", "alloy-signer-local", - "derive_more", + "derive_more 2.0.1", "metrics", "parking_lot", "pin-project", @@ -6783,7 +6817,7 @@ dependencies = [ "alloy-rlp", "alloy-trie", "auto_impl", - "derive_more", + "derive_more 2.0.1", "reth-ethereum-forks", "reth-network-peers", "reth-primitives-traits", @@ -6821,7 +6855,7 @@ dependencies = [ "fdlimit", "futures", "human_bytes", - "itertools 0.13.0", + "itertools 0.14.0", "proptest", "proptest-arbitrary-interop", "ratatui", @@ -6863,7 +6897,7 @@ dependencies = [ "reth-trie", "reth-trie-common", "reth-trie-db", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_json", "tokio", @@ -6891,7 +6925,7 @@ dependencies = [ "libc", "rand 0.8.5", "reth-fs-util", - "secp256k1", + "secp256k1 0.30.0", "serde", "snmalloc-rs", "thiserror 2.0.11", @@ -7007,7 +7041,7 @@ dependencies = [ "arbitrary", "assert_matches", "codspeed-criterion-compat", - "derive_more", + "derive_more 2.0.1", "eyre", "metrics", "page_size", @@ -7026,7 +7060,7 @@ dependencies = [ "rustc-hash 2.1.1", "serde", "serde_json", - "strum", + "strum 0.27.1", "sysinfo", "tempfile", "thiserror 2.0.11", @@ -7041,7 +7075,7 @@ dependencies = [ "alloy-primitives", "arbitrary", "bytes", - "derive_more", + "derive_more 2.0.1", "metrics", "modular-bitfield", "parity-scale-codec", @@ -7118,7 +7152,7 @@ dependencies = [ "discv5", "enr", "generic-array", - "itertools 0.13.0", + "itertools 0.14.0", "parking_lot", "rand 0.8.5", "reth-ethereum-forks", @@ -7127,7 +7161,7 @@ dependencies = [ "reth-network-peers", "reth-tracing", "schnellru", - "secp256k1", + "secp256k1 0.30.0", "serde", "thiserror 2.0.11", "tokio", @@ -7141,11 +7175,11 @@ version = "1.2.0" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 2.0.1", "discv5", "enr", "futures", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "rand 0.8.5", "reth-chainspec", @@ -7153,7 +7187,7 @@ dependencies = [ "reth-metrics", "reth-network-peers", "reth-tracing", - "secp256k1", + "secp256k1 0.30.0", "thiserror 2.0.11", "tokio", "tracing", @@ -7178,7 +7212,7 @@ dependencies = [ "reth-tokio-util", "reth-tracing", "schnellru", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.11", @@ -7198,7 +7232,7 @@ dependencies = [ "assert_matches", "futures", "futures-util", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "pin-project", "rand 0.8.5", @@ -7239,7 +7273,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-signer", "alloy-signer-local", - "derive_more", + "derive_more 2.0.1", "eyre", "futures-util", "jsonrpsee", @@ -7291,7 +7325,7 @@ dependencies = [ "pin-project", "rand 0.8.5", "reth-network-peers", - "secp256k1", + "secp256k1 0.30.0", "sha2 0.10.8", "sha3", "thiserror 2.0.11", @@ -7395,7 +7429,7 @@ dependencies = [ "assert_matches", "codspeed-criterion-compat", "crossbeam-channel", - "derive_more", + "derive_more 2.0.1", "futures", "metrics", "mini-moka", @@ -7452,7 +7486,7 @@ dependencies = [ "alloy-rpc-types-engine", "eyre", "futures", - "itertools 0.13.0", + "itertools 0.14.0", "pin-project", "reth-chainspec", "reth-consensus-common", @@ -7499,7 +7533,7 @@ dependencies = [ "arbitrary", "async-stream", "bytes", - "derive_more", + "derive_more 2.0.1", "futures", "pin-project", "proptest", @@ -7514,7 +7548,7 @@ dependencies = [ "reth-primitives", "reth-primitives-traits", "reth-tracing", - "secp256k1", + "secp256k1 0.30.0", "serde", "snap", "test-fuzz", @@ -7537,7 +7571,7 @@ dependencies = [ "alloy-rlp", "arbitrary", "bytes", - "derive_more", + "derive_more 2.0.1", "proptest", "proptest-arbitrary-interop", "rand 0.8.5", @@ -7676,7 +7710,7 @@ dependencies = [ "alloy-serde", "arbitrary", "bincode", - "derive_more", + "derive_more 2.0.1", "modular-bitfield", "proptest", "proptest-arbitrary-interop", @@ -7686,7 +7720,7 @@ dependencies = [ "reth-testing-utils", "reth-zstd-compressors", "revm-context", - "secp256k1", + "secp256k1 0.30.0", "serde", "test-fuzz", ] @@ -7750,7 +7784,7 @@ dependencies = [ "reth-primitives-traits", "reth-revm", "reth-testing-utils", - "secp256k1", + "secp256k1 0.30.0", "serde_json", ] @@ -7776,7 +7810,7 @@ dependencies = [ "alloy-primitives", "arbitrary", "bincode", - "derive_more", + "derive_more 2.0.1", "rand 0.8.5", "reth-ethereum-primitives", "reth-execution-errors", @@ -7798,7 +7832,7 @@ dependencies = [ "alloy-primitives", "eyre", "futures", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "parking_lot", "rand 0.8.5", @@ -7823,7 +7857,7 @@ dependencies = [ "reth-testing-utils", "reth-tracing", "rmp-serde", - "secp256k1", + "secp256k1 0.30.0", "tempfile", "thiserror 2.0.11", "tokio", @@ -7947,12 +7981,11 @@ dependencies = [ "byteorder", "codspeed-criterion-compat", "dashmap 6.1.0", - "derive_more", + "derive_more 2.0.1", "indexmap 2.7.1", "parking_lot", "pprof", "rand 0.8.5", - "rand_xorshift", "reth-mdbx-sys", "smallvec", "tempfile", @@ -8013,11 +8046,11 @@ dependencies = [ "aquamarine", "auto_impl", "codspeed-criterion-compat", - "derive_more", + "derive_more 2.0.1", "discv5", "enr", "futures", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "parking_lot", "pin-project", @@ -8050,7 +8083,7 @@ dependencies = [ "reth-transaction-pool", "rustc-hash 2.1.1", "schnellru", - "secp256k1", + "secp256k1 0.30.0", "serde", "serial_test", "smallvec", @@ -8070,7 +8103,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", "auto_impl", - "derive_more", + "derive_more 2.0.1", "enr", "futures", "reth-eth-wire-types", @@ -8093,7 +8126,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "auto_impl", - "derive_more", + "derive_more 2.0.1", "futures", "parking_lot", "reth-consensus", @@ -8115,7 +8148,7 @@ dependencies = [ "alloy-rlp", "enr", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde_json", "serde_with", "thiserror 2.0.11", @@ -8142,7 +8175,7 @@ version = "1.2.0" dependencies = [ "anyhow", "bincode", - "derive_more", + "derive_more 2.0.1", "lz4_flex", "memmap2", "rand 0.8.5", @@ -8233,7 +8266,7 @@ dependencies = [ "reth-tokio-util", "reth-tracing", "reth-transaction-pool", - "secp256k1", + "secp256k1 0.30.0", "tempfile", "tokio", "tokio-stream", @@ -8249,7 +8282,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", "clap", - "derive_more", + "derive_more 2.0.1", "dirs-next", "eyre", "futures", @@ -8279,10 +8312,10 @@ dependencies = [ "reth-storage-errors", "reth-tracing", "reth-transaction-pool", - "secp256k1", + "secp256k1 0.30.0", "serde", "shellexpand", - "strum", + "strum 0.27.1", "thiserror 2.0.11", "tokio", "toml", @@ -8349,7 +8382,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", - "derive_more", + "derive_more 2.0.1", "futures", "humantime", "pin-project", @@ -8375,7 +8408,7 @@ dependencies = [ "metrics-exporter-prometheus", "metrics-process", "metrics-util", - "procfs 0.16.0", + "procfs", "reqwest", "reth-metrics", "reth-tasks", @@ -8384,7 +8417,6 @@ dependencies = [ "tokio", "tower 0.4.13", "tracing", - "vergen", ] [[package]] @@ -8448,7 +8480,7 @@ dependencies = [ "alloy-eips", "alloy-genesis", "alloy-primitives", - "derive_more", + "derive_more 2.0.1", "once_cell", "op-alloy-consensus", "op-alloy-rpc-types", @@ -8471,7 +8503,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "clap", - "derive_more", + "derive_more 2.0.1", "eyre", "futures-util", "op-alloy-consensus", @@ -8551,7 +8583,7 @@ dependencies = [ "alloy-genesis", "alloy-op-evm", "alloy-primitives", - "derive_more", + "derive_more 2.0.1", "op-alloy-consensus", "reth-chainspec", "reth-consensus", @@ -8651,7 +8683,7 @@ dependencies = [ "alloy-rlp", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "derive_more", + "derive_more 2.0.1", "op-alloy-consensus", "op-alloy-rpc-types-engine", "reth-basic-payload-builder", @@ -8692,7 +8724,7 @@ dependencies = [ "alloy-serde", "arbitrary", "bytes", - "derive_more", + "derive_more 2.0.1", "modular-bitfield", "op-alloy-consensus", "proptest", @@ -8704,7 +8736,7 @@ dependencies = [ "revm-context", "revm-optimism", "rstest", - "secp256k1", + "secp256k1 0.30.0", "serde", ] @@ -8719,7 +8751,7 @@ dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", "async-trait", - "derive_more", + "derive_more 2.0.1", "jsonrpsee", "jsonrpsee-core", "jsonrpsee-types", @@ -8781,7 +8813,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "c-kzg", - "derive_more", + "derive_more 2.0.1", "futures-util", "metrics", "op-alloy-consensus", @@ -8912,7 +8944,7 @@ dependencies = [ "bincode", "byteorder", "bytes", - "derive_more", + "derive_more 2.0.1", "k256", "modular-bitfield", "once_cell", @@ -8926,7 +8958,7 @@ dependencies = [ "revm-bytecode", "revm-primitives", "revm-state", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_json", "serde_with", @@ -8946,7 +8978,7 @@ dependencies = [ "auto_impl", "dashmap 6.1.0", "eyre", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "notify", "parking_lot", @@ -8979,7 +9011,7 @@ dependencies = [ "revm-database", "revm-database-interface", "revm-state", - "strum", + "strum 0.27.1", "tempfile", "tokio", "tracing", @@ -8993,7 +9025,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "assert_matches", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "rayon", "reth-chainspec", @@ -9024,7 +9056,7 @@ dependencies = [ "alloy-primitives", "arbitrary", "assert_matches", - "derive_more", + "derive_more 2.0.1", "modular-bitfield", "proptest", "proptest-arbitrary-interop", @@ -9076,7 +9108,7 @@ dependencies = [ "alloy-signer", "alloy-signer-local", "async-trait", - "derive_more", + "derive_more 2.0.1", "futures", "http", "http-body", @@ -9308,9 +9340,9 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-sol-types", - "derive_more", + "derive_more 2.0.1", "futures", - "itertools 0.13.0", + "itertools 0.14.0", "jsonrpsee-core", "jsonrpsee-types", "metrics", @@ -9372,7 +9404,7 @@ dependencies = [ "reth-errors", "reth-network-api", "serde", - "strum", + "strum 0.27.1", ] [[package]] @@ -9401,7 +9433,7 @@ dependencies = [ "blake3", "codspeed-criterion-compat", "futures-util", - "itertools 0.13.0", + "itertools 0.14.0", "num-traits", "paste", "pprof", @@ -9521,10 +9553,10 @@ version = "1.2.0" dependencies = [ "alloy-primitives", "clap", - "derive_more", + "derive_more 2.0.1", "reth-nippy-jar", "serde", - "strum", + "strum 0.27.1", ] [[package]] @@ -9556,7 +9588,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 2.0.1", "reth-primitives-traits", "reth-prune-types", "reth-static-file-types", @@ -9592,7 +9624,7 @@ dependencies = [ "rand 0.8.5", "reth-primitives", "reth-primitives-traits", - "secp256k1", + "secp256k1 0.30.0", ] [[package]] @@ -9676,7 +9708,7 @@ dependencies = [ "alloy-trie", "auto_impl", "codspeed-criterion-compat", - "itertools 0.13.0", + "itertools 0.14.0", "metrics", "proptest", "proptest-arbitrary-interop", @@ -9710,9 +9742,9 @@ dependencies = [ "bincode", "bytes", "codspeed-criterion-compat", - "derive_more", + "derive_more 2.0.1", "hash-db", - "itertools 0.13.0", + "itertools 0.14.0", "nybbles", "plain_hasher", "proptest", @@ -9734,7 +9766,7 @@ dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 2.0.1", "metrics", "proptest", "proptest-arbitrary-interop", @@ -9764,8 +9796,8 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "codspeed-criterion-compat", - "derive_more", - "itertools 0.13.0", + "derive_more 2.0.1", + "itertools 0.14.0", "metrics", "proptest", "proptest-arbitrary-interop", @@ -9792,7 +9824,7 @@ dependencies = [ "arbitrary", "assert_matches", "codspeed-criterion-compat", - "itertools 0.13.0", + "itertools 0.14.0", "pretty_assertions", "proptest", "proptest-arbitrary-interop", @@ -10002,7 +10034,7 @@ dependencies = [ "revm-primitives", "revm-specification", "ripemd", - "secp256k1", + "secp256k1 0.29.1", "sha2 0.10.8", "substrate-bn", ] @@ -10153,21 +10185,21 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" [[package]] name = "rstest" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" +checksum = "03e905296805ab93e13c1ec3a03f4b6c4f35e9498a3d5fa96dc626d22c03cd89" dependencies = [ - "futures", "futures-timer", + "futures-util", "rstest_macros", "rustc_version 0.4.1", ] [[package]] name = "rstest_macros" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" +checksum = "ef0053bbffce09062bee4bcc499b0fbe7a57b879f1efe088d6d8d4c7adcdef9b" dependencies = [ "cfg-if", "glob", @@ -10477,6 +10509,17 @@ checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand 0.8.5", "secp256k1-sys", +] + +[[package]] +name = "secp256k1" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" +dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", + "secp256k1-sys", "serde", ] @@ -10574,6 +10617,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde_combinators" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de5fb30ae2918667d3cee99ef4b112f1f7ca0a6c58fa349d7d9e76035c72f8b" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.217" @@ -10789,7 +10841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 1.0.3", + "mio", "signal-hook", ] @@ -10994,7 +11046,16 @@ version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros", + "strum_macros 0.26.4", +] + +[[package]] +name = "strum" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +dependencies = [ + "strum_macros 0.27.1", ] [[package]] @@ -11010,6 +11071,19 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "strum_macros" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.98", +] + [[package]] name = "substrate-bn" version = "0.6.0" @@ -11108,9 +11182,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.32.1" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" dependencies = [ "core-foundation-sys", "libc", @@ -11147,11 +11221,12 @@ dependencies = [ [[package]] name = "test-fuzz" -version = "6.0.0" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7a9bb33d134e863862ab9dad2ac7e022ac89707914627f498fe0f29248d9b" +checksum = "13b092bf18815b5fcfadc8b15d4644d5d68b4d761b32ac1192912e3241aa45f7" dependencies = [ "serde", + "serde_combinators", "test-fuzz-internal", "test-fuzz-macro", "test-fuzz-runtime", @@ -11159,25 +11234,24 @@ dependencies = [ [[package]] name = "test-fuzz-internal" -version = "6.0.0" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bef5dd380747bd7b6e636a8032a24aa34fcecaf843e59fc97d299681922e86" +checksum = "f04fc3fa0293849f8762c3e8427cb11a73b8bfc2157f2713029d93df554da052" dependencies = [ "bincode", - "cargo_metadata 0.18.1", + "cargo_metadata 0.19.1", "serde", ] [[package]] name = "test-fuzz-macro" -version = "6.0.0" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500" +checksum = "fcc398c37df7cf559845f32bcf694b3984e0378887dc2e177775a7a918ee7110" dependencies = [ "darling", "heck", - "itertools 0.13.0", - "once_cell", + "itertools 0.14.0", "prettyplease", "proc-macro2", "quote", @@ -11186,9 +11260,9 @@ dependencies = [ [[package]] name = "test-fuzz-runtime" -version = "6.0.0" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fbe6fb7481ec6d9bf64ae2c5d49cb1b40f8da624a91031482af7b08168c679" +checksum = "2dede21a17233c03fdb704ea831e4a6b52da877f54e8bc273f74eee47903d446" dependencies = [ "hex", "num-traits", @@ -11380,7 +11454,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.3", + "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -11688,9 +11762,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.17.6" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73202d787346a5418f8222eddb5a00f29ea47caf3c7d38a8f2f69f8455fa7c7e" +checksum = "d90a2c01305b02b76fdd89ac8608bae27e173c829a35f7d76a345ab5d33836db" dependencies = [ "loom", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index c63166f6c..b51062495 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -502,7 +502,7 @@ bytes = { version = "1.5", default-features = false } cfg-if = "1.0" clap = "4" dashmap = "6.0" -derive_more = { version = "1", default-features = false, features = ["full"] } +derive_more = { version = "2", default-features = false, features = ["full"] } dirs-next = "2.0.0" dyn-clone = "1.0.17" eyre = "0.6" @@ -510,10 +510,10 @@ fdlimit = "0.3.0" generic-array = "0.14" humantime = "2.1" humantime-serde = "1.1" -itertools = { version = "0.13", default-features = false } +itertools = { version = "0.14", default-features = false } linked_hash_set = "0.1" modular-bitfield = "0.11.2" -notify = { version = "6.1.1", default-features = false, features = ["macos_fsevent"] } +notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] } nybbles = { version = "0.3.0", default-features = false } once_cell = { version = "1.19", default-features = false, features = ["critical-section"] } parking_lot = "0.12" @@ -528,7 +528,7 @@ serde_with = { version = "3", default-features = false, features = ["macros"] } sha2 = { version = "0.10", default-features = false } shellexpand = "3.0.0" smallvec = "1" -strum = { version = "0.26", default-features = false } +strum = { version = "0.27", default-features = false } syn = "2.0" thiserror = { version = "2.0.0", default-features = false } tracing = "0.1.0" @@ -569,7 +569,7 @@ tower = "0.4" tower-http = "0.6" # p2p -discv5 = "0.8.0" +discv5 = "0.9" if-addrs = "0.13" # rpc @@ -587,9 +587,9 @@ jsonwebtoken = "9" proptest-arbitrary-interop = "0.1.0" # crypto -enr = { version = "0.12.1", default-features = false } +enr = { version = "0.13", default-features = false } k256 = { version = "0.13", default-features = false, features = ["ecdsa"] } -secp256k1 = { version = "0.29", default-features = false, features = ["global-context", "recovery"] } +secp256k1 = { version = "0.30", default-features = false, features = ["global-context", "recovery"] } # for eip-4844 c-kzg = "1.0.0" @@ -607,13 +607,13 @@ proptest-derive = "0.5" serial_test = { default-features = false, version = "3" } similar-asserts = { version = "1.5.0", features = ["serde"] } tempfile = "3.8" -test-fuzz = "6" -rstest = "0.23.0" +test-fuzz = "7" +rstest = "0.24.0" # allocators tikv-jemalloc-ctl = "0.6" tikv-jemallocator = "0.6" -tracy-client = "0.17.3" +tracy-client = "0.18.0" snmalloc-rs = { version = "0.3.7", features = ["build_cc"] } # TODO: When we build for a windows target on an ubuntu runner, crunchy tries to diff --git a/crates/cli/commands/Cargo.toml b/crates/cli/commands/Cargo.toml index 9e6136f48..a4fc4dd98 100644 --- a/crates/cli/commands/Cargo.toml +++ b/crates/cli/commands/Cargo.toml @@ -68,7 +68,7 @@ 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", "std", "recovery"] } # io fdlimit.workspace = true @@ -77,7 +77,7 @@ toml = { workspace = true, features = ["display"] } # tui comfy-table = "7.0" crossterm = "0.28.0" -ratatui = { version = "0.28", default-features = false, features = ["crossterm"] } +ratatui = { version = "0.29", default-features = false, features = ["crossterm"] } # reth test-vectors proptest = { workspace = true, optional = true } diff --git a/crates/net/discv4/Cargo.toml b/crates/net/discv4/Cargo.toml index dfd2c6eb6..5d5ec7378 100644 --- a/crates/net/discv4/Cargo.toml +++ b/crates/net/discv4/Cargo.toml @@ -22,7 +22,7 @@ reth-network-peers = { workspace = true, features = ["secp256k1"] } alloy-primitives = { workspace = true, features = ["rand"] } alloy-rlp = { workspace = true, features = ["derive"] } discv5.workspace = true -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery", "serde"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery", "serde"] } enr.workspace = true # async/futures diff --git a/crates/net/discv4/src/proto.rs b/crates/net/discv4/src/proto.rs index 97546f4fe..b9ec6cbfa 100644 --- a/crates/net/discv4/src/proto.rs +++ b/crates/net/discv4/src/proto.rs @@ -122,7 +122,7 @@ impl Message { // Serialize the signature and append it to the signature bytes let (rec, sig) = signature.serialize_compact(); sig_bytes.extend_from_slice(&sig); - sig_bytes.put_u8(rec.to_i32() as u8); + sig_bytes.put_u8(i32::from(rec) as u8); sig_bytes.unsplit(payload); // Calculate the hash of the signature bytes and append it to the datagram @@ -156,7 +156,7 @@ impl Message { } let signature = &packet[32..96]; - let recovery_id = RecoveryId::from_i32(packet[96] as i32)?; + let recovery_id = RecoveryId::try_from(packet[96] as i32)?; let recoverable_sig = RecoverableSignature::from_compact(signature, recovery_id)?; // recover the public key diff --git a/crates/net/discv5/Cargo.toml b/crates/net/discv5/Cargo.toml index 329f04cb7..6c59f4224 100644 --- a/crates/net/discv5/Cargo.toml +++ b/crates/net/discv5/Cargo.toml @@ -42,4 +42,4 @@ metrics.workspace = true [dev-dependencies] reth-tracing.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] } -secp256k1 = { workspace = true, features = ["rand-std"] } +secp256k1 = { workspace = true, features = ["std", "rand"] } diff --git a/crates/net/discv5/src/lib.rs b/crates/net/discv5/src/lib.rs index da54d0b52..267a5f63c 100644 --- a/crates/net/discv5/src/lib.rs +++ b/crates/net/discv5/src/lib.rs @@ -655,8 +655,8 @@ pub async fn lookup( mod test { use super::*; use ::enr::{CombinedKey, EnrKey}; + use rand::thread_rng; use reth_chainspec::MAINNET; - use secp256k1::rand::thread_rng; use tracing::trace; fn discv5_noop() -> Discv5 { @@ -729,16 +729,12 @@ mod test { node_1.with_discv5(|discv5| discv5.send_ping(node_2_enr.clone())).await.unwrap(); // verify node_1:discv5 is connected to node_2:discv5 and vv - let event_2_v5 = stream_2.recv().await.unwrap(); let event_1_v5 = stream_1.recv().await.unwrap(); + assert!(matches!( event_1_v5, discv5::Event::SessionEstablished(node, socket) if node == node_2_enr && socket == node_2_enr.udp4_socket().unwrap().into() )); - assert!(matches!( - event_2_v5, - discv5::Event::SessionEstablished(node, socket) if node == node_1_enr && socket == node_1_enr.udp4_socket().unwrap().into() - )); // verify node_1 is in KBuckets of node_2:discv5 let event_2_v5 = stream_2.recv().await.unwrap(); diff --git a/crates/net/dns/Cargo.toml b/crates/net/dns/Cargo.toml index 0c8d30d0e..d078d434a 100644 --- a/crates/net/dns/Cargo.toml +++ b/crates/net/dns/Cargo.toml @@ -19,7 +19,7 @@ reth-tokio-util = { workspace = true, features = ["time"] } # ethereum alloy-primitives.workspace = true -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery", "serde"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery", "serde"] } enr.workspace = true # async/futures @@ -27,7 +27,7 @@ tokio = { workspace = true, features = ["io-util", "net", "time"] } tokio-stream.workspace = true # trust-dns -hickory-resolver = { version = "0.25.0-alpha.4" } +hickory-resolver = { version = "0.25.0-alpha.5" } # misc data-encoding = "2" diff --git a/crates/net/ecies/Cargo.toml b/crates/net/ecies/Cargo.toml index ec34e3e7a..9880162b9 100644 --- a/crates/net/ecies/Cargo.toml +++ b/crates/net/ecies/Cargo.toml @@ -34,7 +34,7 @@ byteorder.workspace = true rand.workspace = true ctr = "0.9.2" digest = "0.10.5" -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery", "rand"] } concat-kdf = "0.1.0" sha2.workspace = true sha3 = "0.10.5" diff --git a/crates/net/ecies/src/algorithm.rs b/crates/net/ecies/src/algorithm.rs index 3abc7cbb2..bd27de3e0 100644 --- a/crates/net/ecies/src/algorithm.rs +++ b/crates/net/ecies/src/algorithm.rs @@ -421,7 +421,7 @@ impl ECIES { let mut sig_bytes = [0u8; 65]; sig_bytes[..64].copy_from_slice(&sig); - sig_bytes[64] = rec_id.to_i32() as u8; + sig_bytes[64] = i32::from(rec_id) as u8; let id = pk2id(&self.public_key); @@ -479,7 +479,7 @@ impl ECIES { let sigdata = data.get_next::<[u8; 65]>()?.ok_or(ECIESErrorImpl::InvalidAuthData)?; let signature = RecoverableSignature::from_compact( &sigdata[..64], - RecoveryId::from_i32(sigdata[64] as i32)?, + RecoveryId::try_from(sigdata[64] as i32)?, )?; let remote_id = data.get_next()?.ok_or(ECIESErrorImpl::InvalidAuthData)?; self.remote_id = Some(remote_id); diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml index 049029b69..9a01f4607 100644 --- a/crates/net/eth-wire/Cargo.toml +++ b/crates/net/eth-wire/Cargo.toml @@ -53,7 +53,7 @@ test-fuzz.workspace = true tokio = { workspace = true, features = ["rt", "rt-multi-thread"] } tokio-util = { workspace = true, features = ["io", "codec"] } rand.workspace = true -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } arbitrary = { workspace = true, features = ["derive"] } proptest.workspace = true diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml index 39bbb9f0e..be53fbc2c 100644 --- a/crates/net/network/Cargo.toml +++ b/crates/net/network/Cargo.toml @@ -65,7 +65,7 @@ rustc-hash.workspace = true thiserror.workspace = true parking_lot.workspace = true rand.workspace = true -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } derive_more.workspace = true schnellru.workspace = true itertools.workspace = true @@ -96,6 +96,7 @@ alloy-consensus.workspace = true serial_test.workspace = true tempfile.workspace = true url.workspace = true +secp256k1 = { workspace = true, features = ["rand"] } ## Benchmarks pprof = { workspace = true, features = ["criterion", "flamegraph"] } diff --git a/crates/node/builder/Cargo.toml b/crates/node/builder/Cargo.toml index 38f3f0a3a..7158a7bc6 100644 --- a/crates/node/builder/Cargo.toml +++ b/crates/node/builder/Cargo.toml @@ -68,7 +68,7 @@ tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thre tokio-stream.workspace = true ## crypto -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } ## misc aquamarine.workspace = true diff --git a/crates/node/core/Cargo.toml b/crates/node/core/Cargo.toml index fe488afc3..4743a722b 100644 --- a/crates/node/core/Cargo.toml +++ b/crates/node/core/Cargo.toml @@ -61,7 +61,7 @@ shellexpand.workspace = true tracing.workspace = true # crypto -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } # async futures.workspace = true diff --git a/crates/node/metrics/Cargo.toml b/crates/node/metrics/Cargo.toml index 3d79d11db..afb6bf10c 100644 --- a/crates/node/metrics/Cargo.toml +++ b/crates/node/metrics/Cargo.toml @@ -29,7 +29,7 @@ eyre.workspace = true tikv-jemalloc-ctl = { workspace = true, optional = true, features = ["stats"] } [target.'cfg(target_os = "linux")'.dependencies] -procfs = "0.16.0" +procfs = "0.17.0" [dev-dependencies] reqwest.workspace = true @@ -40,6 +40,3 @@ workspace = true [features] jemalloc = ["dep:tikv-jemalloc-ctl"] - -[build-dependencies] -vergen = { version = "8.0.0", features = ["build", "cargo", "git", "gitcl"] } diff --git a/crates/optimism/chainspec/src/lib.rs b/crates/optimism/chainspec/src/lib.rs index e90d621d8..82c530db9 100644 --- a/crates/optimism/chainspec/src/lib.rs +++ b/crates/optimism/chainspec/src/lib.rs @@ -25,7 +25,7 @@ use alloy_genesis::Genesis; use alloy_primitives::{B256, U256}; pub use base::BASE_MAINNET; pub use base_sepolia::BASE_SEPOLIA; -use derive_more::{Constructor, Deref, Display, From, Into}; +use derive_more::{Constructor, Deref, From, Into}; pub use dev::OP_DEV; pub use op::OP_MAINNET; pub use op_sepolia::OP_SEPOLIA; @@ -215,7 +215,7 @@ impl EthChainSpec for OpChainSpec { self.inner.prune_delete_limit() } - fn display_hardforks(&self) -> Box { + fn display_hardforks(&self) -> Box { Box::new(ChainSpec::display_hardforks(self)) } diff --git a/crates/optimism/primitives/src/transaction/signed.rs b/crates/optimism/primitives/src/transaction/signed.rs index e087c6cb5..859c962e5 100644 --- a/crates/optimism/primitives/src/transaction/signed.rs +++ b/crates/optimism/primitives/src/transaction/signed.rs @@ -17,6 +17,7 @@ use alloy_rlp::Header; use core::{ hash::{Hash, Hasher}, mem, + ops::Deref, }; use derive_more::{AsRef, Deref}; use op_alloy_consensus::{ diff --git a/crates/primitives-traits/src/crypto.rs b/crates/primitives-traits/src/crypto.rs index 0f59b97db..6b022a6ca 100644 --- a/crates/primitives-traits/src/crypto.rs +++ b/crates/primitives-traits/src/crypto.rs @@ -81,7 +81,7 @@ mod impl_secp256k1 { msg: &[u8; 32], ) -> Result { let sig = - RecoverableSignature::from_compact(&sig[0..64], RecoveryId::from_i32(sig[64] as i32)?)?; + RecoverableSignature::from_compact(&sig[0..64], RecoveryId::try_from(sig[64] as i32)?)?; let public = SECP256K1.recover_ecdsa(&Message::from_digest(*msg), &sig)?; Ok(public_key_to_address(public)) @@ -97,7 +97,7 @@ mod impl_secp256k1 { let signature = Signature::new( U256::try_from_be_slice(&data[..32]).expect("The slice has at most 32 bytes"), U256::try_from_be_slice(&data[32..64]).expect("The slice has at most 32 bytes"), - rec_id.to_i32() != 0, + i32::from(rec_id) != 0, ); Ok(signature) } diff --git a/crates/storage/codecs/derive/Cargo.toml b/crates/storage/codecs/derive/Cargo.toml index f62587faa..f27ce7b30 100644 --- a/crates/storage/codecs/derive/Cargo.toml +++ b/crates/storage/codecs/derive/Cargo.toml @@ -15,7 +15,7 @@ workspace = true proc-macro = true [dependencies] -convert_case = "0.6.0" +convert_case = "0.7.0" proc-macro2.workspace = true quote.workspace = true syn.workspace = true diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml index 35b2b4a2c..1762cfab7 100644 --- a/crates/storage/db/Cargo.toml +++ b/crates/storage/db/Cargo.toml @@ -37,7 +37,7 @@ thiserror.workspace = true tempfile = { workspace = true, optional = true } derive_more.workspace = true rustc-hash = { workspace = true, optional = true } -sysinfo = { version = "0.32", default-features = false, features = ["system"] } +sysinfo = { version = "0.33", default-features = false, features = ["system"] } parking_lot = { workspace = true, optional = true } # arbitrary utils diff --git a/crates/storage/db/src/lockfile.rs b/crates/storage/db/src/lockfile.rs index c44f88790..a1a9946b5 100644 --- a/crates/storage/db/src/lockfile.rs +++ b/crates/storage/db/src/lockfile.rs @@ -112,7 +112,7 @@ impl ProcessUID { system.refresh_processes_specifics( sysinfo::ProcessesToUpdate::Some(&[pid2]), true, - ProcessRefreshKind::new(), + ProcessRefreshKind::nothing(), ); system.process(pid2).map(|process| Self { pid, start_time: process.start_time() }) } @@ -141,9 +141,11 @@ impl ProcessUID { /// Whether a process with this `pid` and `start_time` exists. fn is_active(&self) -> bool { - System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new())) - .process(self.pid.into()) - .is_some_and(|p| p.start_time() == self.start_time) + System::new_with_specifics( + RefreshKind::nothing().with_processes(ProcessRefreshKind::nothing()), + ) + .process(self.pid.into()) + .is_some_and(|p| p.start_time() == self.start_time) } /// Writes `pid` and `start_time` to a file. diff --git a/crates/storage/libmdbx-rs/Cargo.toml b/crates/storage/libmdbx-rs/Cargo.toml index 7e8626348..a61b884ae 100644 --- a/crates/storage/libmdbx-rs/Cargo.toml +++ b/crates/storage/libmdbx-rs/Cargo.toml @@ -34,7 +34,6 @@ read-tx-timeouts = ["dep:dashmap"] pprof = { workspace = true, features = ["flamegraph", "frame-pointer", "criterion"] } criterion.workspace = true rand.workspace = true -rand_xorshift = "0.3" tempfile.workspace = true [[bench]] diff --git a/crates/storage/libmdbx-rs/benches/transaction.rs b/crates/storage/libmdbx-rs/benches/transaction.rs index eb4b0671b..e230e13f4 100644 --- a/crates/storage/libmdbx-rs/benches/transaction.rs +++ b/crates/storage/libmdbx-rs/benches/transaction.rs @@ -2,8 +2,7 @@ mod utils; use criterion::{criterion_group, criterion_main, Criterion}; -use rand::{prelude::SliceRandom, SeedableRng}; -use rand_xorshift::XorShiftRng; +use rand::{prelude::SliceRandom, rngs::StdRng, SeedableRng}; use reth_libmdbx::{ffi::*, ObjectLength, WriteFlags}; use std::{hint::black_box, ptr}; use utils::*; @@ -15,7 +14,7 @@ fn bench_get_rand(c: &mut Criterion) { let db = txn.open_db(None).unwrap(); let mut keys: Vec = (0..n).map(get_key).collect(); - keys.shuffle(&mut XorShiftRng::from_seed(Default::default())); + keys.shuffle(&mut StdRng::from_seed(Default::default())); c.bench_function("bench_get_rand", |b| { b.iter(|| { @@ -35,7 +34,7 @@ fn bench_get_rand_raw(c: &mut Criterion) { let db = txn.open_db(None).unwrap(); let mut keys: Vec = (0..n).map(get_key).collect(); - keys.shuffle(&mut XorShiftRng::from_seed(Default::default())); + keys.shuffle(&mut StdRng::from_seed(Default::default())); let dbi = db.dbi(); @@ -71,7 +70,7 @@ fn bench_put_rand(c: &mut Criterion) { let db = txn.commit_and_rebind_open_dbs().unwrap().2.remove(0); let mut items: Vec<(String, String)> = (0..n).map(|n| (get_key(n), get_data(n))).collect(); - items.shuffle(&mut XorShiftRng::from_seed(Default::default())); + items.shuffle(&mut StdRng::from_seed(Default::default())); c.bench_function("bench_put_rand", |b| { b.iter(|| { @@ -88,7 +87,7 @@ fn bench_put_rand_raw(c: &mut Criterion) { let (_dir, env) = setup_bench_db(0); let mut items: Vec<(String, String)> = (0..n).map(|n| (get_key(n), get_data(n))).collect(); - items.shuffle(&mut XorShiftRng::from_seed(Default::default())); + items.shuffle(&mut StdRng::from_seed(Default::default())); let dbi = env.begin_ro_txn().unwrap().open_db(None).unwrap().dbi(); diff --git a/crates/trie/db/src/prefix_set.rs b/crates/trie/db/src/prefix_set.rs index 08ab9cba4..9d2cf8a28 100644 --- a/crates/trie/db/src/prefix_set.rs +++ b/crates/trie/db/src/prefix_set.rs @@ -2,8 +2,10 @@ use alloy_primitives::{ map::{HashMap, HashSet}, BlockNumber, B256, }; -use core::{marker::PhantomData, ops::RangeInclusive}; -use derive_more::Deref; +use core::{ + marker::PhantomData, + ops::{Deref, RangeInclusive}, +}; use reth_db_api::{ cursor::DbCursorRO, models::{AccountBeforeTx, BlockNumberAddress}, diff --git a/examples/bsc-p2p/Cargo.toml b/examples/bsc-p2p/Cargo.toml index d5a7c982d..4201fde72 100644 --- a/examples/bsc-p2p/Cargo.toml +++ b/examples/bsc-p2p/Cargo.toml @@ -16,7 +16,7 @@ reth-network-peers.workspace = true reth-primitives.workspace = true reth-tracing.workspace = true -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } tokio.workspace = true tokio-stream.workspace = true diff --git a/examples/manual-p2p/Cargo.toml b/examples/manual-p2p/Cargo.toml index b1642f66c..eaaa211cd 100644 --- a/examples/manual-p2p/Cargo.toml +++ b/examples/manual-p2p/Cargo.toml @@ -16,7 +16,7 @@ reth-network-peers.workspace = true alloy-consensus.workspace = true -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } futures.workspace = true tokio.workspace = true diff --git a/examples/polygon-p2p/Cargo.toml b/examples/polygon-p2p/Cargo.toml index 5daa8149b..d0e856b97 100644 --- a/examples/polygon-p2p/Cargo.toml +++ b/examples/polygon-p2p/Cargo.toml @@ -8,7 +8,7 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { workspace = true, features = ["global-context", "std", "recovery"] } tokio.workspace = true reth-network.workspace = true reth-chainspec.workspace = true