forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 13:16:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/vm: implement 7904 repricings for basic opcodes

Browse source
This commit is contained in:
Marius van der Wijden 2025-09-20 11:09:03 +02:00
parent 5143a438f7
commit 7949a928e9
4 changed files with 98 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
core/vm/eips.go
View file

@ -41,6 +41,7 @@ var activators = map[int]func(*JumpTable){
1153: enable1153, 1153: enable1153,
4762: enable4762, 4762: enable4762,
7702: enable7702, 7702: enable7702,
7904: enable7904,
7939: enable7939, 7939: enable7939,
} }
@ -556,3 +557,80 @@ func enable7702(jt *JumpTable) {
jt[STATICCALL].dynamicGas = gasStaticCallEIP7702 jt[STATICCALL].dynamicGas = gasStaticCallEIP7702
jt[DELEGATECALL].dynamicGas = gasDelegateCallEIP7702 jt[DELEGATECALL].dynamicGas = gasDelegateCallEIP7702
} }
// enable7904 enables the EIP-7907 gas cost changes.
func enable7904(jt *JumpTable) {
jt[ADD].constantGas = GasBaseCost
jt[MUL].constantGas = GasBaseCost
jt[SUB].constantGas = GasBaseCost
jt[DIV].constantGas = GasBaseCost
jt[SDIV].constantGas = GasBaseCost
jt[MOD].constantGas = GasBaseCost
jt[SMOD].constantGas = GasBaseCost
jt[ADDMOD].constantGas = GasFastCost
jt[MULMOD].constantGas = GasMidCost
//jt[EXP].constantGas = GasMidCost
jt[SIGNEXTEND].constantGas = GasBaseCost
jt[LT].constantGas = GasBaseCost
jt[GT].constantGas = GasBaseCost
jt[SLT].constantGas = GasBaseCost
jt[SGT].constantGas = GasBaseCost
jt[EQ].constantGas = GasBaseCost
jt[ISZERO].constantGas = GasBaseCost
jt[AND].constantGas = GasBaseCost
jt[OR].constantGas = GasBaseCost
jt[XOR].constantGas = GasBaseCost
jt[NOT].constantGas = GasBaseCost
jt[BYTE].constantGas = GasBaseCost
jt[SHL].constantGas = GasBaseCost
jt[SHR].constantGas = GasBaseCost
jt[SAR].constantGas = GasBaseCost
jt[ADDRESS].constantGas = GasBaseCost
//jt[BALANCE].constantGas = GasBaseCost
jt[ORIGIN].constantGas = GasBaseCost
jt[CALLER].constantGas = GasBaseCost
jt[CALLVALUE].constantGas = GasBaseCost
jt[CALLDATALOAD].constantGas = GasBaseCost
jt[CALLDATASIZE].constantGas = GasBaseCost
//jt[CALLDATACOPY].constantGas = GasBaseCost
jt[CODESIZE].constantGas = GasBaseCost
//jt[CODECOPY].constantGas = GasBaseCost
jt[GASPRICE].constantGas = GasBaseCost
//jt[EXTCODESIZE].constantGas = GasBaseCost
//jt[EXTCODECOPY].constantGas = GasBaseCost
jt[RETURNDATASIZE].constantGas = GasBaseCost
//jt[RETURNDATACOPY].constantGas = GasBaseCost
//jt[EXTCODEHASH].constantGas = GasBaseCost
jt[COINBASE].constantGas = GasBaseCost
jt[TIMESTAMP].constantGas = GasBaseCost
jt[NUMBER].constantGas = GasBaseCost
jt[GASLIMIT].constantGas = GasBaseCost
jt[CHAINID].constantGas = GasBaseCost
jt[SELFBALANCE].constantGas = GasBaseCost
jt[POP].constantGas = GasBaseCost
jt[MLOAD].constantGas = GasBaseCost
//jt[MSTORE].constantGas = GasBaseCost
//jt[MSTORE8].constantGas = GasBaseCost
jt[JUMP].constantGas = GasBaseCost
jt[JUMPI].constantGas = GasBaseCost
jt[PC].constantGas = GasBaseCost
jt[MSIZE].constantGas = GasBaseCost
jt[TLOAD].constantGas = GasWarmStorageCost
jt[TSTORE].constantGas = GasWarmStorageCost
jt[JUMPDEST].constantGas = GasBaseCost
//jt[MCOPY].constantGas = GasBaseCost
jt[PUSH0].constantGas = GasBaseCost
for i := PUSH1; i < PUSH32; i++ {
jt[i].constantGas = GasBaseCost
}
for i := PUSH1; i < PUSH32; i++ {
jt[i].constantGas = GasBaseCost
}
for i := DUP1; i < DUP16; i++ {
jt[i].constantGas = GasBaseCost
}
for i := SWAP1; i < SWAP16; i++ {
jt[i].constantGas = GasBaseCost
}
}

2
core/vm/evm.go
View file

@ -149,6 +149,8 @@ func NewEVM(blockCtx BlockContext, statedb StateDB, chainConfig *params.ChainCon
evm.precompiles = activePrecompiledContracts(evm.chainRules) evm.precompiles = activePrecompiledContracts(evm.chainRules)
switch { switch {
case evm.chainRules.IsAmsterdam:
evm.table = &amsterdamInstructionSet
case evm.chainRules.IsOsaka: case evm.chainRules.IsOsaka:
evm.table = &osakaInstructionSet evm.table = &osakaInstructionSet
case evm.chainRules.IsVerkle: case evm.chainRules.IsVerkle:

4
core/vm/gas.go
View file

@ -29,6 +29,10 @@ const (
GasMidStep uint64 = 8 GasMidStep uint64 = 8
GasSlowStep uint64 = 10 GasSlowStep uint64 = 10
GasExtStep uint64 = 20 GasExtStep uint64 = 20
GasBaseCost uint64 = 1
GasFastCost uint64 = 2
GasMidCost uint64 = 3
GasWarmStorageCost uint64 = 5
) )
// callGas returns the actual gas cost of the call. // callGas returns the actual gas cost of the call.

7
core/vm/jump_table.go
View file

@ -63,6 +63,7 @@ var (
verkleInstructionSet = newVerkleInstructionSet() verkleInstructionSet = newVerkleInstructionSet()
pragueInstructionSet = newPragueInstructionSet() pragueInstructionSet = newPragueInstructionSet()
osakaInstructionSet = newOsakaInstructionSet() osakaInstructionSet = newOsakaInstructionSet()
amsterdamInstructionSet = newAmsterdamInstructionSet()
) )
// JumpTable contains the EVM opcodes supported at a given fork. // JumpTable contains the EVM opcodes supported at a given fork.
@ -92,6 +93,12 @@ func newVerkleInstructionSet() JumpTable {
return validate(instructionSet) return validate(instructionSet)
} }
func newAmsterdamInstructionSet() JumpTable {
instructionSet := newOsakaInstructionSet()
enable7904(&instructionSet) // EIP-7904 (gas repricings)
return validate(instructionSet)
}
func newOsakaInstructionSet() JumpTable { func newOsakaInstructionSet() JumpTable {
instructionSet := newPragueInstructionSet() instructionSet := newPragueInstructionSet()
enable7939(&instructionSet) // EIP-7939 (CLZ opcode) enable7939(&instructionSet) // EIP-7939 (CLZ opcode)