Fix create2DeployerTx condition

testinprod-io · Nov 9, 2023 · 14fe07c · 14fe07c
1 parent 0cedf1f
commit 14fe07c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go
@@ -136,8 +136,7 @@ func (rw *Worker) RunTxTaskNoLock(txTask *exec22.TxTask) {
 	daoForkTx := rw.chainConfig.DAOForkBlock != nil && rw.chainConfig.DAOForkBlock.Uint64() == txTask.BlockNum && txTask.TxIndex == -1
 	// Optimism Canyon
 	header := txTask.Header
-	create2DeployerTx := rw.chainConfig.IsOptimism() && rw.chainConfig.CanyonTime != nil &&
-		(*rw.chainConfig.CanyonTime).Uint64() != header.Time && txTask.TxIndex == -1
+	create2DeployerTx := misc.IsCanyonActivationBlock(rw.chainConfig, header.Time) && txTask.TxIndex == -1
 
 	var err error
 

diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go
@@ -294,7 +294,7 @@ func (rw *ReconWorker) runTxTask(txTask *exec22.TxTask) error {
 	rules := txTask.Rules
 	daoForkTx := rw.chainConfig.DAOForkBlock != nil && rw.chainConfig.DAOForkBlock.Uint64() == txTask.BlockNum && txTask.TxIndex == -1
 	// Optimism Canyon
-	create2DeployerTx := txTask.TxIndex == -1
+	create2DeployerTx := misc.IsCanyonActivationBlock(rw.chainConfig, txTask.Header.Time) && txTask.TxIndex == -1
 
 	var err error
 	if txTask.BlockNum == 0 && txTask.TxIndex == -1 {

diff --git a/consensus/misc/create2deployer.go b/consensus/misc/create2deployer.go
@@ -23,8 +23,12 @@ var create2DeployerCodeHash = libcommon.HexToHash("0xb0550b5b431e30d38000efb7107
 // remove TestCreateDeployerCodeHash test after integration is done
 var create2DeployerCode, _ = hex.DecodeString("6080604052600436106100435760003560e01c8063076c37b21461004f578063481286e61461007157806356299481146100ba57806366cfa057146100da57600080fd5b3661004a57005b600080fd5b34801561005b57600080fd5b5061006f61006a366004610327565b6100fa565b005b34801561007d57600080fd5b5061009161008c366004610327565b61014a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100c657600080fd5b506100916100d5366004610349565b61015d565b3480156100e657600080fd5b5061006f6100f53660046103ca565b610172565b61014582826040518060200161010f9061031a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe082820381018352601f90910116604052610183565b505050565b600061015683836102e7565b9392505050565b600061016a8484846102f0565b949350505050565b61017d838383610183565b50505050565b6000834710156101f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f437265617465323a20696e73756666696369656e742062616c616e636500000060448201526064015b60405180910390fd5b815160000361025f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f60448201526064016101eb565b8282516020840186f5905073ffffffffffffffffffffffffffffffffffffffff8116610156576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f437265617465323a204661696c6564206f6e206465706c6f790000000000000060448201526064016101eb565b60006101568383305b6000604051836040820152846020820152828152600b8101905060ff815360559020949350505050565b61014e806104ad83390190565b6000806040838503121561033a57600080fd5b50508035926020909101359150565b60008060006060848603121561035e57600080fd5b8335925060208401359150604084013573ffffffffffffffffffffffffffffffffffffffff8116811461039057600080fd5b809150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000806000606084860312156103df57600080fd5b8335925060208401359150604084013567ffffffffffffffff8082111561040557600080fd5b818601915086601f83011261041957600080fd5b81358181111561042b5761042b61039b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156104715761047161039b565b8160405282815289602084870101111561048a57600080fd5b826020860160208301376000602084830101528095505050505050925092509256fe608060405234801561001057600080fd5b5061012e806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063249cb3fa14602d575b600080fd5b603c603836600460b1565b604e565b60405190815260200160405180910390f35b60008281526020818152604080832073ffffffffffffffffffffffffffffffffffffffff8516845290915281205460ff16608857600060aa565b7fa2ef4600d742022d532d4747cb3547474667d6f13804902513b2ec01c848f4b45b9392505050565b6000806040838503121560c357600080fd5b82359150602083013573ffffffffffffffffffffffffffffffffffffffff8116811460ed57600080fd5b80915050925092905056fea26469706673582212205ffd4e6cede7d06a5daf93d48d0541fc68189eeb16608c1999a82063b666eb1164736f6c63430008130033a2646970667358221220fdc4a0fe96e3b21c108ca155438d37c9143fb01278a3c1d274948bad89c564ba64736f6c63430008130033")
 
+func IsCanyonActivationBlock(c *chain.Config, timestamp uint64) bool {
+	return c.IsOptimism() && c.CanyonTime != nil && (*c.CanyonTime).Uint64() == timestamp
+}
+
 func EnsureCreate2Deployer(c *chain.Config, timestamp uint64, statedb *state.IntraBlockState) bool {
-	if !c.IsOptimism() || c.CanyonTime == nil || (*c.CanyonTime).Uint64() != timestamp {
+	if !IsCanyonActivationBlock(c, timestamp) {
 		return false
 	}
 	log.Info("Setting Create2Deployer code", "address", create2DeployerAddress, "codeHash", create2DeployerCodeHash)