fix(zetaclient): add zetaclient evm outbound tx index by nonce to supplement outtx tracker

changelog.md

@@ -29,6 +29,7 @@
 
 * [2654](https://github.com/zeta-chain/node/pull/2654) - add validation for authorization list in when validating genesis state for authorization module
 * [2672](https://github.com/zeta-chain/node/pull/2672) - check observer set for duplicates when adding a new observer or updating an existing one
+* [2735](https://github.com/zeta-chain/node/pull/2735) - fix the outbound tracker blocking confirmation and outbound processing on EVM chains by locally index outbound txs in zetaclient
 
 ## v19.0.0
 

zetaclient/chains/evm/observer/inbound.go

@@ -446,13 +446,13 @@
 	// query incoming gas asset
 	for bn := startBlock; bn <= toBlock; bn++ {
 		// observe TSS received gas token in block 'bn'
-		err := ob.ObserveTSSReceiveInBlock(ctx, bn)
+		err := ob.ObserveTSSReceiveInBlockAndOutbound(ctx, bn)
 		if err != nil {
 			ob.Logger().Inbound.Error().
 				Err(err).
 				Int64("tss.chain_id", chainID).
 				Uint64("tss.block_number", bn).
-				Msg("ObserverTSSReceive: unable to ObserveTSSReceiveInBlock")
+				Msg("ObserverTSSReceive: unable to ObserveTSSReceiveInBlockAndOutbound")
 
 			// we have to re-scan from this block next time
 			return bn - 1, nil
@@ -770,8 +770,9 @@
 	)
 }
 
-// ObserveTSSReceiveInBlock queries the incoming gas asset to TSS address in a single block and posts votes
-func (ob *Observer) ObserveTSSReceiveInBlock(ctx context.Context, blockNumber uint64) error {
+// ObserveTSSReceiveInBlockAndOutbound queries the incoming gas asset to TSS address in a single block and posts votes.
+// It also filters TSS outbounds indexed by nonce to supplement outtx tracker.
+func (ob *Observer) ObserveTSSReceiveInBlockAndOutbound(ctx context.Context, blockNumber uint64) error {
 	block, err := ob.GetBlockByNumberCached(blockNumber)
 	if err != nil {
 		return errors.Wrapf(err, "error getting block %d for chain %d", blockNumber, ob.Chain().ChainId)
@@ -794,6 +795,12 @@
 				)
 			}
 		}
+		if ethcommon.HexToAddress(tx.From) == ob.TSS().EVMAddress() {
+			nonce := uint64(tx.Nonce)
+			if receipt, txx, ok := ob.checkConfirmedTx(ctx, tx.Hash, nonce); ok {
+				ob.SetTxNReceipt(nonce, receipt, txx)
+			}
+		}
 	}
 	return nil
 }

zetaclient/chains/evm/observer/inbound_test.go

@@ -481,19 +481,19 @@ func Test_ObserveTSSReceiveInBlock(t *testing.T) {
 		// feed archived block and receipt
 		evmJSONRPC.WithBlock(block)
 		evmClient.WithReceipt(receipt)
-		err := ob.ObserveTSSReceiveInBlock(ctx, blockNumber)
+		err := ob.ObserveTSSReceiveInBlockAndOutbound(ctx, blockNumber)
 		require.NoError(t, err)
 	})
 	t.Run("should not observe on error getting block", func(t *testing.T) {
 		ob, _ := MockEVMObserver(t, chain, evmClient, evmJSONRPC, zetacoreClient, tss, lastBlock, chainParam)
-		err := ob.ObserveTSSReceiveInBlock(ctx, blockNumber)
+		err := ob.ObserveTSSReceiveInBlockAndOutbound(ctx, blockNumber)
 		// error getting block is expected because the mock JSONRPC contains no block
 		require.ErrorContains(t, err, "error getting block")
 	})
 	t.Run("should not observe on error getting receipt", func(t *testing.T) {
 		ob, _ := MockEVMObserver(t, chain, evmClient, evmJSONRPC, zetacoreClient, tss, lastBlock, chainParam)
 		evmJSONRPC.WithBlock(block)
-		err := ob.ObserveTSSReceiveInBlock(ctx, blockNumber)
+		err := ob.ObserveTSSReceiveInBlockAndOutbound(ctx, blockNumber)
 		// error getting block is expected because the mock evmClient contains no receipt
 		require.ErrorContains(t, err, "error getting receipt")
 	})