mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-03-10 05:09:03 +00:00
6489aab697
## Summary Two EIP-8037 state gas accounting fixes: 1. **CALL state gas ordering** — Charge new-account state gas (112 × cpsb = 131,488) **before** the 63/64 child gas allocation, not after 2. **Code-store OOG underflow** — Do not inflate `TotalStateGasCharged` when `UseGas` fails for code deposit, preventing uint64 underflow in `blockGasUsed()` ## Bug 1: CALL state gas ordering (`operations_acl.go`) In `makeCallVariantGasCall`, the EIP-8037 state gas for new account creation was returned in the `GasCosts` struct and charged by the interpreter's `UseGas`/`Sub` **after** `callGas()` had already computed the 63/64 child gas allocation using the full (pre-state-gas) `contract.Gas.RegularGas`. When the state gas reservoir is empty (common case — reservoir only has gas when `tx.gasLimit` exceeds `TX_MAX_GAS_LIMIT - intrinsic`), state gas spills to regular gas. The spill amount (131,488) far exceeds the 1/64 retained gas (~15,600 at 1M gas), causing an underflow/OOG on CALLs that should succeed. **Fix:** Charge state gas directly before `callGas()` so the 63/64 calculation uses the reduced regular gas, then return `StateGas: 0` to avoid double-charging. This matches nethermind's implementation (`EvmInstructions.Call.cs:187-213`) and besu's approach. **Spec basis:** EIP-8037 says "State gas charges deduct from `state_gas_reservoir` first; when the reservoir is exhausted, from `gas_left`." The 63/64 rule applies to `gas_left`, so state gas spillover into `gas_left` must happen before the 63/64 computation. ## Bug 2: Code-store OOG underflow (`evm.go`) In `initNewContract`, when `UseGas` fails for code deposit (code-store OOG on valid code), the upstream code at `evm.go:666-672` added `createDataGas.StateGas` to `TotalStateGasCharged` without actually consuming any gas. For a 14KB init code output, this adds ~17.3M phantom state gas to TSC. This inflated TSC propagates through `blockGasUsed()`: ``` execRegularUsed := totalExecUsed - execStateUsed // uint64 underflow when TSC > totalExecUsed ``` The underflow produces a massive `txRegular` value, causing `ReturnGasAmsterdam` to reject the block with `gas limit reached`. **Fix:** Remove the TSC inflation on `UseGas` failure (lines 666-672). Also remove `ErrCodeStoreOutOfGas` from the `isCodeValidation` condition (line 621-623), so code-store OOG follows the normal exceptional halt path: all regular gas consumed, state gas reverted via `RevertStateGas()`. **Spec basis:** EIP-8037 §"Contract deployment cost calculation" explicitly lists code-store OOG as a failure path: > **Failure paths** (REVERT, OOG/invalid during initcode, **OOG during code deposit**, or `L > MAX_CODE_SIZE`): Do NOT charge `GAS_CODE_DEPOSIT * L` or `HASH_COST(L)` And §"Transaction-level gas accounting": > On child **exceptional halt**, all state gas consumed by the child, both from the reservoir and any that spilled into `gas_left`, is restored to the parent's reservoir. ## Test plan - [x] geth+besu: 161 blocks (5+ epochs) with heavy spamoor load (eoatx 50 + evm-fuzz 25 + tx-fuzz 15), zero errors - [x] Without Bug 2 fix: geth+besu chain-split at block ~30 under load — `blockGasUsed` uint64 underflow - [x] geth+nethermind: 86+ blocks no-load, 162 blocks eoatx load (nethermind has separate BAL validation bug under fuzz) - [x] geth+nimbus: 150+ blocks evm-fuzz with nimbus CALL fix applied — gasUsed matches - [x] Verified cross-client: nethermind and besu both charge CALL state gas before 63/64 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| program | ||
| runtime | ||
| testdata | ||
| analysis_legacy.go | ||
| analysis_legacy_test.go | ||
| common.go | ||
| contract.go | ||
| contracts.go | ||
| contracts_fuzz_test.go | ||
| contracts_test.go | ||
| doc.go | ||
| eips.go | ||
| errors.go | ||
| evm.go | ||
| gas.go | ||
| gas_table.go | ||
| gas_table_test.go | ||
| gascosts.go | ||
| instructions.go | ||
| instructions_test.go | ||
| interface.go | ||
| interpreter.go | ||
| interpreter_test.go | ||
| jump_table.go | ||
| jump_table_export.go | ||
| jump_table_test.go | ||
| jumpdests.go | ||
| memory.go | ||
| memory_table.go | ||
| memory_test.go | ||
| opcodes.go | ||
| operations_acl.go | ||
| operations_verkle.go | ||
| stack.go | ||
| stack_table.go | ||