evm: deploy new testnet contracts (#159)

gator-boi · a5-pickle · web-flow · commit fca6912c66c9 · 2024-05-21T10:00:11.000-05:00
Co-authored-by: gator-boi &lt;gator-boi@users.noreply.github.com&gt;
Co-authored-by: A5 Pickle &lt;5342825+a5-pickle@users.noreply.github.com&gt;
Co-authored-by: A5 Pickle &lt;a5-pickle@users.noreply.github.com&gt;
diff --git a/evm/README.md b/evm/README.md
@@ -12,8 +12,8 @@ make build
 
 The testing environments can be found in the following locations:
 
--   [Unit Tests](./forge/tests/)
--   [Integration Tests](./ts/tests/)
+- [Unit Tests](./forge/tests/)
+- [Integration Tests](./ts/tests/)
 
 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:
 
@@ -30,14 +30,14 @@ Then run `make integration-test`.
 
 Before deploying any contracts, make sure to set the `RPC` environment variable in each environment file in the target `env` directory.
 
-To deploy the `MatchingEngine` contract, open the `avalanche.env` file in the target `env` directory and set the `RELEASE_FEE_RECIPIENT_ADDRESS` environment variable. The `MatchingEngine` contract is design to be deployed to the Avalanche network to help support faster-than-finality transfers. Run the following command for each network:
+To deploy the `MatchingEngine` contract, open the `Avalanche.env` file in the target `env` directory and set the `RELEASE_FEE_RECIPIENT_ADDRESS` environment variable. The `MatchingEngine` contract is design to be deployed to the Avalanche network to help support faster-than-finality transfers. Run the following command for each network:
 
 ```
 bash sh/deploy_matching_engine.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
 
 # Argument examples
 -n testnet, mainnet, localnet
--c avalanche, ethereum
+-c Avalanche, Ethereum
 ```
 
 To deploy the `TokenRouter` contract, open the target environment file in the `env` directory and set the `RELEASE_OWNER_ASSISTANT_ADDRESS`, `RELEASE_MATCHING_ENGINE_CHAIN` and `RELEASE_MATCHING_ENGINE_ADDRESS` environment variables. The `MatchingEngine` contract must be deployed before any `TokenRouter` contracts. Then run the following command:
@@ -47,21 +47,21 @@ bash sh/deploy_token_router.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
 
 # Argument examples
 -n testnet, mainnet, localnet
--c avalanche, ethereum
+-c Avalanche, Ethereum
 ```
 
 ## Initial Contract Setup
 
 Once the contracts (`TokenRouter` and `MatchingEngine`) have been deployed, the deployment configuration file needs to be updated with the deployed contract addresses, initial `FastTransferParameters` and `AuctionConfig`. The configuration file can be found in the `cfg` directory. Copy the sample testnet file and replace the network type with your network of choice. Run the following commands for each `TokenRouter` contract (in the following order):
 
 ```
-bash sh/setup_token_router.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
-bash sh/set_fast_transfer_parameters.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
+bash sh/configure_token_router.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
+bash sh/update_fast_transfer_parameters.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
 ```
 
 Run the following commands for the `MatchingEngine` contract (in the following order):
 
 ```
-bash sh/setup_matching_engine.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
-bash sh/set_auction_config.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
+bash sh/configure_matching_engine.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
+bash sh/update_auction_config.sh -k PRIVATE_KEY -n NETWORK_TYPE -c CHAIN_NAME
 ```
diff --git a/evm/env/localnet/Avalanche.env b/evm/env/localnet/Avalanche.env
diff --git a/evm/env/localnet/Base.env b/evm/env/localnet/Base.env
diff --git a/evm/env/localnet/Ethereum.env b/evm/env/localnet/Ethereum.env
diff --git a/evm/env/testnet/ArbitrumSepolia.env b/evm/env/testnet/ArbitrumSepolia.env
@@ -37,7 +37,7 @@ export RELEASE_OWNER_ASSISTANT_ADDRESS=0x
 
 
 ### Token Router Proxy (evm address)
-export RELEASE_TOKEN_ROUTER_ADDRESS=0xc1Cf3501ef0b26c8A47759F738832563C7cB014A
+export RELEASE_TOKEN_ROUTER_ADDRESS=0xe0418C44F06B0b0D7D1706E01706316DBB0B210E
 
 
 ###############################  Matching Engine ###############################
diff --git a/evm/env/testnet/Avalanche.env b/evm/env/testnet/Avalanche.env
@@ -41,7 +41,7 @@ export RELEASE_FEE_RECIPIENT_ADDRESS=0x
 ###############################  Token Router  #################################
 
 ### Token Router Proxy (evm address)
-export RELEASE_TOKEN_ROUTER_ADDRESS=0x7353B29FDc79435dcC7ECc9Ac9F9b61d83B4E0F4
+export RELEASE_TOKEN_ROUTER_ADDRESS=0x8Cd7D7C980cd72eBD16737dC3fa04469dcFcf07A
 
 
 ###############################  Matching Engine ###############################
diff --git a/evm/env/testnet/BaseSepolia.env b/evm/env/testnet/BaseSepolia.env
@@ -37,7 +37,7 @@ export RELEASE_OWNER_ASSISTANT_ADDRESS=0x
 
 
 ### Token Router Proxy (evm address)
-export RELEASE_TOKEN_ROUTER_ADDRESS=0x4452B708C01d6aD7058a7541A3A82f0aD0A1abB1
+export RELEASE_TOKEN_ROUTER_ADDRESS=0x824Ea687CD1CC2f2446235D33Ae764CbCd08e18C
 
 
 ###############################  Matching Engine ###############################
diff --git a/evm/env/testnet/OptimismSepolia.env b/evm/env/testnet/OptimismSepolia.env
@@ -37,7 +37,7 @@ export RELEASE_OWNER_ASSISTANT_ADDRESS=0x
 
 
 ### Token Router Proxy (evm address)
-export RELEASE_TOKEN_ROUTER_ADDRESS=0xc1Cf3501ef0b26c8A47759F738832563C7cB014A
+export RELEASE_TOKEN_ROUTER_ADDRESS=0x6BAa7397c18abe6221b4f6C3Ac91C88a9faE00D8
 
 
 ###############################  Matching Engine ###############################
diff --git a/evm/env/testnet/PolygonSepolia.env b/evm/env/testnet/PolygonSepolia.env
@@ -1,23 +1,23 @@
 export RELEASE_CHAIN_TYPE=evm
 
 ### RPC
-export RPC=
+export RPC=https://rpc-amoy.polygon.technology/
 
 ### Wormhole Chain ID (uint16)
-export RELEASE_CHAIN_ID=5
+export RELEASE_CHAIN_ID=10007
 
 ### Circle Domain (uint32)
 export RELEASE_DOMAIN=7
 
 ### Token (evm address)
 ###
-### Token Info: https://mumbai.polygonscan.com/token/0x9999f7fea5938fd3b1e26a12c3f2fb024e194f97
-export RELEASE_TOKEN_ADDRESS=0x9999f7fea5938fd3b1e26a12c3f2fb024e194f97
+### Token Info: https://www.oklink.com/amoy/address/0x41e94eb019c0762f9bfcf9fb1e58725bfb0e7582
+export RELEASE_TOKEN_ADDRESS=0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582
 
 #############################  Wormhole Contracts  #############################
 
 ### Wormhole (evm address)
-export RELEASE_WORMHOLE_ADDRESS=0x0CBE91CF822c73C2315FB05100C2F714765d5c20
+export RELEASE_WORMHOLE_ADDRESS=0x6b9C8671cdDC8dEab9c719bB87cBd3e782bA6a35
 
 
 ############################# Circle Contracts #################################
@@ -37,7 +37,7 @@ export RELEASE_OWNER_ASSISTANT_ADDRESS=0x
 
 
 ### Token Router Proxy (evm address)
-export RELEASE_TOKEN_ROUTER_ADDRESS=0x3Ce8a3aC230Eb4bCE3688f2A1ab21d986a0A0B06
+export RELEASE_TOKEN_ROUTER_ADDRESS=0xa098368AaaDc0FdF3e309cda710D7A5f8BDEeCD9
 
 
 ###############################  Matching Engine ###############################
diff --git a/evm/env/testnet/Sepolia.env b/evm/env/testnet/Sepolia.env
@@ -38,7 +38,7 @@ export RELEASE_OWNER_ASSISTANT_ADDRESS=0x
 
 
 ### Token Router Proxy (evm address)
-export RELEASE_TOKEN_ROUTER_ADDRESS=0x603541d1Cf7178C407aA7369b67CB7e0274952e2
+export RELEASE_TOKEN_ROUTER_ADDRESS=0xE57D917bf955FedE2888AAbD056202a6497F1882
 
 
 ###############################  Matching Engine ###############################
diff --git a/evm/ts/scripts/set_fast_transfer_parameters.ts b/evm/ts/scripts/set_fast_transfer_parameters.ts
@@ -2,7 +2,7 @@ import { getConfig } from "./helpers";
 import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
 import { ITokenRouter, FastTransferParametersStruct } from "../src/types/ITokenRouter";
 import { ethers } from "ethers";
-import { Chain, toChainId, toNative } from "@wormhole-foundation/sdk";
+import { Chain, toChainId, toNative, toUniversal, toChain } from "@wormhole-foundation/sdk";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -53,12 +53,13 @@ async function main() {
     const wallet = new ethers.Wallet(key, provider);
 
     const routerChainId = toChainId(chain);
+    const routerChain = toChain(routerChainId);
+    const routerAddress = toUniversal(routerChain, routers[routerChainId].address)
+        .toNative(routerChain)
+        .toString();
 
     // Setup token router contract.
-    const tokenRouter = ITokenRouter__factory.connect(
-        toNative(chain as Chain, routers[routerChainId].address).toString(),
-        wallet,
-    );
+    const tokenRouter = ITokenRouter__factory.connect(routerAddress, wallet);
 
     await setFastTransferParams(routerChainId.toString(), tokenRouter, fastTransferParams);
 }
diff --git a/evm/ts/scripts/setup_matching_engine.ts b/evm/ts/scripts/setup_matching_engine.ts
@@ -2,7 +2,7 @@ import { getConfig, ZERO_BYTES32 } from "./helpers";
 import { IMatchingEngine__factory, IMatchingEngine } from "../src/types/";
 import { RouterEndpointStruct } from "../src/types/IMatchingEngine";
 import { ethers } from "ethers";
-import { ChainId, toChain, toChainId, toNative } from "@wormhole-foundation/sdk";
+import { ChainId, toChain, toChainId, toNative, toUniversal } from "@wormhole-foundation/sdk";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -71,7 +71,10 @@ async function main() {
     }
 
     const engineChain = toChain(engineChainId);
-    const engineAddress = toNative(engineChain, matchingEngineConfig["address"]);
+    const engineAddress = toUniversal(engineChain, matchingEngineConfig["address"])
+        .toNative(engineChain)
+        .toString();
+
     // Setup token router contract.
     const engine = IMatchingEngine__factory.connect(engineAddress.toString(), wallet);
 
diff --git a/evm/ts/scripts/setup_token_router.ts b/evm/ts/scripts/setup_token_router.ts
@@ -3,7 +3,7 @@ import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__fact
 import { ITokenRouter } from "../src/types/ITokenRouter";
 import { EndpointStruct } from "../src/types/ITokenRouter";
 import { ethers } from "ethers";
-import { toChain, toChainId, toNative } from "@wormhole-foundation/sdk";
+import { toChain, toChainId, toNative, toUniversal } from "@wormhole-foundation/sdk";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -66,7 +66,9 @@ async function main() {
 
     const routerChainId = toChainId(chain);
     const routerChain = toChain(routerChainId);
-    const routerAddress = toNative(routerChain, routers[routerChainId].address);
+    const routerAddress = toUniversal(routerChain, routers[routerChainId].address)
+        .toNative(routerChain)
+        .toString();
 
     // Setup token router contract.
     const tokenRouter = ITokenRouter__factory.connect(routerAddress.toString(), wallet);
diff --git a/evm/ts/tests/00__environment.ts b/evm/ts/tests/00__environment.ts
@@ -35,7 +35,7 @@ describe("Environment", () => {
             tokenAddress: usdcAddress,
             wormholeAddress,
             tokenMessengerAddress,
-        } = parseLiquidityLayerEnvFile(`${envPath}/${chainName.toLowerCase()}.env`);
+        } = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.env`);
 
         const localhost = LOCALHOSTS[chainName] as string;
 
