From 9cdbb3f2e279d8c9a0acd3111ba9189bd81ea16c Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Dec 2024 12:55:45 +0100
Subject: [PATCH 1/2] core: add EIP-2935 support in GenerateChain

---
 core/chain_makers.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/chain_makers.go b/core/chain_makers.go
index 97c785d52b48..58d0b24ff528 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -330,6 +330,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
 				b.header.Difficulty = big.NewInt(0)
 			}
 		}
+
 		// Mutate the state and block according to any hard-fork specs
 		if daoBlock := config.DAOForkBlock; daoBlock != nil {
 			limit := new(big.Int).Add(daoBlock, params.DAOForkExtraRange)
@@ -342,6 +343,15 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
 		if config.DAOForkSupport && config.DAOForkBlock != nil && config.DAOForkBlock.Cmp(b.header.Number) == 0 {
 			misc.ApplyDAOHardFork(statedb)
 		}
+
+		if config.IsPrague(b.header.Number, b.header.Time) {
+			// EIP-2935
+			blockContext := NewEVMBlockContext(b.header, cm, &b.header.Coinbase)
+			blockContext.Random = &common.Hash{} // enable post-merge instruction set
+			evm := vm.NewEVM(blockContext, statedb, cm.config, vm.Config{})
+			ProcessParentBlockHash(b.header.ParentHash, evm)
+		}
+
 		// Execute any user modifications to the block
 		if gen != nil {
 			gen(i, b)

From 6af5c6247ee8f7a41389e91bd5f921a7620da227 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Dec 2024 13:43:40 +0100
Subject: [PATCH 2/2] core: add BlockGen.ConsensusLayerRequests

I need this to collect the requests in cmd/hivechain.
---
 core/chain_makers.go | 55 +++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/core/chain_makers.go b/core/chain_makers.go
index 58d0b24ff528..26714845ebc8 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -293,6 +293,41 @@ func (b *BlockGen) OffsetTime(seconds int64) {
 	b.header.Difficulty = b.engine.CalcDifficulty(b.cm, b.header.Time, b.parent.Header())
 }
 
+// ConsensusLayerRequests returns the EIP-7685 requests which have accumulated so far.
+func (b *BlockGen) ConsensusLayerRequests() [][]byte {
+	return b.collectRequests(true)
+}
+
+func (b *BlockGen) collectRequests(readonly bool) (requests [][]byte) {
+	statedb := b.statedb
+	if readonly {
+		// The system contracts clear themselves on a system-initiated read.
+		// When reading the requests mid-block, we don't want this behavior, so fork
+		// off the statedb before executing the system calls.
+		statedb = statedb.Copy()
+	}
+
+	if b.cm.config.IsPrague(b.header.Number, b.header.Time) {
+		requests = [][]byte{}
+		// EIP-6110 deposits
+		var blockLogs []*types.Log
+		for _, r := range b.receipts {
+			blockLogs = append(blockLogs, r.Logs...)
+		}
+		if err := ParseDepositLogs(&requests, blockLogs, b.cm.config); err != nil {
+			panic(fmt.Sprintf("failed to parse deposit log: %v", err))
+		}
+		// create EVM for system calls
+		blockContext := NewEVMBlockContext(b.header, b.cm, &b.header.Coinbase)
+		evm := vm.NewEVM(blockContext, statedb, b.cm.config, vm.Config{})
+		// EIP-7002
+		ProcessWithdrawalQueue(&requests, evm)
+		// EIP-7251
+		ProcessConsolidationQueue(&requests, evm)
+	}
+	return requests
+}
+
 // GenerateChain creates a chain of n blocks. The first block's
 // parent will be the provided parent. db is used to store
 // intermediate states and should contain the parent's state trie.
@@ -357,25 +392,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
 			gen(i, b)
 		}
 
-		var requests [][]byte
-		if config.IsPrague(b.header.Number, b.header.Time) {
-			requests = [][]byte{}
-			// EIP-6110 deposits
-			var blockLogs []*types.Log
-			for _, r := range b.receipts {
-				blockLogs = append(blockLogs, r.Logs...)
-			}
-			if err := ParseDepositLogs(&requests, blockLogs, config); err != nil {
-				panic(fmt.Sprintf("failed to parse deposit log: %v", err))
-			}
-			// create EVM for system calls
-			blockContext := NewEVMBlockContext(b.header, cm, &b.header.Coinbase)
-			evm := vm.NewEVM(blockContext, statedb, cm.config, vm.Config{})
-			// EIP-7002
-			ProcessWithdrawalQueue(&requests, evm)
-			// EIP-7251
-			ProcessConsolidationQueue(&requests, evm)
-		}
+		requests := b.collectRequests(false)
 		if requests != nil {
 			reqHash := types.CalcRequestsHash(requests)
 			b.header.RequestsHash = &reqHash