diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index c71d5eb653e5be81baa3a232b9188b04b767d5f9..c77c04c252de8f65172689198a32df609449eef1 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -20,6 +20,7 @@ import (
"bufio"
"errors"
"fmt"
+ "math/big"
"os"
"reflect"
"unicode"
@@ -165,7 +166,9 @@ func checkWhisper(ctx *cli.Context) {
// makeFullNode loads geth configuration and creates the Ethereum backend.
func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
stack, cfg := makeConfigNode(ctx)
-
+ if ctx.GlobalIsSet(utils.OverrideBerlinFlag.Name) {
+ cfg.Eth.OverrideBerlin = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideBerlinFlag.Name))
+ }
backend := utils.RegisterEthService(stack, &cfg.Eth)
checkWhisper(ctx)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index a3af44f6c4088f17a4905e5b990ca54f5d0a47d0..9afa031584a422f3690d5e699a0c7c910808174a 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -69,6 +69,7 @@ var (
utils.NoUSBFlag,
utils.USBFlag,
utils.SmartCardDaemonPathFlag,
+ utils.OverrideBerlinFlag,
utils.EthashCacheDirFlag,
utils.EthashCachesInMemoryFlag,
utils.EthashCachesOnDiskFlag,
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index 78f63e1c7a5fe1b91d9e2f9d14afc10ace3cf99c..4f701fa1c3052e57bac317b17219dd7f94524552 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -235,6 +235,10 @@ func (w *wizard) manageGenesis() {
fmt.Printf("Which block should Istanbul come into effect? (default = %v)\n", w.conf.Genesis.Config.IstanbulBlock)
w.conf.Genesis.Config.IstanbulBlock = w.readDefaultBigInt(w.conf.Genesis.Config.IstanbulBlock)
+ fmt.Println()
+ fmt.Printf("Which block should Berlin come into effect? (default = %v)\n", w.conf.Genesis.Config.BerlinBlock)
+ w.conf.Genesis.Config.BerlinBlock = w.readDefaultBigInt(w.conf.Genesis.Config.BerlinBlock)
+
fmt.Println()
fmt.Printf("Which block should YOLOv3 come into effect? (default = %v)\n", w.conf.Genesis.Config.YoloV3Block)
w.conf.Genesis.Config.YoloV3Block = w.readDefaultBigInt(w.conf.Genesis.Config.YoloV3Block)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 57547d0c49b63e0a7578e5ea0d5c47e4a17ac22f..324a6d6a47298b5a6fac7acb6ec824f9819e8ebb 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -230,6 +230,10 @@ var (
Usage: "Megabytes of memory allocated to bloom-filter for pruning",
Value: 2048,
}
+ OverrideBerlinFlag = cli.Uint64Flag{
+ Name: "override.berlin",
+ Usage: "Manually specify Berlin fork-block, overriding the bundled setting",
+ }
// Light server and client settings
LightServeFlag = cli.IntFlag{
Name: "light.serve",
diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
index 888b5534752406416ebcf0949071a72c01f11410..a20598fa9daa8572833a7a9a38f1c954e453f3cf 100644
--- a/core/forkid/forkid_test.go
+++ b/core/forkid/forkid_test.go
@@ -43,24 +43,26 @@ func TestCreation(t *testing.T) {
params.MainnetChainConfig,
params.MainnetGenesisHash,
[]testcase{
- {0, ID{Hash: checksumToBytes(0xfc64ec04), Next: 1150000}}, // Unsynced
- {1149999, ID{Hash: checksumToBytes(0xfc64ec04), Next: 1150000}}, // Last Frontier block
- {1150000, ID{Hash: checksumToBytes(0x97c2c34c), Next: 1920000}}, // First Homestead block
- {1919999, ID{Hash: checksumToBytes(0x97c2c34c), Next: 1920000}}, // Last Homestead block
- {1920000, ID{Hash: checksumToBytes(0x91d1f948), Next: 2463000}}, // First DAO block
- {2462999, ID{Hash: checksumToBytes(0x91d1f948), Next: 2463000}}, // Last DAO block
- {2463000, ID{Hash: checksumToBytes(0x7a64da13), Next: 2675000}}, // First Tangerine block
- {2674999, ID{Hash: checksumToBytes(0x7a64da13), Next: 2675000}}, // Last Tangerine block
- {2675000, ID{Hash: checksumToBytes(0x3edd5b10), Next: 4370000}}, // First Spurious block
- {4369999, ID{Hash: checksumToBytes(0x3edd5b10), Next: 4370000}}, // Last Spurious block
- {4370000, ID{Hash: checksumToBytes(0xa00bc324), Next: 7280000}}, // First Byzantium block
- {7279999, ID{Hash: checksumToBytes(0xa00bc324), Next: 7280000}}, // Last Byzantium block
- {7280000, ID{Hash: checksumToBytes(0x668db0af), Next: 9069000}}, // First and last Constantinople, first Petersburg block
- {9068999, ID{Hash: checksumToBytes(0x668db0af), Next: 9069000}}, // Last Petersburg block
- {9069000, ID{Hash: checksumToBytes(0x879d6e30), Next: 9200000}}, // First Istanbul and first Muir Glacier block
- {9199999, ID{Hash: checksumToBytes(0x879d6e30), Next: 9200000}}, // Last Istanbul and first Muir Glacier block
- {9200000, ID{Hash: checksumToBytes(0xe029e991), Next: 0}}, // First Muir Glacier block
- {10000000, ID{Hash: checksumToBytes(0xe029e991), Next: 0}}, // Future Muir Glacier block
+ {0, ID{Hash: checksumToBytes(0xfc64ec04), Next: 1150000}}, // Unsynced
+ {1149999, ID{Hash: checksumToBytes(0xfc64ec04), Next: 1150000}}, // Last Frontier block
+ {1150000, ID{Hash: checksumToBytes(0x97c2c34c), Next: 1920000}}, // First Homestead block
+ {1919999, ID{Hash: checksumToBytes(0x97c2c34c), Next: 1920000}}, // Last Homestead block
+ {1920000, ID{Hash: checksumToBytes(0x91d1f948), Next: 2463000}}, // First DAO block
+ {2462999, ID{Hash: checksumToBytes(0x91d1f948), Next: 2463000}}, // Last DAO block
+ {2463000, ID{Hash: checksumToBytes(0x7a64da13), Next: 2675000}}, // First Tangerine block
+ {2674999, ID{Hash: checksumToBytes(0x7a64da13), Next: 2675000}}, // Last Tangerine block
+ {2675000, ID{Hash: checksumToBytes(0x3edd5b10), Next: 4370000}}, // First Spurious block
+ {4369999, ID{Hash: checksumToBytes(0x3edd5b10), Next: 4370000}}, // Last Spurious block
+ {4370000, ID{Hash: checksumToBytes(0xa00bc324), Next: 7280000}}, // First Byzantium block
+ {7279999, ID{Hash: checksumToBytes(0xa00bc324), Next: 7280000}}, // Last Byzantium block
+ {7280000, ID{Hash: checksumToBytes(0x668db0af), Next: 9069000}}, // First and last Constantinople, first Petersburg block
+ {9068999, ID{Hash: checksumToBytes(0x668db0af), Next: 9069000}}, // Last Petersburg block
+ {9069000, ID{Hash: checksumToBytes(0x879d6e30), Next: 9200000}}, // First Istanbul and first Muir Glacier block
+ {9199999, ID{Hash: checksumToBytes(0x879d6e30), Next: 9200000}}, // Last Istanbul and first Muir Glacier block
+ {9200000, ID{Hash: checksumToBytes(0xe029e991), Next: 12244000}}, // First Muir Glacier block
+ {12243999, ID{Hash: checksumToBytes(0xe029e991), Next: 12244000}}, // Last Muir Glacier block
+ {12244000, ID{Hash: checksumToBytes(0x0eb440f6), Next: 0}}, // First Berlin block
+ {20000000, ID{Hash: checksumToBytes(0x0eb440f6), Next: 0}}, // Future Berlin block
},
},
// Ropsten test cases
@@ -80,8 +82,10 @@ func TestCreation(t *testing.T) {
{6485845, ID{Hash: checksumToBytes(0xd6e2149b), Next: 6485846}}, // Last Petersburg block
{6485846, ID{Hash: checksumToBytes(0x4bc66396), Next: 7117117}}, // First Istanbul block
{7117116, ID{Hash: checksumToBytes(0x4bc66396), Next: 7117117}}, // Last Istanbul block
- {7117117, ID{Hash: checksumToBytes(0x6727ef90), Next: 0}}, // First Muir Glacier block
- {7500000, ID{Hash: checksumToBytes(0x6727ef90), Next: 0}}, // Future
+ {7117117, ID{Hash: checksumToBytes(0x6727ef90), Next: 9812189}}, // First Muir Glacier block
+ {9812188, ID{Hash: checksumToBytes(0x6727ef90), Next: 9812189}}, // Last Muir Glacier block
+ {9812189, ID{Hash: checksumToBytes(0xa157d377), Next: 0}}, // First Berlin block
+ {10000000, ID{Hash: checksumToBytes(0xa157d377), Next: 0}}, // Future Berlin block
},
},
// Rinkeby test cases
@@ -100,8 +104,10 @@ func TestCreation(t *testing.T) {
{4321233, ID{Hash: checksumToBytes(0xe49cab14), Next: 4321234}}, // Last Constantinople block
{4321234, ID{Hash: checksumToBytes(0xafec6b27), Next: 5435345}}, // First Petersburg block
{5435344, ID{Hash: checksumToBytes(0xafec6b27), Next: 5435345}}, // Last Petersburg block
- {5435345, ID{Hash: checksumToBytes(0xcbdb8838), Next: 0}}, // First Istanbul block
- {6000000, ID{Hash: checksumToBytes(0xcbdb8838), Next: 0}}, // Future Istanbul block
+ {5435345, ID{Hash: checksumToBytes(0xcbdb8838), Next: 8290928}}, // First Istanbul block
+ {8290927, ID{Hash: checksumToBytes(0xcbdb8838), Next: 8290928}}, // Last Istanbul block
+ {8290928, ID{Hash: checksumToBytes(0x6910c8bd), Next: 0}}, // First Berlin block
+ {10000000, ID{Hash: checksumToBytes(0x6910c8bd), Next: 0}}, // Future Berlin block
},
},
// Goerli test cases
@@ -111,8 +117,10 @@ func TestCreation(t *testing.T) {
[]testcase{
{0, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}}, // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople and first Petersburg block
{1561650, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}}, // Last Petersburg block
- {1561651, ID{Hash: checksumToBytes(0xc25efa5c), Next: 0}}, // First Istanbul block
- {2000000, ID{Hash: checksumToBytes(0xc25efa5c), Next: 0}}, // Future Istanbul block
+ {1561651, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}}, // First Istanbul block
+ {4460643, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}}, // Last Istanbul block
+ {4460644, ID{Hash: checksumToBytes(0x757a1c47), Next: 0}}, // First Berlin block
+ {5000000, ID{Hash: checksumToBytes(0x757a1c47), Next: 0}}, // Future Berlin block
},
},
}
@@ -185,11 +193,11 @@ func TestValidation(t *testing.T) {
// Local is mainnet Petersburg, remote is Rinkeby Petersburg.
{7987396, ID{Hash: checksumToBytes(0xafec6b27), Next: 0}, ErrLocalIncompatibleOrStale},
- // Local is mainnet Muir Glacier, far in the future. Remote announces Gopherium (non existing fork)
+ // Local is mainnet Berlin, far in the future. Remote announces Gopherium (non existing fork)
// at some future block 88888888, for itself, but past block for local. Local is incompatible.
//
// This case detects non-upgraded nodes with majority hash power (typical Ropsten mess).
- {88888888, ID{Hash: checksumToBytes(0xe029e991), Next: 88888888}, ErrLocalIncompatibleOrStale},
+ {88888888, ID{Hash: checksumToBytes(0x0eb440f6), Next: 88888888}, ErrLocalIncompatibleOrStale},
// Local is mainnet Byzantium. Remote is also in Byzantium, but announces Gopherium (non existing
// fork) at block 7279999, before Petersburg. Local is incompatible.
diff --git a/core/genesis.go b/core/genesis.go
index 6bcc50b050abce35eb38171b339c5a8880d1cc8a..e05e27fe175063fd8b542ceaeb08f82e9bd35a74 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -153,6 +153,10 @@ func (e *GenesisMismatchError) Error() string {
//
// The returned chain configuration is never nil.
func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig, common.Hash, error) {
+ return SetupGenesisBlockWithOverride(db, genesis, nil)
+}
+
+func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, overrideBerlin *big.Int) (*params.ChainConfig, common.Hash, error) {
if genesis != nil && genesis.Config == nil {
return params.AllEthashProtocolChanges, common.Hash{}, errGenesisNoConfig
}
@@ -198,6 +202,9 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig
}
// Get the existing chain configuration.
newcfg := genesis.configOrDefault(stored)
+ if overrideBerlin != nil {
+ newcfg.BerlinBlock = overrideBerlin
+ }
if err := newcfg.CheckConfigForkOrder(); err != nil {
return newcfg, common.Hash{}, err
}
diff --git a/core/state_transition.go b/core/state_transition.go
index 0d589a6119f7024e8aaafe9d520ecd8232cf9a38..d511e40bd645e717515d12a1c990883674fec5da 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -259,7 +259,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
}
// Set up the initial access list.
- if st.evm.ChainConfig().IsYoloV3(st.evm.Context.BlockNumber) {
+ if st.evm.ChainConfig().IsBerlin(st.evm.Context.BlockNumber) {
st.state.PrepareAccessList(msg.From(), msg.To(), st.evm.ActivePrecompiles(), msg.AccessList())
}
diff --git a/core/tx_pool.go b/core/tx_pool.go
index 28ac822131f41146851f91205c7b1f68fbbf1146..4c1bd809fd2e3af08795d12e9a79ee8c59bd7f5a 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -1204,7 +1204,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
// Update all fork indicator by next pending block number.
next := new(big.Int).Add(newHead.Number, big.NewInt(1))
pool.istanbul = pool.chainconfig.IsIstanbul(next)
- pool.eip2718 = pool.chainconfig.IsYoloV3(next)
+ pool.eip2718 = pool.chainconfig.IsBerlin(next)
}
// promoteExecutables moves transactions that have become processable from the
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 1645369b4fbefe7e5a0b6c5c3f5d13c58159aa29..b4594cb90bc280adbda03efb92eaaf30a9db620d 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -40,7 +40,7 @@ type sigCache struct {
func MakeSigner(config *params.ChainConfig, blockNumber *big.Int) Signer {
var signer Signer
switch {
- case config.IsYoloV3(blockNumber):
+ case config.IsBerlin(blockNumber):
signer = NewEIP2930Signer(config.ChainID)
case config.IsEIP155(blockNumber):
signer = NewEIP155Signer(config.ChainID)
@@ -61,7 +61,7 @@ func MakeSigner(config *params.ChainConfig, blockNumber *big.Int) Signer {
// have the current block number available, use MakeSigner instead.
func LatestSigner(config *params.ChainConfig) Signer {
if config.ChainID != nil {
- if config.YoloV3Block != nil {
+ if config.BerlinBlock != nil || config.YoloV3Block != nil {
return NewEIP2930Signer(config.ChainID)
}
if config.EIP155Block != nil {
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 9ea19d38a71c4daf2d7c1fae6c80b22f3f042f08..4e99a51618eb4df1511609cc8a11cc04d9a17a5c 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -78,9 +78,9 @@ var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
common.BytesToAddress([]byte{9}): &blake2F{},
}
-// PrecompiledContractsYoloV3 contains the default set of pre-compiled Ethereum
-// contracts used in the Yolo v3 test release.
-var PrecompiledContractsYoloV3 = map[common.Address]PrecompiledContract{
+// PrecompiledContractsBerlin contains the default set of pre-compiled Ethereum
+// contracts used in the Berlin release.
+var PrecompiledContractsBerlin = map[common.Address]PrecompiledContract{
common.BytesToAddress([]byte{1}): &ecrecover{},
common.BytesToAddress([]byte{2}): &sha256hash{},
common.BytesToAddress([]byte{3}): &ripemd160hash{},
@@ -107,7 +107,7 @@ var PrecompiledContractsBLS = map[common.Address]PrecompiledContract{
}
var (
- PrecompiledAddressesYoloV3 []common.Address
+ PrecompiledAddressesBerlin []common.Address
PrecompiledAddressesIstanbul []common.Address
PrecompiledAddressesByzantium []common.Address
PrecompiledAddressesHomestead []common.Address
@@ -123,8 +123,8 @@ func init() {
for k := range PrecompiledContractsIstanbul {
PrecompiledAddressesIstanbul = append(PrecompiledAddressesIstanbul, k)
}
- for k := range PrecompiledContractsYoloV3 {
- PrecompiledAddressesYoloV3 = append(PrecompiledAddressesYoloV3, k)
+ for k := range PrecompiledContractsBerlin {
+ PrecompiledAddressesBerlin = append(PrecompiledAddressesBerlin, k)
}
}
diff --git a/core/vm/evm.go b/core/vm/evm.go
index 3617d77b121398cd5b38391e0fa4e18d52e53e31..7346d76e5bb8965dd1bf382d41562fe7777a7cb4 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -46,8 +46,8 @@ type (
// configuration
func (evm *EVM) ActivePrecompiles() []common.Address {
switch {
- case evm.chainRules.IsYoloV3:
- return PrecompiledAddressesYoloV3
+ case evm.chainRules.IsBerlin:
+ return PrecompiledAddressesBerlin
case evm.chainRules.IsIstanbul:
return PrecompiledAddressesIstanbul
case evm.chainRules.IsByzantium:
@@ -60,8 +60,8 @@ func (evm *EVM) ActivePrecompiles() []common.Address {
func (evm *EVM) precompile(addr common.Address) (PrecompiledContract, bool) {
var precompiles map[common.Address]PrecompiledContract
switch {
- case evm.chainRules.IsYoloV3:
- precompiles = PrecompiledContractsYoloV3
+ case evm.chainRules.IsBerlin:
+ precompiles = PrecompiledContractsBerlin
case evm.chainRules.IsIstanbul:
precompiles = PrecompiledContractsIstanbul
case evm.chainRules.IsByzantium:
@@ -446,7 +446,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
evm.StateDB.SetNonce(caller.Address(), nonce+1)
// We add this to the access list _before_ taking a snapshot. Even if the creation fails,
// the access-list change should not be rolled back
- if evm.chainRules.IsYoloV3 {
+ if evm.chainRules.IsBerlin {
evm.StateDB.AddAddressToAccessList(address)
}
// Ensure there's no existing contract already at the designated address
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
index 967db32780ccea45c0ee768ba37cf59584cdd789..0084b7d071eee25e0804dfd307639e1d7bc9a31a 100644
--- a/core/vm/interpreter.go
+++ b/core/vm/interpreter.go
@@ -99,8 +99,8 @@ func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter {
if cfg.JumpTable[STOP] == nil {
var jt JumpTable
switch {
- case evm.chainRules.IsYoloV3:
- jt = yoloV3InstructionSet
+ case evm.chainRules.IsBerlin:
+ jt = berlinInstructionSet
case evm.chainRules.IsIstanbul:
jt = istanbulInstructionSet
case evm.chainRules.IsConstantinople:
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index 954f657a947ecf2bb56aafdfd649a3b9d6e73c36..d831f9300f853cd985ffa90ab263762281e32d2e 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -56,24 +56,23 @@ var (
byzantiumInstructionSet = newByzantiumInstructionSet()
constantinopleInstructionSet = newConstantinopleInstructionSet()
istanbulInstructionSet = newIstanbulInstructionSet()
- yoloV3InstructionSet = newYoloV3InstructionSet()
+ berlinInstructionSet = newBerlinInstructionSet()
)
// JumpTable contains the EVM opcodes supported at a given fork.
type JumpTable [256]*operation
-// newYoloV3InstructionSet creates an instructionset containing
-// - "EIP-2315: Simple Subroutines"
-// - "EIP-2929: Gas cost increases for state access opcodes"
-func newYoloV3InstructionSet() JumpTable {
+// newBerlinInstructionSet returns the frontier, homestead, byzantium,
+// contantinople, istanbul, petersburg and berlin instructions.
+func newBerlinInstructionSet() JumpTable {
instructionSet := newIstanbulInstructionSet()
enable2315(&instructionSet) // Subroutines - https://eips.ethereum.org/EIPS/eip-2315
enable2929(&instructionSet) // Access lists for trie accesses https://eips.ethereum.org/EIPS/eip-2929
return instructionSet
}
-// newIstanbulInstructionSet returns the frontier, homestead
-// byzantium, contantinople and petersburg instructions.
+// newIstanbulInstructionSet returns the frontier, homestead, byzantium,
+// contantinople, istanbul and petersburg instructions.
func newIstanbulInstructionSet() JumpTable {
instructionSet := newConstantinopleInstructionSet()
@@ -84,7 +83,7 @@ func newIstanbulInstructionSet() JumpTable {
return instructionSet
}
-// newConstantinopleInstructionSet returns the frontier, homestead
+// newConstantinopleInstructionSet returns the frontier, homestead,
// byzantium and contantinople instructions.
func newConstantinopleInstructionSet() JumpTable {
instructionSet := newByzantiumInstructionSet()
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index c97bdc420c436d56df631bee7d41c787cc0027f1..9cb69e1c76bbe50ea48c135df01c25db8de6aa54 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -65,6 +65,7 @@ func setDefaults(cfg *Config) {
PetersburgBlock: new(big.Int),
IstanbulBlock: new(big.Int),
MuirGlacierBlock: new(big.Int),
+ BerlinBlock: new(big.Int),
YoloV3Block: nil,
}
}
@@ -113,7 +114,7 @@ func Execute(code, input []byte, cfg *Config) ([]byte, *state.StateDB, error) {
vmenv = NewEnv(cfg)
sender = vm.AccountRef(cfg.Origin)
)
- if cfg.ChainConfig.IsYoloV3(vmenv.Context.BlockNumber) {
+ if cfg.ChainConfig.IsBerlin(vmenv.Context.BlockNumber) {
cfg.State.PrepareAccessList(cfg.Origin, &address, vmenv.ActivePrecompiles(), nil)
}
cfg.State.CreateAccount(address)
@@ -145,7 +146,7 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, uint64, error) {
vmenv = NewEnv(cfg)
sender = vm.AccountRef(cfg.Origin)
)
- if cfg.ChainConfig.IsYoloV3(vmenv.Context.BlockNumber) {
+ if cfg.ChainConfig.IsBerlin(vmenv.Context.BlockNumber) {
cfg.State.PrepareAccessList(cfg.Origin, nil, vmenv.ActivePrecompiles(), nil)
}
@@ -171,7 +172,7 @@ func Call(address common.Address, input []byte, cfg *Config) ([]byte, uint64, er
sender := cfg.State.GetOrNewStateObject(cfg.Origin)
statedb := cfg.State
- if cfg.ChainConfig.IsYoloV3(vmenv.Context.BlockNumber) {
+ if cfg.ChainConfig.IsBerlin(vmenv.Context.BlockNumber) {
statedb.PrepareAccessList(cfg.Origin, &address, vmenv.ActivePrecompiles(), nil)
}
diff --git a/eth/backend.go b/eth/backend.go
index 044422763b98b7bef80f737d263ce04db56221ee..76ce5137f4c12d08b2542cfd03d99cb9122cbd94 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -126,7 +126,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
if err != nil {
return nil, err
}
- chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis)
+ chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideBerlin)
if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
return nil, genesisErr
}
diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
index 841dc5e9e11d8be25bcbcf9c0b1cb36888004b61..5d0eece067b312b9eaeaa5624636a5c05b2babe3 100644
--- a/eth/ethconfig/config.go
+++ b/eth/ethconfig/config.go
@@ -198,6 +198,9 @@ type Config struct {
// CheckpointOracle is the configuration for checkpoint oracle.
CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"`
+
+ // Berlin block override (TODO: remove after the fork)
+ OverrideBerlin *big.Int `toml:",omitempty"`
}
// CreateConsensusEngine creates a consensus engine for the given chain configuration.
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index bd995d08a954917a4a5648fbc1c40efe70ca2a68..61fe055689c46c374ec7d469f302cf7e87d0f2bd 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -581,8 +581,8 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
chainConfigCopy := new(params.ChainConfig)
*chainConfigCopy = *chainConfig
chainConfig = chainConfigCopy
- if yolov3 := config.LogConfig.Overrides.YoloV3Block; yolov3 != nil {
- chainConfig.YoloV3Block = yolov3
+ if berlin := config.LogConfig.Overrides.BerlinBlock; berlin != nil {
+ chainConfig.BerlinBlock = berlin
canon = false
}
}
diff --git a/les/client.go b/les/client.go
index e20519fd91b60aa2da309c6d2674320053f02999..4d07f844f8ec819ce47244620c83cb429547972e 100644
--- a/les/client.go
+++ b/les/client.go
@@ -84,7 +84,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
if err != nil {
return nil, err
}
- chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis)
+ chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideBerlin)
if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {
return nil, genesisErr
}
diff --git a/light/txpool.go b/light/txpool.go
index bf5f9ff5833ea569a3a75784366edcbde6522cf9..1296389e3b11066a8cf40e42a992df6e413c649a 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -314,7 +314,7 @@ func (pool *TxPool) setNewHead(head *types.Header) {
// Update fork indicator by next pending block number
next := new(big.Int).Add(head.Number, big.NewInt(1))
pool.istanbul = pool.config.IsIstanbul(next)
- pool.eip2718 = pool.config.IsYoloV3(next)
+ pool.eip2718 = pool.config.IsBerlin(next)
}
// Stop stops the light transaction pool
diff --git a/params/config.go b/params/config.go
index 929bdbeb94f7ce49c61a672b67ecadc2be63346b..8cbfffc03cbd960e6605946fecbd4f60c52ce56f 100644
--- a/params/config.go
+++ b/params/config.go
@@ -56,18 +56,19 @@ var (
// MainnetChainConfig is the chain parameters to run a node on the main network.
MainnetChainConfig = &ChainConfig{
ChainID: big.NewInt(1),
- HomesteadBlock: big.NewInt(1150000),
- DAOForkBlock: big.NewInt(1920000),
+ HomesteadBlock: big.NewInt(1_150_000),
+ DAOForkBlock: big.NewInt(1_920_000),
DAOForkSupport: true,
- EIP150Block: big.NewInt(2463000),
+ EIP150Block: big.NewInt(2_463_000),
EIP150Hash: common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0"),
- EIP155Block: big.NewInt(2675000),
- EIP158Block: big.NewInt(2675000),
- ByzantiumBlock: big.NewInt(4370000),
- ConstantinopleBlock: big.NewInt(7280000),
- PetersburgBlock: big.NewInt(7280000),
- IstanbulBlock: big.NewInt(9069000),
- MuirGlacierBlock: big.NewInt(9200000),
+ EIP155Block: big.NewInt(2_675_000),
+ EIP158Block: big.NewInt(2_675_000),
+ ByzantiumBlock: big.NewInt(4_370_000),
+ ConstantinopleBlock: big.NewInt(7_280_000),
+ PetersburgBlock: big.NewInt(7_280_000),
+ IstanbulBlock: big.NewInt(9_069_000),
+ MuirGlacierBlock: big.NewInt(9_200_000),
+ BerlinBlock: big.NewInt(12_244_000),
Ethash: new(EthashConfig),
}
@@ -102,11 +103,12 @@ var (
EIP150Hash: common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d"),
EIP155Block: big.NewInt(10),
EIP158Block: big.NewInt(10),
- ByzantiumBlock: big.NewInt(1700000),
- ConstantinopleBlock: big.NewInt(4230000),
- PetersburgBlock: big.NewInt(4939394),
- IstanbulBlock: big.NewInt(6485846),
- MuirGlacierBlock: big.NewInt(7117117),
+ ByzantiumBlock: big.NewInt(1_700_000),
+ ConstantinopleBlock: big.NewInt(4_230_000),
+ PetersburgBlock: big.NewInt(4_939_394),
+ IstanbulBlock: big.NewInt(6_485_846),
+ MuirGlacierBlock: big.NewInt(7_117_117),
+ BerlinBlock: big.NewInt(9_812_189),
Ethash: new(EthashConfig),
}
@@ -141,11 +143,12 @@ var (
EIP150Hash: common.HexToHash("0x9b095b36c15eaf13044373aef8ee0bd3a382a5abb92e402afa44b8249c3a90e9"),
EIP155Block: big.NewInt(3),
EIP158Block: big.NewInt(3),
- ByzantiumBlock: big.NewInt(1035301),
- ConstantinopleBlock: big.NewInt(3660663),
- PetersburgBlock: big.NewInt(4321234),
- IstanbulBlock: big.NewInt(5435345),
+ ByzantiumBlock: big.NewInt(1_035_301),
+ ConstantinopleBlock: big.NewInt(3_660_663),
+ PetersburgBlock: big.NewInt(4_321_234),
+ IstanbulBlock: big.NewInt(5_435_345),
MuirGlacierBlock: nil,
+ BerlinBlock: big.NewInt(8_290_928),
Clique: &CliqueConfig{
Period: 15,
Epoch: 30000,
@@ -184,8 +187,9 @@ var (
ByzantiumBlock: big.NewInt(0),
ConstantinopleBlock: big.NewInt(0),
PetersburgBlock: big.NewInt(0),
- IstanbulBlock: big.NewInt(1561651),
+ IstanbulBlock: big.NewInt(1_561_651),
MuirGlacierBlock: nil,
+ BerlinBlock: big.NewInt(4_460_644),
Clique: &CliqueConfig{
Period: 15,
Epoch: 30000,
@@ -227,6 +231,7 @@ var (
PetersburgBlock: big.NewInt(0),
IstanbulBlock: big.NewInt(0),
MuirGlacierBlock: nil,
+ BerlinBlock: nil, // Don't enable Berlin directly, we're YOLOing it
YoloV3Block: big.NewInt(0),
Clique: &CliqueConfig{
Period: 15,
@@ -239,16 +244,16 @@ var (
//
// This configuration is intentionally not using keyed fields to force anyone
// adding flags to the config to also have to set these fields.
- AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, new(EthashConfig), nil}
+ AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil}
// AllCliqueProtocolChanges contains every protocol change (EIPs) introduced
// and accepted by the Ethereum core developers into the Clique consensus.
//
// This configuration is intentionally not using keyed fields to force anyone
// adding flags to the config to also have to set these fields.
- AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, big.NewInt(0), nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}}
+ AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}}
- TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, big.NewInt(0), nil, new(EthashConfig), nil}
+ TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil}
TestRules = TestChainConfig.Rules(new(big.Int))
)
@@ -319,6 +324,7 @@ type ChainConfig struct {
PetersburgBlock *big.Int `json:"petersburgBlock,omitempty"` // Petersburg switch block (nil = same as Constantinople)
IstanbulBlock *big.Int `json:"istanbulBlock,omitempty"` // Istanbul switch block (nil = no fork, 0 = already on istanbul)
MuirGlacierBlock *big.Int `json:"muirGlacierBlock,omitempty"` // Eip-2384 (bomb delay) switch block (nil = no fork, 0 = already activated)
+ BerlinBlock *big.Int `json:"berlinBlock,omitempty"` // Berlin switch block (nil = no fork, 0 = already on berlin)
YoloV3Block *big.Int `json:"yoloV3Block,omitempty"` // YOLO v3: Gas repricings TODO @holiman add EIP references
EWASMBlock *big.Int `json:"ewasmBlock,omitempty"` // EWASM switch block (nil = no fork, 0 = already activated)
@@ -358,7 +364,7 @@ func (c *ChainConfig) String() string {
default:
engine = "unknown"
}
- return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, YOLO v3: %v, Engine: %v}",
+ return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Berlin: %v, YOLO v3: %v, Engine: %v}",
c.ChainID,
c.HomesteadBlock,
c.DAOForkBlock,
@@ -371,6 +377,7 @@ func (c *ChainConfig) String() string {
c.PetersburgBlock,
c.IstanbulBlock,
c.MuirGlacierBlock,
+ c.BerlinBlock,
c.YoloV3Block,
engine,
)
@@ -428,9 +435,9 @@ func (c *ChainConfig) IsIstanbul(num *big.Int) bool {
return isForked(c.IstanbulBlock, num)
}
-// IsYoloV3 returns whether num is either equal to the YoloV3 fork block or greater.
-func (c *ChainConfig) IsYoloV3(num *big.Int) bool {
- return isForked(c.YoloV3Block, num)
+// IsBerlin returns whether num is either equal to the Berlin fork block or greater.
+func (c *ChainConfig) IsBerlin(num *big.Int) bool {
+ return isForked(c.BerlinBlock, num) || isForked(c.YoloV3Block, num)
}
// IsEWASM returns whether num represents a block number after the EWASM fork
@@ -476,7 +483,7 @@ func (c *ChainConfig) CheckConfigForkOrder() error {
{name: "petersburgBlock", block: c.PetersburgBlock},
{name: "istanbulBlock", block: c.IstanbulBlock},
{name: "muirGlacierBlock", block: c.MuirGlacierBlock, optional: true},
- {name: "yoloV3Block", block: c.YoloV3Block},
+ {name: "berlinBlock", block: c.BerlinBlock},
} {
if lastFork.name != "" {
// Next one must be higher number
@@ -540,6 +547,9 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, head *big.Int) *Confi
if isForkIncompatible(c.MuirGlacierBlock, newcfg.MuirGlacierBlock, head) {
return newCompatError("Muir Glacier fork block", c.MuirGlacierBlock, newcfg.MuirGlacierBlock)
}
+ if isForkIncompatible(c.BerlinBlock, newcfg.BerlinBlock, head) {
+ return newCompatError("Berlin fork block", c.BerlinBlock, newcfg.BerlinBlock)
+ }
if isForkIncompatible(c.YoloV3Block, newcfg.YoloV3Block, head) {
return newCompatError("YOLOv3 fork block", c.YoloV3Block, newcfg.YoloV3Block)
}
@@ -613,7 +623,7 @@ type Rules struct {
ChainID *big.Int
IsHomestead, IsEIP150, IsEIP155, IsEIP158 bool
IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool
- IsYoloV3 bool
+ IsBerlin bool
}
// Rules ensures c's ChainID is not nil.
@@ -632,6 +642,6 @@ func (c *ChainConfig) Rules(num *big.Int) Rules {
IsConstantinople: c.IsConstantinople(num),
IsPetersburg: c.IsPetersburg(num),
IsIstanbul: c.IsIstanbul(num),
- IsYoloV3: c.IsYoloV3(num),
+ IsBerlin: c.IsBerlin(num),
}
}
diff --git a/tests/init.go b/tests/init.go
index a2ef040786e153ef47aaeeaf428dbcacde581bdd..67f706eb50bc0a70e6ff6c40769707a3fff8d403 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -165,7 +165,7 @@ var Forks = map[string]*params.ChainConfig{
ConstantinopleBlock: big.NewInt(0),
PetersburgBlock: big.NewInt(0),
IstanbulBlock: big.NewInt(0),
- YoloV3Block: big.NewInt(0),
+ BerlinBlock: big.NewInt(0),
},
}
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 03dc01459c0919b5ac6df0c08bcd859b58586e76..99681baaf1eb63dedffaf443c17b6687e8746b17 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -24,14 +24,13 @@ import (
"strconv"
"strings"
- "github.com/ethereum/go-ethereum/core/state/snapshot"
-
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/state/snapshot"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto"