flush queued txs if there is newly added txs from mempool or blocks

Author: beer-1

Diff for: indexer/abci.go

@@ -44,14 +44,15 @@ func (e *EVMIndexerImpl) ListenFinalizeBlock(ctx context.Context, req abci.Reque
 	cumulativeGasUsed := uint64(0)
 	ethTxs := make([]*coretypes.Transaction, 0, len(req.Txs))
 	receipts := make([]*coretypes.Receipt, 0, len(req.Txs))
+	senderNonceMap := make(map[string]uint64)
 	for idx, txBytes := range req.Txs {
 		tx, err := e.txConfig.TxDecoder()(txBytes)
 		if err != nil {
 			e.logger.Error("failed to decode tx", "err", err)
 			continue
 		}
 
-		ethTx, _, err := keeper.NewTxUtils(e.evmKeeper).ConvertCosmosTxToEthereumTx(sdkCtx, tx)
+		ethTx, sender, err := keeper.NewTxUtils(e.evmKeeper).ConvertCosmosTxToEthereumTx(sdkCtx, tx)
 		if err != nil {
 			e.logger.Error("failed to convert CosmosTx to EthTx", "err", err)
 			return err
@@ -82,6 +83,7 @@ func (e *EVMIndexerImpl) ListenFinalizeBlock(ctx context.Context, req abci.Reque
 
 		txIndex++
 		ethTxs = append(ethTxs, ethTx)
+		senderNonceMap[sender.Hex()] = ethTx.Nonce()
 
 		// extract logs and contract address from tx results
 		ethLogs, contractAddr, err := extractLogsAndContractAddr(txStatus, txResult.Data, ethTx.To() == nil)
@@ -201,6 +203,18 @@ func (e *EVMIndexerImpl) ListenFinalizeBlock(ctx context.Context, req abci.Reque
 		}
 	}()
 
+	// flush queued txs to mempool
+	if e.flushQueuedTxs != nil {
+		go func() {
+			for senderHex, nonce := range senderNonceMap {
+				// try to flush queued txs from the next nonce
+				if err := e.flushQueuedTxs(senderHex, nonce+1); err != nil {
+					e.logger.Error("failed to flush queued txs", "err", err)
+				}
+			}
+		}()
+	}
+
 	// TODO - currently state changes are not supported in abci listener, so we track cosmos block hash at x/evm preblocker.
 	// - https://github.com/cosmos/cosmos-sdk/issues/22246
 	//

Diff for: indexer/abci_test.go

@@ -112,6 +112,38 @@ func Test_ListenFinalizeBlock_Subscribe(t *testing.T) {
 	done()
 }
 
+func Test_ListenFinalizeBlock_FlushQueuedTxs(t *testing.T) {
+	app, addrs, privKeys := tests.CreateApp(t)
+	indexer := app.EVMIndexer()
+	defer app.Close()
+
+	received := make(map[string]uint64)
+
+	wg := sync.WaitGroup{}
+	wg.Add(1)
+	indexer.RegisterFlushQueuedTxs(func(senderHex string, accSeq uint64) error {
+		received[senderHex] = accSeq
+		wg.Done()
+		return nil
+	})
+
+	tx, _ := tests.GenerateCreateERC20Tx(t, app, privKeys[0])
+
+	// load current sequence
+	ctx, err := app.CreateQueryContext(0, false)
+	require.NoError(t, err)
+	seq, err := app.AccountKeeper.GetSequence(ctx, addrs[0].Bytes())
+	require.NoError(t, err)
+
+	_, finalizeRes := tests.ExecuteTxs(t, app, tx)
+	tests.CheckTxResult(t, finalizeRes.TxResults[0], true)
+
+	wg.Wait()
+
+	require.Len(t, received, 1)
+	require.Equal(t, uint64(seq+1), received[addrs[0].Hex()])
+}
+
 func Test_ListenFinalizeBlock_ContractCreation(t *testing.T) {
 	app, _, privKeys := tests.CreateApp(t)
 	indexer := app.EVMIndexer()

Diff for: indexer/indexer.go

@@ -54,6 +54,9 @@ type EVMIndexer interface {
 	MempoolWrapper(mempool mempool.Mempool) mempool.Mempool
 	TxInMempool(hash common.Hash) *rpctypes.RPCTransaction
 
+	// register flush queued txs function to
+	RegisterFlushQueuedTxs(f FlushQueuedTxs)
+
 	// bloom
 	ReadBloomBits(ctx context.Context, section uint64, index uint32) ([]byte, error)
 	PeekBloomBitsNextSection(ctx context.Context) (uint64, error)
@@ -63,6 +66,9 @@ type EVMIndexer interface {
 	Stop()
 }
 
+// FlushQueuedTxs is a function to flush queued transactions.
+type FlushQueuedTxs = func(senderHex string, accSeq uint64) error
+
 // EVMIndexerImpl implements EVMIndexer.
 type EVMIndexerImpl struct {
 	enabled      bool
@@ -102,6 +108,9 @@ type EVMIndexerImpl struct {
 
 	// txPendingMap is a map to store tx hashes in pending state.
 	txPendingMap *ttlcache.Cache[common.Hash, *rpctypes.RPCTransaction]
+
+	// flushQueuedTxs is a function to flush queued transactions to mempool.
+	flushQueuedTxs FlushQueuedTxs
 }
 
 func NewEVMIndexer(
@@ -163,6 +172,8 @@ func NewEVMIndexer(
 			// pending tx lifetime is 1 minute in indexer
 			ttlcache.WithTTL[common.Hash, *rpctypes.RPCTransaction](time.Minute),
 		),
+
+		flushQueuedTxs: nil,
 	}
 
 	schema, err := sb.Build()
@@ -189,6 +200,11 @@ func (e *EVMIndexerImpl) Subscribe() (chan *coretypes.Header, chan []*coretypes.
 	return blockChan, logsChan, pendingChan
 }
 
+// RegisterFlushQueuedTxs registers a function to flush queued transactions.
+func (e *EVMIndexerImpl) RegisterFlushQueuedTxs(f FlushQueuedTxs) {
+	e.flushQueuedTxs = f
+}
+
 // blockEvents is a struct to emit block events.
 type blockEvents struct {
 	header *coretypes.Header

Diff for: indexer/mempool.go

@@ -43,14 +43,17 @@ func (m *MempoolWrapper) CountTx() int {
 // Insert implements mempool.Mempool.
 func (m *MempoolWrapper) Insert(ctx context.Context, tx sdk.Tx) error {
 	txUtils := evmkeeper.NewTxUtils(m.indexer.evmKeeper)
-	ethTx, _, err := txUtils.ConvertCosmosTxToEthereumTx(ctx, tx)
+	ethTx, sender, err := txUtils.ConvertCosmosTxToEthereumTx(ctx, tx)
 	if err != nil {
 		m.indexer.logger.Error("failed to convert CosmosTx to EthTx", "err", err)
 		return err
 	}
 
 	if ethTx != nil {
 		ethTxHash := ethTx.Hash()
+		senderHex := sender.Hex()
+		nonce := ethTx.Nonce()
+
 		rpcTx := rpctypes.NewRPCTransaction(ethTx, common.Hash{}, 0, 0, ethTx.ChainId())
 
 		m.indexer.logger.Debug("inserting tx into mempool", "pending len", m.indexer.txPendingMap.Len(), "ethTxHash", ethTxHash)
@@ -62,6 +65,15 @@ func (m *MempoolWrapper) Insert(ctx context.Context, tx sdk.Tx) error {
 				pendingChan <- rpcTx
 			}
 		}()
+
+		if m.indexer.flushQueuedTxs != nil {
+			go func() {
+				// try to flush queued txs from the next nonce
+				if err := m.indexer.flushQueuedTxs(senderHex, nonce+1); err != nil {
+					m.indexer.logger.Error("failed to flush queued txs", "err", err)
+				}
+			}()
+		}
 	}
 
 	return m.mempool.Insert(ctx, tx)

Diff for: indexer/mempool_test.go

@@ -55,6 +55,40 @@ func Test_Mempool_Subscribe(t *testing.T) {
 	done()
 }
 
+func Test_Mempool_TriggerFlushQueuedTxs(t *testing.T) {
+	app, addrs, privKeys := tests.CreateApp(t)
+	indexer := app.EVMIndexer()
+	defer app.Close()
+
+	received := make(map[string]uint64)
+
+	wg := sync.WaitGroup{}
+	wg.Add(1)
+	indexer.RegisterFlushQueuedTxs(func(senderHex string, accSeq uint64) error {
+		received[senderHex] = accSeq
+		wg.Done()
+		return nil
+	})
+
+	tx, _ := tests.GenerateCreateERC20Tx(t, app, privKeys[0])
+
+	noopMempool := &mempool.NoOpMempool{}
+	mempool := indexer.MempoolWrapper(noopMempool)
+
+	// insert tx into mempool
+	ctx, err := app.CreateQueryContext(0, false)
+	require.NoError(t, err)
+	seq, err := app.AccountKeeper.GetSequence(ctx, addrs[0].Bytes())
+	require.NoError(t, err)
+	err = mempool.Insert(ctx, tx)
+	require.NoError(t, err)
+
+	wg.Wait()
+
+	require.Len(t, received, 1)
+	require.Equal(t, uint64(seq+1), received[addrs[0].Hex()])
+}
+
 func consumeBlockLogsChan(blockCh <-chan *coretypes.Header, logChan <-chan []*coretypes.Log, duration int) {
 	timer := time.NewTimer(time.Second * time.Duration(duration))
 

Diff for: jsonrpc/backend/backend.go

@@ -149,6 +149,9 @@ func NewJSONRPCBackend(
 	// Start the bloom bits servicing goroutines
 	b.startBloomHandlers(evmconfig.SectionSize)
 
+	// Register flush queued txs function
+	b.app.EVMIndexer().RegisterFlushQueuedTxs(b.FlushQueuedTxs)
+
 	return b, nil
 }
 

Diff for: jsonrpc/backend/tx.go

@@ -75,10 +75,6 @@ func (b *JSONRPCBackend) SendTx(tx *coretypes.Transaction) error {
 
 	senderHex := common.BytesToAddress(sender.Bytes()).Hex()
 
-	// hold mutex for each sender
-	accMut := b.acquireAccMut(senderHex)
-	defer b.releaseAccMut(senderHex, accMut)
-
 	checkCtx := b.app.GetContextForCheckTx(nil)
 	if acc := b.app.AccountKeeper.GetAccount(checkCtx, sender); acc != nil {
 		accSeq = acc.GetSequence()
@@ -93,9 +89,26 @@ func (b *JSONRPCBackend) SendTx(tx *coretypes.Transaction) error {
 
 	txHash := tx.Hash()
 	b.queuedTxHashes.Store(txHash, cacheKey)
+
+	// hold mutex for each sender
+	accMut := b.acquireAccMut(senderHex)
 	_ = b.queuedTxs.Add(cacheKey, txQueueItem{hash: txHash, bytes: txBytes, body: tx, sender: senderHex})
+	b.releaseAccMut(senderHex, accMut)
 
 	// check if there are queued txs which can be sent
+	if err = b.FlushQueuedTxs(senderHex, accSeq); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// flush the queued transactions for the given sender only if the sequence matches
+func (b *JSONRPCBackend) FlushQueuedTxs(senderHex string, accSeq uint64) error {
+	// hold mutex for each sender
+	accMut := b.acquireAccMut(senderHex)
+	defer b.releaseAccMut(senderHex, accMut)
+
 	for {
 		cacheKey := fmt.Sprintf("%s-%d", senderHex, accSeq)
 		if txQueueItem, ok := b.queuedTxs.Get(cacheKey); ok {

Diff for: x/evm/keeper/txutils.go

@@ -91,6 +91,7 @@ func (u *TxUtils) ConvertEthereumTxToCosmosTx(ctx context.Context, ethTx *corety
 	if err != nil {
 		return nil, err
 	}
+
 	// sig bytes
 	v, r, s := ethTx.RawSignatureValues()
 	sigBytes := make([]byte, 65)