From fa2ac3e2188fe7b1c51b49ca5d2184ad61ffe565 Mon Sep 17 00:00:00 2001
From: bnoieh <135800952+bnoieh@users.noreply.github.com>
Date: Sun, 28 Apr 2024 15:52:06 +0800
Subject: [PATCH] canyon fork: revert disable create2deployer in canyon fork
 (#100)

Co-authored-by: Nolan <33241113+nolanxyg@users.noreply.github.com>
---
 core/state_processor.go | 3 +--
 miner/worker.go         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/state_processor.go b/core/state_processor.go
index 4c18b48248..e29fb6f0f7 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -79,8 +79,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		misc.ApplyPreContractHardFork(statedb)
 	}
 
-	// opBNB no need to hard code this contract via hardfork
-	// misc.EnsureCreate2Deployer(p.config, block.Time(), statedb)
+	misc.EnsureCreate2Deployer(p.config, block.Time(), statedb)
 
 	var (
 		context = NewEVMBlockContext(header, p.bc, nil, p.config, statedb)
diff --git a/miner/worker.go b/miner/worker.go
index 30969aa84a..fd9fa7e043 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -1147,8 +1147,7 @@ func (w *worker) generateWork(genParams *generateParams) *newPayloadResult {
 		misc.ApplyPreContractHardFork(work.state)
 	}
 
-	// opBNB no need to hard code this contract via hardfork
-	// misc.EnsureCreate2Deployer(w.chainConfig, work.header.Time, work.state)
+	misc.EnsureCreate2Deployer(w.chainConfig, work.header.Time, work.state)
 
 	start := time.Now()
 	for _, tx := range genParams.txs {