core: Do not process vote/block in agreement if it has stopped (#269)

1 files changed, 18 insertions, 4 deletions

diff --git a/core/agreement.go b/core/agreement.go
index cab896c..8c2218b 100644
--- a/core/agreement.go
+++ b/core/agreement.go
@@ -160,6 +160,10 @@ func (a *agreement) restart(
 		a.aID = *aID.Clone()
 	}()
 
+	if isStop(aID) {
+		return
+	}
+
 	expireTime := time.Now().Add(-10 * time.Second)
 	replayBlock := make([]*types.Block, 0)
 	func() {
@@ -210,6 +214,10 @@ func (a *agreement) stop() {
 	})
 }
 
+func isStop(aID types.Position) bool {
+	return aID.ChainID == math.MaxUint32
+}
+
 // clocks returns how many time this state is required.
 func (a *agreement) clocks() int {
 	return a.state.clocks()
@@ -279,8 +287,11 @@ func (a *agreement) processVote(vote *types.Vote) error {
 	}
 	aID := a.agreementID()
 	if vote.Position != aID {
-		if aID.Newer(&vote.Position) {
-			return nil
+		// Agreement module has stopped.
+		if !isStop(aID) {
+			if aID.Newer(&vote.Position) {
+				return nil
+			}
 		}
 		a.lock.Lock()
 		defer a.lock.Unlock()
@@ -383,8 +394,11 @@ func (a *agreement) processBlock(block *types.Block) error {
 
 	aID := a.agreementID()
 	if block.Position != aID {
-		if aID.Newer(&block.Position) {
-			return nil
+		// Agreement module has stopped.
+		if !isStop(aID) {
+			if aID.Newer(&block.Position) {
+				return nil
+			}
 		}
 		a.pendingBlock = append(a.pendingBlock, pendingBlock{
 			block:        block,