Skip to content

feat: add l1 data fee buffer check #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frisitano merged 4 commits into from
Feb 5, 2026
+357 −198
Merged

feat: add l1 data fee buffer check #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84724e1
add l1 data fee buffer check
frisitano Feb 3, 2026
3822c81
update reth
frisitano Feb 4, 2026
97d5fec
merge main
frisitano Feb 4, 2026
67c868b
update tag and fix docker genesis
frisitano Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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" }
Expand Down Expand Up @@ -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" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
}
}

Expand Down Expand Up @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
}
}

Expand Down Expand Up @@ -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,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading