simplify track method

Author: kev1n-peters

sdk/route/src/multiTokenManual.ts

@@ -31,7 +31,7 @@ import {
 } from "@wormhole-foundation/sdk-connect";
 import "@wormhole-foundation/sdk-definitions-ntt";
 import { MultiTokenNttRoute, NttRoute } from "./types.js";
-import { MultiTokenNtt } from "@wormhole-foundation/sdk-definitions-ntt";
+import { MultiTokenNtt, Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
 import {
   getAxelarTransactionStatus,
   getAxelarExplorerUrl,
@@ -131,7 +131,7 @@ export class MultiTokenNttManualRoute<N extends Network>
       ? await sourceNtt.getWrappedNativeToken()
       : request.source.id;
 
-    const originalToken = await sourceNtt.getOriginalToken(sourceToken);
+    const originalTokenId = await sourceNtt.getOriginalToken(sourceToken);
 
     const sendTransceivers = await sourceNtt.getSendTransceivers(
       request.toChain.chain
@@ -145,7 +145,7 @@ export class MultiTokenNttManualRoute<N extends Network>
         destinationContracts,
         sourceTokenId: request.source.id,
         destinationTokenId: request.destination.id,
-        originalTokenId: originalToken,
+        originalTokenId,
         sendTransceivers,
       },
       options,
@@ -413,31 +413,145 @@ export class MultiTokenNttManualRoute<N extends Network>
     };
   }
 
