integrate scroll reth upstream changes and foundry fork

Author: frisitano

Cargo.lock

@@ -99,6 +99,7 @@ test-utils = [
     "scroll-db/test-utils",
     "scroll-engine/test-utils",
     "scroll-network/test-utils",
+    "reth-tasks/test-utils",
 ]
 serde = [
     "dep:serde",

Cargo.toml

@@ -80,7 +80,7 @@ aws-config = "1.8.0"
 aws-sdk-kms = "1.76.0"
 
 # test-utils
-anvil = { git = "https://github.com/foundry-rs/foundry.git", rev = "2c84e1c970d11ef5023a77d8002a1cb70b143888", default-features = false, optional = true }
+anvil = { git = "https://github.com/scroll-tech/foundry.git", branch = "feat/bump-dependencies", default-features = false, optional = true }
 alloy-rpc-types-eth = { workspace = true, optional = true }
 alloy-rpc-types-anvil = { workspace = true, optional = true }
 reth-db = { workspace = true, optional = true, features = ["test-utils"] }
@@ -175,4 +175,5 @@ test-utils = [
     "alloy-provider/anvil-api",
     "alloy-provider/anvil-node",
     "reth-db?/test-utils",
+    "reth-tasks/test-utils",
 ]

crates/chain-orchestrator/Cargo.toml

@@ -25,4 +25,8 @@ impl<
     fn rpc_handle(&self) -> &RpcHandle<Node, EthApi> {
         &self.rpc_handle
     }
+
+    fn rpc_handle_mut(&mut self) -> &mut RpcHandle<Node, EthApi> {
+        &mut self.rpc_handle
+    }
 }

crates/node/Cargo.toml

