chore: bump dependencies (#1834)

Author: KolbyML

Cargo.lock

@@ -38,7 +38,7 @@ rust-version = "1.85.0"
 version = "0.3.1"
 
 [workspace.dependencies]
-alloy = { version = "0.15", default-features = false, features = ["std", "serde", "getrandom"] }
+alloy = { version = "1.0", default-features = false, features = ["std", "serde", "getrandom"] }
 alloy-chains = "0.2"
 alloy-hardforks = "0.2.0"
 alloy-rlp = { version = "0.3.8", default-features = false, features = ["derive"] }
@@ -48,9 +48,9 @@ bytes = "1.3.0"
 chrono = "0.4.38"
 clap = { version = "4.2.1", features = ["derive"] }
 delay_map = "0.4.0"
-directories = "3.0"
+directories = "6.0"
 discv5 = { version = "0.9.1", features = ["serde"] }
-env_logger = "0.9.0"
+env_logger = "0.11"
 eth_trie = "0.6"
 ethereum_hashing = "0.7.0"
 ethereum_serde_utils = "0.8"
@@ -59,47 +59,45 @@ ethereum_ssz_derive = "0.9"
 futures = "0.3.23"
 futures-util = "0.3.23"
 hex = "0.4.3"
-humanize-duration = "0.0.6"
-itertools = "0.13.0"
-jsonrpsee = "0.24.4"
-keccak-hash = "0.10.0"
+humanize-duration = "0.0.7"
+itertools = "0.14"
+jsonrpsee = "0.24"
+keccak-hash = "0.11"
 lazy_static = "1.4.0"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 prometheus_exporter = "0.8.4"
 quickcheck = "1.0.3"
 r2d2 = "0.8.9"
-r2d2_sqlite = "0.24.0"
-rand = "0.8.5"
+r2d2_sqlite = "0.28"
+rand = "0.9"
 rayon = "1.10.0"
 reqwest = { version = "0.12.7", features = ["native-tls-vendored", "json"] }
-reth-ipc = { tag = "v1.0.8", git = "https://github.com/paradigmxyz/reth.git"}
-revm = { version = "22.0", default-features = false, features = ["std", "secp256k1", "serde-json", "c-kzg"] }
-revm-primitives = { version = "18.0.0", default-features = false, features = ["std", "serde"] }
-rstest = "0.18.2"
+reth-ipc = { tag = "v1.3.12", git = "https://github.com/paradigmxyz/reth.git"}
+revm = { version = "23.1", default-features = false, features = ["std", "secp256k1", "serde-json", "c-kzg"] }
+revm-primitives = { version = "19.0.0", default-features = false, features = ["std", "serde"] }
+rstest = "0.25"
 rust-embed = "8.5.0"
-rusqlite = { version = "0.31.0", features = ["bundled"] }
-scraper = "0.18.1"
+rusqlite = { version = "0.35", features = ["bundled"] }
+scraper = "0.23"
 serde = { version = "1.0.150", features = ["derive"] }
 serde_json = "1.0.95"
 serde_yaml = "0.9.33"
-serde-this-or-that = "0.4.2"
-serial_test = "0.5.1"
-sha3 = "0.9.1"
+serde-this-or-that = "0.5"
+serial_test = "3.2"
+sha3 = "0.10"
 snap = "1.1.1"
 ssz_types = "0.11.0"
-strum = { version = "0.26.1", features = ["derive"] }
+strum = { version = "0.27", features = ["derive"] }
 tempfile = "3.3.0"
 test-log = { version = "0.2.11", features = ["trace"] }
-thiserror = "1.0.57"
+thiserror = "2.0"
 tokio = { version = "1.14.0", features = ["full"] }
 tokio-test = "0.4.2"
 tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
-tracing-test = "0.1"
 tree_hash = "0.10"
 tree_hash_derive = "0.10"
 uds_windows = "1.0.1"
-ureq = { version = "2.5.0", features = ["json"] }
 url = "2.3.1"
 utp-rs = "0.1.0-alpha.17"
 
@@ -122,7 +120,7 @@ trin-storage = { path = "crates/storage" }
 trin-utils = { path = "crates/utils" }
 trin-validation = { path = "crates/validation" }
 
-crunchy = "=0.2.2"
+crunchy = "0.2.3"
 
 [patch.crates-io]
 # TODO: remove this when our other dependencies update to getrandom 0.3 as it is a breaking change

Cargo.toml

@@ -52,4 +52,3 @@ url.workspace = true
 env_logger.workspace = true
 rstest.workspace = true
 test-log.workspace = true
-tracing-test.workspace = true

bin/portal-bridge/Cargo.toml

@@ -27,7 +27,7 @@ use futures::{
     FutureExt,
 };
 use itertools::Itertools;
-use rand::seq::SliceRandom;
+use rand::{rng, seq::SliceRandom};
 use reqwest::{
     header::{HeaderMap, HeaderValue, CONTENT_TYPE},
     Client,
@@ -131,7 +131,7 @@ impl E2HSBridge {
         let epochs = block_range_to_epochs(self.block_range.start, block_range_end);
         let mut epoch_indexes: Vec<u64> = epochs.keys().cloned().sorted().collect();
         if self.random_fill {
-            epoch_indexes.shuffle(&mut rand::thread_rng());
+            epoch_indexes.shuffle(&mut rng());
         }
 
         let mut latest_task = None;

bin/portal-bridge/src/bridge/e2hs.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, time::Duration};
 
 use ethportal_api::types::{accept_code::AcceptCode, portal_wire::OfferTrace};
 use itertools::Itertools;
-use rand::{seq::SliceRandom, thread_rng};
+use rand::{rng, seq::IndexedRandom};
 
 use super::peer::{Peer, PeerInfo};
 
@@ -141,7 +141,7 @@ impl<W: Weight> PeerSelector<W> {
             .collect_vec();
 
         weighted_peers
-            .choose_multiple_weighted(&mut thread_rng(), self.limit, |(_peer, weight)| *weight)
+            .choose_multiple_weighted(&mut rng(), self.limit, |(_peer, weight)| *weight)
             .expect("choosing random sample shouldn't fail")
             .map(|(peer, _weight)| peer.peer_info())
             .collect()

bin/portal-bridge/src/census/scoring.rs

@@ -14,7 +14,7 @@ version.workspace = true
 [dependencies]
 alloy = { workspace = true, features = ["eips", "rpc-types-engine", "serde"] }
 alloy-rlp.workspace = true
-alloy-rpc-types-engine = { version = "0.15", default-features = false, features = ["serde"] }
+alloy-rpc-types-engine = { version = "1.0", default-features = false, features = ["serde"] }
 anyhow.workspace = true
 clap.workspace = true
 ethportal-api.workspace = true
@@ -31,9 +31,9 @@ rand.workspace = true
 rayon.workspace = true
 reqwest =  { workspace = true, features = ["stream"] }
 revm.workspace = true
-revm-inspectors = "0.20.0"
+revm-inspectors = "0.22"
 revm-primitives.workspace = true
-rocksdb = "0.22.0"
+rocksdb = "0.23"
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
 thiserror.workspace = true
@@ -44,4 +44,3 @@ trin-utils.workspace = true
 
 [dev-dependencies]
 test-log.workspace = true
-tracing-test.workspace = true

bin/trin-execution/Cargo.toml

@@ -1,5 +1,5 @@
 use alloy::primitives::U256;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
 
 use crate::utils::nibbles_to_right_padded_b256;
 
@@ -47,7 +47,7 @@ impl Filter {
             };
         }
 
-        Self::new(thread_rng().gen_range(0..slice_count), slice_count)
+        Self::new(rng().random_range(0..slice_count), slice_count)
     }
 
     /// Check if a path is included in the filter

bin/trin-execution/src/trie_walker/filter.rs

@@ -4,7 +4,7 @@ pub mod filter;
 use std::sync::Arc;
 
 use alloy::primitives::{Bytes, B256};
-use anyhow::{anyhow, Ok};
+use anyhow::anyhow;
 use db::TrieWalkerDb;
 use eth_trie::{decode_node, node::Node};
 use filter::Filter;
@@ -176,7 +176,6 @@ mod tests {
 
     use alloy::primitives::{keccak256, Address, B256, U256};
     use eth_trie::{EthTrie, RootWithTrieDiff, Trie};
-    use tracing_test::traced_test;
     use trin_utils::dir::create_temp_test_dir;
 
     use super::*;
@@ -188,7 +187,6 @@ mod tests {
     };
 
     #[tokio::test]
-    #[traced_test]
     async fn test_state_walker() {
         let temp_directory = create_temp_test_dir().unwrap();
         let db = Arc::new(setup_rocksdb(temp_directory.path()).unwrap());

bin/trin-execution/src/trie_walker/mod.rs

@@ -10,7 +10,6 @@ use ethportal_api::{
 };
 use revm_primitives::keccak256;
 use tracing::info;
-use tracing_test::traced_test;
 use trin_execution::{
     config::StateConfig,
     content::{
@@ -86,7 +85,6 @@ impl Stats {
 /// BLOCKS=1000000 cargo test --release -p trin-execution --test content_generation -- --include-ignored --nocapture
 /// ```
 #[tokio::test]
-#[traced_test]
 #[ignore = "takes too long"]
 async fn test_we_can_generate_content_key_values_up_to_x() -> Result<()> {
     let blocks = std::env::var("BLOCKS")?.parse::<u64>()?;

bin/trin-execution/tests/content_generation.rs

@@ -1,5 +1,4 @@
 use tracing::info;
-use tracing_test::traced_test;
 use trin_execution::{
     cli::{ExportStateConfig, ImportStateConfig},
     config::StateConfig,
@@ -22,7 +21,6 @@ use trin_utils::dir::create_temp_test_dir;
 /// BLOCKS=10000 cargo test -p trin-execution --test export_import -- --nocapture
 /// ```
 #[tokio::test]
-#[traced_test]
 #[ignore = "This test downloads data from a remote server"]
 async fn execute_export_import_execute() -> anyhow::Result<()> {
     let blocks = std::env::var("BLOCKS")