Remove old transactions from TX pool (#68)

idena-network · Jul 30, 2019 · 3003d65 · 3003d65
1 parent 6a3414b
commit 3003d65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/api/dna_api.go b/api/dna_api.go
@@ -44,6 +44,7 @@ func (api *DnaApi) GetCoinbaseAddr() common.Address {
 type Balance struct {
 	Stake   decimal.Decimal `json:"stake"`
 	Balance decimal.Decimal `json:"balance"`
+	Nonce   uint32          `json:"nonce"`
 }
 
 func (api *DnaApi) GetBalance(address common.Address) Balance {
@@ -52,6 +53,7 @@ func (api *DnaApi) GetBalance(address common.Address) Balance {
 	return Balance{
 		Stake:   blockchain.ConvertToFloat(state.State.GetStakeBalance(address)),
 		Balance: blockchain.ConvertToFloat(state.State.GetBalance(address)),
+		Nonce:   state.State.GetNonce(address),
 	}
 }
 

diff --git a/core/mempool/txpool.go b/core/mempool/txpool.go
@@ -195,16 +195,11 @@ func (txpool *TxPool) ResetTo(block *types.Block) {
 		if tx.Epoch > globalEpoch {
 			continue
 		}
-
-		sender, _ := types.Sender(tx)
-		if tx.AccountNonce <= txpool.appState.State.GetNonce(sender) && txpool.appState.State.GetEpoch(sender) == globalEpoch {
-			continue
-		}
-
 		if err := validation.ValidateTx(appState, tx, false); err != nil {
 			txpool.Remove(tx)
 			continue
 		}
+		sender, _ := types.Sender(tx)
 		txpool.appState.NonceCache.SetNonce(sender, tx.Epoch, tx.AccountNonce)
 	}
 }