vote and syncInfo use epochInfo.Masternodes

Author: wanwiset25

consensus/XDPoS/engines/engine_v2/syncInfo.go

@@ -29,35 +29,36 @@ func (x *XDPoS_v2) VerifySyncInfoMessage(chain consensus.ChainReader, syncInfo *
 		return false, nil
 	}
 
-	snapshot, err := x.getSnapshot(chain, qc.GapNumber, true)
-	if err != nil {
-		log.Error("[VerifySyncInfoMessage] fail to get snapshot for a syncInfo message", "blockNum", qc.ProposedBlockInfo.Number, "blockHash", qc.ProposedBlockInfo.Hash, "error", err)
-		return false, err
-	}
-
 	voteSigHash := types.VoteSigHash(&types.VoteForSign{
 		ProposedBlockInfo: qc.ProposedBlockInfo,
 		GapNumber:         qc.GapNumber,
 	})
 
-	if err := x.verifySignatures(voteSigHash, qc.Signatures, snapshot.NextEpochCandidates); err != nil {
+	epochInfo, err := x.getEpochSwitchInfo(chain, nil, qc.ProposedBlockInfo.Hash)
+	if err != nil {
+		log.Error("[VerifySyncInfoMessage] fail to get epochInfo for qc syncInfo message", "blockNum", qc.ProposedBlockInfo.Number, "blockHash", qc.ProposedBlockInfo.Hash, "error", err)
+		return false, err
+	}
+
+	if err := x.verifySignatures(voteSigHash, qc.Signatures, epochInfo.Masternodes); err != nil {
 		log.Warn("[VerifySyncInfoMessage] SyncInfo message verification failed due to QC", "blockNum", qc.ProposedBlockInfo.Number, "gapNum", qc.GapNumber, "round", qc.ProposedBlockInfo.Round, "error", err)
 		return false, err
 	}
 
 	if tc != nil { // tc is optional, when the node is starting up there is no TC at the memory
-		snapshot, err = x.getSnapshot(chain, tc.GapNumber, true)
+		// TODO: verify TC should use chain.currentHeader() ? if processing TC it should be latest round ?
+		epochInfo, err := x.getEpochSwitchInfo(chain, chain.CurrentHeader(), chain.CurrentHeader().Hash())
 		if err != nil {
-			log.Error("[VerifySyncInfoMessage] Fail to get snapshot when verifying TC!", "tcGapNumber", tc.GapNumber)
-			return false, fmt.Errorf("[VerifySyncInfoMessage] Unable to get snapshot, %s", err)
+			log.Error("[VerifySyncInfoMessage] fail to get epochInfo for tc syncInfo message", "tcGapNumber", tc.GapNumber, "tcRound", tc.Round, "error", err)
+			return false, err
 		}
 
 		signedTimeoutObj := types.TimeoutSigHash(&types.TimeoutForSign{
 			Round:     tc.Round,
 			GapNumber: tc.GapNumber,
 		})
 
-		if err := x.verifySignatures(signedTimeoutObj, tc.Signatures, snapshot.NextEpochCandidates); err != nil {
+		if err := x.verifySignatures(signedTimeoutObj, tc.Signatures, epochInfo.Masternodes); err != nil {
 			log.Warn("[VerifySyncInfoMessage] SyncInfo message verification failed due to TC", "gapNum", tc.GapNumber, "round", tc.Round, "error", err)
 			return false, err
 		}

consensus/XDPoS/engines/engine_v2/vote.go

@@ -21,18 +21,19 @@ func (x *XDPoS_v2) VerifyVoteMessage(chain consensus.ChainReader, vote *types.Vo
 		log.Debug("[VerifyVoteMessage] Disqualified vote message as the proposed round does not match currentRound", "voteHash", vote.Hash(), "voteProposedBlockInfoRound", vote.ProposedBlockInfo.Round, "currentRound", x.currentRound)
 		return false, nil
 	}
+	epochInfo, err := x.getEpochSwitchInfo(chain, chain.CurrentHeader(), chain.CurrentHeader().Hash())
 
-	snapshot, err := x.getSnapshot(chain, vote.GapNumber, true)
 	if err != nil {
-		log.Error("[VerifyVoteMessage] fail to get snapshot for a vote message", "blockNum", vote.ProposedBlockInfo.Number, "blockHash", vote.ProposedBlockInfo.Hash, "voteHash", vote.Hash(), "error", err.Error())
+		log.Error("[VerifyVoteMessage] Fail to get epochInfo when verifying vote message!", "blockNum", vote.ProposedBlockInfo.Number, "blockHash", vote.ProposedBlockInfo.Hash, "voteHash", vote.Hash(), "voteGapNumber", vote.GapNumber, "err", err)
 		return false, err
 	}
+	
 	verified, signer, err := x.verifyMsgSignature(types.VoteSigHash(&types.VoteForSign{
 		ProposedBlockInfo: vote.ProposedBlockInfo,
 		GapNumber:         vote.GapNumber,
-	}), vote.Signature, snapshot.NextEpochCandidates)
+	}), vote.Signature, epochInfo.Masternodes)
 	if err != nil {
-		for i, mn := range snapshot.NextEpochCandidates {
+		for i, mn := range epochInfo.Masternodes {
 			log.Warn("[VerifyVoteMessage] Master node list item", "index", i, "Master node", mn.Hex())
 		}
 		log.Warn("[VerifyVoteMessage] Error while verifying vote message", "votedBlockNum", vote.ProposedBlockInfo.Number.Uint64(), "votedBlockHash", vote.ProposedBlockInfo.Hash.Hex(), "voteHash", vote.Hash(), "error", err.Error())