feat: l1 data fee buffer#376

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 3 commits into from
Jan 30, 2026
Merged

feat: l1 data fee buffer #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d166b37
l1 data fee buffer
frisitano Jan 22, 2026
60fc1ec
fix deny
frisitano Jan 30, 2026
785391e
Merge branch 'scroll' into feat/l1-data-fee-buffer
frisitano Jan 30, 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
29 changes: 15 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down
129 changes: 126 additions & 3 deletions crates/scroll/node/src/builder/pool.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
/// Enforced overrides that are applied to the pool config.
pub pool_config_overrides: PoolBuilderConfigOverrides,

/// Require L1 data fee buffer in balance check.
/// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
/// 1*`L1_cost`.
pub require_l1_data_fee_buffer: bool,
/// Marker for the pooled transaction type.
_pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
fn default() -> Self {
Self { pool_config_overrides: Default::default(), _pd: Default::default() }
Self {
pool_config_overrides: Default::default(),
require_l1_data_fee_buffer: false,
_pd: Default::default(),
}
}
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
self.pool_config_overrides = pool_config_overrides;
self
}

/// Sets the require L1 data fee buffer flag.
/// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
/// 1*`L1_cost`. This matches geth's block validation behavior.
pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
self.require_l1_data_fee_buffer = require;
self
}
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
let Self { pool_config_overrides, .. } = self;
let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
let data_dir = ctx.config().datadir();
let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
// In --dev mode we can't require gas fees because we're unable to decode
// the L1 block info
.require_l1_data_gas_fee(!ctx.config().dev.dev)
.require_l1_data_fee_buffer(require_l1_data_fee_buffer)
});

let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
// drop all validation tasks.
drop(manager);
}

#[test]
fn test_pool_builder_with_require_l1_data_fee_buffer() {
// Test that the builder method correctly sets the flag
let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
assert!(!pool_builder.require_l1_data_fee_buffer);

let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
assert!(pool_builder.require_l1_data_fee_buffer);

let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
assert!(!pool_builder.require_l1_data_fee_buffer);
}

#[tokio::test]
async fn test_l1_data_fee_buffer_validation() {
// Test that the L1 data fee buffer feature correctly validates transactions:
// - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
// - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
//
// Both scenarios use identical setup to prove only the buffer flag differs.

// Shared test constants
let signer: alloy_primitives::Address = Default::default();
let balance = U256::from(500_000_000_000_000u64); // 500 Twei
let gas_limit = 55_000u64;
let gas_price = 7u128;
let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

// Helper to create a client with identical state
let client =
MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
let hash = B256::random();
client.add_header(hash, Header::default());
client.add_block(hash, ScrollBlock::default());
// Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
// With u32::MAX storage values, L1 cost is ~483 Twei.
// max L2_cost = 55,000 * 7 = 385,000 Wei.
client.add_account(signer, ExtendedAccount::new(0, balance));
client.add_account(
L1_GAS_PRICE_ORACLE_ADDRESS,
ExtendedAccount::new(0, U256::ZERO).extend_storage(
(0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
),
);

// Helper to create a transaction with identical parameters
let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
Signature::new(U256::ZERO, U256::ZERO, false),
Default::default(),
));
let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

let handle = tokio::runtime::Handle::current();
let manager = TaskManager::new(handle);

// Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
.no_eip4844()
.build_with_tasks(manager.executor(), NoopBlobStore::default())
.map(|validator| {
ScrollTransactionValidator::new(validator)
.require_l1_data_gas_fee(true)
.require_l1_data_fee_buffer(true)
});

let pool = ScrollTransactionPool::new(
validator,
CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
NoopBlobStore::default(),
PoolConfig::default(),
);

