Implement postponed validation of proposed blocks (#735)

idena-network · Jul 13, 2021 · dbd5bc2 · dbd5bc2
1 parent c7d8462
commit dbd5bc2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/consensus/engine.go b/consensus/engine.go
@@ -339,7 +339,7 @@ func (engine *Engine) proposeBlock(proof []byte) *types.Block {
 	engine.pm.ProposeProof(proofProposal)
 	engine.pm.ProposeBlock(proposal)
 
-	engine.proposals.AddProposedBlock(proposal, "", time.Now().UTC(), nil)
+	engine.proposals.AddProposedBlock(proposal, "", time.Now().UTC())
 	engine.proposals.AddProposeProof(proofProposal)
 
 	return proposal.Block

diff --git a/pengings/proposals.go b/pengings/proposals.go
@@ -196,28 +196,21 @@ func (proposals *Proposals) ProcessPendingProofs() []*types.ProofProposal {
 func (proposals *Proposals) ProcessPendingBlocks() []*types.BlockProposal {
 	var result []*types.BlockProposal
 
-	checkState, err := proposals.appState.ForCheck(proposals.chain.Head.Height())
-	if err != nil {
-		proposals.log.Warn("failed to create checkState", "err", err)
-	}
 	proposals.pendingBlocks.Range(func(key, value interface{}) bool {
 
 		blockPeer := value.(*blockPeer)
-		if added, pending := proposals.AddProposedBlock(blockPeer.proposal, blockPeer.peerId, blockPeer.receivingTime, checkState); added {
+		if added, pending := proposals.AddProposedBlock(blockPeer.proposal, blockPeer.peerId, blockPeer.receivingTime); added {
 			result = append(result, blockPeer.proposal)
 		} else if !pending {
 			proposals.pendingBlocks.Delete(key)
 		}
-		if checkState != nil {
-			checkState.Reset()
-		}
 		return true
 	})
 
 	return result
 }
 
-func (proposals *Proposals) AddProposedBlock(proposal *types.BlockProposal, peerId peer.ID, receivingTime time.Time, checkState *appstate.AppState) (added bool, pending bool) {
+func (proposals *Proposals) AddProposedBlock(proposal *types.BlockProposal, peerId peer.ID, receivingTime time.Time) (added bool, pending bool) {
 	block := proposal.Block
 	currentRound := proposals.chain.Round()
 	if currentRound == block.Height() {
@@ -258,8 +251,9 @@ func (proposals *Proposals) AddProposedBlock(proposal *types.BlockProposal, peer
 		if _, ok := round.Load(block.Hash()); ok {
 			return false, false
 		}
-		if _, err := proposals.chain.ValidateBlock(block, checkState, nil); err != nil {
-			log.Warn("Failed proposed block validation", "err", err)
+
+		if err := proposals.chain.ValidateHeader(block.Header, proposals.chain.Head); err != nil {
+			log.Warn("Failed proposed block header validation", "err", err)
 			// it might be a signal about a fork
 			if err == blockchain.ParentHashIsInvalid && peerId != "" {
 				proposals.potentialForkedPeers.Add(peerId)
@@ -303,6 +297,9 @@ func (proposals *Proposals) GetProposedBlock(round uint64, proposerPubKey []byte
 				return true
 			})
 			if result != nil {
+				if _, err := proposals.chain.ValidateBlock(result, nil, nil); err != nil {
+					return nil, err
+				}
 				return result, nil
 			}
 		}

diff --git a/protocol/gossip.go b/protocol/gossip.go
@@ -234,7 +234,7 @@ func (h *IdenaGossipHandler) handle(p *protoPeer) error {
 		}
 		// if peer proposes this msg it should be on `query.Round-1` height
 		p.setHeight(proposal.Block.Height() - 1)
-		if ok, _ := h.proposals.AddProposedBlock(proposal, p.id, time.Now().UTC(), nil); ok {
+		if ok, _ := h.proposals.AddProposedBlock(proposal, p.id, time.Now().UTC()); ok {
 			h.ProposeBlock(proposal)
 		}
 	case Vote: