chore: Update Dependencies (#109)

### Description - Bumps `alloy-*` deps to `0.5.4` - Bumps `op-alloy-*` to `0.5.1` - Bumps `superchain` deps to `0.8.2` - Updates kona (still can't publish kona crates due to `thiserror` `no_std` support not being merged :/)
ithacaxyz · Oct 24, 2024 · 0c07c5a · 0c07c5a
1 parent 5aec5a5
commit 0c07c5a
Show file tree

Hide file tree

Showing 12 changed files with 576 additions and 714 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,103 +9,77 @@ keywords = ["ethereum", "crypto"]
 categories = ["cryptography", "cryptography::cryptocurrencies"]
 
 [workspace]
+resolver = "2"
 members = ["bin/*", "crates/*"]
 default-members = ["bin/hera"]
 
-# Explicitly set the resolver to version 2, which is the default for packages with edition >= 2021
-# https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
-resolver = "2"
-
 [profile.release]
-strip = "debuginfo"
 lto = "thin"
 panic = "unwind"
+strip = "debuginfo"
 codegen-units = 1
 incremental = false
 
-[patch.crates-io]
-op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-op-alloy-genesis = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-op-alloy-rpc-jsonrpsee = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-op-alloy-provider = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
-
 [workspace.dependencies]
 # Workspace
 ser = { path = "crates/ser" }
 op-net = { path = "crates/net" }
 rollup = { path = "crates/rollup" }
-kona-providers-local = { path = "crates/providers-local" }
+kona-derive-local = { path = "crates/derive" }
 
-# Kona
-kona-derive = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
-kona-providers = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
-kona-providers-alloy = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
-
-# Superchain
+# 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 }
 
 # Alloy
-alloy-rlp = { version = "0.3.8", default-features = false }
-alloy-eips = { version = "0.5", default-features = false }
-alloy-signer = { version = "0.5.2", default-features = false }
-alloy-network = { version = "0.5.2", default-features = false }
-alloy-provider = { version = "0.5.2", default-features = false }
-alloy-contract = { version = "0.5.2", default-features = false }
-alloy-transport = { version = "0.5.2", default-features = false }
-alloy-rpc-types = { version = "0.5.2", default-features = false }
-alloy-consensus = { version = "0.5.2", default-features = false }
-alloy-primitives = { version = "0.8.8", default-features = false }
-alloy-rpc-client = { version = "0.5.2", default-features = false }
-alloy-rpc-types-eth = { version = "0.5.2", default-features = false }
-alloy-transport-http = { version = "0.5.2", default-features = false }
-alloy-rpc-types-engine = { version = "0.5.2", default-features = false }
+alloy-rlp = { version = "0.3.9", default-features = false }
+alloy-eips = { version = "0.5.4", default-features = false }
+alloy-signer = { version = "0.5.4", default-features = false }
+alloy-network = { version = "0.5.4", default-features = false }
+alloy-provider = { version = "0.5.4", default-features = false }
+alloy-contract = { version = "0.5.4", default-features = false }
+alloy-transport = { version = "0.5.4", default-features = false }
+alloy-rpc-types = { version = "0.5.4", default-features = false }
+alloy-consensus = { version = "0.5.4", default-features = false }
+alloy-primitives = { version = "0.8.9", default-features = false }
+alloy-rpc-client = { version = "0.5.4", default-features = false }
+alloy-rpc-types-eth = { version = "0.5.4", default-features = false }
+alloy-transport-http = { version = "0.5.4", default-features = false }
+alloy-rpc-types-engine = { version = "0.5.4", default-features = false }
 
 # Op Alloy
-op-alloy-genesis = { version = "0.5.0", default-features = false }
-op-alloy-provider = { version = "0.5.0", default-features = false }
-op-alloy-protocol = { version = "0.5.0", default-features = false }
-op-alloy-consensus = { version = "0.5.0", default-features = false }
-op-alloy-rpc-types = { version = "0.5.0", default-features = false }
-op-alloy-rpc-jsonrpsee = { version = "0.5.0", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.5.0", default-features = false }
+op-alloy-genesis = { version = "0.5.1", default-features = false }
+op-alloy-provider = { version = "0.5.1", default-features = false }
+op-alloy-protocol = { version = "0.5.1", default-features = false }
+op-alloy-consensus = { version = "0.5.1", default-features = false }
+op-alloy-rpc-types = { version = "0.5.1", default-features = false }
+op-alloy-rpc-jsonrpsee = { version = "0.5.1", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.5.1", default-features = false }
 
 # Reth
-reth = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-discv5 = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
-reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" }
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" }
+reth-node-api = { 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" }
 
 # 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
@@ -115,14 +89,13 @@ 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"
-hashbrown = "0.15.0"
 parking_lot = "0.12.3"
 unsigned-varint = "0.8.0"
 tower = "0.5"

diff --git a/crates/providers-local/Cargo.toml → crates/derive/Cargo.toml b/crates/providers-local/Cargo.toml → crates/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "kona-providers-local"
-description = "Local provider implementations for Kona trait abstractions"
+name = "kona-derive-local"
+description = "kona-derive with local trait implementations"
 version = "0.0.0"
 edition.workspace = true
 authors.workspace = true
@@ -16,15 +16,14 @@ alloy-rlp.workspace = true
 alloy-eips.workspace = true
 alloy-signer.workspace = true
 alloy-consensus.workspace = true
-alloy-primitives.workspace = true
+alloy-primitives = { workspace = true, features = ["map"] }
 
 # Op Alloy
 op-alloy-protocol.workspace = true
 
 # Kona
 kona-derive.workspace = true
-kona-providers.workspace = true
-kona-providers-alloy.workspace = true
+kona-derive-alloy.workspace = true
 
 # Reth
 reth.workspace = true
@@ -33,6 +32,5 @@ reth.workspace = true
 url.workspace = true
 eyre.workspace = true
 tracing.workspace = true
-hashbrown.workspace = true
 async-trait.workspace = true
 parking_lot.workspace = true
diff --git a/crates/providers-local/src/blob_provider.rs → crates/derive/src/blob_provider.rs b/crates/providers-local/src/blob_provider.rs → crates/derive/src/blob_provider.rs
@@ -1,14 +1,13 @@
 //! Blob Providers
 
 use alloc::{boxed::Box, collections::VecDeque, string::ToString, sync::Arc, vec::Vec};
-use hashbrown::HashMap;
 
 use alloy_eips::eip4844::Blob;
-use alloy_primitives::B256;
+use alloy_primitives::{map::HashMap, B256};
 use async_trait::async_trait;
 use eyre::{eyre, Result};
 use kona_derive::{errors::BlobProviderError, sources::IndexedBlobHash, traits::BlobProvider};
-use kona_providers_alloy::{
+use kona_derive_alloy::{
     OnlineBeaconClient, OnlineBlobProviderBuilder, OnlineBlobProviderWithFallback,
 };
 use op_alloy_protocol::BlockInfo;
@@ -63,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/providers-local/src/chain_provider.rs → crates/derive/src/chain_provider.rs b/crates/providers-local/src/chain_provider.rs → crates/derive/src/chain_provider.rs
@@ -1,19 +1,18 @@
 //! Chain Provider
 
 use alloc::{boxed::Box, collections::vec_deque::VecDeque, sync::Arc, vec::Vec};
-use hashbrown::HashMap;
+use alloy_primitives::{map::HashMap, B256};
 
 use alloy_consensus::{
     Header, Receipt, Signed, TxEip1559, TxEip2930, TxEip4844, TxEip4844Variant, TxEnvelope,
     TxLegacy,
 };
 use alloy_eips::BlockNumHash;
-use alloy_primitives::B256;
 use alloy_rlp::{Decodable, Encodable};
 use alloy_signer::Signature;
 use async_trait::async_trait;
 use eyre::eyre;
-use kona_providers::ChainProvider;
+use kona_derive::traits::ChainProvider;
 use op_alloy_protocol::BlockInfo;
 use parking_lot::RwLock;
 use reth::{primitives::Transaction, providers::Chain};
@@ -73,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/providers-local/src/lib.rs → crates/derive/src/lib.rs b/crates/providers-local/src/lib.rs → crates/derive/src/lib.rs
diff --git a/crates/rollup/Cargo.toml b/crates/rollup/Cargo.toml
@@ -12,13 +12,12 @@ categories.workspace = true
 [dependencies]
 # Kona
 kona-derive.workspace = true
-kona-providers.workspace = true
-kona-providers-alloy.workspace = true
-kona-providers-local.workspace = true
+kona-derive-alloy.workspace = true
+kona-derive-local.workspace = true
 
 # Alloy
 alloy-eips.workspace = true
-alloy-primitives.workspace = true
+alloy-primitives = { workspace = true, features = ["map"] }
 alloy-provider = { workspace = true, features = ["ipc"] }
 alloy-transport.workspace = true
 alloy-transport-http = { workspace = true, features = ["jwt-auth"] }
@@ -44,18 +43,17 @@ reth-execution-types.workspace = true
 reth-exex = { workspace = true, features = ["serde"] }
 
 # Telemetry
-tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] }   
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] }
 metrics-exporter-prometheus = { version = "0.16.0", features = ["http-listener"] }
 
-# Misc 
+# Misc
 url.workspace = true
 serde_json.workspace = true
 eyre.workspace = true
 tracing.workspace = true
 async-trait.workspace = true
 tokio.workspace = true
 futures.workspace = true
-hashbrown.workspace = true
 tower.workspace = true
 http-body-util.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }

diff --git a/crates/rollup/src/driver/context/exex.rs b/crates/rollup/src/driver/context/exex.rs
@@ -1,7 +1,7 @@
 use alloy_eips::BlockNumHash;
 use async_trait::async_trait;
 use futures::StreamExt;
-use kona_providers_local::InMemoryChainProvider;
+use kona_derive_local::InMemoryChainProvider;
 use reth_exex::{ExExContext, ExExEvent};
 use reth_node_api::FullNodeComponents;
 

diff --git a/crates/rollup/src/driver/context/standalone.rs b/crates/rollup/src/driver/context/standalone.rs
@@ -1,9 +1,8 @@
-use hashbrown::HashMap;
 use std::{collections::BTreeMap, time::Duration};
 
 use alloy_eips::{eip1898::BlockNumHash, BlockId};
 use alloy_network::Ethereum;
-use alloy_primitives::{BlockNumber, B256};
+use alloy_primitives::{map::HashMap, BlockNumber, B256};
 use alloy_provider::{IpcConnect, Provider, ProviderBuilder, ReqwestProvider, WsConnect};
 use alloy_rpc_types_eth::Block;
 use alloy_transport::{TransportErrorKind, TransportResult};

diff --git a/crates/rollup/src/driver/cursor.rs b/crates/rollup/src/driver/cursor.rs
@@ -1,4 +1,4 @@
-use hashbrown::HashMap;
+use alloy_primitives::map::HashMap;
 use std::collections::{BTreeMap, VecDeque};
 
 use op_alloy_protocol::{BlockInfo, L2BlockInfo};
