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

core/vm: fix nitpicks

Browse source
This commit is contained in:
MariusVanDerWijden 2025-06-04 23:23:21 +02:00
parent c49db5aa26
commit 7b6cbde393
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/vm/contracts.go
View file

@ -164,6 +164,7 @@ var PrecompiledContractsOsaka = PrecompiledContracts{
} }
var ( var (
PrecompiledAddressesOsaka []common.Address
PrecompiledAddressesPrague []common.Address PrecompiledAddressesPrague []common.Address
PrecompiledAddressesCancun []common.Address PrecompiledAddressesCancun []common.Address
PrecompiledAddressesBerlin []common.Address PrecompiledAddressesBerlin []common.Address
@ -191,6 +192,9 @@ func init() {
for k := range PrecompiledContractsPrague { for k := range PrecompiledContractsPrague {
PrecompiledAddressesPrague = append(PrecompiledAddressesPrague, k) PrecompiledAddressesPrague = append(PrecompiledAddressesPrague, k)
} }
for k := range PrecompiledContractsOsaka {
PrecompiledAddressesOsaka = append(PrecompiledAddressesOsaka, k)
}
} }
func activePrecompiledContracts(rules params.Rules) PrecompiledContracts { func activePrecompiledContracts(rules params.Rules) PrecompiledContracts {
@ -222,6 +226,8 @@ func ActivePrecompiledContracts(rules params.Rules) PrecompiledContracts {
// ActivePrecompiles returns the precompile addresses enabled with the current configuration. // ActivePrecompiles returns the precompile addresses enabled with the current configuration.
func ActivePrecompiles(rules params.Rules) []common.Address { func ActivePrecompiles(rules params.Rules) []common.Address {
switch { switch {
case rules.IsOsaka:
return PrecompiledAddressesOsaka
case rules.IsPrague: case rules.IsPrague:
return PrecompiledAddressesPrague return PrecompiledAddressesPrague
case rules.IsCancun: case rules.IsCancun:
@ -432,7 +438,8 @@ func (c *bigModExp) RequiredGas(input []byte) uint64 {
} else { } else {
gas.Set(modLen) gas.Set(modLen)
} }
maxLen := new(big.Int).Set(gas)
maxLenOver32 := gas.Cmp(big32) > 0
if c.eip2565 { if c.eip2565 {
// EIP-2565 has three changes // EIP-2565 has three changes
// 1. Different multComplexity (inlined here) // 1. Different multComplexity (inlined here)
@ -449,8 +456,8 @@ func (c *bigModExp) RequiredGas(input []byte) uint64 {
var minPrice uint64 = 200 var minPrice uint64 = 200
if c.eip7883 { if c.eip7883 {
minPrice = 500 minPrice = 500
if maxLen.Cmp(big32) > 0 { if maxLenOver32 {
gas.Mul(gas, big.NewInt(2)) gas.Add(gas, gas)
} }
} }