cleanup

Author: kev1n-peters

evm/ts/package.json

@@ -44,7 +44,6 @@
     "test": "jest --config ./jest.config.ts"
   },
   "dependencies": {
-    "@axelar-network/axelarjs-sdk": "^0.17.6-alpha.2",
     "@wormhole-foundation/sdk-definitions-ntt": "1.0.0",
     "ethers": "^6.5.1"
   },

evm/ts/src/axelar.ts

@@ -34,41 +34,42 @@ export interface GMPError {
   message: string;
 }
 
+export function getAxelarApiUrl(network: Network): string {
+  return network === "Mainnet"
+    ? "https://api.axelarscan.io"
+    : "https://testnet.api.axelarscan.io";
+}
+
+export function getAxelarChain(chain: Chain): string {
+  const axelarChain = axelarChains[chain];
+  if (!axelarChain) {
+    throw new Error(`Unsupported axelar chain: ${chain}`);
+  }
+  return axelarChain;
+}
+
 export async function getAxelarGasFee(
   network: Network,
   sourceChain: Chain,
   destinationChain: Chain,
   gasLimit: bigint,
   timeoutMs = 10000
 ): Promise<bigint> {
-  const baseUrl =
-    network === "Mainnet"
-      ? "https://api.axelarscan.io/gmp/estimateGasFee"
-      : "https://testnet.api.axelarscan.io/gmp/estimateGasFee";
-
-  const axelarSourceChain = axelarChains[sourceChain];
-  if (!axelarSourceChain) {
-    throw new Error(`Unsupported axelar source chain: ${sourceChain}`);
-  }
-
-  const axelarDestinationChain = axelarChains[destinationChain];
-  if (!axelarDestinationChain) {
-    throw new Error(
-      `Unsupported axelar destination chain: ${destinationChain}`
-    );
-  }
+  const url = `${getAxelarApiUrl(network)}/gmp/estimateGasFee`;
+  const axelarSourceChain = getAxelarChain(sourceChain);
+  const axelarDestinationChain = getAxelarChain(destinationChain);
 
   const maxRetries = 3;
   let lastResult: bigint | null = null;
 
   // TODO: the Axelar API sometimes returns 0 gas fee. Retry a few times if we get 0.
-  // The issue is intermittent and the Axelar team is looking into it.
+  // The issue is intermittent and the Axelar team is looking into fixing it.
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
 
     try {
-      const response = await fetch(baseUrl, {
+      const response = await fetch(url, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -115,21 +116,15 @@ export async function getAxelarTransactionStatus(
   txHash: string,
   timeoutMs = 10000
 ): Promise<{ status: GMPStatus | string; error?: GMPError }> {
-  const baseUrl =
-    network === "Mainnet"
-      ? "https://api.axelarscan.io"
-      : "https://testnet.api.axelarscan.io";
-
-  const axelarSourceChain = axelarChains[sourceChain];
-  if (!axelarSourceChain) {
-    throw new Error(`Unsupported axelar source chain: ${sourceChain}`);
-  }
+  const url = `${getAxelarApiUrl(network)}/gmp/searchGMP`;
+
+  const axelarSourceChain = getAxelarChain(sourceChain);
 
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
 
   try {
-    const response = await fetch(`${baseUrl}/gmp/searchGMP`, {
+    const response = await fetch(url, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",

evm/ts/src/ethers-contracts/multiTokenNtt/1_1_0/index.ts

@@ -1,11 +1,6 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-//import type * as gmpManagerSol from "./GmpManager.sol";
-//export type { gmpManagerSol };
-//import type * as multiTokenNttSol from "./MultiTokenNtt.sol";
-//export type { multiTokenNttSol };
-//export * as factories from "./factories/index.js";
 export type { GmpManager } from "./GmpManager.sol/GmpManager.js";
 export { GmpManager__factory } from "./factories/GmpManager.sol/GmpManager__factory.js";
 export type { MultiTokenNtt } from "./MultiTokenNtt.sol/MultiTokenNtt.js";

evm/ts/src/multiTokenNtt.ts

@@ -146,12 +146,25 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
     );
   }
 
+  private static versionCache = new Map<string, string>();
+
   static async getVersion(
     provider: ethers.Provider,
     contracts: Contracts & { multiTokenNtt?: MultiTokenNtt.Contracts }
   ) {
+    const multiTokenNtt = contracts.multiTokenNtt;
+    if (!multiTokenNtt) {
+      throw new Error("No multiTokenNtt contracts configured");
+    }
+
+    const cacheKey = `${multiTokenNtt.chain}-${multiTokenNtt.manager}`;
+    const cached = EvmMultiTokenNtt.versionCache.get(cacheKey);
+    if (cached) {
+      return cached;
+    }
+
     const contract = new ethers.Contract(
-      contracts.multiTokenNtt!.manager,
+      multiTokenNtt.manager,
       ["function NTT_MANAGER_VERSION() public view returns (string)"],
       provider
     );
@@ -162,6 +175,7 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
       if (!abiVersion) {
         throw new Error("NTT_MANAGER_VERSION not found");
       }
+      EvmMultiTokenNtt.versionCache.set(cacheKey, abiVersion);
       return abiVersion;
     } catch (e) {
       console.error(
@@ -252,7 +266,7 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
           case "wormhole":
             return {
               index: transceiver.index,
-              payload: new Uint8Array([1]), // disable standard relayer
+              payload: new Uint8Array([1]), // disable standard relayer, use executor route for automatic relay
             };
           case "axelar": {
             // If we fail to fetch the gas fee, then use 0 as a fallback.
@@ -626,6 +640,7 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
     );
   }
 
+  // Upper bound estimate of gas limit needed for transfer on the destination chain
   async estimateGasLimit(
     originalToken: MultiTokenNtt.OriginalTokenId
   ): Promise<bigint> {