forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-24 23:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: apply change

Browse source
This commit is contained in:
Gary Rong 2026-06-24 17:41:27 +08:00 committed by MariusVanDerWijden
parent 0c92e31779
commit c5e22b6124
No known key found for this signature in database
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/eip2780_test.go
View file

@ -17,7 +17,6 @@
package core
import (
"errors"
"math/big"
"testing"
@ -192,15 +191,22 @@ func TestEIP2780NewAccountFunded(t *testing.T) {
}
// TestEIP2780InsufficientGasForCallCharge verifies that a value transfer
// creating a new account is rejected when the gas limit only covers the 21,000
// intrinsic base and not the additional new-account state gas charged before the
// call executes.
// creating a new account, whose gas limit only covers the 21,000 intrinsic base
// and not the additional new-account state gas charged before the call executes,
// halts out of gas. The transaction stays valid (no consensus error) but
// execution fails and the recipient is not created.
func TestEIP2780InsufficientGasForCallCharge(t *testing.T) {
fresh := common.HexToAddress("0xbeef000000000000000000000000000000000003")
sdb := mkState(senderAlloc(nil))
_, _, err := applyMsg(t, sdb, callTx(0, fresh, 1, 21_000, nil))
if !errors.Is(err, ErrEIP2780CallRecipientCharge) {
t.Fatalf("expected ErrEIP2780CallRecipientCharge, got %v", err)
res, _, err := applyMsg(t, sdb, callTx(0, fresh, 1, 21_000, nil))
if err != nil {
t.Fatalf("transaction should remain valid: %v", err)
}
if res.Err != vm.ErrOutOfGas {
t.Fatalf("expected out of gas, got %v", res.Err)
}
if res.UsedGas != 21_000 {
t.Fatalf("expected used gas, got %v", res.UsedGas)
}
if sdb.Exist(fresh) {
t.Fatal("recipient should not be created when the call charge cannot be paid")

4
core/error.go
View file

@ -81,10 +81,6 @@ var (
// than required for the data floor cost.
ErrFloorDataGas = errors.New("insufficient gas for floor data gas cost")
// ErrEIP2780CallRecipientCharge is returned if the transaction doesn't have
// sufficient gas to cover the cost of EIP-2780 call charge.
ErrEIP2780CallRecipientCharge = errors.New("insufficient gas for EIP-2780 call recipient charge")
// ErrTxTypeNotSupported is returned if a transaction is not supported in the
// current network configuration.
ErrTxTypeNotSupported = types.ErrTxTypeNotSupported

13
core/state_transition.go
View file

@ -746,13 +746,16 @@ func (st *stateTransition) execute() (*ExecutionResult, error) {
if addr, ok := types.ParseDelegation(st.state.GetCode(*msg.To)); ok {
st.state.AddAddressToAccessList(addr)
}
// EIP-2780: charge the transaction's top-level recipient costs.
// EIP-2780: charge the transaction's top-level recipient costs. If the
// budget cannot cover the charge, the top frame halts out of gas.
if rules.IsAmsterdam && !st.chargeCallRecipientEIP2780(value) {
return nil, fmt.Errorf("%w: address %v", ErrEIP2780CallRecipientCharge, msg.To.Hex())
vmerr = vm.ErrOutOfGas
st.gasRemaining = st.gasRemaining.ExitHalt()
} else {
// Execute the transaction's call.
ret, result, vmerr = st.evm.Call(msg.From, st.to(), msg.Data, st.gasRemaining.ForwardAll(), value)
st.gasRemaining.Absorb(result)
}
// Execute the transaction's call.
ret, result, vmerr = st.evm.Call(msg.From, st.to(), msg.Data, st.gasRemaining.ForwardAll(), value)
st.gasRemaining.Absorb(result)
}
// EIP-8037 (fork.py:1086): on any transaction error, the state gas