[DRAFT] chore(rust/op-reth): update reth to rev 2c5d00f and bump alloy deps

rust/kona/docs/docs/pages/sdk/examples/frames-to-batch.mdx

@@ -1,7 +1,7 @@
 # Transform Frames into a Batch
 
 :::info
-This example performs the reverse transformation as the [batch-to-frames][batch-to-frames] example.
+This example performs the reverse transformation of encoding a batch into frames.
 :::
 
 This example walks through transforming [`Frame`][frame]s into the [`Batch`][batch] types.
@@ -156,7 +156,6 @@ fn example_transactions() -> Vec<Bytes> {
 ```
 
 
-[batch-to-frames]: /sdk/examples/batch-to-frames
 [frame]: https://docs.rs/kona-protocol/latest/kona_protocol/struct.Frame.html
 [batch]: https://docs.rs/kona-protocol/latest/kona_protocol/enum.Batch.html
 [channel]: https://docs.rs/kona-protocol/latest/kona_protocol/struct.Channel.html

rust/kona/docs/docs/pages/sdk/examples/intro.mdx

@@ -4,7 +4,6 @@ Examples for working with `kona` crates.
 
 - [Load a Rollup Config for a Chain ID](/sdk/examples/load-a-rollup-config)
 - [Transform Frames to a Batch](/sdk/examples/frames-to-batch)
-- [Transform a Batch to Frames](/sdk/examples/batch-to-frames)
 - [Create a new L1BlockInfoTx Hardfork Variant](/sdk/examples/new-l1-block-info-tx-hardfork)
 - [Create a new `kona-executor` test fixture](/sdk/examples/executor-test-fixtures)
 - [Configuring P2P Network Peer Scoring](/sdk/examples/p2p-peer-scoring)

rust/kona/docs/sidebar.ts

@@ -182,7 +182,6 @@ export const sidebar: SidebarItem[] = [
           { text: "Introduction", link: "/sdk/examples/intro" },
           { text: "Load a Rollup Config", link: "/sdk/examples/load-a-rollup-config" },
           { text: "Transform Frames to a Batch", link: "/sdk/examples/frames-to-batch" },
-          { text: "Transform a Batch into Frames", link: "/sdk/examples/batch-to-frames" },
           { text: "Create a new L1BlockInfoTx Hardfork Variant", link: "/sdk/examples/new-l1-block-info-tx-hardfork" },
           { text: "Create a new kona-executor test fixture", link: "/sdk/examples/executor-test-fixtures" },
           { text: "Configuring P2P Network Peer Scoring", link: "/sdk/examples/p2p-peer-scoring" },

rust/op-reth/bin/Cargo.toml

@@ -4,9 +4,9 @@ version = "1.10.2"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true
-homepage = "https://paradigmxyz.github.io/reth"
-repository = "https://github.com/paradigmxyz/reth"
-exclude = [".github/"]
+homepage.workspace = true
+repository.workspace = true
+exclude.workspace = true
 
 [dependencies]
 reth-cli-util.workspace = true

rust/op-reth/crates/cli/src/lib.rs

@@ -37,7 +37,7 @@ pub use commands::{import::ImportOpCommand, import_receipts::ImportReceiptsOpCom
 use reth_optimism_chainspec::OpChainSpec;
 use reth_rpc_server_types::{DefaultRpcModuleValidator, RpcModuleValidator};
 
-use std::{ffi::OsString, fmt, marker::PhantomData, sync::Arc};
+use std::{ffi::OsString, fmt, marker::PhantomData};
 
 use chainspec::OpChainSpecParser;
 use clap::Parser;
@@ -121,7 +121,7 @@ where
     /// [`NodeCommand`](reth_cli_commands::node::NodeCommand).
     pub fn run<L, Fut>(self, launcher: L) -> eyre::Result<()>
     where
-        L: FnOnce(WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, C::ChainSpec>>, Ext) -> Fut,
+        L: FnOnce(WithLaunchContext<NodeBuilder<DatabaseEnv, C::ChainSpec>>, Ext) -> Fut,
         Fut: Future<Output = eyre::Result<()>>,
     {
         self.with_runner(CliRunner::try_default_runtime()?, launcher)
@@ -130,7 +130,7 @@ where
     /// Execute the configured cli command with the provided [`CliRunner`].
     pub fn with_runner<L, Fut>(self, runner: CliRunner, launcher: L) -> eyre::Result<()>
     where
-        L: FnOnce(WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, C::ChainSpec>>, Ext) -> Fut,
+        L: FnOnce(WithLaunchContext<NodeBuilder<DatabaseEnv, C::ChainSpec>>, Ext) -> Fut,
         Fut: Future<Output = eyre::Result<()>>,
     {
         let mut this = self.configure();

rust/op-reth/crates/evm/src/lib.rs

@@ -293,7 +293,10 @@ mod tests {
     use alloy_consensus::{Header, Receipt};
     use alloy_eips::eip7685::Requests;
     use alloy_genesis::Genesis;
-    use alloy_primitives::{Address, B256, LogData, bytes, map::HashMap};
+    use alloy_primitives::{
+        Address, B256, LogData, bytes,
+        map::{AddressMap, B256Map, HashMap},
+    };
     use op_revm::OpSpecId;
     use reth_chainspec::ChainSpec;
     use reth_evm::execute::ProviderError;
@@ -588,12 +591,12 @@ mod tests {
         );
 
         // Create a BundleStateInit object and insert initial data
-        let mut state_init: BundleStateInit = HashMap::default();
+        let mut state_init: BundleStateInit = AddressMap::default();
         state_init
-            .insert(Address::new([2; 20]), (None, Some(Account::default()), HashMap::default()));
+            .insert(Address::new([2; 20]), (None, Some(Account::default()), B256Map::default()));
 
-        // Create a HashMap for account reverts and insert initial data
-        let mut revert_inner: HashMap<Address, AccountRevertInit> = HashMap::default();
+        // Create an AddressMap for account reverts and insert initial data
+        let mut revert_inner: AddressMap<AccountRevertInit> = AddressMap::default();
         revert_inner.insert(Address::new([2; 20]), (None, vec![]));
 
         // Create a RevertsInit object and insert the revert_inner data

rust/op-reth/crates/flashblocks/Cargo.toml

@@ -4,8 +4,8 @@ version = "1.10.2"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true
-homepage = "https://paradigmxyz.github.io/reth"
-repository = "https://github.com/paradigmxyz/reth"
+homepage.workspace = true
+repository.workspace = true
 
 [lints]
 workspace = true
@@ -38,11 +38,11 @@ op-alloy-rpc-types-engine = { workspace = true, features = ["k256"] }
 
 # io
 tokio.workspace = true
-tokio-tungstenite = { workspace = true, features = ["rustls-tls-native-roots"] }
+tokio-tungstenite.workspace = true
 serde_json.workspace = true
 url.workspace = true
 futures-util.workspace = true
-brotli = { workspace = true, features = ["std"] }
+brotli.workspace = true
 
 # debug
 tracing.workspace = true

rust/op-reth/crates/flashblocks/src/lib.rs

@@ -21,9 +21,7 @@ mod payload;
 pub use payload::{FlashBlock, PendingFlashBlock};
 
 mod sequence;
-pub use sequence::{
-    FlashBlockCompleteSequence, FlashBlockPendingSequence, SequenceExecutionOutcome,
-};
+pub use sequence::{FlashBlockCompleteSequence, FlashBlockPendingSequence};
 
 mod service;
 pub use service::{FlashBlockBuildInfo, FlashBlockService};
@@ -32,13 +30,11 @@ mod worker;
 
 mod cache;
 
-pub mod validation;
-
 #[cfg(test)]
 mod test_utils;
 
 mod ws;
-pub use ws::{FlashBlockDecoder, WsConnect, WsConnector, WsFlashBlockStream};
+pub use ws::{FlashBlockDecoder, WsConnect, WsFlashBlockStream};
 
 /// Receiver of the most recent [`PendingFlashBlock`] built out of [`FlashBlock`]s.
 ///

rust/op-reth/crates/flashblocks/src/sequence.rs

@@ -14,6 +14,7 @@ const FLASHBLOCK_SEQUENCE_CHANNEL_SIZE: usize = 128;
 
 /// Outcome from executing a flashblock sequence.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[allow(unnameable_types)]
 pub struct SequenceExecutionOutcome {
     /// The block hash of the executed pending block
     pub block_hash: B256,

rust/op-reth/crates/flashblocks/src/service.rs

@@ -241,9 +241,9 @@ where
 
         let (tx, rx) = oneshot::channel();
         let builder = self.builder.clone();
-        self.spawner.spawn_blocking(Box::pin(async move {
+        self.spawner.spawn_blocking(move || {
             let _ = tx.send(builder.execute(args));
-        }));
+        });
         self.job = Some((Instant::now(), rx));
     }
 }

rust/op-reth/crates/flashblocks/src/ws/mod.rs

@@ -1,4 +1,4 @@
-pub use stream::{WsConnect, WsConnector, WsFlashBlockStream};
+pub use stream::{WsConnect, WsFlashBlockStream};
 
 mod decoding;
 pub use decoding::FlashBlockDecoder;

rust/op-reth/crates/flashblocks/src/ws/stream.rs

@@ -223,6 +223,7 @@ pub trait WsConnect {
 ///
 /// See the [`WsConnect`] documentation for details.
 #[derive(Debug, Clone)]
+#[allow(unnameable_types)]
 pub struct WsConnector;
 
 impl WsConnect for WsConnector {

rust/op-reth/crates/flashblocks/tests/it/stream.rs

@@ -2,7 +2,8 @@ use futures_util::stream::StreamExt;
 use reth_optimism_flashblocks::WsFlashBlockStream;
 
 #[tokio::test]
-async fn test_online_streaming_flashblocks_from_remote_source_is_successful() {
+#[ignore = "depends on external service availability"]
+async fn test_streaming_flashblocks_from_remote_source_is_successful() {
     let items = 3;
     let ws_url = "wss://sepolia.flashblocks.base.org/ws".parse().unwrap();
     let stream = WsFlashBlockStream::new(ws_url);

rust/op-reth/crates/hardforks/src/lib.rs

@@ -32,7 +32,6 @@ use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition, Hardf
 
 /// Dev hardforks
 pub static DEV_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {
-    const JOVIAN_TIMESTAMP: ForkCondition = ForkCondition::Timestamp(1761840000);
     ChainHardforks::new(vec![
         (EthereumHardfork::Frontier.boxed(), ForkCondition::Block(0)),
         (EthereumHardfork::Homestead.boxed(), ForkCondition::Block(0)),
@@ -64,7 +63,7 @@ pub static DEV_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {
         (OpHardfork::Holocene.boxed(), ForkCondition::Timestamp(0)),
         (EthereumHardfork::Prague.boxed(), ForkCondition::Timestamp(0)),
         (OpHardfork::Isthmus.boxed(), ForkCondition::Timestamp(0)),
-        (OpHardfork::Jovian.boxed(), JOVIAN_TIMESTAMP),
+        (OpHardfork::Jovian.boxed(), ForkCondition::Timestamp(0)),
     ])
 });
 

rust/op-reth/crates/node/Cargo.toml

@@ -109,10 +109,7 @@ js-tracer = [
     "reth-rpc-eth-types/js-tracer",
 ]
 test-utils = [
-	"reth-codec",
 	"reth-tasks",
-	"dep:reth-db-api",
-	"reth-db-api/op",
 	"reth-e2e-test-utils",
 	"alloy-genesis",
 	"serde_json",
@@ -132,7 +129,8 @@ test-utils = [
 	"reth-trie-common/test-utils",
 	"reth-trie-db/test-utils",
 	"reth-stages-types/test-utils",
-	"reth-db-api?/test-utils"
+	"reth-db-api?/test-utils",
+	"reth-tasks?/test-utils"
 ]
 reth-codec = ["reth-optimism-primitives/reth-codec"]
 

rust/op-reth/crates/node/src/lib.rs

@@ -11,8 +11,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
-// Used for feature activation only.
-#[cfg(feature = "test-utils")]
+#[cfg(feature = "reth-db-api")]
 use reth_db_api as _;
 
 /// CLI argument parsing for the optimism node.
@@ -49,3 +48,6 @@ pub use reth_optimism_storage::OpStorage;
 
 use op_revm as _;
 use revm as _;
+
+#[cfg(feature = "test-utils")]
+use reth_tasks as _;

rust/op-reth/crates/node/src/node.rs

@@ -208,25 +208,29 @@ impl OpNode {
     /// use reth_optimism_chainspec::BASE_MAINNET;
     /// use reth_optimism_node::OpNode;
     ///
-    /// let factory =
-    ///     OpNode::provider_factory_builder().open_read_only(BASE_MAINNET.clone(), "datadir").unwrap();
+    /// fn demo(runtime: reth_tasks::Runtime) {
+    ///     let factory = OpNode::provider_factory_builder()
+    ///         .open_read_only(BASE_MAINNET.clone(), "datadir", runtime)
+    ///         .unwrap();
+    /// }
     /// ```
     ///
-    /// # Open a Providerfactory manually with all required components
+    /// # Open a Providerfactory with custom config
     ///
     /// ```no_run
-    /// use reth_db::open_db_read_only;
     /// use reth_optimism_chainspec::OpChainSpecBuilder;
     /// use reth_optimism_node::OpNode;
-    /// use reth_provider::providers::{RocksDBProvider, StaticFileProvider};
-    /// use std::sync::Arc;
+    /// use reth_provider::providers::ReadOnlyConfig;
     ///
-    /// let factory = OpNode::provider_factory_builder()
-    ///     .db(Arc::new(open_db_read_only("db", Default::default()).unwrap()))
-    ///     .chainspec(OpChainSpecBuilder::base_mainnet().build().into())
-    ///     .static_file(StaticFileProvider::read_only("db/static_files", false).unwrap())
-    ///     .rocksdb_provider(RocksDBProvider::builder("db/rocksdb").build().unwrap())
-    ///     .build_provider_factory();
+    /// fn demo(runtime: reth_tasks::Runtime) {
+    ///     let factory = OpNode::provider_factory_builder()
+    ///         .open_read_only(
+    ///             OpChainSpecBuilder::base_mainnet().build().into(),
+    ///             ReadOnlyConfig::from_datadir("datadir").no_watch(),
+    ///             runtime,
+    ///         )
+    ///         .unwrap();
+    /// }
     /// ```
     pub fn provider_factory_builder() -> ProviderFactoryBuilder<Self> {
         ProviderFactoryBuilder::default()
@@ -1022,7 +1026,7 @@ where
         if ctx.chain_spec().is_interop_active_at_timestamp(ctx.head().timestamp) {
             // spawn the Op txpool maintenance task
             let chain_events = ctx.provider().canonical_state_stream();
-            ctx.task_executor().spawn_critical(
+            ctx.task_executor().spawn_critical_task(
                 "Op txpool interop maintenance task",
                 reth_optimism_txpool::maintain::maintain_transaction_pool_interop_future(
                     transaction_pool.clone(),
@@ -1036,7 +1040,7 @@ where
         if self.enable_tx_conditional {
             // spawn the Op txpool maintenance task
             let chain_events = ctx.provider().canonical_state_stream();
-            ctx.task_executor().spawn_critical(
+            ctx.task_executor().spawn_critical_task(
                 "Op txpool conditional maintenance task",
                 reth_optimism_txpool::maintain::maintain_transaction_pool_conditional_future(
                     transaction_pool.clone(),

rust/op-reth/crates/node/src/rpc.rs

@@ -23,7 +23,7 @@
 //! use reth_provider::providers::BlockchainProvider;
 //! use reth_rpc::TraceApi;
 //! use reth_rpc_eth_types::{EthConfig, EthStateCache};
-//! use reth_tasks::{TaskManager, pool::BlockingTaskGuard};
+//! use reth_tasks::{Runtime, pool::BlockingTaskGuard};
 //! use reth_trie_db::ChangesetCache;
 //! use std::sync::Arc;
 //!
@@ -32,8 +32,8 @@
 //!     // build core node with all components disabled except EVM and state
 //!     let sepolia = NodeConfig::new(OP_SEPOLIA.clone());
 //!     let db = create_test_rw_db_with_path(sepolia.datadir());
-//!     let tasks = TaskManager::current();
-//!     let launch_ctx = LaunchContext::new(tasks.executor(), sepolia.datadir());
+//!     let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current()).unwrap();
+//!     let launch_ctx = LaunchContext::new(runtime, sepolia.datadir());
 //!     let node = launch_ctx
 //!         .with_loaded_toml_config(sepolia)
 //!         .unwrap()

rust/op-reth/crates/node/src/utils.rs

@@ -9,7 +9,6 @@ use reth_node_api::NodeTypesWithDBAdapter;
 use reth_optimism_chainspec::OpChainSpecBuilder;
 use reth_payload_builder::EthPayloadBuilderAttributes;
 use reth_provider::providers::BlockchainProvider;
-use reth_tasks::TaskManager;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
@@ -18,7 +17,7 @@ pub(crate) type OpNode =
     NodeHelperType<OtherOpNode, BlockchainProvider<NodeTypesWithDBAdapter<OtherOpNode, TmpDB>>>;
 
 /// Creates the initial setup with `num_nodes` of the node config, started and connected.
-pub async fn setup(num_nodes: usize) -> eyre::Result<(Vec<OpNode>, TaskManager, Wallet)> {
+pub async fn setup(num_nodes: usize) -> eyre::Result<(Vec<OpNode>, Wallet)> {
     let genesis: Genesis =
         serde_json::from_str(include_str!("../tests/assets/genesis.json")).unwrap();
     reth_e2e_test_utils::setup_engine(

rust/op-reth/crates/node/tests/e2e-testsuite/p2p.rs

@@ -7,7 +7,7 @@ use tokio::sync::Mutex;
 async fn can_sync() -> eyre::Result<()> {
     reth_tracing::init_test_tracing();
 
-    let (mut nodes, _tasks, wallet) = setup(3).await?;
+    let (mut nodes, wallet) = setup(3).await?;
     let wallet = Arc::new(Mutex::new(wallet));
 
     let third_node = nodes.pop().unwrap();

rust/op-reth/crates/node/tests/it/custom_genesis.rs

@@ -36,29 +36,26 @@ async fn test_op_node_custom_genesis_number() {
     let wallet = Arc::new(Mutex::new(Wallet::default().with_chain_id(chain_spec.chain().into())));
 
     // Configure and launch the node
-    let mut config =
-        NodeConfig::new(chain_spec.clone()).with_unused_ports().with_datadir_args(DatadirArgs {
-            datadir: reth_db::test_utils::tempdir_path().into(),
-            ..Default::default()
-        });
-    config.network.discovery.discv5_port = 0;
-    config.network.discovery.discv5_port_ipv6 = 0;
+    let config = NodeConfig::new(chain_spec.clone()).with_datadir_args(DatadirArgs {
+        datadir: reth_db::test_utils::tempdir_path().into(),
+        ..Default::default()
+    });
     let db = create_test_rw_db_with_path(
         config
             .datadir
             .datadir
             .unwrap_or_chain_default(config.chain.chain(), config.datadir.clone())
             .db(),
     );
-    let tasks = reth_tasks::TaskManager::current();
+    let runtime = reth_tasks::Runtime::test();
     let node_handle = NodeBuilder::new(config.clone())
         .with_database(db)
         .with_types_and_provider::<OpNode, BlockchainProvider<_>>()
         .with_components(OpNode::default().components())
         .with_add_ons(OpNode::new(Default::default()).add_ons())
         .launch_with_fn(|builder| {
             let launcher = EngineNodeLauncher::new(
-                tasks.executor(),
+                runtime.clone(),
                 builder.config.datadir(),
                 Default::default(),
             );