fix compile error

Author: gzliudan

consensus/XDPoS/XDPoS.go

@@ -491,7 +491,7 @@ func (x *XDPoS) GetAuthorisedSignersFromSnapshot(chain consensus.ChainHeaderRead
 	}
 }
 
-func (x *XDPoS) FindParentBlockToAssign(chain consensus.ChainHeaderReader, currentBlock *types.Header) *types.Block {
+func (x *XDPoS) FindParentBlockToAssign(chain consensus.ChainReader, currentBlock *types.Header) *types.Block {
 	var parent *types.Block = nil
 	if x.config.BlockConsensusVersion(currentBlock.Number) == params.ConsensusEngineVersion2 {
 		parent = x.EngineV2.FindParentBlockToAssign(chain)

consensus/XDPoS/engines/engine_v1/engine.go

@@ -1011,8 +1011,10 @@ func removePenaltiesFromBlock(chain consensus.ChainHeaderReader, masternodes []c
 		return masternodes
 	}
 	header := chain.GetHeaderByNumber(epochNumber)
-	block := chain.GetBlock(header.Hash(), epochNumber)
-	penalties := block.Penalties()
+	if header == nil {
+		return masternodes
+	}
+	penalties := header.Penalties
 	if penalties != nil {
 		prevPenalties := common.ExtractAddressFromBytes(penalties)
 		masternodes = common.RemoveItemFromArray(masternodes, prevPenalties)

consensus/XDPoS/engines/engine_v2/engine.go

@@ -1063,7 +1063,7 @@ func (x *XDPoS_v2) GetPreviousPenaltyByHash(chain consensus.ChainHeaderReader, h
 	return common.ExtractAddressFromBytes(header.Penalties)
 }
 
-func (x *XDPoS_v2) FindParentBlockToAssign(chain consensus.ChainHeaderReader) *types.Block {
+func (x *XDPoS_v2) FindParentBlockToAssign(chain consensus.ChainReader) *types.Block {
 	parent := chain.GetBlock(x.highestQuorumCert.ProposedBlockInfo.Hash, x.highestQuorumCert.ProposedBlockInfo.Number.Uint64())
 	if parent == nil {
 		log.Error("[FindParentBlockToAssign] Can not find parent block from highestQC proposedBlockInfo", "x.highestQuorumCert.ProposedBlockInfo.Hash", x.highestQuorumCert.ProposedBlockInfo.Hash, "x.highestQuorumCert.ProposedBlockInfo.Number", x.highestQuorumCert.ProposedBlockInfo.Number.Uint64())

consensus/ethash/consensus.go

@@ -120,6 +120,10 @@ func (ethash *Ethash) VerifyHeaders(chain consensus.ChainHeaderReader, headers [
 // VerifyUncles verifies that the given block's uncles conform to the consensus
 // rules of the stock Ethereum ethash engine.
 func (ethash *Ethash) VerifyUncles(chain consensus.ChainHeaderReader, block *types.Block) error {
+	chainReader, ok := chain.(consensus.ChainReader)
+	if !ok {
+		return consensus.ErrUnknownAncestor
+	}
 	// Verify that there are at most 2 uncles included in this block
 	if len(block.Uncles()) > maxUncles {
 		return errTooManyUncles
@@ -129,7 +133,7 @@ func (ethash *Ethash) VerifyUncles(chain consensus.ChainHeaderReader, block *typ
 
 	number, parent := block.NumberU64()-1, block.ParentHash()
 	for i := 0; i < 7; i++ {
-		ancestor := chain.GetBlock(parent, number)
+		ancestor := chainReader.GetBlock(parent, number)
 		if ancestor == nil {
 			break
 		}

contracts/utils.go

@@ -332,8 +332,12 @@ func GetRewardForCheckpoint(c *XDPoS.XDPoS, chain consensus.ChainHeaderReader, h
 		signingTxs, ok := c.GetCachedSigningTxs(header.Hash())
 		if !ok {
 			log.Debug("Failed get from cached", "hash", header.Hash(), "number", i)
-			block := chain.GetBlock(header.Hash(), i)
-			txs := block.Transactions()
+			body := rawdb.ReadBody(c.GetDb(), header.Hash(), i)
+			if body == nil {
+				log.Debug("Failed get block body", "hash", header.Hash(), "number", i)
+				continue
+			}
+			txs := body.Transactions
 			if !chain.Config().IsTIPSigning(header.Number) {
 				receipts := rawdb.ReadRawReceipts(c.GetDb(), header.Hash(), i)
 				signingTxs = c.CacheNoneTIPSigningTxs(header, txs, receipts)

eth/hooks/engine_v1_hooks.go

@@ -42,7 +42,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
 				if i%common.MergeSignRange == 0 || !chainConfig.IsTIP2019(big.NewInt(int64(i))) {
 					bheader := chain.GetHeaderByNumber(i)
 					bhash := bheader.Hash()
-					block := chain.GetBlock(bhash, i)
+					block := bc.GetBlock(bhash, i)
 					if len(penSigners) > 0 {
 						signedMasternodes, err := contracts.GetSignersFromContract(canonicalState, block)
 						if err != nil {
@@ -144,7 +144,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
 				}
 				signingTxs, ok := adaptor.GetCachedSigningTxs(bhash)
 				if !ok {
-					block := chain.GetBlock(bhash, blockNumber)
+					block := bc.GetBlock(bhash, blockNumber)
 					txs := block.Transactions()
 					signingTxs = adaptor.CacheSigningTxs(bhash, txs)
 				}

eth/hooks/engine_v2_hooks.go

@@ -14,6 +14,7 @@ import (
 	"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils"
 	"github.com/XinFinOrg/XDPoSChain/contracts"
 	"github.com/XinFinOrg/XDPoSChain/core"
+	"github.com/XinFinOrg/XDPoSChain/core/rawdb"
 	"github.com/XinFinOrg/XDPoSChain/core/state"
 	"github.com/XinFinOrg/XDPoSChain/core/tracing"
 	"github.com/XinFinOrg/XDPoSChain/core/types"
@@ -155,7 +156,7 @@ func AttachConsensusV2Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
 					}
 					signingTxs, ok := adaptor.GetCachedSigningTxs(bhash)
 					if !ok {
-						block := chain.GetBlock(bhash, blockNumber)
+						block := bc.GetBlock(bhash, blockNumber)
 						if block != nil {
 							txs := block.Transactions()
 							signingTxs = adaptor.CacheSigningTxs(bhash, txs)
@@ -229,7 +230,7 @@ func AttachConsensusV2Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
 					}
 					signingTxs, ok := adaptor.GetCachedSigningTxs(bhash)
 					if !ok {
-						block := chain.GetBlock(bhash, blockNumber)
+						block := bc.GetBlock(bhash, blockNumber)
 						if block != nil {
 							txs := block.Transactions()
 							signingTxs = adaptor.CacheSigningTxs(bhash, txs)
@@ -504,9 +505,9 @@ func GetSigningTxCount(c *XDPoS.XDPoS, chain consensus.ChainHeaderReader, header
 		signingTxs, ok := c.GetCachedSigningTxs(h.Hash())
 		if !ok {
 			log.Debug("Failed get from cached", "hash", h.Hash(), "number", i)
-			block := chain.GetBlock(h.Hash(), i)
-			if block != nil {
-				txs := block.Transactions()
+			body := rawdb.ReadBody(c.GetDb(), h.Hash(), i)
+			if body != nil {
+				txs := body.Transactions
 				signingTxs = c.CacheSigningTxs(h.Hash(), txs)
 			}
 		}