From 3b2c3bbb6a32cc51add6629b096d6d9e9bf62b8f Mon Sep 17 00:00:00 2001
From: Steven Landers <steven.landers@gmail.com>
Date: Thu, 25 Jan 2024 23:10:10 -0500
Subject: [PATCH] avoid double insert

---
 internal/mempool/mempool.go | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/internal/mempool/mempool.go b/internal/mempool/mempool.go
index ed3a68668..7c24668dd 100644
--- a/internal/mempool/mempool.go
+++ b/internal/mempool/mempool.go
@@ -331,10 +331,6 @@ func (txmp *TxMempool) CheckTx(
 				"nonce", res.EVMNonce,
 				"address", res.EVMSenderAddress,
 			)
-
-			if wtx.gossipEl != txmp.recheckCursor {
-				panic("corrupted reCheckTx cursor")
-			}
 			txmp.removeTx(wtx, !txmp.config.KeepInvalidTxsInCache)
 		} else {
 			// otherwise add to pending txs store
@@ -659,15 +655,19 @@ func (txmp *TxMempool) addNewTransaction(wtx *WrappedTx, res *abci.ResponseCheck
 	txmp.metrics.Size.Set(float64(txmp.Size()))
 	txmp.metrics.PendingSize.Set(float64(txmp.PendingSize()))
 
-	txmp.insertTx(wtx)
-	txmp.logger.Debug(
-		"inserted good transaction",
-		"priority", wtx.priority,
-		"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
-		"height", txmp.height,
-		"num_txs", txmp.Size(),
-	)
-	txmp.notifyTxsAvailable()
+	if txmp.insertTx(wtx) {
+		txmp.logger.Debug(
+			"inserted good transaction",
+			"priority", wtx.priority,
+			"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
+			"height", txmp.height,
+			"num_txs", txmp.Size(),
+		)
+		txmp.notifyTxsAvailable()
+	} else {
+		fmt.Println("DEBUG: ******************************** NOT INSERTING, ALREADY EXISTS")
+	}
+
 	return nil
 }
 
@@ -843,8 +843,10 @@ func (txmp *TxMempool) mustNotExist(msg string, wtx *WrappedTx) {
 	}
 }
 
-func (txmp *TxMempool) insertTx(wtx *WrappedTx) {
-	txmp.mustNotExist("insertTx", wtx)
+func (txmp *TxMempool) insertTx(wtx *WrappedTx) bool {
+	if txmp.isInMempool(wtx.tx) {
+		return false
+	}
 
 	txmp.txStore.SetTx(wtx)
 	txmp.priorityIndex.PushTx(wtx)
@@ -858,6 +860,7 @@ func (txmp *TxMempool) insertTx(wtx *WrappedTx) {
 	wtx.gossipEl = gossipEl
 
 	atomic.AddInt64(&txmp.sizeBytes, int64(wtx.Size()))
+	return true
 }
 
 func (txmp *TxMempool) removeTx(wtx *WrappedTx, removeFromCache bool) {