feat: ensure no requests are included in isthmus blocks (#498)

* feat: ensure no requests are included in isthmus blocks

* Ensure cancun enabled in block encode decode test

---------

Co-authored-by: refcell <[email protected]>

cmd/evm/internal/t8ntool/execution.go

@@ -353,6 +353,10 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		core.ProcessConsolidationQueue(&requests, evm)
 	}
 
+	if chainConfig.IsIsthmus(vmContext.Time) {
+		requests = [][]byte{}
+	}
+
 	// Commit block
 	root, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber), chainConfig.IsCancun(vmContext.BlockNumber, vmContext.Time))
 	if err != nil {

core/chain_makers.go

@@ -325,6 +325,11 @@ func (b *BlockGen) collectRequests(readonly bool) (requests [][]byte) {
 		// EIP-7251
 		ProcessConsolidationQueue(&requests, evm)
 	}
+
+	if b.cm.config.IsIsthmus(b.header.Time) {
+		requests = [][]byte{}
+	}
+
 	return requests
 }
 

core/rlp_test.go

@@ -207,6 +207,7 @@ func TestBlockRlpEncodeDecode(t *testing.T) {
 	config := *params.OptimismTestConfig
 	config.ShanghaiTime = &zeroTime
 	config.IsthmusTime = &zeroTime
+	config.CancunTime = &zeroTime
 	require.True(t, config.IsOptimismIsthmus(zeroTime))
 
 	block := getBlock(&config, 10, 2, 50)

core/state_processor.go

@@ -118,6 +118,10 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		ProcessConsolidationQueue(&requests, evm)
 	}
 
+	if p.config.IsIsthmus(block.Time()) {
+		requests = [][]byte{}
+	}
+
 	// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
 	p.chain.engine.Finalize(p.chain, header, tracingStateDB, block.Body())
 

miner/worker.go

@@ -196,6 +196,11 @@ func (miner *Miner) generateWork(params *generateParams, witness bool) *newPaylo
 		// EIP-7251 consolidations
 		core.ProcessConsolidationQueue(&requests, work.evm)
 	}
+
+	if miner.chainConfig.IsIsthmus(work.header.Time) {
+		requests = [][]byte{}
+	}
+
 	if requests != nil {
 		reqHash := types.CalcRequestsHash(requests)
 		work.header.RequestsHash = &reqHash