fixes

ithacaxyz · Oct 24, 2024 · 51d4e30 · 51d4e30
1 parent 609cd9d
commit 51d4e30
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,8 +27,8 @@ op-net = { path = "crates/net" }
 rollup = { path = "crates/rollup" }
 kona-derive-local = { path = "crates/derive" }
 
-# Kona + Superchain
-superchain = { version = "0.8.2", default-features = false }
+# anton-rs
+superchain = { git = "https://github.com/anton-rs/superchain", branch = "main", default-features = false }
 kona-derive = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
 kona-derive-alloy = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
 
@@ -59,38 +59,27 @@ op-alloy-rpc-types-engine = { version = "0.5.1", default-features = false }
 
 # Reth
 reth = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
 reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-discv5 = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
 reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
 reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
 reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
-reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
 
 # Tokio
-tokio = { version = "1.21", default-features = false }
+tokio = { version = "1.41", default-features = false }
 
 # Serialization
 serde_json = "1"
 ethereum_ssz = "0.8.0"
 
 # RPC
-jsonrpsee = { version = "0.24", default-features = false }
 jsonrpsee-types = "0.24"
+jsonrpsee = { version = "0.24", default-features = false }
 
 # Networking
 snap = "1.1.1"
 discv5 = "0.8.0"
-libp2p = "0.54.0"
-openssl = "0.10.66"
+libp2p = "0.54.1"
+openssl = "0.10.68"
 libp2p-identity = "0.2.9"
 
 # Testing
@@ -100,12 +89,12 @@ arbitrary = "1"
 # Misc
 url = "2.5.2"
 eyre = "0.6.12"
-clap = "4.5.4"
+clap = "4.5.20"
 reqwest = "0.12"
 tracing = "0.1.40"
 thiserror = "1.0"
 lazy_static = "1.5.0"
-futures = "0.3.30"
+futures = "0.3.31"
 async-trait = "0.1.83"
 parking_lot = "0.12.3"
 unsigned-varint = "0.8.0"

diff --git a/crates/derive/src/blob_provider.rs b/crates/derive/src/blob_provider.rs
@@ -62,7 +62,7 @@ impl InnerBlobProvider {
     pub fn with_capacity(cap: usize) -> Self {
         Self {
             capacity: cap,
-            blocks_to_blob_sidecars: HashMap::with_capacity(cap),
+            blocks_to_blob_sidecars: HashMap::default(),
             key_order: VecDeque::with_capacity(cap),
         }
     }

diff --git a/crates/derive/src/chain_provider.rs b/crates/derive/src/chain_provider.rs
@@ -72,10 +72,10 @@ impl InMemoryChainProviderInner {
         Self {
             capacity: cap,
             key_order: VecDeque::new(),
-            hash_to_header: HashMap::with_capacity(cap),
-            hash_to_block_info: HashMap::with_capacity(cap),
-            hash_to_receipts: HashMap::with_capacity(cap),
-            hash_to_txs: HashMap::with_capacity(cap),
+            hash_to_header: HashMap::default(),
+            hash_to_block_info: HashMap::default(),
+            hash_to_receipts: HashMap::default(),
+            hash_to_txs: HashMap::default(),
         }
     }
 

diff --git a/crates/rollup/src/driver/cursor.rs b/crates/rollup/src/driver/cursor.rs
@@ -35,7 +35,7 @@ impl SyncCursor {
             capacity,
             channel_timeout,
             l1_origin_key_order: VecDeque::with_capacity(capacity),
-            l1_origin_block_info: HashMap::with_capacity(capacity),
+            l1_origin_block_info: HashMap::default(),
             l1_origin_to_l2_blocks: BTreeMap::new(),
         }
     }

diff --git a/crates/rollup/src/pipeline.rs b/crates/rollup/src/pipeline.rs
@@ -7,7 +7,7 @@ use kona_derive::{
     pipeline::{DerivationPipeline, PipelineBuilder},
     sources::EthereumDataSource,
     stages::{
-        AttributesQueue, BatchQueue, BatchStream, ChannelProvider, ChannelReader, FrameQueue,
+        AttributesQueue, BatchProvider, BatchStream, ChannelProvider, ChannelReader, FrameQueue,
         L1Retrieval, L1Traversal,
     },
     traits::{BlobProvider, ChainProvider},
@@ -23,7 +23,7 @@ type L1FrameQueue<CP, BP> = FrameQueue<L1Retrieval<EthereumDataSource<CP, BP>, L
 /// A concrete [NextAttributes](kona_derive::traits::NextAttributes) stage implementation that
 /// accepts batches from the [BatchQueue] stage and transforms them into payload attributes.
 type L1AttributesQueue<CP, BP, L2CP> = AttributesQueue<
-    BatchQueue<BatchStream<ChannelReader<ChannelProvider<L1FrameQueue<CP, BP>>>, L2CP>, L2CP>,
+    BatchProvider<BatchStream<ChannelReader<ChannelProvider<L1FrameQueue<CP, BP>>>, L2CP>, L2CP>,
     StatefulAttributesBuilder<CP, L2CP>,
 >;