update tracker

common/txmgr/tracker.go

@@ -110,17 +110,21 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) startIntern
 	if err := tr.setEnabledAddresses(ctx); err != nil {
 		return fmt.Errorf("failed to set enabled addresses: %w", err)
 	}
+	tr.lggr.Infof("enabled addresses set for chainID %v", tr.chainID)
 
 	if err := tr.trackAbandonedTxes(ctx); err != nil {
 		return fmt.Errorf("failed to track abandoned txes: %w", err)
 	}
 
-	if len(tr.txCache) > 0 {
-		tr.lggr.Infof("%d abandoned txes found, starting runLoop", len(tr.txCache))
-		tr.wg.Add(1)
-		go tr.runLoop()
+	if len(tr.txCache) == 0 {
+		tr.lggr.Info("no abandoned txes found, skipping runLoop")
+		tr.isStarted = true
+		return nil
 	}
 
+	tr.lggr.Infof("%d abandoned txes found, starting runLoop", len(tr.txCache))
+	tr.wg.Add(1)
+	go tr.runLoop()
 	tr.isStarted = true
 	return nil
 }
@@ -137,7 +141,7 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) closeIntern
 
 	tr.lggr.Info("stopping tracker")
 	if !tr.isStarted {
-		return fmt.Errorf("tracker not started")
+		return fmt.Errorf("tracker is not started: %w", services.ErrAlreadyStopped)
 	}
 
 	close(tr.chStop)
@@ -160,9 +164,14 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop() {
 				if !exists {
 					break
 				}
+				tr.lggr.Infof("received blockHeight %v", blockHeight)
 				if err := tr.handleTxesByState(ctx, blockHeight); err != nil {
 					tr.lggr.Errorw(fmt.Errorf("failed to handle txes by state: %w", err).Error())
 				}
+				if len(tr.txCache) == 0 {
+					tr.lggr.Info("all abandoned txes handled, stopping runLoop")
+					return
+				}
 			}
 		case <-ttlExceeded.C:
 			tr.lggr.Info("ttl exceeded")
@@ -175,13 +184,13 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop() {
 }
 
 func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetAbandonedAddresses() []ADDR {
-	tr.lock.Lock()
-	defer tr.lock.Unlock()
-
 	if !tr.isStarted {
 		return []ADDR{}
 	}
 
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+
 	abandonedAddrs := make([]ADDR, len(tr.txCache))
 	for _, atx := range tr.txCache {
 		abandonedAddrs = append(abandonedAddrs, atx.fromAddress)
@@ -209,10 +218,10 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) setEnabledA
 	return nil
 }
 
