chore: Dep Updates (#980)

Co-authored-by: clabby <[email protected]>
op-rs · Jan 30, 2025 · 57f59b7 · 57f59b7
1 parent 71a02cc
commit 57f59b7
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -106,27 +106,27 @@ op-alloy-consensus = { version = "0.9.6", default-features = false }
 op-alloy-rpc-types-engine = { version = "0.9.6", default-features = false }
 
 # General
-lru = "0.12.5"
+lru = "0.13.0"
 spin = "0.9.8"
-rand = "0.8.5"
-clap = "4.5.24"
-tokio = "1.42.0"
+rand = "0.9.0"
+clap = "4.5.27"
+tokio = "1.43.0"
 async-channel = "2.3.1"
 cfg-if = "1.0.0"
 reqwest = "0.12.12"
 async-trait = "0.1.85"
 linked_list_allocator = "0.10.5"
 rstest = "0.24.0"
-tempfile = "3.15.0"
+tempfile = "3.16.0"
 
 # General
 sha2 = { version = "0.10.8", default-features = false }
 c-kzg = { version = "2.0.0", default-features = false }
 anyhow = { version = "1.0.95", default-features = false }
-thiserror = { version = "2.0.9", default-features = false }
+thiserror = { version = "2.0.11", default-features = false }
 
 # Tracing
-tracing-loki = "0.2.5"
+tracing-loki = "0.2.6"
 tracing-subscriber = "0.3.19"
 tracing = { version = "0.1.41", default-features = false }
 
@@ -138,11 +138,11 @@ criterion = "0.5.1"
 # Serialization
 rkyv = "0.8.9"
 serde = { version = "1.0.217", default-features = false }
-serde_json = { version = "1.0.135", default-features = false }
+serde_json = { version = "1.0.138", default-features = false }
 
 # Ethereum
 unsigned-varint = "0.8.0"
-revm = { version = "19.3.0", default-features = false }
+revm = { version = "19.4.0", default-features = false }
 
 # K/V database
 rocksdb = { version = "0.22.0", default-features = false }
diff --git a/crates/derive/src/test_utils/frame_queue.rs b/crates/derive/src/test_utils/frame_queue.rs
@@ -31,7 +31,7 @@ impl TestFrameQueueProvider {
     }
 
     /// Sets the origin for the [MockFrameQueueProvider].
-    pub fn set_origin(&mut self, origin: BlockInfo) {
+    pub const fn set_origin(&mut self, origin: BlockInfo) {
         self.origin = Some(origin);
     }
 }

diff --git a/crates/interop/src/super_root.rs b/crates/interop/src/super_root.rs
@@ -195,7 +195,7 @@ mod test {
     #[test]
     fn test_arbitrary_super_root_roundtrip() {
         let mut bytes = [0u8; 1024];
-        rand::thread_rng().fill(bytes.as_mut_slice());
+        rand::rng().fill(bytes.as_mut_slice());
         let super_root = SuperRoot::arbitrary(&mut arbitrary::Unstructured::new(&bytes)).unwrap();
 
         let mut rlp_buf = Vec::with_capacity(super_root.encoded_length());

diff --git a/crates/mpt/benches/trie_node.rs b/crates/mpt/benches/trie_node.rs
@@ -5,7 +5,7 @@ use alloy_trie::Nibbles;
 use criterion::{criterion_group, criterion_main, Criterion};
 use kona_mpt::{NoopTrieHinter, NoopTrieProvider, TrieNode};
 use pprof::criterion::{Output, PProfProfiler};
-use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng};
+use rand::{rngs::StdRng, seq::IteratorRandom, Rng, SeedableRng};
 
 fn trie(c: &mut Criterion) {
     let mut g = c.benchmark_group("execution");
@@ -15,8 +15,9 @@ fn trie(c: &mut Criterion) {
     let mut rng = StdRng::seed_from_u64(42);
 
     g.bench_function("Insertion - 4096 nodes", |b| {
-        let keys =
-            (0..2usize.pow(12)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(12))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
 
         b.iter(|| {
             let mut trie = TrieNode::Empty;
@@ -27,8 +28,9 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Insertion - 65,536 nodes", |b| {
-        let keys =
-            (0..2usize.pow(16)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(16))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
 
         b.iter(|| {
             let mut trie = TrieNode::Empty;
@@ -39,12 +41,13 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Delete 16 nodes - 4096 nodes", |b| {
-        let keys =
-            (0..2usize.pow(12)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(12))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
         let mut trie = TrieNode::Empty;
 
-        let rng = &mut rand::thread_rng();
-        let keys_to_delete = keys.choose_multiple(rng, 16).cloned().collect::<Vec<_>>();
+        let rng = &mut rand::rng();
+        let keys_to_delete = keys.clone().into_iter().choose_multiple(rng, 16);
 
         for key in &keys {
             trie.insert(key, key.to_vec().into(), &NoopTrieProvider).unwrap();
@@ -59,15 +62,16 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Delete 16 nodes - 65,536 nodes", |b| {
-        let keys =
-            (0..2usize.pow(16)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(16))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
         let mut trie = TrieNode::Empty;
         for key in &keys {
             trie.insert(key, key.to_vec().into(), &NoopTrieProvider).unwrap();
         }
 
-        let rng = &mut rand::thread_rng();
-        let keys_to_delete = keys.choose_multiple(rng, 16).cloned().collect::<Vec<_>>();
+        let rng = &mut rand::rng();
+        let keys_to_delete = keys.into_iter().choose_multiple(rng, 16);
 
         b.iter(|| {
             let trie = &mut trie.clone();
@@ -78,15 +82,16 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Open 1024 nodes - 4096 nodes", |b| {
-        let keys =
-            (0..2usize.pow(12)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(12))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
         let mut trie = TrieNode::Empty;
         for key in &keys {
             trie.insert(key, key.to_vec().into(), &NoopTrieProvider).unwrap();
         }
 
-        let rng = &mut rand::thread_rng();
-        let keys_to_retrieve = keys.choose_multiple(rng, 1024).cloned().collect::<Vec<_>>();
+        let rng = &mut rand::rng();
+        let keys_to_retrieve = keys.into_iter().choose_multiple(rng, 1024);
 
         b.iter(|| {
             for key in &keys_to_retrieve {
@@ -96,15 +101,16 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Open 1024 nodes - 65,536 nodes", |b| {
-        let keys =
-            (0..2usize.pow(16)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(16))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
         let mut trie = TrieNode::Empty;
         for key in &keys {
             trie.insert(key, key.to_vec().into(), &NoopTrieProvider).unwrap();
         }
 
-        let rng = &mut rand::thread_rng();
-        let keys_to_retrieve = keys.choose_multiple(rng, 1024).cloned().collect::<Vec<_>>();
+        let rng = &mut rand::rng();
+        let keys_to_retrieve = keys.into_iter().choose_multiple(rng, 1024);
 
         b.iter(|| {
             for key in &keys_to_retrieve {
@@ -114,8 +120,9 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Compute root, fully open trie - 4096 nodes", |b| {
-        let keys =
-            (0..2usize.pow(12)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(12))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
         let mut trie = TrieNode::Empty;
         for key in &keys {
             trie.insert(key, key.to_vec().into(), &NoopTrieProvider).unwrap();
@@ -128,8 +135,9 @@ fn trie(c: &mut Criterion) {
     });
 
     g.bench_function("Compute root, fully open trie - 65,536 nodes", |b| {
-        let keys =
-            (0..2usize.pow(16)).map(|_| Nibbles::unpack(rng.gen::<[u8; 32]>())).collect::<Vec<_>>();
+        let keys = (0..2usize.pow(16))
+            .map(|_| Nibbles::unpack(rng.random::<[u8; 32]>()))
+            .collect::<Vec<_>>();
         let mut trie = TrieNode::Empty;
         for key in &keys {
             trie.insert(key, key.to_vec().into(), &NoopTrieProvider).unwrap();

diff --git a/crates/mpt/src/list_walker.rs b/crates/mpt/src/list_walker.rs
@@ -77,7 +77,7 @@ where
 
     /// Takes the inner list of the [OrderedListWalker], returning it and setting the inner list to
     /// [None].
-    pub fn take_inner(&mut self) -> Option<VecDeque<(Bytes, Bytes)>> {
+    pub const fn take_inner(&mut self) -> Option<VecDeque<(Bytes, Bytes)>> {
         self.inner.take()
     }
 

diff --git a/crates/mpt/src/node.rs b/crates/mpt/src/node.rs
@@ -674,7 +674,7 @@ mod test {
     use alloy_primitives::{b256, bytes, hex, keccak256};
     use alloy_rlp::{Decodable, Encodable, EMPTY_STRING_CODE};
     use alloy_trie::{HashBuilder, Nibbles};
-    use rand::prelude::SliceRandom;
+    use rand::prelude::IteratorRandom;
 
     #[test]
     fn test_empty_blinded() {
@@ -869,9 +869,9 @@ mod test {
             let mut hb = HashBuilder::default();
             let mut node = TrieNode::Empty;
 
-            let mut rng = rand::thread_rng();
+            let mut rng = rand::rng();
             let deleted_keys =
-            keys.choose_multiple(&mut rng, 5.min(keys.len())).copied().collect::<Vec<_>>();
+            keys.clone().into_iter().choose_multiple(&mut rng, 5.min(keys.len()));
 
             // Insert the keys into the `HashBuilder` and `TrieNode`.
             for key in keys {

diff --git a/crates/proof-sdk/proof-interop/src/pre_state.rs b/crates/proof-sdk/proof-interop/src/pre_state.rs
@@ -252,7 +252,7 @@ mod test {
     #[test]
     fn test_arbitrary_pre_state_roundtrip() {
         let mut bytes = [0u8; 1024];
-        rand::thread_rng().fill(bytes.as_mut_slice());
+        rand::rng().fill(bytes.as_mut_slice());
         let pre_state =
             super::PreState::arbitrary(&mut arbitrary::Unstructured::new(&bytes)).unwrap();
 
@@ -264,7 +264,7 @@ mod test {
     #[test]
     fn test_arbitrary_transition_state_roundtrip() {
         let mut bytes = [0u8; 1024];
-        rand::thread_rng().fill(bytes.as_mut_slice());
+        rand::rng().fill(bytes.as_mut_slice());
         let transition_state =
             TransitionState::arbitrary(&mut arbitrary::Unstructured::new(&bytes)).unwrap();
 

diff --git a/crates/proof-sdk/std-fpvm/src/channel.rs b/crates/proof-sdk/std-fpvm/src/channel.rs
@@ -69,7 +69,7 @@ struct ReadFuture<'a> {
 
 impl<'a> ReadFuture<'a> {
     /// Create a new [ReadFuture] from a channel and a buffer.
-    fn new(channel: FileChannel, buf: &'a mut [u8]) -> Self {
+    const fn new(channel: FileChannel, buf: &'a mut [u8]) -> Self {
         Self { channel, buf: RefCell::new(buf), read: 0 }
     }
 }