Refactor timeout and retry (#100)

connect/__tests__/index.test.ts

@@ -58,17 +58,15 @@ describe("Wormhole Tests", () => {
       expect(vaa).toBeUndefined();
     });
 
-    // TODO: Fix this test
-    //test("returns after first try fails", async () => {
-    //  publicRpcMock.givenSignedVaaRequestWorksAfterRetry();
-    //  const vaa = await wh.getVAABytes(
-    //    "Base",
-    //    testing.utils.makeChainAddress("Base").address,
-    //    1n,
-    //    5,
-    //  );
-    //  expect(vaa).toBeDefined();
-    //});
+    test("returns after first try fails", async () => {
+      publicRpcMock.givenSignedVaaRequestWorksAfterRetry();
+      const vaa = await wh.getVAABytes(
+        "Base",
+        testing.utils.makeChainAddress("Base").address,
+        1n,
+      );
+      expect(vaa).toBeDefined();
+    });
   });
 });
 
@@ -98,7 +96,6 @@ describe("Chain Tests", () => {
   let c: ChainContext<PlatformName>;
   beforeEach(() => {
     const wh = new Wormhole(network, allPlatformCtrs);
-    const p = wh.getPlatform("Ethereum");
     c = wh.getChain("Ethereum");
   });
 

connect/src/circle-api.ts

@@ -26,20 +26,18 @@ const mapCircleAttestation = (
 export async function getCircleAttestation(
   circleApi: string,
   msgHash: string,
-): Promise<Attestation | null> {
+): Promise<string | null> {
   const url = `${circleApi}/${msgHash}`;
   try {
     const response = await axios.get<CircleAttestationResponse>(url);
     const attestation = mapCircleAttestation(response?.data);
-
-    // Found but still pending
-    if (attestation.message === "PENDING") return null;
-
-    return attestation;
+    return attestation.message === "PENDING" ? null : attestation.message;
   } catch (error) {
+    // This is a 404 error, which means the attestation is not yet available
+    // since its not available yet, we return null signaling it can be tried again
     if (!(axios.isAxiosError(error) && error?.response?.status === 404)) {
-      console.error(error);
+      return null;
     }
-    return null;
+    throw error;
   }
 }

connect/src/common.ts

@@ -0,0 +1,40 @@
+import {
+  ChainContext,
+  Signer,
+  TransactionId,
+  TxHash,
+  UnsignedTransaction,
+} from "@wormhole-foundation/sdk-definitions";
+import { PlatformName } from "@wormhole-foundation/sdk-base";
+
+export async function signSendWait(
+  chain: ChainContext<PlatformName>,
+  xfer: AsyncGenerator<UnsignedTransaction>,
+  signer: Signer,
+): Promise<TransactionId[]> {
+  // buffer unsigned transactions as long as they are
+  // marked as parallelizable
+  let txbuff: UnsignedTransaction[] = [];
+
+  const txHashes: TxHash[] = [];
+  for await (const tx of xfer) {
+    txbuff.push(tx);
+
+    if (!tx.parallelizable) {
+      // sign/send
+      const signed = await signer.sign(txbuff);
+      const txids = await chain.sendWait(signed);
+      txHashes.push(...txids);
+      // reset buffer
+      txbuff = [];
+    }
+  }
+
+  if (txbuff.length > 0) {
+    const signed = await signer.sign(txbuff);
+    const txids = await chain.sendWait(signed);
+    txHashes.push(...txids);
+  }
+
+  return txHashes.map((txid) => ({ chain: chain.chain, txid }));
+}

connect/src/config.ts

@@ -11,6 +11,7 @@ import {
   constMap,
   circleAPI,
   PlatformName,
+  blockTime,
 } from "@wormhole-foundation/sdk-base";
 import { WormholeConfig } from "./types";
 import {
@@ -19,20 +20,22 @@ import {
   ChainsConfig,
 } from "@wormhole-foundation/sdk-definitions";
 
-/*
-TODO:
-    add missing chains for each config
- Note: the false exclamation marks here are because not every chain
-    is represented in the consts we're pulling from yet
-*/
+export const DEFAULT_TASK_TIMEOUT = 60 * 1000; // 1 minute in milliseconds
+
+export const CIRCLE_RETRY_INTERVAL = 2000;
+export const WHSCAN_RETRY_INTERVAL = 2000;
+
+// TODO: add missing chains for each config
 function combineConfig(n: Network): ChainsConfig {
   const cc: ChainsConfig = chains
     .map((c: ChainName): ChainConfig => {
       const platform = chainToPlatform(c);
       return {
         key: c,
         platform,
+        network: n,
         finalityThreshold: finalityThreshold.get(n, c) || 0,
+        blockTime: blockTime(c),
         contracts: getContracts(n, c),
         nativeTokenDecimals: nativeDecimals.get(platform)!, //TODO the exclamation mark is a lie
         explorer: explorerConfigs(n, c)!, //TODO the exclamation mark is a lie

connect/src/index.ts

@@ -8,7 +8,7 @@ export * from "./protocols/cctpTransfer";
 export * from "./protocols/gatewayTransfer";
 
 export * as circle from "./circle-api";
-export * as api from "./api";
+export * as api from "./whscan-api";
 
 // Re-export from core packages
 export {