JS/SDK: Handle relayer move

sdk/js/.gitignore

@@ -25,6 +25,7 @@ yarn-error.log*
 # ethereum contracts
 /contracts
 /src/ethers-contracts
+/src/ethers-relayer-contracts
 
 # tsproto output
 /src/proto

sdk/js/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 0.10.14
 
+Support for move of relayer ethereum contracts
 Blast Sepolia support
 
 ## 0.10.13

sdk/js/package.json

@@ -11,7 +11,7 @@
   "sideEffects": false,
   "repository": "https://github.com/certusone/wormhole/tree/main/sdk/js",
   "scripts": {
-    "build-contracts": "cd ../../ethereum && make forge_dependencies && npm run build && cd ../sdk/js && node scripts/copyContracts.js",
+    "build-contracts": "cd ../../ethereum && make forge_dependencies && npm run build && cd ../ethereum-relayer && make forge_dependencies && npm run build && cd ../sdk/js && node scripts/copyContracts.js",
     "build-abis": "typechain --target=ethers-v5 --out-dir=src/ethers-contracts/abi src/abi/Wormhole.abi.json",
     "build-idl": "node scripts/compileAnchorIdls.js",
     "build-deps": "npm run build-abis && npm run build-contracts && npm run build-idl",

sdk/js/scripts/copyContracts.js

@@ -1,3 +1,7 @@
 const copydir = require("copy-dir");
 console.log("Copying from ../../ethereum/ethers-contracts");
 copydir.sync("../../ethereum/ethers-contracts", "src/ethers-contracts");
+copydir.sync(
+  "../../ethereum-relayer/ethers-contracts",
+  "src/ethers-relayer-contracts"
+);

sdk/js/scripts/copyEthersTypes.js

@@ -1,20 +1,26 @@
 const fs = require("fs");
-["lib/esm", "lib/cjs"].forEach((buildPath) => {
-  fs.readdirSync("src/ethers-contracts").forEach((file) => {
-    if (file.endsWith(".d.ts")) {
-      fs.copyFileSync(
-        `src/ethers-contracts/${file}`,
-        `${buildPath}/ethers-contracts/${file}`
-      );
-    }
-  });
 
-  fs.readdirSync("src/ethers-contracts/abi").forEach((file) => {
-    if (file.endsWith(".d.ts")) {
-      fs.copyFileSync(
-        `src/ethers-contracts/abi/${file}`,
-        `${buildPath}/ethers-contracts/abi/${file}`
-      );
-    }
+function copyTypes(srcDir) {
+  ["lib/esm", "lib/cjs"].forEach((buildPath) => {
+    fs.readdirSync(srcDir).forEach((file) => {
+      if (file.endsWith(".d.ts")) {
+        fs.copyFileSync(
+          `src/ethers-contracts/${file}`,
+          `${buildPath}/ethers-contracts/${file}`
+        );
+      }
+    });
+
+    fs.readdirSync(srcDir).forEach((file) => {
+      if (file.endsWith(".d.ts")) {
+        fs.copyFileSync(
+          `src/ethers-contracts/abi/${file}`,
+          `${buildPath}/ethers-contracts/abi/${file}`
+        );
+      }
+    });
   });
-});
+}
+
+copyTypes("src/ethers-contracts");
+copyTypes("src/ethers-relayer-contracts");

sdk/js/src/relayer/consts.ts

@@ -3,7 +3,7 @@ import { ChainName, Network } from "../";
 import {
   WormholeRelayer,
   WormholeRelayer__factory,
-} from "../ethers-contracts/";
+} from "../ethers-relayer-contracts/";
 
 type AddressInfo = {
   wormholeRelayerAddress?: string;

sdk/js/src/relayer/relayer/deliver.ts

@@ -1,5 +1,5 @@
 import { BigNumber, ethers, ContractReceipt } from "ethers";
-import { IWormholeRelayer__factory } from "../../ethers-contracts";
+import { IWormholeRelayer__factory } from "../../ethers-relayer-contracts";
 import {
   ChainName,
   toChainName,

sdk/js/src/relayer/relayer/helpers.ts

@@ -34,13 +34,13 @@ import {
   CCTPKey,
 } from "../structs";
 import { InfoRequestParams } from "./info";
+import { Implementation__factory } from "../../ethers-contracts/";
 import {
   DeliveryProvider,
   DeliveryProvider__factory,
-  Implementation__factory,
-} from "../../ethers-contracts/";
-import { DeliveryEvent } from "../../ethers-contracts/WormholeRelayer";
-import { VaaKeyStruct } from "../../ethers-contracts/IWormholeRelayer.sol/IWormholeRelayer";
+} from "../../ethers-relayer-contracts/";
+import { DeliveryEvent } from "../../ethers-relayer-contracts/WormholeRelayer";
+import { VaaKeyStruct } from "../../ethers-relayer-contracts/IWormholeRelayer.sol/IWormholeRelayer";
 
 export type DeliveryTargetInfo = {
   status: DeliveryStatus | string;

sdk/js/src/relayer/relayer/info.ts

@@ -44,6 +44,7 @@ import {
   TokenTransferParsed,
 } from "./deliver";
 import { ERC20__factory } from "../../ethers-contracts";
+import { IWormholeRelayer__factory } from "../../ethers-relayer-contracts";
 
 export type InfoRequestParams = {
   environment?: Network;
@@ -79,11 +80,10 @@ export async function getPriceAndRefundInfo(
   const wormholeRelayerAddress =
     optionalParams?.wormholeRelayerAddress ||
     getWormholeRelayerAddress(sourceChain, environment);
-  const sourceWormholeRelayer =
-    ethers_contracts.IWormholeRelayer__factory.connect(
-      wormholeRelayerAddress,
-      sourceChainProvider
-    );
+  const sourceWormholeRelayer = IWormholeRelayer__factory.connect(
+    wormholeRelayerAddress,
+    sourceChainProvider
+  );
   const deliveryProviderAddress =
     optionalParams?.deliveryProviderAddress ||
     (await sourceWormholeRelayer.getDefaultDeliveryProvider());

sdk/js/src/relayer/relayer/send.ts

@@ -1,6 +1,7 @@
 import { ethers, BigNumber } from "ethers";
 import { ethers_contracts } from "../..";
-import { VaaKeyStruct } from "../../ethers-contracts/MockRelayerIntegration";
+import { VaaKeyStruct } from "../../ethers-relayer-contracts/MockRelayerIntegration";
+import { IWormholeRelayer__factory } from "../../ethers-relayer-contracts";
 import {
   ChainId,
   ChainName,
@@ -46,11 +47,10 @@ export async function sendToEvm(
   const wormholeRelayerAddress =
     sendOptionalParams?.wormholeRelayerAddress ||
     getWormholeRelayerAddress(sourceChain, environment);
-  const sourceWormholeRelayer =
-    ethers_contracts.IWormholeRelayer__factory.connect(
-      wormholeRelayerAddress,
-      signer
-    );
+  const sourceWormholeRelayer = IWormholeRelayer__factory.connect(
+    wormholeRelayerAddress,
+    signer
+  );
 
   const refundLocationExists =
     sendOptionalParams?.refundChainId !== undefined &&