-  public override async *track(receipt: R, timeout?: number) {
-    if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
-      const { txid } = receipt.originTxs.at(-1)!;
-      const vaa = await this.wh.getVaa(
-        txid,
-        "MultiTokenNtt:WormholeTransfer",
-        timeout
+  async trackWormholeAttestation(receipt: R, timeout?: number): Promise<R> {
+    if (!isSourceInitiated(receipt) && !isSourceFinalized(receipt)) {
+      return receipt;
+    }
+
+    const { txid } = receipt.originTxs.at(-1)!;
+    const vaa = await this.wh.getVaa(
+      txid,
+      "MultiTokenNtt:WormholeTransfer",
+      timeout
+    );
+    if (!vaa) throw new Error("No VAA found for transaction: " + txid);
+
+    const msgId: WormholeMessageId = {
+      chain: vaa.emitterChain,
+      emitter: vaa.emitterAddress,
+      sequence: vaa.sequence,
+    };
+
+    return {
+      ...receipt,
+      state: TransferState.Attested,
+      attestation: {
+        id: msgId,
+        attestation: vaa,
+      },
+    } satisfies AttestedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
+  }
+
+  async trackAxelarTransceiver(
+    receipt: R,
+    destinationNtt: MultiTokenNtt<N, Chain>,
+    axelarTransceiver: Ntt.TransceiverMeta
+  ): Promise<R> {
+    if (!isAttested(receipt) && !isFailed(receipt)) {
+      return receipt;
+    }
+
+    if (!receipt.attestation) {
+      throw new Error("No attestation found on the transfer receipt");
+    }
+
+    const axelarAttested = await destinationNtt.transceiverAttestedToMessage(
+      receipt.from,
+      receipt.attestation!.attestation.payload.nttManagerPayload,
+      axelarTransceiver.index
+    );
+
+    if (axelarAttested) {
+      // Axelar has attested - if we were in failed state, reset to attested
+      if (isFailed(receipt)) {
+        return {
+          ...receipt,
+          state: TransferState.Attested,
+          attestation: receipt.attestation,
+          // @ts-ignore
+          error: undefined,
+        } satisfies AttestedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
+      }
+      return receipt;
+    }
+
+    // Axelar hasn't attested yet - check status via API
+    try {
+      const txid = receipt.originTxs.at(-1)!.txid;
+      const axelarStatus = await getAxelarTransactionStatus(
+        this.wh.network,
+        txid
       );
-      if (!vaa) throw new Error("No VAA found for transaction: " + txid);
 
-      const msgId: WormholeMessageId = {
-        chain: vaa.emitterChain,
-        emitter: vaa.emitterAddress,
-        sequence: vaa.sequence,
-      };
+      if (axelarStatus.error) {
+        return {
+          ...receipt,
+          state: TransferState.Failed,
+          error: new routes.RelayFailedError(
+            `Axelar transceiver error: ${axelarStatus.error.message}`,
+            // @ts-ignore
+            {
+              url: getAxelarExplorerUrl(this.wh.network, txid),
+              explorerName: "Axelarscan",
+            }
+          ),
+        };
+      } else if (isFailed(receipt)) {
+        // if we previously marked it as failed, but now it's not an error, clear the error
+        return {
+          ...receipt,
+          state: TransferState.Attested,
+          attestation: receipt.attestation,
+          // @ts-ignore
+          error: undefined,
+        } satisfies AttestedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
+      }
+
+      console.log("Axelar transceiver status:", axelarStatus);
+    } catch (error) {
+      // Log but don't fail - continue with standard tracking
+      console.warn("Failed to query Axelar transceiver status:", error);
+    }
+
+    return receipt;
+  }
+
+  async checkDestinationQueue(
+    receipt: R,
+    destinationNtt: MultiTokenNtt<N, Chain>
+  ): Promise<R> {
+    if (!isRedeemed(receipt)) {
+      return receipt;
+    }
+
+    const vaa = receipt.attestation!.attestation;
+
+    const queuedTransfer = await destinationNtt.getInboundQueuedTransfer(
+      vaa.emitterChain,
+      vaa.payload.nttManagerPayload
+    );
 
-      receipt = {
+    if (queuedTransfer !== null) {
+      return {
         ...receipt,
-        state: TransferState.Attested,
-        attestation: {
-          id: msgId,
-          attestation: vaa,
-        },
-      } satisfies AttestedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
+        state: TransferState.DestinationQueued,
+        queueReleaseTime: new Date(
+          queuedTransfer.rateLimitExpiryTimestamp * 1000
+        ),
+      } satisfies DestinationQueuedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
+    } else if (await destinationNtt.getIsExecuted(vaa)) {
+      return {
+        ...receipt,
+        state: TransferState.DestinationFinalized,
+      } satisfies CompletedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
+    }
 
+    return receipt;
+  }
+
+  public override async *track(receipt: R, timeout?: number) {
+    if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
+      receipt = await this.trackWormholeAttestation(receipt, timeout);
       yield receipt;
     }
 
@@ -451,9 +565,7 @@ export class MultiTokenNttManualRoute<N extends Network>
         throw new Error("No attestation found on the transfer receipt");
       }
 
-      const {
-        attestation: { attestation: vaa },
-      } = receipt;
+      const vaa = receipt.attestation.attestation;
 
       if (await destinationNtt.getIsApproved(vaa)) {
         // All transceivers have approved the transfer
@@ -464,85 +576,33 @@ export class MultiTokenNttManualRoute<N extends Network>
         } satisfies RedeemedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt>;
         yield receipt;
       } else {
-        // At this point the wormhole message has been emitted, but we need to check
-        // the status of the axelar transceiver if configured
+        // Wormhole transceiver has attested, check Axelar transceiver (if enabled)
         const { sendTransceivers } = receipt.params.normalizedParams;
         const axelarTransceiver = sendTransceivers.find(
           (t) => t.type.toLowerCase() === "axelar"
         );
+
         if (axelarTransceiver) {
-          const axelarAttested =
-            await destinationNtt.transceiverAttestedToMessage(
-              receipt.from,
-              receipt.attestation.attestation.payload.nttManagerPayload,
-              axelarTransceiver.index
-            );
-
-          if (!axelarAttested) {
-            try {
-              const txid = receipt.originTxs.at(-1)!.txid;
-              const axelarStatus = await getAxelarTransactionStatus(
-                this.wh.network,
-                txid
-              );
-              if (axelarStatus.error) {
-                receipt = {
-                  ...receipt,
-                  state: TransferState.Failed,
-                  error: new routes.RelayFailedError(
-                    `Axelar transceiver error: ${axelarStatus.error.message}`,
-                    {
-                      url: getAxelarExplorerUrl(this.wh.network, txid),
-                      explorerName: "Axelarscan",
-                    }
-                  ),
-                };
-                yield receipt;
-              } else if (isFailed(receipt)) {
-                // if we previously marked it as failed, but now it's not an error, clear the error
-                receipt = {
-                  ...receipt,
-                  state: TransferState.Attested,
-                  attestation: receipt.attestation,
-                  // @ts-ignore
-                  error: undefined,
-                } satisfies AttestedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt> as R;
-                yield receipt;
-              }
-
-              console.log("Axelar transceiver status:", axelarStatus);
-            } catch (error) {
-              // Log but don't fail - continue with standard tracking
-              console.warn("Failed to query Axelar transceiver status:", error);
-            }
+          const updatedReceipt = await this.trackAxelarTransceiver(
+            receipt,
+            destinationNtt,
+            axelarTransceiver
+          );
+          if (updatedReceipt !== receipt) {
+            receipt = updatedReceipt;
+            yield receipt;
           }
         }
       }
     }
 
     if (isRedeemed(receipt) || isDestinationQueued(receipt)) {
-      const {
-        attestation: { attestation: vaa },
-      } = receipt;
-
-      const queuedTransfer = await destinationNtt.getInboundQueuedTransfer(
-        vaa.emitterChain,
-        vaa.payload.nttManagerPayload
+      const updatedReceipt = await this.checkDestinationQueue(
+        receipt,
+        destinationNtt
       );
-      if (queuedTransfer !== null) {
-        receipt = {
-          ...receipt,
-          state: TransferState.DestinationQueued,
-          queueReleaseTime: new Date(
-            queuedTransfer.rateLimitExpiryTimestamp * 1000
-          ),
-        } satisfies DestinationQueuedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt>;
-        yield receipt;
-      } else if (await destinationNtt.getIsExecuted(vaa)) {
-        receipt = {
-          ...receipt,
-          state: TransferState.DestinationFinalized,
-        } satisfies CompletedTransferReceipt<MultiTokenNttRoute.ManualAttestationReceipt>;
+      if (updatedReceipt !== receipt) {
+        receipt = updatedReceipt;
         yield receipt;
       }
     }