forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-08 07:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: misc fixes (claude)

Browse source
This commit is contained in:
MariusVanDerWijden 2026-04-29 23:10:30 +02:00
parent 9d545adcb3
commit 05b7239548
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/state/journal.go
View file

@ -288,16 +288,14 @@ func (j *journal) stateChangedBytes(revid int, stateObjects map[common.Address]*
var totalBytes int64
// Per EIP-8037 spec compute_state_byte_diff: only count +112 for accounts
// that exist at frame exit. Per EIP-161, accounts that end up with
// nonce=0, balance=0, and empty code are considered non-existent and
// pruned — these don't count even though we created the object record
// (e.g. AddBalance(addr, 0) for a zero-value SELFDESTRUCT to a
// non-existent beneficiary).
for addr := range created {
obj := stateObjects[addr]
if obj == nil {
continue
}
if obj.origin != nil {
continue
}
if obj.empty() {
continue
}

18
core/state_transition.go
View file

@ -649,16 +649,20 @@ func (st *stateTransition) execute() (*ExecutionResult, error) {
// EIP-8037: charge state gas for the outer call frame's own state changes.
if rules.IsAmsterdam {
if vmerr == nil {
outerBytes := st.state.StateChangedBytes(outerSnapshot, false)
// For contract-creation txs the intrinsic already paid for the
// account creation; subtract it so we don't double-charge.
// Only contract-creation txs need an outer charge: the intrinsic
// pre-paid for the +112 account creation, but inner evm.Create's
// frame-end excludes it (post-create diff snapshot), so the outer
// charge reconciles. CALL txs don't need any outer charge — the
// inner evm.Call's apply-frame already handles everything via its
// post-value-transfer diff snapshot, matching spec semantics for
// the outermost frame.
if contractCreation {
outerBytes := st.state.StateChangedBytes(outerSnapshot, false)
outerBytes -= int64(params.AccountCreationSize)
alreadyPaid := st.gasRemaining.StateGasUsed
thisCallCost := outerBytes*int64(st.evm.Context.CostPerStateByte) - alreadyPaid
st.gasRemaining.Charge(vm.GasCosts{StateGas: thisCallCost})
}
// EIP-8037 spec: this_call_cost = growth_cost - already_paid.
alreadyPaid := st.gasRemaining.StateGasUsed
thisCallCost := outerBytes*int64(st.evm.Context.CostPerStateByte) - alreadyPaid
st.gasRemaining.Charge(vm.GasCosts{StateGas: thisCallCost})
// EIP-8037 + EIP-6780: refund state gas for accounts created and
// selfdestructed in the same tx. Per spec interpreter.py:200-201,