miner blockchain interface

berachain · Sep 30, 2023 · 564e2be · 564e2be
1 parent 89db795
commit 564e2be
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/miner/miner.go b/miner/miner.go
@@ -30,6 +30,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/txpool"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/downloader"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
@@ -39,10 +40,23 @@ import (
 // Backend wraps all methods required for mining. Only full node is capable
 // to offer all the functions here.
 type Backend interface {
-	BlockChain() *core.BlockChain
+	BlockChain() BlockChain
 	TxPool() *txpool.TxPool
 }
 
+type BlockChain interface {
+	GetVMConfig() *vm.Config
+	Engine() consensus.Engine
+	CurrentBlock() *types.Header
+	StateAt(common.Hash) (state.StateDBI, error)
+	StateAtBlockNumber(uint64) (state.StateDBI, error)
+	GetBlockByHash(common.Hash) *types.Block
+	consensus.ChainHeaderReader
+	HasBlock(common.Hash, uint64) bool
+	SubscribeChainHeadEvent(chan<- core.ChainHeadEvent) event.Subscription
+	WriteBlockAndSetHead(block *types.Block, receipts []*types.Receipt, logs []*types.Log, state state.StateDBI, emitHeadEvent bool) (status core.WriteStatus, err error)
+}
+
 // Config is the configuration parameters of mining.
 type Config struct {
 	Etherbase common.Address `toml:",omitempty"` // Public address for block mining rewards

diff --git a/miner/miner_test.go b/miner/miner_test.go
@@ -40,7 +40,7 @@ import (
 )
 
 type mockBackend struct {
-	bc     *core.BlockChain
+	bc     BlockChain
 	txPool *txpool.TxPool
 }
 
@@ -51,7 +51,7 @@ func NewMockBackend(bc *core.BlockChain, txPool *txpool.TxPool) *mockBackend {
 	}
 }
 
-func (m *mockBackend) BlockChain() *core.BlockChain {
+func (m *mockBackend) BlockChain() BlockChain {
 	return m.bc
 }
 

diff --git a/miner/worker.go b/miner/worker.go
@@ -176,7 +176,7 @@ type worker struct {
 	chainConfig *params.ChainConfig
 	engine      consensus.Engine
 	eth         Backend
-	chain       *core.BlockChain
+	chain       BlockChain
 
 	// Feeds
 	pendingLogsFeed event.Feed
@@ -706,7 +706,10 @@ func (w *worker) makeEnv(parent *types.Header, header *types.Header, coinbase co
 	// the miner to speed block sealing up a bit.
 	state, err := w.chain.StateAt(parent.Root)
 	if err != nil {
-		return nil, err
+		state, err = w.chain.StateAtBlockNumber(parent.Number.Uint64())
+		if err != nil {
+			return nil, err
+		}
 	}
 	state.StartPrefetcher("miner")
 

diff --git a/miner/worker_test.go b/miner/worker_test.go
@@ -144,8 +144,8 @@ func newTestWorkerBackend(t *testing.T, chainConfig *params.ChainConfig, engine
 	}
 }
 
-func (b *testWorkerBackend) BlockChain() *core.BlockChain { return b.chain }
-func (b *testWorkerBackend) TxPool() *txpool.TxPool       { return b.txPool }
+func (b *testWorkerBackend) BlockChain() BlockChain { return b.chain }
+func (b *testWorkerBackend) TxPool() *txpool.TxPool { return b.txPool }
 
 func (b *testWorkerBackend) newRandomTx(creation bool) *types.Transaction {
 	var tx *types.Transaction