-// trackAbandonedTxes called once to find and insert all abandoned txes into the tracker.
+// trackAbandonedTxes called once on stratup to find and insert all abandoned txes into the tracker.
 func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) trackAbandonedTxes(ctx context.Context) (err error) {
 	if tr.isStarted {
-		return fmt.Errorf("tracker already started")
+		return fmt.Errorf("trackAbandonedTxes must only be called once on startup")
 	}
 
 	return sqlutil.Batch(func(offset, limit uint) (count uint, err error) {
@@ -282,6 +291,11 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) handleConfi
 	tx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
 	blockHeight int64,
 ) error {
+	if blockHeight == 0 {
+		// Can't be sure if tx is finalized or not during initialization
+		return nil
+	}
+
 	finalized, err := tr.txStore.IsTxFinalized(ctx, blockHeight, tx.ID, tr.chainID)
 	if err != nil {
 		return fmt.Errorf("failed to check if tx is finalized: %w", err)

core/chains/evm/txmgr/tracker_test.go

@@ -1,7 +1,6 @@
 package txmgr_test
 
 import (
-	"context"
 	"math/big"
 	"testing"
 	"time"
@@ -48,8 +47,9 @@ func TestEvmTracker_Initialization(t *testing.T) {
 	t.Parallel()
 
 	tracker, _, _, _ := newTestEvmTrackerSetup(t)
+	ctx := testutils.Context(t)
 
-	require.NoError(t, tracker.Start(testutils.Context(t)))
+	require.NoError(t, tracker.Start(ctx))
 	require.True(t, tracker.IsStarted())
 
 	t.Run("stop tracker", func(t *testing.T) {
@@ -60,6 +60,7 @@ func TestEvmTracker_Initialization(t *testing.T) {
 
 func TestEvmTracker_AddressTracking(t *testing.T) {
 	t.Parallel()
+	ctx := testutils.Context(t)
 
 	t.Run("track abandoned addresses", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
@@ -73,7 +74,7 @@ func TestEvmTracker_AddressTracking(t *testing.T) {
 		_ = mustInsertConfirmedEthTxWithReceipt(t, txStore, confirmedAddr, 123, 1)
 		_ = mustCreateUnstartedTx(t, txStore, unstartedAddr, cltest.MustGenerateRandomKey(t).Address, []byte{}, 0, big.Int{}, ethClient.ConfiguredChainID())
 
-		err := tracker.Start(context.Background())
+		err := tracker.Start(ctx)
 		require.NoError(t, err)
 		defer func(tracker *txmgr.Tracker) {
 			err = tracker.Close()
@@ -92,13 +93,17 @@ func TestEvmTracker_AddressTracking(t *testing.T) {
 		confirmedAddr := cltest.MustGenerateRandomKey(t).Address
 		_ = mustInsertConfirmedEthTxWithReceipt(t, txStore, confirmedAddr, 123, 1)
 
-		err := tracker.Start(context.Background())
+		err := tracker.Start(ctx)
 		require.NoError(t, err)
 		defer func(tracker *txmgr.Tracker) {
 			err = tracker.Close()
 			require.NoError(t, err)
 		}(tracker)
 
+		// deliver block before minConfirmations
+		tracker.XXXDeliverBlock(1)
+		time.Sleep(waitTime)
+
 		addrs := tracker.GetAbandonedAddresses()
 		require.Contains(t, addrs, confirmedAddr)
 
@@ -113,13 +118,14 @@ func TestEvmTracker_AddressTracking(t *testing.T) {
 
 func TestEvmTracker_ExceedingTTL(t *testing.T) {
 	t.Parallel()
+	ctx := testutils.Context(t)
 
 	t.Run("confirmed but unfinalized transaction still tracked", func(t *testing.T) {
 		tracker, txStore, _, _ := newTestEvmTrackerSetup(t)
 		addr1 := cltest.MustGenerateRandomKey(t).Address
 		_ = mustInsertConfirmedEthTxWithReceipt(t, txStore, addr1, 123, 1)
 
-		err := tracker.Start(context.Background())
+		err := tracker.Start(ctx)
 		require.NoError(t, err)
 		defer func(tracker *txmgr.Tracker) {
 			err = tracker.Close()
@@ -137,7 +143,7 @@ func TestEvmTracker_ExceedingTTL(t *testing.T) {
 		tx2 := cltest.MustInsertUnconfirmedEthTx(t, txStore, 123, addr2)
 
 		tracker.XXXTestSetTTL(time.Nanosecond)
-		err := tracker.Start(context.Background())
+		err := tracker.Start(ctx)
 		require.NoError(t, err)
 		defer func(tracker *txmgr.Tracker) {
 			err = tracker.Close()
@@ -147,7 +153,7 @@ func TestEvmTracker_ExceedingTTL(t *testing.T) {
 		time.Sleep(waitTime)
 		require.NotContains(t, tracker.GetAbandonedAddresses(), addr1, addr2)
 
-		fatalTxes, err := txStore.GetFatalTransactions(context.Background())
+		fatalTxes, err := txStore.GetFatalTransactions(ctx)
 		require.NoError(t, err)
 		require.True(t, containsID(fatalTxes, tx1.ID))
 		require.True(t, containsID(fatalTxes, tx2.ID))