@@ -217,7 +217,7 @@ impl ScrollRollupNodeConfig {
                 Ok(handle) => {
                     tracing::info!(target: "rollup_node::pprof", "pprof server started successfully");
                     // Spawn the pprof server task
-                    ctx.task_executor.spawn_critical("pprof_server", async move {
+                    ctx.task_executor.spawn_critical_task("pprof_server", async move {
                         if let Err(e) = handle.await {
                             tracing::error!(target: "rollup_node::pprof", "pprof server error: {:?}", e);
                         }
@@ -281,7 +281,7 @@ impl ScrollRollupNodeConfig {
         // Fetch the database from the hydrated config.
         let db = self.database.clone().expect("should hydrate config before build");
         let db_maintenance = DatabaseMaintenance::new(db.clone());
-        ctx.task_executor.spawn(db_maintenance.run());
+        ctx.task_executor.spawn_critical_task("db_maintenance", db_maintenance.run());
 
         // Run the database migrations
         if let Some(named) = chain_spec.chain().named() {
@@ -383,7 +383,8 @@ impl ScrollRollupNodeConfig {
             td_constant(chain_spec.chain().named()),
             authorized_signer,
         );
-        ctx.task_executor.spawn(scroll_network_manager.run());
+        ctx.task_executor
+            .spawn_critical_task("scroll_network_manager", scroll_network_manager.run());
 
         tracing::info!(target: "scroll::node::args", fcs = ?fcs, payload_building_duration = ?self.sequencer_args.payload_building_duration, "Starting engine driver");
         let engine = Engine::new(Arc::new(engine_api), fcs);

crates/node/src/add_ons/handle.rs

@@ -28,7 +28,7 @@ use reth_node_types::NodeTypesWithDBAdapter;
 use reth_provider::providers::BlockchainProvider;
 use reth_scroll_chainspec::SCROLL_DEV;
 use reth_scroll_primitives::ScrollPrimitives;
-use reth_tasks::TaskManager;
+use reth_tasks::TaskExecutor;
 use reth_tokio_util::EventStream;
 use rollup_node_chain_orchestrator::{ChainOrchestratorEvent, ChainOrchestratorHandle};
 use rollup_node_primitives::BlockInfo;
@@ -119,8 +119,8 @@ pub enum NodeType {
 pub struct ScrollNodeTestComponents {
     /// The node helper type for the test node.
     pub node: ScrollTestNode,
-    /// The task manager for the test node.
-    pub task_manager: TaskManager,
+    /// The task executor for the test node.
+    pub task_executor: TaskExecutor,
     /// The exit future for the test node.
     pub exit_future: NodeExitFuture,
 }
@@ -129,10 +129,10 @@ impl ScrollNodeTestComponents {
     /// Create new test node components.
     pub async fn new(
         node: ScrollTestNode,
-        task_manager: TaskManager,
+        task_executor: TaskExecutor,
         exit_future: NodeExitFuture,
     ) -> Self {
-        Self { node, task_manager, exit_future }
+        Self { node, task_executor, exit_future }
     }
 }
 

crates/node/src/args.rs

@@ -99,7 +99,7 @@ use reth_node_builder::{
 use reth_node_core::args::{DiscoveryArgs, NetworkArgs, RpcServerArgs, TxPoolArgs};
 use reth_provider::providers::BlockchainProvider;
 use reth_rpc_server_types::RpcModuleSelection;
-use reth_tasks::TaskManager;
+use reth_tasks::TaskExecutor;
 use rollup_node_sequencer::L1MessageInclusionMode;
 use std::{path::PathBuf, sync::Arc};
 use tokio::sync::Mutex;
@@ -155,7 +155,11 @@ where
             .with_rpc(RpcServerArgs::default().with_http().with_http_api(RpcModuleSelection::All))
             .with_unused_ports()
             .set_dev(is_dev)
-            .with_txpool(TxPoolArgs { no_local_transactions_propagation, ..Default::default() });
+            .with_txpool(TxPoolArgs {
+                no_local_transactions_propagation,
+                max_account_slots: 16_384,
+                ..Default::default()
+            });
 
         // Check if we already have provided a database for a node (reboot scenario)
         let db = if let Some((_, provided_db)) = &reboot_info {
@@ -201,10 +205,10 @@ where
 
         let span = span!(Level::INFO, "node", node_index);
         let _enter = span.enter();
-        let task_manager = TaskManager::current();
+        let task_executor = TaskExecutor::default();
         let testing_node = NodeBuilder::new(node_config.clone())
             .with_database(db.clone())
-            .with_launch_context(task_manager.executor());
+            .with_launch_context(task_executor.clone());
         let testing_config = testing_node.config().clone();
         let node = ScrollRollupNode::new(scroll_node_config.clone(), testing_config).await;
         let RethNodeHandle { node, node_exit_future } = testing_node
@@ -241,7 +245,7 @@ where
             }
         }
 
-        let node = ScrollNodeTestComponents::new(node, task_manager, node_exit_future).await;
+        let node = ScrollNodeTestComponents::new(node, task_executor, node_exit_future).await;
 
         nodes.push(node);
     }
@@ -252,7 +256,7 @@ where
 /// Generate a transfer transaction with the given wallet.
 pub async fn generate_tx(wallet: Arc<Mutex<Wallet>>) -> Bytes {
     let mut wallet = wallet.lock().await;
-    let tx_fut = TransactionTestContext::transfer_tx_nonce_bytes(
+    let tx_fut = TransactionTestContext::transfer_tx_bytes_with_nonce(
         wallet.chain_id,
         wallet.inner.clone(),
         wallet.inner_nonce,

crates/node/src/test_utils/fixture.rs

@@ -41,10 +41,10 @@ impl TestFixture {
             .get_mut(node_index)
             .and_then(|opt| opt.take())
             .expect("Node existence checked above");
-        let ScrollNodeTestComponents { node, task_manager, exit_future } = node;
+        let ScrollNodeTestComponents { node, task_executor, exit_future } = node;
 
-        tokio::task::spawn_blocking(|| {
-            if !task_manager.graceful_shutdown_with_timeout(Duration::from_secs(10)) {
+        tokio::task::spawn_blocking(move || {
+            if !task_executor.graceful_shutdown_with_timeout(Duration::from_secs(10)) {
                 return Err(eyre::eyre!("Failed to shutdown tasks within timeout"));
             }
             eyre::Ok(())

crates/node/src/test_utils/mod.rs

@@ -60,7 +60,7 @@ impl<'a> TransferTxBuilder<'a> {
         let mut wallet = self.tx_helper.fixture.wallet.lock().await;
 
         // Generate the transaction
-        let raw_tx = TransactionTestContext::transfer_tx_nonce_bytes(
+        let raw_tx = TransactionTestContext::transfer_tx_bytes_with_nonce(
             wallet.chain_id,
             wallet.inner.clone(),
             wallet.inner_nonce,
@@ -85,7 +85,7 @@ impl<'a> TransferTxBuilder<'a> {
     pub async fn build(self) -> eyre::Result<Bytes> {
         let mut wallet = self.tx_helper.fixture.wallet.lock().await;
 
-        let raw_tx = TransactionTestContext::transfer_tx_nonce_bytes(
+        let raw_tx = TransactionTestContext::transfer_tx_bytes_with_nonce(
             wallet.chain_id,
             wallet.inner.clone(),
             wallet.inner_nonce,