@@ -243,9 +243,7 @@ describe("Environment", () => {
                     const scripts = `${__dirname}/../../sh`;
                     const cmd =
                         `bash ${scripts}/deploy_matching_engine.sh ` +
-                        `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
-                            owner.privateKey
-                        } ` +
+                        `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey} ` +
                         `> /dev/null 2>&1`;
                     const out = execSync(cmd, { encoding: "utf8" });
 
@@ -258,9 +256,7 @@ describe("Environment", () => {
                     const scripts = `${__dirname}/../../sh`;
                     const cmd =
                         `bash ${scripts}/upgrade_matching_engine.sh ` +
-                        `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
-                            owner.privateKey
-                        }` +
+                        `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey}` +
                         `> /dev/null 2>&1`;
                     const out = execSync(cmd, { encoding: "utf8" });
                     await provider.send("evm_setAutomine", [false]);
@@ -273,9 +269,7 @@ describe("Environment", () => {
                 const scripts = `${__dirname}/../../sh`;
                 const cmd =
                     `bash ${scripts}/deploy_token_router.sh ` +
-                    `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
-                        owner.privateKey
-                    } ` +
+                    `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey} ` +
                     `> /dev/null 2>&1`;
                 const out = execSync(cmd, { encoding: "utf8" });
 
@@ -288,9 +282,7 @@ describe("Environment", () => {
                 const scripts = `${__dirname}/../../sh`;
                 const cmd =
                     `bash ${scripts}/upgrade_token_router.sh ` +
-                    `-n localnet -c ${chainName.toLowerCase()} -u ${localhost} -k ${
-                        owner.privateKey
-                    }` +
+                    `-n localnet -c ${chainName} -u ${localhost} -k ${owner.privateKey}` +
                     `> /dev/null 2>&1`;
                 const out = execSync(cmd, { encoding: "utf8" });
                 await provider.send("evm_setAutomine", [false]);
diff --git a/evm/ts/tests/01__registration.ts b/evm/ts/tests/01__registration.ts
@@ -19,9 +19,7 @@ describe("Registration", () => {
     const envPath = `${__dirname}/../../env/localnet`;
 
     describe(`Register Token Routers on ${MATCHING_ENGINE_NAME} Matching Engine`, () => {
-        const env = parseLiquidityLayerEnvFile(
-            `${envPath}/${MATCHING_ENGINE_NAME.toLowerCase()}.env`,
-        );
+        const env = parseLiquidityLayerEnvFile(`${envPath}/${MATCHING_ENGINE_NAME}.env`);
         const provider = new ethers.providers.StaticJsonRpcProvider(
             LOCALHOSTS[MATCHING_ENGINE_NAME],
         );
@@ -37,9 +35,7 @@ describe("Registration", () => {
 
         for (const chainName of CHAIN_PATHWAYS) {
             it(`Register ${chainName}`, async () => {
-                const targetEnv = parseLiquidityLayerEnvFile(
-                    `${envPath}/${chainName.toLowerCase()}.env`,
-                );
+                const targetEnv = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.env`);
                 const [formattedAddress, mintRecipient] = fetchTokenRouterEndpoint(
                     targetEnv,
                     chainName,
@@ -66,7 +62,7 @@ describe("Registration", () => {
 
     for (const chainName of CHAIN_PATHWAYS) {
         describe(`Register Token Routers on ${chainName}`, () => {
-            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName.toLowerCase()}.env`);
+            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.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);
@@ -77,9 +73,7 @@ describe("Registration", () => {
                 }
 
                 it(`Register ${targetChain}`, async () => {
-                    const targetEnv = parseLiquidityLayerEnvFile(
-                        `${envPath}/${targetChain.toLowerCase()}.env`,
-                    );
+                    const targetEnv = parseLiquidityLayerEnvFile(`${envPath}/${targetChain}.env`);
                     const [formattedAddress, mintRecipient] = fetchTokenRouterEndpoint(
                         targetEnv,
                         chainName,
diff --git a/evm/ts/tests/02__configuration.ts b/evm/ts/tests/02__configuration.ts
@@ -19,7 +19,7 @@ describe("Configuration", () => {
 
     describe("Token Router Configuration", () => {
         for (const chainName of CHAIN_PATHWAYS) {
-            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName.toLowerCase()}.env`);
+            const env = parseLiquidityLayerEnvFile(`${envPath}/${chainName}.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,9 +52,7 @@ describe("Configuration", () => {
 
     describe("Matching Engine Configuration", () => {
         it("Set Infinite Approval For Matching Engine", async () => {
-            const env = parseLiquidityLayerEnvFile(
-                `${envPath}/${MATCHING_ENGINE_NAME.toLowerCase()}.env`,
-            );
+            const env = parseLiquidityLayerEnvFile(`${envPath}/${MATCHING_ENGINE_NAME}.env`);
             const provider = new ethers.providers.StaticJsonRpcProvider(
                 LOCALHOSTS[MATCHING_ENGINE_NAME],
             );
diff --git a/evm/ts/tests/03__marketOrder.ts b/evm/ts/tests/03__marketOrder.ts
@@ -44,9 +44,7 @@ describe("Market Order Business Logic -- CCTP to CCTP", () => {
             );
             const fromWallet = new ethers.Wallet(WALLET_PRIVATE_KEYS[0], fromProvider);
 
-            const fromEnv = parseLiquidityLayerEnvFile(
-                `${envPath}/${fromChainName.toLowerCase()}.env`,
-            );
+            const fromEnv = parseLiquidityLayerEnvFile(`${envPath}/${fromChainName}.env`);
             const fromTokenRouter = (() => {
                 if (fromEnv.chainType === ChainType.Evm) {
                     return new EvmTokenRouter(
@@ -63,7 +61,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.toLowerCase()}.env`);
+            const toEnv = parseLiquidityLayerEnvFile(`${envPath}/${toChainName}.env`);
             const toTokenRouter = (() => {
                 if (toEnv.chainType === ChainType.Evm) {
                     return new EvmTokenRouter(
diff --git a/evm/ts/tests/04__fastMarketOrder.ts b/evm/ts/tests/04__fastMarketOrder.ts
@@ -51,9 +51,7 @@ describe("Fast Market Order Business Logic -- CCTP to CCTP", function (this: Moc
         LOCALHOSTS[MATCHING_ENGINE_NAME],
     );
     const engineWallet = new ethers.Wallet(WALLET_PRIVATE_KEYS[2], engineProvider);
-    const engineEnv = parseLiquidityLayerEnvFile(
-        `${envPath}/${MATCHING_ENGINE_NAME.toLowerCase()}.env`,
-    );
+    const engineEnv = parseLiquidityLayerEnvFile(`${envPath}/${MATCHING_ENGINE_NAME}.env`);
     const engine = (() => {
         if (engineEnv.chainType === ChainType.Evm) {
             return new EvmMatchingEngine(
@@ -85,9 +83,7 @@ describe("Fast Market Order Business Logic -- CCTP to CCTP", function (this: Moc
             );
             const fromWallet = new ethers.Wallet(WALLET_PRIVATE_KEYS[0], fromProvider);
 
-            const fromEnv = parseLiquidityLayerEnvFile(
-                `${envPath}/${fromChainName.toLowerCase()}.env`,
-            );
+            const fromEnv = parseLiquidityLayerEnvFile(`${envPath}/${fromChainName}.env`);
             const fromTokenRouter = (() => {
                 if (fromEnv.chainType === ChainType.Evm) {
                     return new EvmTokenRouter(
@@ -104,7 +100,7 @@ describe("Fast Market Order Business Logic -- CCTP to CCTP", function (this: Moc
             const toProvider = new ethers.providers.StaticJsonRpcProvider(LOCALHOSTS[toChainName]);
             const toWallet = new ethers.Wallet(WALLET_PRIVATE_KEYS[1], toProvider);
 
-            const toEnv = parseLiquidityLayerEnvFile(`${envPath}/${toChainName.toLowerCase()}.env`);
+            const toEnv = parseLiquidityLayerEnvFile(`${envPath}/${toChainName}.env`);
             const toTokenRouter = (() => {
                 if (toEnv.chainType === ChainType.Evm) {
                     return new EvmTokenRouter(
diff --git a/solana/cfg/testnet/sample.config.json b/solana/cfg/testnet/sample.config.json
diff --git a/solana/ts/scripts/setUpTestnetMatchingEngine.ts b/solana/ts/scripts/setUpTestnetMatchingEngine.ts
