Evm: Fix tests post SDK restructure (#137)

Co-authored-by: gator-boi <[email protected]>

Author: barnjamin

.github/workflows/evm.yml

@@ -0,0 +1,34 @@
+name: EVM CI
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - 'evm/**'
+  push:
+    branches:
+      - main
+env:
+  FOUNDRY_PROFILE: ci
+jobs:
+  test:
+    strategy:
+      fail-fast: true
+    name: forge test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+      - name: Run Forge build
+        working-directory: evm
+        run: make build 
+      - name: Run unit tests
+        working-directory: evm
+        run: make unit-test
+      - name: Run Integration tests
+        working-directory: evm
+        run: make integration-test

evm/Makefile

@@ -6,24 +6,28 @@ all: build
 
 .PHONY: unit-test
 unit-test: build
-	forge test --fork-url ${AVAX_RPC} -vv
+	forge test --fork-url ${AVALANCHE_RPC} -vv
 
 .PHONY: integration-test
-integration-test: node_modules ts/tests/.env
+integration-test: build ts/tests/.env
 	bash ts/tests/run_integration_test.sh
 
 .PHONY: test
 test: forge-test ts/tests/.env
 	bash ts/tests/run_integration_test.sh
 
+.PHONY: ts/tests/.env
+ts/tests/.env:
+	cp env/testing.env ts/tests/.env
+
 .PHONY: forge-test
 forge-test: dependencies
-	forge test --fork-url ${AVAX_RPC} -vv
+	forge test --fork-url ${AVALANCHE_RPC} -vv
 
 .PHONY: build
 build: dependencies
-	forge build --skip test
-	npm run generate 
+	forge build
+	npm run generate
 
 .PHONY: dependencies
 dependencies: node_modules
@@ -33,5 +37,5 @@ clean:
 	forge clean
 	rm -rf anvil.log ts/src/types
 
-node_modules:
+node_modules: ../package-lock.json
 	cd .. && npm ci

evm/README.md

@@ -15,7 +15,7 @@ The testing environments can be found in the following locations:
 -   [Unit Tests](./forge/tests/)
 -   [Integration Tests](./ts/tests/)
 
-To run the unit tests, set the `AVAX_RPC` environment variable in `env/testing.env` and run `make unit-test`. To run the integration tests, create a `.env` file in the `ts/tests` directory with the following environment variables:
+To run the unit tests, set the `AVALANCHE_RPC` environment variable in `env/testing.env` and run `make unit-test`. To run the integration tests, create a `.env` file in the `ts/tests` directory with the following environment variables:
 
 ```
 # Mainnet RPCs

evm/env/testing.env

@@ -1,4 +1,8 @@
-export AVAX_RPC=https://api.avax.network/ext/bc/C/rpc
+export AVALANCHE_RPC=https://api.avax.network/ext/bc/C/rpc
+export ETHEREUM_RPC=https://rpc.ankr.com/eth
+export BASE_RPC=https://mainnet.base.org
+
+
 export AVAX_USDC_ADDRESS=0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E
 export AVAX_MESSAGE_TRANSMITTER=0x8186359af5f57fbb40c6b14a588d2a59c0c29880
 export AVAX_CIRCLE_BRIDGE=0x6b25532e1060ce10cc3b0a99e5683b91bfde6982
@@ -12,4 +16,4 @@ export SUI_TOKEN_BRIDGE_ADDRESS=0xccceeb29348f71bdd22ffef43a2a19c1f5b5e17c5cca54
 export ARB_TOKEN_BRIDGE_ADDRESS=0x0b2402144Bb366A632D14B83F244D2e0e21bD39c
 export POLY_TOKEN_BRIDGE_ADDRESS=0x5a58505a96D1dbf8dF91cB21B54419FC36e93fdE
 export ARB_CIRCLE_BRIDGE=0x19330d10D9Cc8751218eaf51E8885D058642E08A
-export ARB_CIRCLE_INTEGRATION=0x2703483B1a5a7c577e8680de9Df8Be03c6f30e3c
+export ARB_CIRCLE_INTEGRATION=0x2703483B1a5a7c577e8680de9Df8Be03c6f30e3c

evm/package.json

@@ -13,7 +13,7 @@
     "generate": "typechain --target=ethers-v5 --out-dir=ts/src/types out/*/*.json"
   },
   "dependencies": {
-    "@wormhole-foundation/sdk":"^0.6.8-beta.0",
+    "@wormhole-foundation/sdk":"^0.6.8",
     "ethers": "^5.7.2"
   },
   "devDependencies": {

evm/ts/src/TokenRouter/index.ts

@@ -1,3 +1,4 @@
+import { VAA } from "@wormhole-foundation/sdk";
 import { LiquidityLayerTransactionResult, PreparedInstruction } from "..";
 import { ethers } from "ethers";
 export * from "./evm";
@@ -29,7 +30,7 @@ export abstract class TokenRouter<PreparedTransactionType extends PreparedInstru
         redeemer: Buffer | Uint8Array,
         redeemerMessage: Buffer | Uint8Array,
         minAmountOut?: bigint,
-        refundAddress?: string
+        refundAddress?: string,
     ): Promise<PreparedTransactionType>;
 
     abstract placeFastMarketOrder(
@@ -40,19 +41,19 @@ export abstract class TokenRouter<PreparedTransactionType extends PreparedInstru
         maxFee: bigint,
         deadline: number,
         minAmountOut?: bigint,
-        refundAddress?: string
+        refundAddress?: string,
     ): Promise<PreparedTransactionType>;
 
     abstract redeemFill(response: OrderResponse): Promise<PreparedTransactionType>;
 
     abstract addRouterEndpoint(
         chain: number,
         endpoint: Endpoint,
-        domain: number
+        domain: number,
     ): Promise<PreparedTransactionType>;
 
     abstract updateFastTransferParameters(
-        newParams: FastTransferParameters
+        newParams: FastTransferParameters,
     ): Promise<PreparedTransactionType>;
 
     abstract enableFastTransfer(enable: boolean): Promise<PreparedTransactionType>;

evm/ts/tests/00__environment.ts

@@ -4,9 +4,10 @@ import { ethers } from "ethers";
 import {
     ICircleBridge__factory,
     IMessageTransmitter__factory,
-    IUSDC__factory,
     IWormhole__factory,
-} from "../src/types";
+} from "../src/types/factories";
+
+import { IUSDC__factory } from "../src/types/factories/IUSDC__factory";
 import {
     parseLiquidityLayerEnvFile,
     GUARDIAN_PRIVATE_KEY,
@@ -21,7 +22,7 @@ import {
 } from "./helpers";
 
 describe("Environment", () => {
-    const chainNames: ValidNetwork[] = ["avalanche", "ethereum", "base"];
+    const chainNames: ValidNetwork[] = ["Avalanche", "Ethereum", "Base"];
 
     for (const chainName of chainNames) {
         if (!(chainName in LOCALHOSTS)) {
@@ -34,7 +35,7 @@ describe("Environment", () => {
             tokenAddress: usdcAddress,
             wormholeAddress,
             tokenMessengerAddress,
-        } = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.env`);
+        } = parseLiquidityLayerEnvFile(`${envPath}/${chainName.toLowerCase()}.env`);
 
         const localhost = LOCALHOSTS[chainName] as string;
 
