fix cleanup in priority nonce

thomas-nguy · thomas-nguy · commit 4199dea5fcc1 · 2025-11-17T10:13:58.000+09:00
diff --git a/types/mempool/priority_nonce.go b/types/mempool/priority_nonce.go
@@ -257,13 +257,13 @@ func (mp *PriorityNonceMempool[C]) Insert(ctx context.Context, tx sdk.Tx) error
 			)
 		}
 
-		mp.priorityIndex.Remove(txMeta[C]{
-			nonce:    nonce,
-			sender:   sender,
-			priority: oldScore.priority,
-			weight:   oldScore.weight,
-		})
+		oldKey := txMeta[C]{nonce: nonce, sender: sender, priority: oldScore.priority, weight: oldScore.weight}
+		mp.priorityIndex.Remove(oldKey)
+		mp.senderIndices[sender].Remove(oldKey)
 		mp.priorityCounts[oldScore.priority]--
+		if mp.priorityCounts[oldScore.priority] == 0 {
+			delete(mp.priorityCounts, oldScore.priority)
+		}
 	}
 
 	mp.priorityCounts[priority]++

Original file line number	Diff line number	Diff line change
`@@ -257,13 +257,13 @@ func (mp *PriorityNonceMempool[C]) Insert(ctx context.Context, tx sdk.Tx) error`
`257`	`257`	`)`
`258`	`258`	`}`
`259`	`259`
`260`		`- mp.priorityIndex.Remove(txMeta[C]{`
`261`		`- nonce: nonce,`
`262`		`- sender: sender,`
`263`		`- priority: oldScore.priority,`
`264`		`- weight: oldScore.weight,`
`265`		`- })`
	`260`	`+ oldKey := txMeta[C]{nonce: nonce, sender: sender, priority: oldScore.priority, weight: oldScore.weight}`
	`261`	`+ mp.priorityIndex.Remove(oldKey)`
	`262`	`+ mp.senderIndices[sender].Remove(oldKey)`
`266`	`263`	`mp.priorityCounts[oldScore.priority]--`
	`264`	`+ if mp.priorityCounts[oldScore.priority] == 0 {`
	`265`	`+ delete(mp.priorityCounts, oldScore.priority)`
	`266`	`+ }`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`mp.priorityCounts[priority]++`