deploy: cleans up helper exports to avoid name collisions

scnale · scnale · commit 91bcb62f1251 · 2024-07-25T16:11:26.000-03:00
diff --git a/deployment/helpers/index.ts b/deployment/helpers/index.ts
@@ -1,5 +1,5 @@
 export * from "./env";
-export * from "./evm";
-export * from "./solana";
+export * as evm from "./evm";
+export * as solana from "./solana";
 export * from "./interfaces";
 export * from "./utils";
diff --git a/deployment/scripts/evm/TokenRouter/bytecode-verification-token-router.ts b/deployment/scripts/evm/TokenRouter/bytecode-verification-token-router.ts
@@ -1,10 +1,9 @@
-import { runOnEvms, ChainInfo, LoggerFn, getContractAddress, getDeploymentArgs, getVerifyCommand, verificationApiKeys, flattenObject } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm, getContractAddress, getDeploymentArgs, getVerifyCommand, verificationApiKeys, flattenObject } from "../../../helpers";
 import { execSync } from "child_process";
 import path from "path";
 import chalk from "chalk";
 
-runOnEvms("bytecode-verification-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("bytecode-verification-token-router", async (chain, signer, log) => {
   // The root path of the foundry project
   const rootPath = path.resolve('../evm/');
 
diff --git a/deployment/scripts/evm/TokenRouter/config-token-router.ts b/deployment/scripts/evm/TokenRouter/config-token-router.ts
@@ -1,11 +1,10 @@
-import { ChainInfo, LoggerFn, getContractInstance, getContractAddress, runOnEvmsSequentially, ValueDiff } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm, LoggerFn, getContractInstance, getContractAddress, ValueDiff } from "../../../helpers";
 import { getConfigurationDifferences, logDiff } from "./utils";
 import confirm from '@inquirer/confirm';
 import { TokenRouter } from "../../../contract-bindings";
 import { FastTransferParametersStruct } from "../../../contract-bindings/ITokenRouter";
 
-runOnEvmsSequentially("config-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvmsSequentially("config-token-router", async (chain, signer, log) => {
   const tokenRouterAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const tokenRouter = (await getContractInstance("TokenRouter", tokenRouterAddress, chain)) as TokenRouter;
   const diff = await getConfigurationDifferences(chain);
diff --git a/deployment/scripts/evm/TokenRouter/cross-registration-token-router.ts b/deployment/scripts/evm/TokenRouter/cross-registration-token-router.ts
@@ -1,9 +1,8 @@
-import { ChainInfo, LoggerFn, getContractInstance, getContractAddress, runOnEvms, contracts, getUniversalAddress } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm, getContractInstance, getContractAddress, contracts, getUniversalAddress } from "../../../helpers";
 import { TokenRouter } from "../../../contract-bindings";
 import { circle, toChain } from "@wormhole-foundation/sdk-base";
 
