fixed get miner rpc is 0 bug

Author: bin8886

consensus/clique/clique.go

@@ -56,11 +56,11 @@ const (
 var (
 	epochLength = uint64(30000) // Default number of blocks after which to checkpoint and reset the pending votes
 
-	extraVanity = 32                     // Fixed number of extra-data prefix bytes reserved for signer vanity
-	extraSeal   = crypto.SignatureLength // Fixed number of extra-data suffix bytes reserved for signer seal
+	extraVanity    = 32                     // Fixed number of extra-data prefix bytes reserved for signer vanity
+	extraSeal      = crypto.SignatureLength // Fixed number of extra-data suffix bytes reserved for signer seal
 	extraElaHeight = 8
-	nonceAuthVote = hexutil.MustDecode("0xffffffffffffffff") // Magic nonce number to vote on adding a new signer
-	nonceDropVote = hexutil.MustDecode("0x0000000000000000") // Magic nonce number to vote on removing a signer.
+	nonceAuthVote  = hexutil.MustDecode("0xffffffffffffffff") // Magic nonce number to vote on adding a new signer
+	nonceDropVote  = hexutil.MustDecode("0x0000000000000000") // Magic nonce number to vote on removing a signer.
 
 	uncleHash = types.CalcUncleHash(nil) // Always Keccak256(RLP([])) as uncles are meaningless outside of PoW.
 
@@ -162,7 +162,6 @@ func ecrecover(header *types.Header, sigcache *lru.ARCCache) (common.Address, er
 	}
 	var signer common.Address
 	copy(signer[:], crypto.Keccak256(pubkey[1:])[12:])
-
 	sigcache.Add(hash, signer)
 	return signer, nil
 }
@@ -383,7 +382,7 @@ func (c *Clique) snapshot(chain consensus.ChainReader, number uint64, hash commo
 			if checkpoint != nil {
 				hash := checkpoint.Hash()
 				signersSize := len(checkpoint.Extra) - extraVanity - extraSeal
-				if signersSize %common.AddressLength == extraElaHeight {
+				if signersSize%common.AddressLength == extraElaHeight {
 					signersSize -= extraElaHeight
 				}
 
@@ -425,7 +424,7 @@ func (c *Clique) snapshot(chain consensus.ChainReader, number uint64, hash commo
 	beforeChangeEngine := false
 	for i := 0; i < len(headers); i++ {
 		beforeChangeEngine = c.isBeforeChangeEngine(chain, headers[i])
-		log.Info("snap headers","number:", headers[i].Number.Uint64(), "beforeChangeEngine", beforeChangeEngine)
+		log.Info("snap headers", "number:", headers[i].Number.Uint64(), "beforeChangeEngine", beforeChangeEngine)
 		if beforeChangeEngine {
 			log.Info("get before change engine header")
 			break
@@ -586,7 +585,7 @@ func (c *Clique) Finalize(chain consensus.ChainReader, header *types.Header, sta
 	// No block rewards in PoA, so the state remains as is and uncles are dropped
 	header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
 	header.UncleHash = types.CalcUncleHash(nil)
-	log.Info("clique finalize", "height", header.Number.Uint64(), "hash",   header.Hash().String())
+	log.Info("clique finalize", "height", header.Number.Uint64(), "hash", header.Hash().String())
 }
 
 // FinalizeAndAssemble implements consensus.Engine, ensuring no uncles are set,
@@ -615,7 +614,7 @@ func (c *Clique) isBeforeChangeEngine(chain consensus.ChainReader,
 	if chain.Config().PBFTBlock == nil {
 		return false
 	}
-	return chain.Config().PBFTBlock.Uint64() - 1 == header.Number.Uint64()
+	return chain.Config().PBFTBlock.Uint64()-1 == header.Number.Uint64()
 }
 
 // Seal implements consensus.Engine, attempting to create a sealed block using
@@ -696,7 +695,7 @@ func (c *Clique) Seal(chain consensus.ChainReader, block *types.Block, results c
 	if err != nil {
 		return err
 	}
-	copy(header.Extra[length - extraSeal:], sighash)
+	copy(header.Extra[length-extraSeal:], sighash)
 	// Wait until sealing is terminated or delay timeout.
 	log.Trace("Waiting for slot to sign and propagate", "delay", common.PrettyDuration(delay))
 	go func() {

core/headerchain.go

@@ -69,9 +69,10 @@ type HeaderChain struct {
 }
 
 // NewHeaderChain creates a new HeaderChain structure.
-//  getValidator should return the parent's validator
-//  procInterrupt points to the parent's interrupt semaphore
-//  wg points to the parent's shutdown wait group
+//
+//	getValidator should return the parent's validator
+//	procInterrupt points to the parent's interrupt semaphore
+//	wg points to the parent's shutdown wait group
 func NewHeaderChain(chainDb ethdb.Database, config *params.ChainConfig, engine consensus.Engine, procInterrupt func() bool) (*HeaderChain, error) {
 	headerCache, _ := lru.New(headerCacheLimit)
 	tdCache, _ := lru.New(tdCacheLimit)
@@ -123,6 +124,14 @@ func (hc *HeaderChain) SetDposChain(engine consensus.Engine) {
 	hc.pbftEngine = engine
 }
 
+func (hc *HeaderChain) GetPOAEngine() consensus.Engine {
+	return hc.poaEngine
+}
+
+func (hc *HeaderChain) GetDposChain() consensus.Engine {
+	return hc.pbftEngine
+}
+
 // GetBlockNumber retrieves the block number belonging to the given hash
 // from the cache or database
 func (hc *HeaderChain) GetBlockNumber(hash common.Hash) *uint64 {

eth/api_backend.go

@@ -46,8 +46,11 @@ type EthAPIBackend struct {
 	gpo           *gasprice.Oracle
 }
 
-func (b *EthAPIBackend) Engine() consensus.Engine {
-	return b.eth.engine
+func (b *EthAPIBackend) Engine(number *big.Int) consensus.Engine {
+	if b.ChainConfig().IsPBFTFork(number) {
+		return b.eth.BlockChain().GetDposEngine()
+	}
+	return b.eth.BlockChain().GetPoAEngine()
 }
 
 // ChainConfig returns the active chain configuration.

internal/ethapi/api.go

@@ -1219,7 +1219,7 @@ func (s *PublicBlockChainAPI) rpcMarshalHeader(header *types.Header) map[string]
 	fields := RPCMarshalHeader(header)
 	var zeroAddress common.Address
 	if header.Coinbase == zeroAddress {
-		coinbase, err := s.b.Engine().Author(header)
+		coinbase, err := s.b.Engine(header.Number).Author(header)
 		if err == nil {
 			fields["miner"] = coinbase
 		} else {
@@ -1241,7 +1241,7 @@ func (s *PublicBlockChainAPI) rpcMarshalBlock(b *types.Block, inclTx bool, fullT
 	fields["totalDifficulty"] = (*hexutil.Big)(s.b.GetTd(b.Hash()))
 	var zeroAddress common.Address
 	if b.Coinbase() == zeroAddress {
-		coinbase, err := s.b.Engine().Author(b.Header())
+		coinbase, err := s.b.Engine(b.Number()).Author(b.Header())
 		if err == nil {
 			fields["miner"] = coinbase
 		} else {

internal/ethapi/backend.go

@@ -85,7 +85,7 @@ type Backend interface {
 
 	ChainConfig() *params.ChainConfig
 	CurrentBlock() *types.Block
-	Engine() consensus.Engine
+	Engine(number *big.Int) consensus.Engine
 }
 
 func GetAPIs(apiBackend Backend) []rpc.API {

les/api_backend.go

@@ -46,8 +46,11 @@ type LesApiBackend struct {
 	gpo           *gasprice.Oracle
 }
 
-func (b *LesApiBackend) Engine() consensus.Engine {
-	return b.eth.engine
+func (b *LesApiBackend) Engine(number *big.Int) consensus.Engine {
+	if b.ChainConfig().IsPBFTFork(number) {
+		return b.eth.BlockChain().GetDposEngine()
+	}
+	return b.eth.BlockChain().GetPOAEngine()
 }
 
 func (b *LesApiBackend) ChainConfig() *params.ChainConfig {

light/lightchain.go

@@ -150,6 +150,14 @@ func (lc *LightChain) SetPOAEngine(engine consensus.Engine) {
 	lc.hc.SetPOAEngine(engine)
 }
 
+func (lc *LightChain) GetDposEngine() consensus.Engine {
+	return lc.hc.GetDposChain()
+}
+
+func (lc *LightChain) GetPOAEngine() consensus.Engine {
+	return lc.hc.GetPOAEngine()
+}
+
 // AddTrustedCheckpoint adds a trusted checkpoint to the blockchain
 func (lc *LightChain) AddTrustedCheckpoint(cp *params.TrustedCheckpoint) {
 	if lc.odr.ChtIndexer() != nil {
@@ -650,4 +658,4 @@ func (lc *LightChain) addEvilSingerEvents(evilEvents []*core.EvilSingerEvent) []
 		lc.evilSigners = &core.EvilSignersMap{}
 	}
 	return lc.evilSigners.AddEvilSingerEvents(evilEvents)
-}
+}