feat(dpos): update process proposal logic

elastos · Jan 14, 2025 · 3950281 · 3950281
1 parent b4c39e6
commit 3950281
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/dpos/manager/dposmanager.go b/dpos/manager/dposmanager.go
@@ -331,6 +331,10 @@ func (d *DPOSManager) isBlockExist(blockHash common.Uint256) bool {
 	return block != nil
 }
 
+func (d *DPOSManager) GetBlockByHash(blockHash common.Uint256) (*types.Block, error) {
+	return d.getBlock(blockHash)
+}
+
 func (d *DPOSManager) OnGetBlock(id dpeer.PID, blockHash common.Uint256) {
 	if !d.isCurrentArbiter() {
 		return

diff --git a/dpos/manager/proposaldispatcher.go b/dpos/manager/proposaldispatcher.go
@@ -326,8 +326,8 @@ func (p *ProposalDispatcher) ProcessProposal(id peer.PID, d *payload.DPOSProposa
 		return true, !self
 	}
 
-	currentBlock, ok := p.cfg.Manager.GetBlockCache().TryGetValue(d.BlockHash)
-	if !ok || !p.cfg.Consensus.IsRunning() {
+	currentBlock, err := p.GetBlockByHash(d.BlockHash)
+	if err != nil || !p.cfg.Consensus.IsRunning() {
 		p.pendingProposals[d.Hash()] = d
 		p.cfg.Manager.OnInv(id, d.BlockHash)
 		log.Info("received pending proposal")
@@ -353,6 +353,15 @@ func (p *ProposalDispatcher) ProcessProposal(id peer.PID, d *payload.DPOSProposa
 	return true, true
 }
 
+func (p *ProposalDispatcher) GetBlockByHash(hash common.Uint256) (*types.Block, error) {
+	block, ok := p.cfg.Manager.GetBlockCache().TryGetValue(hash)
+	if ok {
+		return block, nil
+	}
+
+	return p.cfg.Manager.GetBlockByHash(hash)
+}
+
 func (p *ProposalDispatcher) AppendConfirm() {
 	currentVoteSlot := &payload.Confirm{
 		Proposal: *p.processingProposal,