diff --git a/consensus/misc/create2deployer.go b/consensus/misc/create2deployer.go new file mode 100644 index 0000000000..62306725f6 --- /dev/null +++ b/consensus/misc/create2deployer.go @@ -0,0 +1,16 @@ +package misc + +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/vm" +) + +var create2DeployerAddress = common.HexToAddress("0x13b0D85CcB8bf860b6b79AF3029fCA081AE9beF2") +var create2DeployerCode = common.FromHex("0x6080604052600436106100435760003560e01c8063076c37b21461004f578063481286e61461007157806356299481146100ba57806366cfa057146100da57600080fd5b3661004a57005b600080fd5b34801561005b57600080fd5b5061006f61006a366004610327565b6100fa565b005b34801561007d57600080fd5b5061009161008c366004610327565b61014a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100c657600080fd5b506100916100d5366004610349565b61015d565b3480156100e657600080fd5b5061006f6100f53660046103ca565b610172565b61014582826040518060200161010f9061031a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe082820381018352601f90910116604052610183565b505050565b600061015683836102e7565b9392505050565b600061016a8484846102f0565b949350505050565b61017d838383610183565b50505050565b6000834710156101f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f437265617465323a20696e73756666696369656e742062616c616e636500000060448201526064015b60405180910390fd5b815160000361025f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f60448201526064016101eb565b8282516020840186f5905073ffffffffffffffffffffffffffffffffffffffff8116610156576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f437265617465323a204661696c6564206f6e206465706c6f790000000000000060448201526064016101eb565b60006101568383305b6000604051836040820152846020820152828152600b8101905060ff815360559020949350505050565b61014e806104ad83390190565b6000806040838503121561033a57600080fd5b50508035926020909101359150565b60008060006060848603121561035e57600080fd5b8335925060208401359150604084013573ffffffffffffffffffffffffffffffffffffffff8116811461039057600080fd5b809150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000806000606084860312156103df57600080fd5b8335925060208401359150604084013567ffffffffffffffff8082111561040557600080fd5b818601915086601f83011261041957600080fd5b81358181111561042b5761042b61039b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156104715761047161039b565b8160405282815289602084870101111561048a57600080fd5b826020860160208301376000602084830101528095505050505050925092509256fe608060405234801561001057600080fd5b5061012e806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063249cb3fa14602d575b600080fd5b603c603836600460b1565b604e565b60405190815260200160405180910390f35b60008281526020818152604080832073ffffffffffffffffffffffffffffffffffffffff8516845290915281205460ff16608857600060aa565b7fa2ef4600d742022d532d4747cb3547474667d6f13804902513b2ec01c848f4b45b9392505050565b6000806040838503121560c357600080fd5b82359150602083013573ffffffffffffffffffffffffffffffffffffffff8116811460ed57600080fd5b80915050925092905056fea26469706673582212205ffd4e6cede7d06a5daf93d48d0541fc68189eeb16608c1999a82063b666eb1164736f6c63430008130033a2646970667358221220fdc4a0fe96e3b21c108ca155438d37c9143fb01278a3c1d274948bad89c564ba64736f6c63430008130033") + +func EnsureCreate2Deployer(db vm.StateDB) { + if db.GetCodeSize(create2DeployerAddress) > 0 { + return + } + db.SetCode(create2DeployerAddress, create2DeployerCode) +} diff --git a/core/state_processor.go b/core/state_processor.go index 92c7c4b8c4..a4bcbcb0a9 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -70,6 +70,9 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg if p.config.DAOForkSupport && p.config.DAOForkBlock != nil && p.config.DAOForkBlock.Cmp(block.Number()) == 0 { misc.ApplyDAOHardFork(statedb) } + if p.config.IsOptimismMeadow(block.Time()) { + misc.EnsureCreate2Deployer(statedb) + } var ( context = NewEVMBlockContext(header, p.bc, nil, p.config, statedb) vmenv = vm.NewEVM(context, vm.TxContext{}, statedb, p.config, cfg) diff --git a/miner/worker.go b/miner/worker.go index 59a2d5c2b9..57bb881d16 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -1137,6 +1137,10 @@ func (w *worker) generateWork(genParams *generateParams) (*types.Block, *big.Int work.gasPool = new(core.GasPool).AddGas(work.header.GasLimit) } + if w.chainConfig.IsOptimismMeadow(work.header.Time) { + misc.EnsureCreate2Deployer(work.state) + } + for _, tx := range genParams.txs { from, _ := types.Sender(work.signer, tx) work.state.SetTxContext(tx.Hash(), work.tcount) diff --git a/params/config.go b/params/config.go index c07e0d1543..d09eb10e3d 100644 --- a/params/config.go +++ b/params/config.go @@ -315,6 +315,7 @@ type ChainConfig struct { BedrockBlock *big.Int `json:"bedrockBlock,omitempty"` // Bedrock switch block (nil = no fork, 0 = already on optimism bedrock) RegolithTime *uint64 `json:"regolithTime,omitempty"` // Regolith switch time (nil = no fork, 0 = already on optimism regolith) + MeadowTime *uint64 `json:"meadowTime,omitempty"` // Meadow switch time (nil = no fork, 0 = already on optimism meadow) // TerminalTotalDifficulty is the amount of total difficulty reached by // the network that triggers the consensus upgrade. @@ -454,6 +455,9 @@ func (c *ChainConfig) Description() string { if c.RegolithTime != nil { banner += fmt.Sprintf(" - Regolith: @%-10v\n", *c.RegolithTime) } + if c.MeadowTime != nil { + banner += fmt.Sprintf(" - Meadow: @%-10v\n", *c.MeadowTime) + } return banner } @@ -561,6 +565,10 @@ func (c *ChainConfig) IsRegolith(time uint64) bool { return isTimestampForked(c.RegolithTime, time) } +func (c *ChainConfig) IsMeadow(time uint64) bool { + return isTimestampForked(c.MeadowTime, time) +} + // IsOptimism returns whether the node is an optimism node or not. func (c *ChainConfig) IsOptimism() bool { return c.Optimism != nil @@ -575,6 +583,10 @@ func (c *ChainConfig) IsOptimismRegolith(time uint64) bool { return c.IsOptimism() && c.IsRegolith(time) } +func (c *ChainConfig) IsOptimismMeadow(time uint64) bool { + return c.IsOptimism() && c.IsMeadow(time) +} + // IsOptimismPreBedrock returns true iff this is an optimism node & bedrock is not yet active func (c *ChainConfig) IsOptimismPreBedrock(num *big.Int) bool { return c.IsOptimism() && !c.IsBedrock(num) @@ -888,7 +900,9 @@ type Rules struct { IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool IsBerlin, IsLondon bool IsMerge, IsShanghai, IsCancun, IsPrague bool - IsOptimismBedrock, IsOptimismRegolith bool + IsOptimismBedrock bool + IsOptimismRegolith bool + IsOptimismMeadow bool } // Rules ensures c's ChainID is not nil. @@ -916,5 +930,6 @@ func (c *ChainConfig) Rules(num *big.Int, isMerge bool, timestamp uint64) Rules // Optimism IsOptimismBedrock: c.IsOptimismBedrock(num), IsOptimismRegolith: c.IsOptimismRegolith(timestamp), + IsOptimismMeadow: c.IsOptimismMeadow(timestamp), } }