Make the routes return a receipt (#471)

wormhole-foundation · Apr 17, 2024 · 1f9169d · 1f9169d
1 parent a931e9c
commit 1f9169d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/connect/src/routes/cctp/manual.ts b/connect/src/routes/cctp/manual.ts
@@ -5,7 +5,6 @@ import type {
   CircleTransferDetails,
   Signer,
   TokenId,
-  TransactionId,
 } from "@wormhole-foundation/sdk-definitions";
 import { CircleBridge } from "@wormhole-foundation/sdk-definitions";
 import { signSendWait } from "../../common.js";
@@ -149,7 +148,7 @@ export class CCTPRoute<N extends Network>
     };
   }
 
-  async complete(signer: Signer, receipt: R): Promise<TransactionId[]> {
+  async complete(signer: Signer, receipt: R): Promise<R> {
     if (!isAttested(receipt))
       throw new Error("The source must be finalized in order to complete the transfer");
 
@@ -160,10 +159,15 @@ export class CCTPRoute<N extends Network>
 
       const cb = await this.request.toChain.getCircleBridge();
       const xfer = cb.redeem(this.request.to.address, message, attestation);
-      return await signSendWait<N, Chain>(this.request.toChain, xfer, signer);
+      const dstTxids = await signSendWait<N, Chain>(this.request.toChain, xfer, signer);
+      return {
+        ...receipt,
+        state: TransferState.DestinationInitiated,
+        destinationTxs: dstTxids,
+      };
     } else {
       //
-      return [];
+      return receipt;
     }
   }
 

diff --git a/connect/src/routes/route.ts b/connect/src/routes/route.ts
@@ -1,10 +1,5 @@
 import type { Chain, Network } from "@wormhole-foundation/sdk-base";
-import type {
-  ChainContext,
-  Signer,
-  TokenId,
-  TransactionId,
-} from "@wormhole-foundation/sdk-definitions";
+import type { ChainContext, Signer, TokenId } from "@wormhole-foundation/sdk-definitions";
 import type { Wormhole } from "../wormhole.js";
 import type { RouteTransferRequest } from "./request.js";
 import type {
@@ -123,7 +118,7 @@ export abstract class ManualRoute<
 > extends Route<N, OP, VP, R> {
   NATIVE_GAS_DROPOFF_SUPPORTED = false;
   IS_AUTOMATIC = false;
-  public abstract complete(sender: Signer, receipt: R): Promise<TransactionId[]>;
+  public abstract complete(sender: Signer, receipt: R): Promise<R>;
 }
 
 export function isManual<N extends Network>(route: Route<N>): route is ManualRoute<N> {
@@ -140,7 +135,7 @@ export abstract class FinalizableRoute<
   VP extends ValidatedTransferParams<OP> = ValidatedTransferParams<OP>,
   R extends Receipt = Receipt,
 > extends Route<N, OP, VP, R> {
-  public abstract finalize(sender: Signer, receipt: R): Promise<TransactionId[]>;
+  public abstract finalize(sender: Signer, receipt: R): Promise<R>;
 }
 
 export function isFinalizable<N extends Network>(route: Route<N>): route is FinalizableRoute<N> {

diff --git a/connect/src/routes/tokenBridge/manual.ts b/connect/src/routes/tokenBridge/manual.ts
@@ -5,7 +5,6 @@ import type {
   Signer,
   TokenId,
   TokenTransferDetails,
-  TransactionId,
 } from "@wormhole-foundation/sdk-definitions";
 import type { TokenTransferVAA } from "../../protocols/tokenTransfer.js";
 import { TokenTransfer } from "../../protocols/tokenTransfer.js";
@@ -138,15 +137,20 @@ export class TokenBridgeRoute<N extends Network>
     } satisfies SourceInitiatedTransferReceipt;
   }
 
-  async complete(signer: Signer, receipt: R): Promise<TransactionId[]> {
+  async complete(signer: Signer, receipt: R): Promise<R> {
     if (!isAttested(receipt))
       throw new Error("The source must be finalized in order to complete the transfer");
-    return await TokenTransfer.redeem<N>(
+    const dstTxIds = await TokenTransfer.redeem<N>(
       this.request.toChain,
-      // todo: ew?
       receipt.attestation.attestation as TokenTransferVAA,
       signer,
     );
+
+    return {
+      ...receipt,
+      state: TransferState.DestinationInitiated,
+      destinationTxs: dstTxIds,
+    };
   }
 
   public override async *track(receipt: R, timeout?: number) {