-runOnEvms("cross-registration-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("cross-registration-token-router", async (chain, signer, log) => {
   const tokenRouterAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const tokenRouter = (await getContractInstance("TokenRouter", tokenRouterAddress, chain)) as TokenRouter;
   const deployedTokenRouters = contracts['TokenRouterProxy'].filter((router) => router.chainId !== chain.chainId);
diff --git a/deployment/scripts/evm/TokenRouter/deploy-token-router.ts b/deployment/scripts/evm/TokenRouter/deploy-token-router.ts
@@ -1,10 +1,10 @@
 import { ethers } from "ethers";
-import { runOnEvms, ChainInfo, LoggerFn, writeDeployedContract } from "../../../helpers";
+import { evm, LoggerFn, writeDeployedContract } from "../../../helpers";
 import { TokenRouterConfiguration } from "../../../config/config-types";
 import { deployImplementation, getTokenRouterConfiguration } from "./utils";
 import { ERC1967Proxy__factory } from "../../../contract-bindings";
 
-runOnEvms("deploy-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("deploy-token-router", async (chain, signer, log) => {
   const config = await getTokenRouterConfiguration(chain);
   const implementation = await deployImplementation(chain, signer, config, log);
   await deployProxy(signer, config, implementation, log);
diff --git a/deployment/scripts/evm/TokenRouter/disable-router-token-router.ts b/deployment/scripts/evm/TokenRouter/disable-router-token-router.ts
@@ -1,9 +1,8 @@
 import { TokenRouter } from "../../../contract-bindings";
-import { ChainInfo, LoggerFn, getContractInstance, getContractAddress, runOnEvms } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm, getContractInstance, getContractAddress } from "../../../helpers";
 import { getTokenRouterConfiguration } from "./utils";
 
-runOnEvms("disable-router-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("disable-router-token-router", async (chain, signer, log) => {
   const tokenRouterAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const tokenRouter = (await getContractInstance("TokenRouter", tokenRouterAddress, chain)) as TokenRouter;
   const config = await getTokenRouterConfiguration(chain);
diff --git a/deployment/scripts/evm/TokenRouter/get-config-diff-token-router.ts b/deployment/scripts/evm/TokenRouter/get-config-diff-token-router.ts
@@ -1,8 +1,7 @@
-import { runOnEvms, ChainInfo, LoggerFn } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm } from "../../../helpers";
 import { getConfigurationDifferences, logDiff } from "./utils";
 
-runOnEvms("get-config-diff-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("get-config-diff-token-router", async (chain, signer, log) => {
   const diff = await getConfigurationDifferences(chain);
 
   log(`TokenRouter configuration differences on chain ${chain.chainId}:`);
diff --git a/deployment/scripts/evm/TokenRouter/read-config-token-router.ts b/deployment/scripts/evm/TokenRouter/read-config-token-router.ts
@@ -1,9 +1,8 @@
-import { runOnEvms, ChainInfo, LoggerFn } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm } from "../../../helpers";
 import { getOnChainTokenRouterConfiguration } from "./utils";
 import { inspect } from "util";
 
-runOnEvms("read-config-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("read-config-token-router", async (chain, signer, log) => {
   const onChainConfig = await getOnChainTokenRouterConfiguration(chain);
   log(`TokenRouter configuration for chainId ${chain.chainId}:`);
   log(inspect(onChainConfig, { depth: null, colors: true, compact: true }));
diff --git a/deployment/scripts/evm/TokenRouter/update-owner-assistant-token-router.ts b/deployment/scripts/evm/TokenRouter/update-owner-assistant-token-router.ts
@@ -1,15 +1,13 @@
 import { TokenRouter } from "../../../contract-bindings";
-import { runOnEvmsSequentially, ChainInfo, LoggerFn, getContractInstance, getContractAddress, logComparision } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm, getContractInstance, getContractAddress, logComparision } from "../../../helpers";
 import { getConfigurationDifferences } from "./utils";
 import confirm from '@inquirer/confirm';
 
-runOnEvmsSequentially("update-owner-assistant-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvmsSequentially("update-owner-assistant-token-router", async (chain, signer, log) => {
   const tokenRouterAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const tokenRouter = (await getContractInstance("TokenRouter", tokenRouterAddress, chain)) as TokenRouter;
   const diff = await getConfigurationDifferences(chain);
 
-  
   log(`TokenRouter configuration differences on chain ${chain.chainId}:`);
   logComparision('OwnerAssistant', diff.ownerAssistant, log);
 
diff --git a/deployment/scripts/evm/TokenRouter/upgrade-token-router.ts b/deployment/scripts/evm/TokenRouter/upgrade-token-router.ts
@@ -1,11 +1,10 @@
-import { runOnEvms, ChainInfo, LoggerFn, getContractInstance, getContractAddress, getDependencyAddress, getAddressType } from "../../../helpers";
-import { ethers } from "ethers";
+import { evm, ChainInfo, getContractInstance, getContractAddress, getDependencyAddress, getAddressType } from "../../../helpers";
 import { deployImplementation, getTokenRouterConfiguration } from "./utils";
 import { TokenRouter } from "../../../contract-bindings";
 import { TokenRouterConfiguration } from "../../../config/config-types";
 import { UniversalAddress } from "@wormhole-foundation/sdk-definitions";
 
-runOnEvms("upgrade-token-router", async (chain: ChainInfo, signer: ethers.Signer, log: LoggerFn) => {
+evm.runOnEvms("upgrade-token-router", async (chain, signer, log) => {
   const currentImplementationAddress = getContractAddress("TokenRouterImplementation", chain.chainId);
   const proxyAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const proxy = (await getContractInstance("TokenRouter", proxyAddress, chain)) as TokenRouter;
diff --git a/deployment/scripts/solana/initializeMatchingEngine.ts b/deployment/scripts/solana/initializeMatchingEngine.ts
@@ -6,19 +6,19 @@ import {
 import "dotenv/config";
 import { uint64ToBN } from "@wormhole-foundation/example-liquidity-layer-solana/common";
 import { AuctionParameters, MatchingEngineProgram } from "@wormhole-foundation/example-liquidity-layer-solana/matchingEngine";
-import { LoggerFn, connectionCommitmentLevel, getChainConfig, getContractAddress, ledgerSignAndSend, runOnSolana } from "../../helpers";
+import { solana, LoggerFn, getChainConfig, getContractAddress } from "../../helpers";
 import { MatchingEngineConfiguration } from "../../config/config-types";
 import { ProgramId } from "@wormhole-foundation/example-liquidity-layer-solana/matchingEngine";
 import { SolanaLedgerSigner } from "@xlabs-xyz/ledger-signer-solana";
 import { circle } from "@wormhole-foundation/sdk-base";
 
-runOnSolana("deploy-matching-engine", async (chain, signer, log) => {
+solana.runOnSolana("deploy-matching-engine", async (chain, signer, log) => {
     const config = await getChainConfig<MatchingEngineConfiguration>("matching-engine", chain.chainId);
     const matchingEngineId = getContractAddress("MatchingEngine", chain.chainId) as ProgramId;
 
     const env = "Mainnet";
     const usdcMint = new PublicKey(circle.usdcContract(env, "Solana"));
-    const connection = new Connection(chain.rpc, connectionCommitmentLevel);
+    const connection = new Connection(chain.rpc, solana.connectionCommitmentLevel);
     const matchingEngine = new MatchingEngineProgram(connection, matchingEngineId, usdcMint);
 
     await initialize(matchingEngine, signer, log, config, usdcMint);
@@ -63,10 +63,10 @@ async function initialize(matchingEngine: MatchingEngineProgram, signer: SolanaL
     createAtaInstructions.push(splToken.createAssociatedTokenAccountInstruction(signerPubkey, associatedToken, signerPubkey, usdcMint));
     createAtaInstructions.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 }));
 
-    const createAtaTxid = await ledgerSignAndSend(connection, createAtaInstructions, []);
+    const createAtaTxid = await solana.ledgerSignAndSend(connection, createAtaInstructions, []);
     log(`CreateAtaTxid ${createAtaTxid}`);
 
-    const initializeTxid = await ledgerSignAndSend(connection, [initializeIx], []);
+    const initializeTxid = await solana.ledgerSignAndSend(connection, [initializeIx], []);
     log(`InitializeTxid ${initializeTxid}`);
 }
 
diff --git a/deployment/scripts/solana/registerRoutersInMatchingEngine.ts b/deployment/scripts/solana/registerRoutersInMatchingEngine.ts
@@ -5,20 +5,20 @@ import {
 } from "@solana/web3.js";
 import "dotenv/config";
 import { MatchingEngineProgram } from "@wormhole-foundation/example-liquidity-layer-solana/matchingEngine";
-import { LoggerFn, connectionCommitmentLevel, contracts, getContractAddress, ledgerSignAndSend, runOnSolana } from "../../helpers";
+import { solana, LoggerFn, contracts, getContractAddress } from "../../helpers";
 import { ProgramId } from "@wormhole-foundation/example-liquidity-layer-solana/matchingEngine";
 import { SolanaLedgerSigner } from "@xlabs-xyz/ledger-signer-solana";
 import { Chain, chainToPlatform, circle, toChain, toChainId } from "@wormhole-foundation/sdk-base";
 import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 import { TokenRouterProgram } from "@wormhole-foundation/example-liquidity-layer-solana/tokenRouter";
 
 
-runOnSolana("register-routers-matching-engine", async (chain, signer, log) => {
+solana.runOnSolana("register-routers-matching-engine", async (chain, signer, log) => {
     const matchingEngineId = getContractAddress("MatchingEngine", chain.chainId) as ProgramId;
 
     const env = "Mainnet";
     const usdcMint = new PublicKey(circle.usdcContract(env, "Solana"));
-    const connection = new Connection(chain.rpc, connectionCommitmentLevel);
+    const connection = new Connection(chain.rpc, solana.connectionCommitmentLevel);
     const matchingEngine = new MatchingEngineProgram(connection, matchingEngineId, usdcMint);
 
     const deployedTokenRouters = contracts['TokenRouterProxy'];
@@ -131,7 +131,7 @@ async function addCctpRouterEndpoint(
     } else {
         const priorityFeeIx = ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 });
         const instructions = [registerIx, priorityFeeIx]
-        const txSig = await ledgerSignAndSend(connection, instructions, []);
+        const txSig = await solana.ledgerSignAndSend(connection, instructions, []);
         log(
             `${action} endpoint`,
             txSig,
@@ -188,6 +188,6 @@ async function addSolanaCctpRouterEndpoint(
     });
     const priorityFeeIx = ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 });
     const instructions = [registerIx, priorityFeeIx];
-    const txSig = await ledgerSignAndSend(connection, instructions, []);
+    const txSig = await solana.ledgerSignAndSend(connection, instructions, []);
     log("added local endpoint", txSig, "router", tokenRouter.ID.toString());
 }