@@ -242,7 +243,9 @@ describe("Environment", () => {
                     const scripts = `${__dirname}/../../sh`;
                     const cmd =
                         `bash ${scripts}/deploy_matching_engine.sh ` +
-                        `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey} ` +
+                        `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
+                            owner.privateKey
+                        } ` +
                         `> /dev/null 2>&1`;
                     const out = execSync(cmd, { encoding: "utf8" });
 
@@ -255,7 +258,9 @@ describe("Environment", () => {
                     const scripts = `${__dirname}/../../sh`;
                     const cmd =
                         `bash ${scripts}/upgrade_matching_engine.sh ` +
-                        `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey}` +
+                        `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
+                            owner.privateKey
+                        }` +
                         `> /dev/null 2>&1`;
                     const out = execSync(cmd, { encoding: "utf8" });
                     await provider.send("evm_setAutomine", [false]);
@@ -268,7 +273,9 @@ describe("Environment", () => {
                 const scripts = `${__dirname}/../../sh`;
                 const cmd =
                     `bash ${scripts}/deploy_token_router.sh ` +
-                    `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey} ` +
+                    `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
+                        owner.privateKey
+                    } ` +
                     `> /dev/null 2>&1`;
                 const out = execSync(cmd, { encoding: "utf8" });
 
@@ -281,7 +288,9 @@ describe("Environment", () => {
                 const scripts = `${__dirname}/../../sh`;
                 const cmd =
                     `bash ${scripts}/upgrade_token_router.sh ` +
-                    `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey}` +
+                    `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
+                        owner.privateKey
+                    }` +
                     `> /dev/null 2>&1`;
                 const out = execSync(cmd, { encoding: "utf8" });
                 await provider.send("evm_setAutomine", [false]);

evm/ts/tests/01__registration.ts

@@ -19,21 +19,27 @@ describe("Registration", () => {
     const envPath = `${__dirname}/../../env/localnet`;
 
     describe(`Register Token Routers on ${MATCHING_ENGINE_NAME} Matching Engine`, () => {
-        const env = parseLiquidityLayerEnvFile(`${envPath}/${MATCHING_ENGINE_NAME}.env`);
+        const env = parseLiquidityLayerEnvFile(
+            `${envPath}/${MATCHING_ENGINE_NAME.toLowerCase()}.env`,
+        );
         const provider = new ethers.providers.StaticJsonRpcProvider(
             LOCALHOSTS[MATCHING_ENGINE_NAME],
         );
         const assistant = new ethers.Wallet(OWNER_ASSISTANT_PRIVATE_KEY, provider);
 
-        const matchingEngineAddress = toNative("Avalanche", env.matchingEngineAddress);
+        const matchingEngineAddress = toUniversal("Avalanche", env.matchingEngineAddress).toNative(
+            "Avalanche",
+        );
         const engine = IMatchingEngine__factory.connect(
             matchingEngineAddress.toString(),
             assistant,
         );
 
         for (const chainName of CHAIN_PATHWAYS) {
             it(`Register ${chainName}`, async () => {
-                const targetEnv = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.env`);
+                const targetEnv = parseLiquidityLayerEnvFile(
+                    `${envPath}/${chainName.toLowerCase()}.env`,
+                );
                 const [formattedAddress, mintRecipient] = fetchTokenRouterEndpoint(
                     targetEnv,
                     chainName,
@@ -60,7 +66,7 @@ describe("Registration", () => {
 
     for (const chainName of CHAIN_PATHWAYS) {
         describe(`Register Token Routers on ${chainName}`, () => {
-            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.env`);
+            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName.toLowerCase()}.env`);
             const provider = new ethers.providers.StaticJsonRpcProvider(LOCALHOSTS[chainName]);
             const assistant = new ethers.Wallet(OWNER_ASSISTANT_PRIVATE_KEY, provider);
             const router = ITokenRouter__factory.connect(env.tokenRouterAddress, assistant);
@@ -71,7 +77,9 @@ describe("Registration", () => {
                 }
 
                 it(`Register ${targetChain}`, async () => {
-                    const targetEnv = parseLiquidityLayerEnvFile(`${envPath}/${targetChain}.env`);
+                    const targetEnv = parseLiquidityLayerEnvFile(
+                        `${envPath}/${targetChain.toLowerCase()}.env`,
+                    );
                     const [formattedAddress, mintRecipient] = fetchTokenRouterEndpoint(
                         targetEnv,
                         chainName,

evm/ts/tests/02__configuration.ts

@@ -10,7 +10,7 @@ import {
     parseLiquidityLayerEnvFile,
 } from "./helpers";
 import { expect } from "chai";
-import { toNative } from "@wormhole-foundation/sdk";
+import { toNative, toUniversal } from "@wormhole-foundation/sdk";
 
 const CHAIN_PATHWAYS: ValidNetwork[] = ["Ethereum", "Avalanche", "Base"];
 
@@ -19,7 +19,7 @@ describe("Configuration", () => {
 
     describe("Token Router Configuration", () => {
         for (const chainName of CHAIN_PATHWAYS) {
-            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.env`);
+            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName.toLowerCase()}.env`);
             const provider = new ethers.providers.StaticJsonRpcProvider(LOCALHOSTS[chainName]);
             const assistant = new ethers.Wallet(OWNER_ASSISTANT_PRIVATE_KEY, provider);
             const router = ITokenRouter__factory.connect(env.tokenRouterAddress, assistant);
@@ -52,13 +52,18 @@ describe("Configuration", () => {
 
     describe("Matching Engine Configuration", () => {
         it("Set Infinite Approval For Matching Engine", async () => {
-            const env = parseLiquidityLayerEnvFile(`${envPath}/${MATCHING_ENGINE_NAME}.env`);
+            const env = parseLiquidityLayerEnvFile(
+                `${envPath}/${MATCHING_ENGINE_NAME.toLowerCase()}.env`,
+            );
             const provider = new ethers.providers.StaticJsonRpcProvider(
                 LOCALHOSTS[MATCHING_ENGINE_NAME],
             );
             const assistant = new ethers.Wallet(OWNER_ASSISTANT_PRIVATE_KEY, provider);
 
-            const matchingEngineAddress = toNative("Avalanche", env.matchingEngineAddress);
+            const matchingEngineAddress = toUniversal(
+                "Avalanche",
+                env.matchingEngineAddress,
+            ).toNative("Avalanche");
             const engine = IMatchingEngine__factory.connect(
                 matchingEngineAddress.toString(),
                 assistant,

evm/ts/tests/03__marketOrder.ts

@@ -44,7 +44,9 @@ describe("Market Order Business Logic -- CCTP to CCTP", () => {
             );
             const fromWallet = new ethers.Wallet(WALLET_PRIVATE_KEYS[0], fromProvider);
 
-            const fromEnv = parseLiquidityLayerEnvFile(`${envPath}/${fromChainName}.env`);
+            const fromEnv = parseLiquidityLayerEnvFile(
+                `${envPath}/${fromChainName.toLowerCase()}.env`,
+            );
             const fromTokenRouter = (() => {
                 if (fromEnv.chainType === ChainType.Evm) {
                     return new EvmTokenRouter(
@@ -61,7 +63,7 @@ describe("Market Order Business Logic -- CCTP to CCTP", () => {
             const toProvider = new ethers.providers.StaticJsonRpcProvider(LOCALHOSTS[toChainName]);
             const toWallet = new ethers.Wallet(WALLET_PRIVATE_KEYS[1], toProvider);
 
-            const toEnv = parseLiquidityLayerEnvFile(`${envPath}/${toChainName}.env`);
+            const toEnv = parseLiquidityLayerEnvFile(`${envPath}/${toChainName.toLowerCase()}.env`);
             const toTokenRouter = (() => {
                 if (toEnv.chainType === ChainType.Evm) {
                     return new EvmTokenRouter(
@@ -144,7 +146,7 @@ describe("Market Order Business Logic -- CCTP to CCTP", () => {
                 const circleAttestation = circleAttester.createAttestation(circleBridgeMessage);
 
                 const orderResponse: OrderResponse = {
-                    encodedWormholeMessage: serialize(fillVaa),
+                    encodedWormholeMessage: fillVaa,
                     circleBridgeMessage,
                     circleAttestation,
                 };