let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
assert!(matches!(
err.kind,
PoolErrorKind::InvalidTransaction(
InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
));

// Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
let validator = TransactionValidationTaskExecutor::eth_builder(client)
.no_eip4844()
.build_with_tasks(manager.executor(), NoopBlobStore::default())
.map(|validator| {
ScrollTransactionValidator::new(validator)
.require_l1_data_gas_fee(true)
.require_l1_data_fee_buffer(false)
});

let pool = ScrollTransactionPool::new(
validator,
CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
NoopBlobStore::default(),
PoolConfig::default(),
);

let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
assert!(
result.is_ok(),
"Expected transaction to be accepted without buffer, got: {result:?}"
);

drop(manager);
}
}
2 changes: 1 addition & 1 deletion crates/scroll/openvm-compat/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }
1 change: 1 addition & 0 deletions crates/scroll/txpool/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: l1 data fee buffer#376

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 3 commits into

from

Jan 30, 2026
 Merged


feat: l1 data fee buffer
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d166b37

l1 data fee buffer


frisitano Jan 22, 2026
60fc1ec

fix deny


frisitano Jan 30, 2026
785391e

Merge branch 'scroll' into feat/l1-data-fee-buffer


frisitano Jan 30, 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


29 changes: 15 additions & 14 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -487,18 +487,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

# revm
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91", default-features = false }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
revm-bytecode = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-interpreter = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-inspector = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-context-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-database-interface = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1", default-features = false }
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", tag = "scroll-v91.1", default-features = false }
revm-inspectors = "0.31.0"

# eth
Expand DownExpand Up@@ -771,8 +771,8 @@ walkdir = "2.3.3"
vergen-git2 = "1.0.5"

[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" }
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
Expand Down

129 changes: 126 additions & 3 deletions
crates/scroll/node/src/builder/pool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,21 @@ use scroll_alloy_hardforks::ScrollHardforks;
pub struct ScrollPoolBuilder<T = reth_scroll_txpool::ScrollPooledTransaction> {
 /// Enforced overrides that are applied to the pool config.
 pub pool_config_overrides: PoolBuilderConfigOverrides,

 /// Require L1 data fee buffer in balance check.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`.
 pub require_l1_data_fee_buffer: bool,
 /// Marker for the pooled transaction type.
 _pd: core::marker::PhantomData<T>,
}

impl<T> Default for ScrollPoolBuilder<T> {
 fn default() -> Self {
 Self { pool_config_overrides: Default::default(), _pd: Default::default() }
 Self {
 pool_config_overrides: Default::default(),
 require_l1_data_fee_buffer: false,
 _pd: Default::default(),
 }
 }
}

Expand All@@ -44,6 +51,14 @@ impl<T> ScrollPoolBuilder<T> {
 self.pool_config_overrides = pool_config_overrides;
 self
 }

 /// Sets the require L1 data fee buffer flag.
 /// When enabled, validates balance >= `L2_cost` + 2*`L1_cost` but only charges `L2_cost` +
 /// 1*`L1_cost`. This matches geth's block validation behavior.
 pub const fn with_require_l1_data_fee_buffer(mut self, require: bool) -> Self {
 self.require_l1_data_fee_buffer = require;
 self
 }
}

impl<Node, T> PoolBuilder<Node> for ScrollPoolBuilder<T>
Expand All@@ -58,7 +73,7 @@ where
 type Pool = ScrollTransactionPool<Node::Provider, DiskFileBlobStore, T>;

 async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
 let Self { pool_config_overrides, .. } = self;
 let Self { pool_config_overrides, require_l1_data_fee_buffer, .. } = self;
 let data_dir = ctx.config().datadir();
 let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;