@@ -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/driver/mod.rs b/crates/rollup/src/driver/mod.rs
@@ -7,11 +7,10 @@ use eyre::{bail, eyre, Result};
 use kona_derive::{
     errors::{PipelineError, PipelineErrorKind},
     pipeline::{Pipeline, StepResult},
-    traits::{BlobProvider, ResetSignal, SignalReceiver},
+    traits::{BlobProvider, ChainProvider, L2ChainProvider, ResetSignal, SignalReceiver},
 };
-use kona_providers::{ChainProvider, L2ChainProvider};
-use kona_providers_alloy::{AlloyChainProvider, AlloyL2ChainProvider, OnlineBlobProviderBuilder};
-use kona_providers_local::{DurableBlobProvider, InMemoryChainProvider, LayeredBlobProvider};
+use kona_derive_alloy::{AlloyChainProvider, AlloyL2ChainProvider, OnlineBlobProviderBuilder};
+use kona_derive_local::{DurableBlobProvider, InMemoryChainProvider, LayeredBlobProvider};
 use op_alloy_genesis::RollupConfig;
 use op_alloy_protocol::{BlockInfo, L2BlockInfo};
 use reth_exex::ExExContext;

diff --git a/crates/rollup/src/pipeline.rs b/crates/rollup/src/pipeline.rs
@@ -7,13 +7,12 @@ 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,
+    traits::{BlobProvider, ChainProvider},
 };
-use kona_providers::ChainProvider;
-use kona_providers_alloy::AlloyL2ChainProvider;
+use kona_derive_alloy::AlloyL2ChainProvider;
 use op_alloy_genesis::RollupConfig;
 use op_alloy_protocol::BlockInfo;
 
@@ -22,9 +21,9 @@ use op_alloy_protocol::BlockInfo;
 type L1FrameQueue<CP, BP> = FrameQueue<L1Retrieval<EthereumDataSource<CP, BP>, L1Traversal<CP>>>;
 
 /// A concrete [NextAttributes](kona_derive::traits::NextAttributes) stage implementation that
-/// accepts batches from the [BatchQueue] stage and transforms them into payload attributes.
+/// accepts batches from the [BatchProvider] 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>,
 >;