feat: add l1 data fee buffer check (#486)

* add l1 data fee buffer check

* update reth

* update tag and fix docker genesis

Author: frisitano

Cargo.lock

@@ -127,6 +127,7 @@ strip = "none"
 alloy-chains = { version = "0.2.5", default-features = false }
 alloy-consensus = { version = "1.0.37", default-features = false }
 alloy-eips = { version = "1.0.37", default-features = false }
+alloy-genesis = { version = "1.0.37", default-features = false }
 alloy-json-rpc = { version = "1.0.37", default-features = false }
 alloy-network = { version = "1.0.37", default-features = false }
 alloy-primitives = { version = "1.4.1", default-features = false }
@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
 alloy-transport = { version = "1.0.37", default-features = false }
 
 # scroll-alloy
-scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
+scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
 
 # reth
-reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
-reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
+reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
+reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
 
 # reth-scroll
-reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
-reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
+reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
+reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
 
 # rollup node
 rollup-node = { path = "crates/node" }
@@ -239,8 +240,8 @@ tracing = "0.1.0"
 getrandom = { version = "0.2", features = ["js"] }
 
 [patch.crates-io]
-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
-op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
+revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }
+op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }
 
 # [patch."https://github.com/scroll-tech/reth.git"]
 # reth-chainspec = { path = "../reth/crates/chainspec" }

Cargo.toml

@@ -114,6 +114,8 @@ http-body-util = "0.1"
 
 [dev-dependencies]
 alloy-chains.workspace = true
+alloy-consensus.workspace = true
+alloy-genesis.workspace = true
 alloy-eips.workspace = true
 futures.workspace = true
 reth-e2e-test-utils.workspace = true

crates/node/Cargo.toml

@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
     /// The database connection (not parsed via CLI but hydrated after validation).
     #[arg(skip)]
     pub database: Option<Arc<Database>>,
+    /// Require an additional L1 data fee buffer in the account balance checks for transactions.
+    #[arg(
+        long = "require-l1-data-fee-buffer",
+        value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
+        default_value = "false"
+    )]
+    pub require_l1_data_fee_buffer: bool,
 }
 
 impl ScrollRollupNodeConfig {
@@ -1047,6 +1054,7 @@ mod tests {
             rpc_args: RpcArgs::default(),
             pprof_args: PprofArgs::default(),
             remote_block_source_args: RemoteBlockSourceArgs::default(),
+            require_l1_data_fee_buffer: false,
         };
 
         let result = config.validate();
@@ -1078,6 +1086,7 @@ mod tests {
                 url: None,
                 poll_interval_ms: 100,
             },
+            require_l1_data_fee_buffer: false,
         };
 
         let result = config.validate();
@@ -1112,6 +1121,7 @@ mod tests {
             rpc_args: RpcArgs::default(),
             pprof_args: PprofArgs::default(),
             remote_block_source_args: RemoteBlockSourceArgs::default(),
+            require_l1_data_fee_buffer: false,
         };
 
         let result = config.validate();
@@ -1141,6 +1151,7 @@ mod tests {
             rpc_args: RpcArgs::default(),
             pprof_args: PprofArgs::default(),
             remote_block_source_args: RemoteBlockSourceArgs::default(),
+            require_l1_data_fee_buffer: false,
         };
 
         assert!(config.validate().is_ok());
@@ -1168,6 +1179,7 @@ mod tests {
             rpc_args: RpcArgs::default(),
             pprof_args: PprofArgs::default(),
             remote_block_source_args: RemoteBlockSourceArgs::default(),
+            require_l1_data_fee_buffer: false,
         };
 
         assert!(config.validate().is_ok());
@@ -1191,6 +1203,7 @@ mod tests {
             rpc_args: RpcArgs::default(),
             pprof_args: PprofArgs::default(),
             remote_block_source_args: RemoteBlockSourceArgs::default(),
+            require_l1_data_fee_buffer: false,
         };
 
         assert!(config.validate().is_ok());

crates/node/src/args.rs

@@ -30,7 +30,14 @@ fn main() {
     if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
         |builder, args| async move {
             info!(target: "reth::cli", "Launching node");
+
+            // Modify the chain spec based on the CLI args.
             let config = builder.config().clone();
+            let mut chain_spec = (*config.chain).clone();
+            chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
+            let config = config.with_chain(chain_spec);
+
+            // Launch the node.
             let handle = builder
                 .node(ScrollRollupNode::new(args, config).await)
                 .launch_with_fn(|builder| {

crates/node/src/main.rs

@@ -11,7 +11,7 @@ use crate::{
 };
 
 use alloy_eips::BlockNumberOrTag;
-use alloy_primitives::Address;
+use alloy_primitives::{Address, B256};
 use alloy_rpc_types_eth::Block;
 use alloy_signer_local::PrivateKeySigner;
 use reth_chainspec::EthChainSpec;
@@ -171,9 +171,8 @@ impl TestFixture {
         &mut self,
         node_index: usize,
         tx: impl Into<alloy_primitives::Bytes>,
-    ) -> eyre::Result<()> {
-        self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
-        Ok(())
+    ) -> eyre::Result<B256> {
+        Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
     }
 
     /// Get the current (latest) block from a specific node.
@@ -216,7 +215,7 @@ impl TestFixture {
 }
 
 /// Builder for creating test fixtures with a fluent API.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct TestFixtureBuilder {
     config: ScrollRollupNodeConfig,
     num_nodes: usize,
@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
             rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
             remote_block_source_args: Default::default(),
             pprof_args: PprofArgs::default(),
+            require_l1_data_fee_buffer: false,
         }
     }
 
@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
         &mut self.config
     }
 
+    /// Modify the underlying config using a closure.
+    pub fn config<F>(mut self, f: F) -> Self
+    where
+        F: FnOnce(&mut ScrollRollupNodeConfig),
+    {
+        f(&mut self.config);
+        self
+    }
+
     /// Build the test fixture.
     pub async fn build(self) -> eyre::Result<TestFixture> {
         let config = self.config;

crates/node/src/test_utils/fixture.rs

@@ -140,7 +140,9 @@ where
 
     // Create nodes and peer them
     let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);
-
+    let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
+    chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
+    let chain_spec = Arc::new(chain_spec);
     for idx in 0..num_nodes {
         // disable sequencer nodes after the first one
         if idx != 0 {
@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
         pprof_args: PprofArgs::default(),
         remote_block_source_args: Default::default(),
         rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
+        require_l1_data_fee_buffer: false,
     }
 }
 
@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
         remote_block_source_args: Default::default(),
         pprof_args: PprofArgs::default(),
         rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
+        require_l1_data_fee_buffer: false,
     }
 }

crates/node/src/test_utils/mod.rs

@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
             "scroll": {
                 "feeVaultAddress": "0x5300000000000000000000000000000000000005",
                 "maxTxPayloadBytesPerBlock": 122880,
+                "l1DataFeeBufferCheck": false,
                 "l1Config": {
                     "l1ChainId": 1,
                     "l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",