Expand All@@ -81,6 +96,7 @@ where
 // In --dev mode we can't require gas fees because we're unable to decode
 // the L1 block info
 .require_l1_data_gas_fee(!ctx.config().dev.dev)
 .require_l1_data_fee_buffer(require_l1_data_fee_buffer)
 });

 let transaction_pool = reth_transaction_pool::Pool::new(
Expand DownExpand Up@@ -379,4 +395,111 @@ mod tests {
 // drop all validation tasks.
 drop(manager);
 }

 #[test]
 fn test_pool_builder_with_require_l1_data_fee_buffer() {
 // Test that the builder method correctly sets the flag
 let pool_builder = ScrollPoolBuilder::<ScrollPooledTransaction>::default();
 assert!(!pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(true);
 assert!(pool_builder.require_l1_data_fee_buffer);

 let pool_builder = pool_builder.with_require_l1_data_fee_buffer(false);
 assert!(!pool_builder.require_l1_data_fee_buffer);
 }

 #[tokio::test]
 async fn test_l1_data_fee_buffer_validation() {
 // Test that the L1 data fee buffer feature correctly validates transactions:
 // - With buffer enabled: rejects when balance < L2_cost + 2*L1_cost
 // - With buffer disabled: accepts when balance >= L2_cost + 1*L1_cost
 //
 // Both scenarios use identical setup to prove only the buffer flag differs.

 // Shared test constants
 let signer: alloy_primitives::Address = Default::default();
 let balance = U256::from(500_000_000_000_000u64); // 500 Twei
 let gas_limit = 55_000u64;
 let gas_price = 7u128;
 let tx_input = Bytes::from(random_iter::<u8>().take(100).collect::<Vec<_>>());

 // Helper to create a client with identical state
 let client =
 MockEthProvider::<ScrollPrimitives, _>::new().with_chain_spec(SCROLL_DEV.clone());
 let hash = B256::random();
 client.add_header(hash, Header::default());
 client.add_block(hash, ScrollBlock::default());
 // Balance covers L2_cost + 1*L1_cost but NOT L2_cost + 2*L1_cost
 // With u32::MAX storage values, L1 cost is ~483 Twei.
 // max L2_cost = 55,000 * 7 = 385,000 Wei.
 client.add_account(signer, ExtendedAccount::new(0, balance));
 client.add_account(
 L1_GAS_PRICE_ORACLE_ADDRESS,
 ExtendedAccount::new(0, U256::ZERO).extend_storage(
 (0u8..8).map(|k| (B256::from(U256::from(k)), U256::from(u32::MAX))),
 ),
 );

 // Helper to create a transaction with identical parameters
 let tx = ScrollTxEnvelope::Legacy(Signed::new_unchecked(
 TxLegacy { gas_limit, gas_price, input: tx_input.clone(), ..Default::default() },
 Signature::new(U256::ZERO, U256::ZERO, false),
 Default::default(),
 ));
 let tx = ScrollPooledTransaction::new(Recovered::new_unchecked(tx, signer), 200);

 let handle = tokio::runtime::Handle::current();
 let manager = TaskManager::new(handle);

 // Test 1: With L1 data fee buffer ENABLED - should reject (requires 2x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client.clone())
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(true)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let err = pool.add_transaction(TransactionOrigin::Local, tx.clone()).await.unwrap_err();
 assert!(matches!(
 err.kind,
 PoolErrorKind::InvalidTransaction(
 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
 ) if *expected == GotExpected{ got: balance, expected: U256::from(967347259159872u64) }
 ));

 // Test 2: With L1 data fee buffer DISABLED - should accept (only requires 1x L1 cost)
 let validator = TransactionValidationTaskExecutor::eth_builder(client)
 .no_eip4844()
 .build_with_tasks(manager.executor(), NoopBlobStore::default())
 .map(|validator| {
 ScrollTransactionValidator::new(validator)
 .require_l1_data_gas_fee(true)
 .require_l1_data_fee_buffer(false)
 });

 let pool = ScrollTransactionPool::new(
 validator,
 CoinbaseTipOrdering::<ScrollPooledTransaction>::default(),
 NoopBlobStore::default(),
 PoolConfig::default(),
 );

 let result = pool.add_transaction(TransactionOrigin::Local, tx).await;
 assert!(
 result.is_ok(),
 "Expected transaction to be accepted without buffer, got: {result:?}"
 );

 drop(manager);
 }
}

2 changes: 1 addition & 1 deletion
crates/scroll/openvm-compat/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }

[patch.crates-io]
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91.1" }

1 change: 1 addition & 0 deletions
crates/scroll/txpool/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,3 +45,4 @@ tracing.workspace = true
[dev-dependencies]
reth-scroll-chainspec.workspace = true
reth-provider = { workspace = true, features = ["test-utils"] }
scroll-alloy-evm.workspace = true
Loading
Loading