refactor

Author: kev1n-peters

sdk/examples/src/index.ts

@@ -62,7 +62,7 @@ const recoverTxids: TransactionId[] = [
   console.log("Source txs", txids);
 
   const vaa = await wh.getVaa(
-    txids[txids.length - 1]!,
+    txids[txids.length - 1]!.txid,
     "Ntt:WormholeTransfer",
     25 * 60 * 1000
   );

sdk/route/src/automatic.ts

@@ -251,8 +251,10 @@ export class NttAutomaticRoute<N extends Network>
   }
 
   async resume(tx: TransactionId): Promise<R> {
-    //@ts-ignore
-    const vaa = await this.wh.getVaa(tx, "Ntt:WormholeTransferStandardRelayer");
+    const vaa = await this.wh.getVaa(
+      tx.txid,
+      "Ntt:WormholeTransferStandardRelayer"
+    );
     if (!vaa) throw new Error("No VAA found for transaction: " + tx.txid);
 
     const msgId: WormholeMessageId = {
@@ -366,18 +368,17 @@ export class NttAutomaticRoute<N extends Network>
 
   public override async *track(receipt: R, timeout?: number) {
     if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
-      const txid = receipt.originTxs[receipt.originTxs.length - 1]!;
+      const { txid } = receipt.originTxs[receipt.originTxs.length - 1]!;
 
       const isEvmPlatform = (chain: Chain) => chainToPlatform(chain) === "Evm";
       const vaaType =
         isEvmPlatform(receipt.from) && isEvmPlatform(receipt.to)
           ? // Automatic NTT transfers between EVM chains use standard relayers
             "Ntt:WormholeTransferStandardRelayer"
           : "Ntt:WormholeTransfer";
-      // @ts-ignore
       const vaa = await this.wh.getVaa(txid, vaaType, timeout);
       if (!vaa) {
-        throw new Error(`No VAA found for transaction: ${txid.txid}`);
+        throw new Error(`No VAA found for transaction: ${txid}`);
       }
 
       const msgId: WormholeMessageId = {

sdk/route/src/executor/executor.ts

@@ -564,8 +564,7 @@ export class NttExecutorRoute<N extends Network>
   }
 
   async resume(tx: TransactionId): Promise<R> {
-    // @ts-ignore
-    const vaa = await this.wh.getVaa(tx, "Ntt:WormholeTransfer");
+    const vaa = await this.wh.getVaa(tx.txid, "Ntt:WormholeTransfer");
     if (!vaa) throw new Error("No VAA found for transaction: " + tx.txid);
 
     const msgId: WormholeMessageId = {
@@ -675,10 +674,9 @@ export class NttExecutorRoute<N extends Network>
   public override async *track(receipt: R, timeout?: number) {
     // First we fetch the attestation (VAA) for the transfer
     if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
-      const txid = receipt.originTxs.at(-1)!;
-      // @ts-ignore
+      const { txid } = receipt.originTxs.at(-1)!;
       const vaa = await this.wh.getVaa(txid, "Ntt:WormholeTransfer", timeout);
-      if (!vaa) throw new Error("No VAA found for transaction: " + txid.txid);
+      if (!vaa) throw new Error("No VAA found for transaction: " + txid);
 
       const msgId: WormholeMessageId = {
         chain: vaa.emitterChain,

sdk/route/src/executor/multiToken.ts

@@ -768,9 +768,14 @@ export class MultiTokenNttExecutorRoute<N extends Network>
   public override async *track(receipt: R, timeout?: number) {
     if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
       const txid = receipt.originTxs.at(-1)!;
+
+      // TODO: can pass txid when this is published: https://github.com/wormhole-foundation/wormhole-sdk-ts/pull/909
+      const fromChain = this.wh.getChain(receipt.from);
+      const [msg] = await fromChain.parseTransaction(txid.txid);
+      if (!msg) throw new Error("No Wormhole messages found");
+
       const vaa = await this.wh.getVaa(
-        // @ts-ignore
-        txid,
+        msg,
         "MultiTokenNtt:WormholeTransfer",
         timeout
       );

sdk/route/src/manual.ts

@@ -238,8 +238,7 @@ export class NttManualRoute<N extends Network>
 
   async resume(tx: TransactionId): Promise<R> {
     const vaa = await this.wh.getVaa(
-      // @ts-ignore
-      tx,
+      tx.txid,
       "Ntt:WormholeTransfer",
       DEFAULT_TASK_TIMEOUT
     );
@@ -349,10 +348,9 @@ export class NttManualRoute<N extends Network>
 
   public override async *track(receipt: R, timeout?: number) {
     if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
-      const txid = receipt.originTxs[receipt.originTxs.length - 1]!;
-      // @ts-ignore
+      const { txid } = receipt.originTxs[receipt.originTxs.length - 1]!;
       const vaa = await this.wh.getVaa(txid, "Ntt:WormholeTransfer", timeout);
-      if (!vaa) throw new Error("No VAA found for transaction: " + txid.txid);
+      if (!vaa) throw new Error("No VAA found for transaction: " + txid);
 
       const msgId: WormholeMessageId = {
         chain: vaa.emitterChain,

sdk/route/src/multiTokenManual.ts

@@ -425,9 +425,14 @@ 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)!;
+
+      // TODO: can pass txid when this is published: https://github.com/wormhole-foundation/wormhole-sdk-ts/pull/909
+      const fromChain = this.wh.getChain(receipt.from);
+      const [msg] = await fromChain.parseTransaction(txid.txid);
+      if (!msg) throw new Error("No Wormhole messages found");
+
       const vaa = await this.wh.getVaa(
-        // @ts-ignore
-        txid,
+        msg,
         "MultiTokenNtt:WormholeTransfer",
         timeout
       );