minerchain

berachain · Oct 2, 2023 · 814ffd5 · 814ffd5
1 parent 564e2be
commit 814ffd5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/eth/backend.go b/eth/backend.go
@@ -467,6 +467,7 @@ func (s *Ethereum) Miner() *miner.Miner { return s.miner }
 
 func (s *Ethereum) AccountManager() *accounts.Manager  { return s.accountManager }
 func (s *Ethereum) BlockChain() *core.BlockChain       { return s.blockchain }
+func (s *Ethereum) MinerChain() miner.BlockChain       { return s.blockchain }
 func (s *Ethereum) TxPool() *txpool.TxPool             { return s.txPool }
 func (s *Ethereum) EventMux() *event.TypeMux           { return s.eventMux }
 func (s *Ethereum) Engine() consensus.Engine           { return s.engine }

diff --git a/miner/miner.go b/miner/miner.go
@@ -40,7 +40,7 @@ import (
 // Backend wraps all methods required for mining. Only full node is capable
 // to offer all the functions here.
 type Backend interface {
-	BlockChain() BlockChain
+	MinerChain() BlockChain
 	TxPool() *txpool.TxPool
 }
 

diff --git a/miner/miner_test.go b/miner/miner_test.go
@@ -55,6 +55,10 @@ func (m *mockBackend) BlockChain() BlockChain {
 	return m.bc
 }
 
+func (m *mockBackend) MinerChain() BlockChain {
+	return m.bc
+}
+
 func (m *mockBackend) TxPool() *txpool.TxPool {
 	return m.txPool
 }

diff --git a/miner/worker.go b/miner/worker.go
@@ -246,7 +246,7 @@ func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus
 		chainConfig:        chainConfig,
 		engine:             engine,
 		eth:                eth,
-		chain:              eth.BlockChain(),
+		chain:              eth.MinerChain(),
 		mux:                mux,
 		isLocalBlock:       isLocalBlock,
 		coinbase:           config.Etherbase,
@@ -266,7 +266,7 @@ func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus
 	// Subscribe NewTxsEvent for tx pool
 	worker.txsSub = eth.TxPool().SubscribeNewTxsEvent(worker.txsCh)
 	// Subscribe events for blockchain
-	worker.chainHeadSub = eth.BlockChain().SubscribeChainHeadEvent(worker.chainHeadCh)
+	worker.chainHeadSub = eth.MinerChain().SubscribeChainHeadEvent(worker.chainHeadCh)
 
 	// Sanitize recommit interval if the user-specified one is too short.
 	recommit := worker.config.Recommit

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