fix tx counter

sequencer/addrqueue.go

@@ -191,8 +191,6 @@ func (a *addrQueue) updateCurrentNonceBalance(nonce *uint64, balance *big.Int) (
 		if (a.readyTx.Nonce != a.currentNonce) || (a.currentBalance.Cmp(a.readyTx.Cost) < 0) {
 			oldReadyTx = a.readyTx
 			a.readyTx = nil
-
-			getPoolReadyTxCounter().delete(oldReadyTx.FromStr)
 		}
 	}
 
@@ -205,8 +203,6 @@ func (a *addrQueue) updateCurrentNonceBalance(nonce *uint64, balance *big.Int) (
 				a.readyTx = nrTx
 				log.Infof("set notReadyTx %s as readyTx for addrQueue %s", nrTx.HashStr, a.fromStr)
 				delete(a.notReadyTxs, a.currentNonce)
-
-				getPoolReadyTxCounter().set(a.fromStr, a.GetTxCount())
 			}
 		}
 	}
@@ -215,8 +211,6 @@ func (a *addrQueue) updateCurrentNonceBalance(nonce *uint64, balance *big.Int) (
 	if oldReadyTx != nil && oldReadyTx.Nonce > a.currentNonce {
 		log.Infof("set readyTx %s as notReadyTx from addrQueue %s", oldReadyTx.HashStr, a.fromStr)
 		a.notReadyTxs[oldReadyTx.Nonce] = oldReadyTx
-
-		getPoolReadyTxCounter().delete(oldReadyTx.FromStr)
 	}
 
 	return a.readyTx, oldReadyTx, txsToDelete

sequencer/addrqueue_xlayer.go

@@ -4,11 +4,13 @@ func (a *addrQueue) GetTxCount() int64 {
 	if a == nil {
 		return 0
 	}
-	var readyTxCount, notReadyTxCount int64
+	var readyTxCount int64
 	if a.readyTx != nil {
 		readyTxCount = 1
 	}
-	notReadyTxCount = int64(len(a.notReadyTxs))
+	notReadyTxCount := int64(len(a.notReadyTxs))
+	forcedTxCount := int64(len(a.forcedTxs))
+	pendingTxsToStoreCount := int64(len(a.pendingTxsToStore))
 
-	return readyTxCount + notReadyTxCount
+	return readyTxCount + notReadyTxCount + forcedTxCount + pendingTxsToStoreCount
 }

sequencer/txsorted_list.go

@@ -40,6 +40,7 @@ func (e *txSortedList) add(tx *TxTracker) bool {
 func (e *txSortedList) delete(tx *TxTracker) bool {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
+	getPoolReadyTxCounter().delete(tx.FromStr)
 
 	if tx, found := e.list[tx.HashStr]; found {
 		sLen := len(e.sorted)

sequencer/worker.go

@@ -203,8 +203,6 @@ func (w *Worker) DeleteTx(txHash common.Hash, addr common.Address) {
 		if deletedReadyTx != nil {
 			log.Debugf("tx %s deleted from TxSortedList", deletedReadyTx.Hash.String())
 			w.txSortedList.delete(deletedReadyTx)
-
-			getPoolReadyTxCounter().set(addrQueue.fromStr, addrQueue.GetTxCount())
 		}
 	} else {
 		log.Warnf("addrQueue %s not found", addr.String())