[isaacdoidge]

Tracking issue: Entropy-Foundation/smr-moonshot#4046.

Merges upstream revm v120 (revm 43.0.3) into feature/revm-43-sync and ports the fork's changes to the upstream API. The spec stays OSAKA.

Merge this PR with "Create a merge commit". Squash or rebase merging drops the merge commit's v120 parent, and the branch would no longer contain upstream's history.

feature/revm-43-sync was cut from feature/evm_automation at 271b6a44. Work on feature/evm_automation continues, and later fork PRs are merged into this branch in separate PRs.

Commits

89984467 is the merge commit. It resolves the 36 conflicts only and does not build. Where upstream restructured code that carries Supra behaviour, it takes upstream's code, and the commits after it re-apply the behaviour:

Commit	Change
1452585f	Restores the bincode workspace dependency, which upstream removed and revm-supra-extension uses.
f566f541	is_state_mutating covers upstream's NonceBump and ExtensionChange entries; HaltReason::ReservedAddressTarget gets a Display arm.
69dd25c4	The TX_HASH precompile uses the new precompile function signature.
72b37891	Caller validation and fee deduction follow the execution mode: EIP-3607 only where the mode enforces it, nonce check and bump only where the mode updates the nonce, no fee in a mode that charges no gas. Both auth-list paths skip Supra reserved addresses and the EIP-2935 system address as authorities.
348c6c53	The call frame refuses value transfers to reserved addresses unless a precompile there accepts value, refuses code execution from a reserved address and through a delegation to one, and gives the TX_HASH precompile the transaction hash as input.
b603ab51, 6111bdfb	A mode that charges no gas skips post-execution, in the handler and the inspector handler. Its ResultGas is built from the frame's gas with no EIP-7623 floor, so it reports the gas the execution used, as before the sync.
5a72702d	Ports the fork's tests to the new API; the state-test TxEnv sets tx_hash.
4330bbe2	Moves the fork's alloy, alloy-contract and alloy-serde to 2.x, so one copy of each alloy crate is linked.
10642fce	The multi-transaction create snapshot expects the fork's account status (see below).
99de9839, 02b3beb7, c9d75cb7, f70fd99c, bf2eed9c, f0b8b76b	const fn under upstream's missing_const_for_fn lint, a no_std import, rustfmt, comments and a doc link, the fork's .github configuration.
3cb8aec2	Corrects the comment on the gas result of modes that charge no gas (spent less the uncapped refund, no floor), moves the reserved and system authority skip into one helper, is_refused_authority, and marks is_supra_reserved and is_vm_signer #[inline].

Behaviour now provided by upstream

The fork had its own fixes for these. Upstream has equivalents, and the merge keeps upstream's:

• reverting a code change restores the previous code and code hash (EIP-7702 re-delegation);
• an account loaded from the database carries the current transaction id;
• coinbase, precompile and access-list addresses start each transaction warm;
• a storage slot's original value is re-baselined at each transaction boundary;
• the caller's touch is journaled only when the account is not already touched, and a balance change is journaled only when the balance changes;
• EIP-7702 delegation is journaled through the account handle.

The fork's tests for each of these pass unchanged.

Differences from upstream that are intended

• An account created and self-destructed earlier in the same journal has its self-destruct and created flags cleared when a later transaction loads it (since Entropy-Foundation/smr-moonshot#3113). Upstream's multi_tx_create snapshot expects the flags to remain, so the snapshot carries the fork's expectation, as the JSON fixture it replaces did.
• The self-destruct burn total counts a self-targeted destruction before Amsterdam. From Amsterdam (EIP-8246) a self-targeted destruction keeps its balance, and nothing is counted.
• PrecompileId::mainnet_address, which upstream removed, is not restored. The call frame compares against TX_HASH_ADDRESS.

Upstream changes a consumer of the fork sees

These come from upstream between v29 and v43 and change what smr-moonshot observes at OSAKA. They are handled when smr-moonshot is moved to this branch.

• A transaction that calls a precompile directly (journal depth 1) and halts for a reason other than out-of-gas reports HaltReason::PrecompileErrorWithContext(String) instead of PrecompileError.
• HaltReason gained PrecompileErrorWithContext before NonceOverflow, so the serialized index of every variant from NonceOverflow on, including ReservedAddressTarget, is one higher.
• ExecutionResult::{Success, Revert, Halt} carry gas: ResultGas in place of gas_used/gas_refunded, and Revert and Halt carry the logs emitted before the revert or halt.
• CfgEnv::new_with_spec defaults tx_chain_id_check to true (it was false).
• Handler::post_execution returns the ResultGas, built after the refund and before the EIP-7623 floor check, and execution_result takes it as an argument.

Follow-ups

Raised in review and left out of this PR because they change behaviour or performance beyond the sync, or predate it:

• Entropy-Foundation/smr-moonshot#5002: apply the EIP-7623 floor rule for modes that charge no gas in validation as well as in the result.
• Entropy-Foundation/smr-moonshot#5003: check delegations into the reserved range where the delegation is resolved, not with a lookup on every call frame.
• Entropy-Foundation/smr-moonshot#5004: decide the gas settlement of modes that charge no gas in one place.
• Entropy-Foundation/smr-moonshot#5005: set the spec in the fork's tests through the constructors that also set the gas parameters.

Not adopted

• crates/op-revm is removed, as upstream removed it.
• The fork keeps its own GitHub configuration (bf2eed9c). Upstream's workflow changes, including its third-party actions and its pr-audit and scan-github-actions workflows, are not adopted, and neither is upstream's SECURITY.md, which directs reports to upstream's maintainer. The only change in .github is ci.yml's no_std and feature-check matrices, which follow upstream's feature set (kzg-rs removed, account-ext added).

Verification

All 20 CI checks pass on 3cb8aec2, including clippy, docs, test --all-features, forge-tests, genesis bytecode checks and the ethtests run.

Locally, on f70fd99c with rustc 1.99.1:

• cargo clippy --workspace --all-targets --all-features -- -D warnings and the same without --all-features: clean.
• cargo nextest run --workspace: 667 passed at c9d75cb7. With --all-features: 680 passed at f70fd99c, including gas_floor_is_not_reported_for_modes_that_charge_no_gas, which fails without 6111bdfb.
• cargo check --target riscv32imac-unknown-none-elf --no-default-features, and the same with -p revm-database: pass.
• cargo fmt --all --check: clean.
• ./scripts/run-tests.sh --keep-going cargo ethtests at c9d75cb7 on the main, devnet and legacy fixtures: all state tests pass, and 61,606 blockchain tests pass with 0 failures, including the fork_Osaka variants.

smr-moonshot is not built against this branch yet. That is the next step on Entropy-Foundation/smr-moonshot#4046.

🤖 Generated with Claude Code