Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 144 additions & 141 deletions Cargo.lock

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,7 @@ strip = "none"
alloy-chains = { version = "0.2.5", default-features = false }
alloy-consensus = { version = "1.0.37", default-features = false }
alloy-eips = { version = "1.0.37", default-features = false }
alloy-genesis = { version = "1.0.37", default-features = false }
alloy-json-rpc = { version = "1.0.37", default-features = false }
alloy-network = { version = "1.0.37", default-features = false }
alloy-primitives = { version = "1.4.1", default-features = false }
Expand All@@ -140,59 +141,59 @@ alloy-signer-local = { version = "1.0.37", default-features = false }
alloy-transport = { version = "1.0.37", default-features = false }

# scroll-alloy
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7" }
reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# reth-scroll
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.5", default-features = false }
reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }
reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.7", default-features = false }

# rollup node
rollup-node = { path = "crates/node" }
Expand DownExpand Up@@ -239,8 +240,8 @@ tracing = "0.1.0"
getrandom = { version = "0.2", features = ["js"] }

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

# [patch."https://github.com/scroll-tech/reth.git"]
# reth-chainspec = { path = "../reth/crates/chainspec" }
Expand Down
2 changes: 2 additions & 0 deletions crates/node/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,8 @@ http-body-util = "0.1"

[dev-dependencies]
alloy-chains.workspace = true
alloy-consensus.workspace = true
alloy-genesis.workspace = true
alloy-eips.workspace = true
futures.workspace = true
reth-e2e-test-utils.workspace = true
Expand Down
13 changes: 13 additions & 0 deletions crates/node/src/args.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,13 @@ pub struct ScrollRollupNodeConfig {
/// The database connection (not parsed via CLI but hydrated after validation).
#[arg(skip)]
pub database: Option<Arc<Database>>,
/// Require an additional L1 data fee buffer in the account balance checks for transactions.
#[arg(
long = "require-l1-data-fee-buffer",
value_name = "REQUIRE_L1_DATA_FEE_BUFFER",
default_value = "false"
)]
pub require_l1_data_fee_buffer: bool,
}

impl ScrollRollupNodeConfig {
Expand DownExpand Up@@ -1047,6 +1054,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1078,6 +1086,7 @@ mod tests {
url: None,
poll_interval_ms: 100,
},
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1112,6 +1121,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

let result = config.validate();
Expand DownExpand Up@@ -1141,6 +1151,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand DownExpand Up@@ -1168,6 +1179,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand All@@ -1191,6 +1203,7 @@ mod tests {
rpc_args: RpcArgs::default(),
pprof_args: PprofArgs::default(),
remote_block_source_args: RemoteBlockSourceArgs::default(),
require_l1_data_fee_buffer: false,
};

assert!(config.validate().is_ok());
Expand Down
7 changes: 7 additions & 0 deletions crates/node/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,14 @@ fn main() {
if let Err(err) = Cli::<ScrollChainSpecParser, ScrollRollupNodeConfig>::parse().run(
|builder, args| async move {
info!(target: "reth::cli", "Launching node");

// Modify the chain spec based on the CLI args.
let config = builder.config().clone();
let mut chain_spec = (*config.chain).clone();
chain_spec.config.l1_data_fee_buffer_check = args.require_l1_data_fee_buffer;
let config = config.with_chain(chain_spec);

// Launch the node.
let handle = builder
.node(ScrollRollupNode::new(args, config).await)
.launch_with_fn(|builder| {
Expand Down
19 changes: 14 additions & 5 deletions crates/node/src/test_utils/fixture.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ use crate::{
};

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::Address;
use alloy_primitives::{Address, B256};
use alloy_rpc_types_eth::Block;
use alloy_signer_local::PrivateKeySigner;
use reth_chainspec::EthChainSpec;
Expand DownExpand Up@@ -171,9 +171,8 @@ impl TestFixture {
&mut self,
node_index: usize,
tx: impl Into<alloy_primitives::Bytes>,
) -> eyre::Result<()> {
self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?;
Ok(())
) -> eyre::Result<B256> {
Ok(self.nodes[node_index].node.rpc.inject_tx(tx.into()).await?)
}

/// Get the current (latest) block from a specific node.
Expand DownExpand Up@@ -216,7 +215,7 @@ impl TestFixture {
}

/// Builder for creating test fixtures with a fluent API.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct TestFixtureBuilder {
config: ScrollRollupNodeConfig,
num_nodes: usize,
Expand DownExpand Up@@ -270,6 +269,7 @@ impl TestFixtureBuilder {
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -444,6 +444,15 @@ impl TestFixtureBuilder {
&mut self.config
}

/// Modify the underlying config using a closure.
pub fn config<F>(mut self, f: F) -> Self
where
F: FnOnce(&mut ScrollRollupNodeConfig),
{
f(&mut self.config);
self
}

/// Build the test fixture.
pub async fn build(self) -> eyre::Result<TestFixture> {
let config = self.config;
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/test_utils/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,9 @@ where

// Create nodes and peer them
let mut nodes: Vec<NodeTestContext<_, _>> = Vec::with_capacity(num_nodes);

let mut chain_spec = Arc::unwrap_or_clone(chain_spec);
chain_spec.config.l1_data_fee_buffer_check = scroll_node_config.require_l1_data_fee_buffer;
let chain_spec = Arc::new(chain_spec);
for idx in 0..num_nodes {
// disable sequencer nodes after the first one
if idx != 0 {
Expand DownExpand Up@@ -243,6 +245,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
pprof_args: PprofArgs::default(),
remote_block_source_args: Default::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}

Expand DownExpand Up@@ -285,5 +288,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
remote_block_source_args: Default::default(),
pprof_args: PprofArgs::default(),
rpc_args: RpcArgs { basic_enabled: true, admin_enabled: true },
require_l1_data_fee_buffer: false,
}
}
1 change: 1 addition & 0 deletions crates/node/tests/e2e.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1610,6 +1610,7 @@ async fn test_custom_genesis_block_production_and_propagation() -> eyre::Result<
"scroll": {
"feeVaultAddress": "0x5300000000000000000000000000000000000005",
"maxTxPayloadBytesPerBlock": 122880,
"l1DataFeeBufferCheck": false,
"l1Config": {
"l1ChainId": 1,
"l1MessageQueueAddress": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
Expand Down
Loading
Loading