chore: dependency updates

Cargo.toml

@@ -9,17 +9,14 @@ 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
 
@@ -28,15 +25,12 @@ incremental = false
 ser = { path = "crates/ser" }
 op-net = { path = "crates/net" }
 rollup = { path = "crates/rollup" }
-kona-providers-local = { path = "crates/providers-local" }
-
-# 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 }
+kona-derive-local = { path = "crates/derive" }
 
-# Superchain
+# Kona + Superchain
 superchain = { version = "0.8.2", 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.9", default-features = false }
@@ -64,22 +58,22 @@ 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-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 }
@@ -113,7 +107,6 @@ thiserror = "1.0"
 lazy_static = "1.5.0"
 futures = "0.3.30"
 async-trait = "0.1.83"
-hashbrown = "0.15.0"
 parking_lot = "0.12.3"
 unsigned-varint = "0.8.0"
 tower = "0.5"

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

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;

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};

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"] }

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;
 

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};

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};

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;

crates/rollup/src/pipeline.rs

@@ -10,10 +10,9 @@ use kona_derive::{
         AttributesQueue, BatchQueue, 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;