core, params: rename RegularPerAuthBaseCost to ExecutionPerAuthBaseCost (#35486)
Some checks are pending
/ Linux Build (push) Waiting to run
/ Linux Build (arm) (push) Waiting to run
/ Keeper Build (push) Waiting to run
/ Windows Build (push) Waiting to run
/ Docker Image (push) Waiting to run

Completes the regular → execution gas rename from #35457. The constant
now matches the EIP-8037 spec name `EXECUTION_PER_AUTH_BASE_COST`.

Pure mechanical rename, no value change.
This commit is contained in:
0xSHKWON 2026-08-09 22:50:43 +09:00 committed by GitHub
parent cae76d5a3c
commit 219d2f22a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions

View file

@ -95,7 +95,7 @@ func TestEIP2780Intrinsic(t *testing.T) {
// Each authorization adds the state-independent per-auth base // Each authorization adds the state-independent per-auth base
// (cold authority access included). // (cold authority access included).
want: params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam + want: params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam +
params.TxValueCost2780 + 3*params.RegularPerAuthBaseCost, params.TxValueCost2780 + 3*params.ExecutionPerAuthBaseCost,
}, },
} }
for _, tc := range cases { for _, tc := range cases {
@ -404,7 +404,7 @@ func TestEIP2780RecipientOOG(t *testing.T) {
auth, authority := signAuth(t, authKeyA, delegate8037, 0) auth, authority := signAuth(t, authKeyA, delegate8037, 0)
recipient := common.HexToAddress("0xbeef000000000000000000000000000000000004") recipient := common.HexToAddress("0xbeef000000000000000000000000000000000004")
intrinsic := params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam + intrinsic := params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam +
params.TxValueCost2780 + params.RegularPerAuthBaseCost params.TxValueCost2780 + params.ExecutionPerAuthBaseCost
// The reservoir case needs a near-cap intrinsic cost. This leaves just // The reservoir case needs a near-cap intrinsic cost. This leaves just
// enough total budget for the authorization but not for the recipient leaf. // enough total budget for the authorization but not for the recipient leaf.
const ( const (
@ -667,7 +667,7 @@ func TestEIP2780InstallDispatch(t *testing.T) {
const ( const (
base = params.TxBaseCost2780 base = params.TxBaseCost2780
cold = params.ColdAccountAccessAmsterdam cold = params.ColdAccountAccessAmsterdam
perAuth = params.RegularPerAuthBaseCost perAuth = params.ExecutionPerAuthBaseCost
valueCst = params.TxValueCost2780 valueCst = params.TxValueCost2780
) )
auth, authority := signAuth(t, authKeyA, delegate8037, 0) auth, authority := signAuth(t, authKeyA, delegate8037, 0)
@ -977,7 +977,7 @@ func TestEIP2780AuthorityAccountWrite(t *testing.T) {
base = params.TxBaseCost2780 base = params.TxBaseCost2780
cold = params.ColdAccountAccessAmsterdam cold = params.ColdAccountAccessAmsterdam
aw = params.AccountWriteAmsterdam aw = params.AccountWriteAmsterdam
perAuth = params.RegularPerAuthBaseCost perAuth = params.ExecutionPerAuthBaseCost
valueCst = params.TxValueCost2780 valueCst = params.TxValueCost2780
) )
existingEOA := common.HexToAddress("0xe0a0000000000000000000000000000000000002") existingEOA := common.HexToAddress("0xe0a0000000000000000000000000000000000002")
@ -1115,7 +1115,7 @@ func TestEIP2780DelegationTargetPrewarmed(t *testing.T) {
cold = params.ColdAccountAccessAmsterdam cold = params.ColdAccountAccessAmsterdam
warm = params.WarmAccountAccessAmsterdam warm = params.WarmAccountAccessAmsterdam
aw = params.AccountWriteAmsterdam aw = params.AccountWriteAmsterdam
perAuth = params.RegularPerAuthBaseCost perAuth = params.ExecutionPerAuthBaseCost
) )
delegatedAcct := common.HexToAddress("0xde1e000000000000000000000000000000000002") delegatedAcct := common.HexToAddress("0xde1e000000000000000000000000000000000002")

View file

@ -809,9 +809,9 @@ func TestAuthIntrinsicBaseOnly(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
// The recipient touch and the per-authorization authority access (priced // The recipient touch and the per-authorization authority access (priced
// into RegularPerAuthBaseCost) are both charged at the cold rate // into ExecutionPerAuthBaseCost) are both charged at the cold rate
// unconditionally at the intrinsic phase (EIP-2780). // unconditionally at the intrinsic phase (EIP-2780).
want := params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam + params.RegularPerAuthBaseCost want := params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam + params.ExecutionPerAuthBaseCost
if cost != want { if cost != want {
t.Fatalf("intrinsic gas = %d, want %d", cost, want) t.Fatalf("intrinsic gas = %d, want %d", cost, want)
} }

View file

@ -84,7 +84,7 @@ func IntrinsicGas(data []byte, accessList types.AccessList, authList []types.Set
// Add gas for authorizations // Add gas for authorizations
if authList != nil { if authList != nil {
if rules.IsAmsterdam { if rules.IsAmsterdam {
gas += uint64(len(authList)) * params.RegularPerAuthBaseCost gas += uint64(len(authList)) * params.ExecutionPerAuthBaseCost
} else { } else {
gas += uint64(len(authList)) * params.CallNewAccountGas gas += uint64(len(authList)) * params.CallNewAccountGas
} }

View file

@ -307,14 +307,14 @@ func TestIntrinsicGas(t *testing.T) {
isEIP2028: true, isEIP2028: true,
isAmsterdam: true, isAmsterdam: true,
// EIP-2780: the recipient touch and the per-authorization authority // EIP-2780: the recipient touch and the per-authorization authority
// access (priced into RegularPerAuthBaseCost) are both charged at the // access (priced into ExecutionPerAuthBaseCost) are both charged at the
// cold rate unconditionally at the intrinsic phase; the account leaf // cold rate unconditionally at the intrinsic phase; the account leaf
// and indicator bytes are charged at runtime. // and indicator bytes are charged at runtime.
want: params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam + want: params.TxBaseCost2780 + params.ColdAccountAccessAmsterdam +
100*params.TxDataNonZeroGasEIP2028 + 100*params.TxDataNonZeroGasEIP2028 +
1*params.TxAccessListAddressGasAmsterdam + 1*params.TxAccessListStorageKeyGasAmsterdam + 1*params.TxAccessListAddressGasAmsterdam + 1*params.TxAccessListStorageKeyGasAmsterdam +
1*amsterdamAddressCost + 1*amsterdamStorageKeyCost + 1*amsterdamAddressCost + 1*amsterdamStorageKeyCost +
1*params.RegularPerAuthBaseCost, 1*params.ExecutionPerAuthBaseCost,
}, },
{ {
name: "amsterdam/value-transfer-call", name: "amsterdam/value-transfer-call",

View file

@ -97,14 +97,14 @@ const (
TxAccessListStorageKeyGas uint64 = 1900 // Per storage key specified in EIP 2930 access list TxAccessListStorageKeyGas uint64 = 1900 // Per storage key specified in EIP 2930 access list
TxAuthTupleGas uint64 = 12500 // Per auth tuple code specified in EIP-7702 TxAuthTupleGas uint64 = 12500 // Per auth tuple code specified in EIP-7702
// RegularPerAuthBaseCost is the state-independent per-authorization floor, // ExecutionPerAuthBaseCost is the state-independent per-authorization floor,
// defined in EIP-8037 as the sum of: // defined in EIP-8037 as the sum of:
// //
// - Calldata cost for the authorization tuple // - Calldata cost for the authorization tuple
// - ECDSA recovery of the authority address // - ECDSA recovery of the authority address
// - Cold authority access (COLD_ACCOUNT_ACCESS) // - Cold authority access (COLD_ACCOUNT_ACCESS)
// - Warm writes to the authority account // - Warm writes to the authority account
RegularPerAuthBaseCost uint64 = 7816 ExecutionPerAuthBaseCost uint64 = 7816
// EIP-2780: resource-based intrinsic transaction gas. // EIP-2780: resource-based intrinsic transaction gas.
TxBaseCost2780 uint64 = 12000 TxBaseCost2780 uint64 = 12000