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
212 changes: 106 additions & 106 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.7.0", default-features = false }
reth-zstd-compressors = { version = "0.7.0", default-features = false }

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

# ==================== REVM (latest: op-reth versions) ====================
revm = { version = "43.0.2", default-features = false }
Expand Down
38 changes: 37 additions & 1 deletion rust/UPDATING-RETH.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,48 @@ git tag -a op-v<version>-<n> <reth-sha> -m "..."
git push git@github.com:ethereum-optimism/reth.git op-v<version>-<n>
```

Tags are immutable, so a tag pin is as reproducible as a rev pin.
Tags are immutable, so a tag pin is as reproducible as a rev pin. The org's
tag ruleset also forbids deleting or re-annotating one, so a tag on the wrong
commit stays forever with its misleading annotation (`op-v2.6.0-3` is one).
Tag only after the PR that carries the change is merged, and take the commit
from the PR, never from the branch tip:

```bash
gh pr view <pr> --repo ethereum-optimism/reth --json state,mergeCommit \
--jq '"\(.state) \(.mergeCommit.oid)"'
```

Before pushing, compare the commit's subject with the annotation you wrote.
Do not chain the tag push after a merge command in one script: a failed merge
must stop the script, not leave the tag pointing at the old tip.

Always use the full 40-character commit id, in `rev = "..."` pins, in
`git tag -a`, and in `gh` flags such as `--match-head-commit`, which rejects
abbreviated ids.

**Maintain** the branch until the next update: later backports to the same base
are PRs into it, tagged when the monorepo pins them. Keep old branches as a
historical record.

### Carried patches

Patches the current branch carries beyond upstream, and what to do with each
on the next base:

- **RPC replay through the block executor** (ethereum-optimism/reth#37, a
backport of paradigmxyz/reth#28266). Op-reth's SDM refund settlement is only
visible to `debug_*`, `trace_*` and `ots_*` replays through it, and
`rust/op-reth/crates/node/tests/it/rpc_replay_settlement/` fails without
it. On a base that still uses alloy-evm 0.39 (`v2.7.0` through `v2.8.1`),
cherry-pick the backport and resolve conflicts in `helpers/call.rs`,
`helpers/trace.rs` and `rpc/src/debug.rs`. On an evm2 base (`v2.9.0` and
later), drop the backport and cherry-pick #28266 itself until a release
contains it; there, upstream's `inspect_transaction_without_commit` installs
the tracer through the EVM's inspector slot, which op-reth's
`PostExecCompositeInspector` occupies, so `OpBlockExecutor` needs an override
or composition for it. Upstream's BAL branch skips per-transaction
settlement; op-reth rejects computed BALs, keep that invariant under test.

### Pinning a fork change

This applies to any monorepo PR that needs a fork change, in a reth update or
Expand Down
15 changes: 10 additions & 5 deletions rust/alloy-op-evm/src/block/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,21 @@ struct JovianExecutorFixture {
beneficiary: Address,
}

/// Mainnet's schedule with Jovian moved to `jovian_timestamp`.
fn jovian_hardforks(jovian_timestamp: u64) -> OpChainHardforks {
OpChainHardforks::new(
OpHardfork::op_mainnet()
.into_iter()
.chain([(OpHardfork::Jovian, ForkCondition::Timestamp(jovian_timestamp))]),
)
}

impl JovianExecutorFixture {
fn new(da_footprint_gas_scalar: u16, gas_limit: u64, jovian_timestamp: u64) -> Self {
Self {
db: prepare_jovian_db(da_footprint_gas_scalar),
receipt_builder: OpAlloyReceiptBuilder::default(),
op_chain_hardforks: OpChainHardforks::new(
OpHardfork::op_mainnet()
.into_iter()
.chain(vec![(OpHardfork::Jovian, ForkCondition::Timestamp(jovian_timestamp))]),
),
op_chain_hardforks: jovian_hardforks(jovian_timestamp),
gas_limit,
jovian_timestamp,
// These Jovian execution tests run normal (non-activation) blocks; leaving the parent
Expand Down
Loading
Loading