fix iotexproject#2 isssue

Liuhaai · Dec 19, 2023 · 3fa5ee5 · dustinxie · Dec 19, 2023 · 3fa5ee5
1 parent 301011d
commit 3fa5ee5
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/actpool/actqueue.go b/actpool/actqueue.go
@@ -181,12 +181,9 @@ func (q *actQueue) cleanTimeout() []action.SealedEnvelope {
 		size             = len(q.ascQueue)
 	)
 	for i := 0; i < size; {
-		// TODO: keep consequence nonce actions
-		if timeNow.After(q.ascQueue[i].deadline) {
+		// only remove the action if it is timed out and nonce is larger than pendingNonce
+		if timeNow.After(q.ascQueue[i].deadline) && nonce >= q.pendingNonce{
 			nonce := q.ascQueue[i].nonce
-			if nonce < q.pendingNonce {
-				q.pendingNonce = nonce
-			}
 			removedFromQueue = append(removedFromQueue, q.items[nonce])
 			delete(q.items, nonce)
 			delete(q.pendingBalance, nonce)