Sync with wormhole master repo

.github/workflows/build.yml

@@ -1,5 +1,10 @@
 name: Node.js CI
-on: [push]
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

README.md

@@ -1,10 +1,8 @@
-# Wormhole TS SDK
+# Wormhole TypeScript SDK
 
-The Wormhole Typescript SDK is useful for interacting with the chains Wormhole supports and the [protocols](#protocols) built on top of Wormhole.
-
-## Warning 
+[![npm version](https://img.shields.io/npm/v/@wormhole-foundation/sdk.svg)](https://www.npmjs.com/package/@wormhole-foundation/sdk)
 
-:warning: This package is a Work in Progress so the interface may change and there are likely bugs. Please [report](https://github.com/wormhole-foundation/connect-sdk/issues) any issues you find. :warning:
+The Wormhole Typescript SDK is useful for interacting with the chains Wormhole supports and the [protocols](#protocols) built on top of Wormhole.
 
 ## Installation
 
@@ -497,12 +495,6 @@ We can also transfer native USDC using [Circle's CCTP](https://www.circle.com/en
   const srcTxids = await xfer.initiateTransfer(src.signer);
   console.log(`Started Transfer: `, srcTxids);
 
-  if (req.automatic) {
-    const relayStatus = await waitForRelay(srcTxids[srcTxids.length - 1]!);
-    console.log(`Finished relay: `, relayStatus);
-    return;
-  }
-
   // Note: Depending on chain finality, this timeout may need to be increased.
   // See https://developers.circle.com/stablecoin/docs/cctp-technical-reference#mainnet for more
   console.log("Waiting for Attestation");

connect/__tests__/mocks/routes/automatic.ts

@@ -60,14 +60,6 @@ export class AutomaticMockRoute<N extends Network>
     return [nativeTokenId(toChain.chain)];
   }
 
-  static isProtocolSupported<N extends Network>(chain: ChainContext<N>): boolean {
-    return true;
-  }
-
-  async isAvailable(): Promise<boolean> {
-    return true;
-  }
-
   async validate(
     request: RouteTransferRequest<N>,
     params: TransferParams<Op>,

connect/__tests__/mocks/routes/manual.ts

@@ -58,10 +58,6 @@ export class ManualMockRoute<N extends Network>
     return [nativeTokenId(toChain.chain)];
   }
 
-  static isProtocolSupported<N extends Network>(chain: ChainContext<N>): boolean {
-    return true;
-  }
-
   async validate(
     request: RouteTransferRequest<N>,
     params: TransferParams<Op>,

connect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wormhole-foundation/sdk-connect",
-  "version": "0.8.2-beta.0",
+  "version": "1.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wormhole-foundation/connect-sdk.git"
@@ -98,8 +98,8 @@
   },
   "dependencies": {
     "axios": "^1.4.0",
-    "@wormhole-foundation/sdk-base": "0.8.2-beta.0",
-    "@wormhole-foundation/sdk-definitions": "0.8.2-beta.0"
+    "@wormhole-foundation/sdk-base": "1.0.3",
+    "@wormhole-foundation/sdk-definitions": "1.0.3"
   },
   "type": "module"
 }

connect/src/index.ts

@@ -2,6 +2,7 @@ export * from "./wormhole.js";
 export * from "./config.js";
 export * from "./common.js";
 export * from "./types.js";
+export * from "./warnings.js";
 
 export * from "./protocols/index.js";
 

connect/src/protocols/cctp/cctpTransfer.ts

@@ -1,5 +1,5 @@
 import type { Chain, Network } from "@wormhole-foundation/sdk-base";
-import { circle, encoding, toChain } from "@wormhole-foundation/sdk-base";
+import { circle, encoding, finality, guardians, toChain } from "@wormhole-foundation/sdk-base";
 import type {
   Attestation,
   AttestationId,
@@ -34,7 +34,13 @@ import type {
   TransferQuote,
   TransferReceipt as _TransferReceipt,
 } from "../../types.js";
-import { TransferState, isAttested, isSourceFinalized, isSourceInitiated } from "../../types.js";
+import {
+  TransferState,
+  isAttested,
+  isRedeemed,
+  isSourceFinalized,
+  isSourceInitiated,
+} from "../../types.js";
 import { Wormhole } from "../../wormhole.js";
 import type { WormholeTransfer } from "../wormholeTransfer.js";
 
@@ -225,10 +231,10 @@ export class CircleTransfer<N extends Network = Network>
     try {
       msgIds = await fromChain.parseTransaction(txid);
     } catch (e: any) {
-      if (e.message.includes('no bridge messages found')) {
+      if (e.message.includes("no bridge messages found")) {
         // This means it's a Circle attestation; swallow
       } else {
-        throw e
+        throw e;
       }
     }
 
@@ -536,7 +542,7 @@ export namespace CircleTransfer {
     // Fall back to asking the destination chain if this VAA has been redeemed
     // assuming we have the full attestation
 
-    if (isAttested(receipt)) {
+    if (isAttested(receipt) || isRedeemed(receipt)) {
       const isComplete = await CircleTransfer.isTransferComplete(
         _toChain,
         receipt.attestation.attestation,
@@ -584,10 +590,14 @@ export namespace CircleTransfer {
     const dstToken = Wormhole.chainAddress(dstChain.chain, dstUsdcAddress);
     const srcToken = Wormhole.chainAddress(srcChain.chain, srcUsdcAddress);
 
+    // https://developers.circle.com/stablecoins/docs/required-block-confirmations
+    const eta =
+      (srcChain.chain === "Polygon" ? 2_000 * 200 : finality.estimateFinalityTime(srcChain.chain)) + guardians.guardianAttestationEta;
     if (!transfer.automatic) {
       return {
         sourceToken: { token: srcToken, amount: transfer.amount },
         destinationToken: { token: dstToken, amount: transfer.amount },
+        eta,
       };
     }
 
@@ -600,15 +610,15 @@ export namespace CircleTransfer {
 
     // The fee is also removed from the amount transferred
     // quoted on the source chain
-    const stb = await srcChain.getAutomaticCircleBridge();
-    const fee = await stb.getRelayerFee(dstChain.chain);
+    const scb = await srcChain.getAutomaticCircleBridge();
+    const fee = await scb.getRelayerFee(dstChain.chain);
     dstAmount -= fee;
 
     // The expected destination gas can be pulled from the destination token bridge
     let destinationNativeGas = 0n;
     if (transfer.nativeGas) {
-      const dtb = await dstChain.getAutomaticTokenBridge();
-      destinationNativeGas = await dtb.nativeTokenAmount(dstToken.address, _nativeGas);
+      const dcb = await dstChain.getAutomaticCircleBridge();
+      destinationNativeGas = await dcb.nativeTokenAmount(_nativeGas);
     }
 
     return {
@@ -619,6 +629,7 @@ export namespace CircleTransfer {
       destinationToken: { token: dstToken, amount: dstAmount },
       relayFee: { token: srcToken, amount: fee },
       destinationNativeGas,
+      eta,
     };
   }