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
226 changes: 113 additions & 113 deletions rust/Cargo.lock

Large diffs are not rendered by default.

146 changes: 73 additions & 73 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -364,79 +364,79 @@ reth-rpc-traits = { version = "0.8.1", default-features = false }
reth-zstd-compressors = { version = "0.8.1", default-features = false }

# ==================== RETH CRATES (git) ====================
reth = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-db-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-db-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-engine-tree = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-evm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-exex = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-ipc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-network = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-network-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-node-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-node-core = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-node-events = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-provider = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-prune = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-revm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-rpc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-stages = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-static-file = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-tasks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-tracing = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-trie = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1", default-features = false }
reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-1" }
reth = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-db-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-db-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-engine-tree = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-evm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-exex = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-ipc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-network = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-network-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-node-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-node-core = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-node-events = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-provider = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-prune = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-revm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-rpc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-stages = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-static-file = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-tasks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-tracing = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-trie = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }
reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2", default-features = false }
reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.7.0-2" }

# ==================== REVM (latest: op-reth versions) ====================
revm = { version = "43.0.3", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions rust/RETH-CARRIED-PATCHES.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ change: add a row for each new pick, and drop a row once the pinned base contain
| | paradigmxyz/reth#28403 | v2.11.0 | ethereum-optimism/reth#44 |
| | paradigmxyz/reth#28423 | v2.11.0 | ethereum-optimism/reth#44 |
| | paradigmxyz/reth#28431 | v2.11.0 | ethereum-optimism/reth#44 |
| `--txpool.enforce-tracked-nonce` flag | paradigmxyz/reth#28526 | none yet (2026-11-20) | ethereum-optimism/reth#47 (`op-v2.7.0`) |

Patches without a section are plain `-x` picks from upstream: cherry-pick them onto a new
base that predates their first release.
Expand Down
23 changes: 23 additions & 0 deletions rust/op-reth/crates/cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ mod test {
use crate::{Cli, chainspec::OpChainSpecParser, commands::Commands};
use clap::Parser;
use reth_cli_commands::{NodeCommand, node::NoArgs};
use reth_node_builder::components::PoolBuilderConfigOverrides;
use reth_node_core::cli::config::RethTransactionPoolConfig;
use reth_optimism_chainspec::{OP_DEV, OP_MAINNET};
use reth_optimism_node::args::RollupArgs;

Expand Down Expand Up @@ -382,6 +384,27 @@ mod test {
}
}

/// `--txpool.enforce-tracked-nonce` survives op-reth's CLI parsing and the composition
/// `OpPoolBuilder::build_pool` uses, `pool_config_overrides.apply(ctx.pool_config())`.
#[test]
fn enforce_tracked_nonce_reaches_the_pool_config() {
let final_pool_config = |args: &[&str]| {
let cli = Cli::<RollupArgs>::try_parse_with_denied_args_from(
["op-reth", "node"].iter().chain(args),
)
.unwrap();
let Commands::Node(command) = cli.command else { panic!("unexpected command") };
let overrides =
PoolBuilderConfigOverrides { max_account_slots: Some(1), ..Default::default() };
overrides.apply(command.txpool.pool_config())
};

assert!(!final_pool_config(&[]).enforce_tracked_nonce);
let config = final_pool_config(&["--txpool.enforce-tracked-nonce"]);
assert!(config.enforce_tracked_nonce);
assert_eq!(config.max_account_slots, 1);
}

#[test]
fn parse_dev() {
let cmd = NodeCommand::<OpChainSpecParser, NoArgs>::parse_from(["op-reth", "--dev"]);
Expand Down
1 change: 1 addition & 0 deletions rust/op-reth/crates/cli/tests/snapshots/cli.snap
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ arg: --txpool.lifetime <DURATION> [action: Set] [num-args: 1] [default: 10800] h
arg: --txpool.transactions-backup <PATH> [action: Set] [num-args: 1] [aliases: txpool.journal] help: Path to store the local transaction backup at, to survive node restarts
arg: --txpool.disable-transactions-backup [action: SetTrue] [num-args: 0] [aliases: txpool.disable-journal] [default: false] [conflicts: --txpool.transactions-backup] help: Disables transaction backup to disk on node shutdown
arg: --txpool.max-batch-size <MAX_BATCH_SIZE> [action: Set] [num-args: 1] [default: 1] help: Max batch size for transaction pool insertions
arg: --txpool.enforce-tracked-nonce [action: SetTrue] [num-args: 0] [default: false] help: Reject transactions whose nonce is below the sender nonce tracked from canonical updates
arg: --builder.extradata <EXTRA_DATA> [action: Set] [num-args: 1] [default: <MACHINE_SPECIFIC>] help: Block extra data set by the payload builder
arg: --builder.gaslimit <GAS_LIMIT> [action: Set] [num-args: 1] [aliases: miner.gaslimit] help: Target gas limit for built blocks
arg: --builder.interval <DURATION> [action: Set] [num-args: 1] [default: 1] help: The interval at which the job should build a new payload after the last
Expand Down
6 changes: 3 additions & 3 deletions rust/op-reth/crates/consensus/src/validation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use reth_optimism_forks::OpHardforks;
use reth_optimism_primitives::OpReceipt;
use reth_primitives_traits::{BlockBody, GotExpected, receipt::gas_spent_by_transactions};

/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-1
/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-2
/// `reth_consensus_common::validation::validate_body_against_header`
///
/// Copies the generic body/header checks and replaces withdrawals-root handling after Isthmus.
Expand Down Expand Up @@ -88,7 +88,7 @@ where
Ok(())
}

/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-1
/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-2
/// `reth_ethereum_consensus::validation::validate_block_post_execution`
///
/// Copies upstream post-execution validation with OP receipt roots and Jovian DA accounting.
Expand Down Expand Up @@ -166,7 +166,7 @@ pub fn validate_block_post_execution(
Ok(())
}

/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-1 `reth_ethereum_consensus::validation::verify_receipts`
/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-2 `reth_ethereum_consensus::validation::verify_receipts`
///
/// Copies the upstream helper, substituting OP receipt-root calculation.
/// Verify the calculated receipts root against the expected receipts root.
Expand Down
2 changes: 1 addition & 1 deletion rust/op-reth/crates/evm/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl OpBlockAssembler {
Self { chain_spec }
}

/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-1
/// UPSTREAM-MIRROR(copy): reth@op-v2.7.0-2
/// `reth_evm_ethereum::EthBlockAssembler::assemble_block`
///
/// Copies upstream block assembly with OP receipt roots, withdrawals, and DA fields.
Expand Down
Loading
Loading