feat: support vm chains in recordInterchainTokenDeployment

axelarnetwork · npty · Jan 15, 2025 · Jan 8, 2025 · Jan 8, 2025 · Jan 8, 2025
commit 3c658fd576b758e6cf656d23e8a5dcc5f375ff8b
diff --git a/apps/maestro/src/server/context.ts b/apps/maestro/src/server/context.ts
@@ -105,8 +105,8 @@ const createContextInner = async ({ req, res }: ContextConfig) => {
       createInterchainTokenClient(chain: Chain, address: `0x${string}`) {
         return new InterchainTokenClient({ chain, address });
       },
-      createTokenManagerClient(chain: Chain, address: `0x${string}`) {
-        return new TokenManagerClient({ chain, address });
+      createTokenManagerClient(chain: Chain, address: string) {
+        return new TokenManagerClient({ chain, address: address as `0x${string}` });
       },
       createInterchainTokenServiceClient(
         chain: Chain,

diff --git a/apps/maestro/src/server/routers/interchainToken/recordInterchainTokenDeployment.ts b/apps/maestro/src/server/routers/interchainToken/recordInterchainTokenDeployment.ts
@@ -1,5 +1,4 @@
 import { invariant, Maybe } from "@axelarjs/utils";
-
 import { always } from "rambda";
 import { z } from "zod";
 
@@ -18,41 +17,43 @@ const recordInterchainTokenDeploymentInput = newInterchainTokenSchema
     tokenManagerAddress: true,
   });
 
-export type RecordInterchainTokenDeploymentInput = z.infer<
-  typeof recordInterchainTokenDeploymentInput
->;
-
 export const recordInterchainTokenDeployment = protectedProcedure
   .input(recordInterchainTokenDeploymentInput)
   .mutation(async ({ ctx, input }) => {
     invariant(ctx.session?.address, "ctx.session.address is required");
 
-    const chains = await ctx.configs.evmChains();
-    const configs = chains[input.axelarChainId];
+    const evmChains = await ctx.configs.evmChains();
+    const vmChains = await ctx.configs.vmChains();
+    const configs = evmChains[input.axelarChainId] || vmChains[input.axelarChainId];
+
+    invariant(configs, `No configuration found for chain ${input.axelarChainId}`);
+
+    // Handle different chain types
+    const createServiceClient = () => {
+      return ctx.contracts.createInterchainTokenServiceClient(configs.wagmi);
+    };
 
-    const originChainServiceClient =
-      ctx.contracts.createInterchainTokenServiceClient(configs.wagmi);
+    const originChainServiceClient = createServiceClient();
 
     const tokenManagerAddress = (await originChainServiceClient.reads
       .tokenManagerAddress({
         tokenId: input.tokenId as `0x${string}`,
       })
       .catch(() => null)) as `0x${string}`;
 
+    const createTokenManagerClient = (address: string) => {
+      return ctx.contracts.createTokenManagerClient(configs.wagmi, address);
+    };
+
     const tokenManagerClient = !tokenManagerAddress
       ? null
-      : ctx.contracts.createTokenManagerClient(
-          configs.wagmi,
-          tokenManagerAddress
-        );
+      : createTokenManagerClient(tokenManagerAddress);
 
     const tokenManagerTypeCode = !tokenManagerClient
       ? null
       : await tokenManagerClient.reads.implementationType().catch(() => null);
 
     const tokenManagerType = Maybe.of(tokenManagerTypeCode).mapOr(
-      // default to mint_burn for interchain tokens
-      // and lock_unlock for canonical tokens
       input.kind === "canonical" ? "lock_unlock" : "mint_burn",
       (value) => getTokenManagerTypeFromBigInt(value as bigint)
     );
@@ -69,12 +70,16 @@ export const recordInterchainTokenDeployment = protectedProcedure
 
     const remoteTokens = await Promise.all(
       input.destinationAxelarChainIds.map(async (axelarChainId) => {
-        const chains = await ctx.configs.evmChains();
-        const configs = chains[axelarChainId];
+        const chains = {
+          ...await ctx.configs.evmChains(),
+          ...await ctx.configs.vmChains(),
+        };
+        const chainConfig = chains[axelarChainId];
+        invariant(chainConfig, `No configuration found for chain ${axelarChainId}`);
+
+        invariant(chainConfig.wagmi, `No wagmi configuration found for chain ${axelarChainId}`);
 
-        const itsClient = ctx.contracts.createInterchainTokenServiceClient(
-          configs.wagmi
-        );
+        const itsClient = ctx.contracts.createInterchainTokenServiceClient(chainConfig.wagmi);
 
         const [tokenManagerAddress, tokenAddress] = await Promise.all([
           itsClient.reads

diff --git a/packages/evm/src/clients/clients.spec.ts b/packages/evm/src/clients/clients.spec.ts
      }
    });

    expect(supportedChains.length).toBe(chains.length - 1); // Excluding centrifuge-2 chain because public rpc is not available
  });
 });
	}
	});

	expect(supportedChains.length).toBe(chains.length - 1); // Excluding centrifuge-2 chain because public rpc is not available
Check failure on line 64 in packages/evm/src/clients/clients.spec.ts GitHub Actions / setup-and-test src/clients/clients.spec.ts > EVM Clients > should support all testnet chains `AssertionError: expected 21 to be 24 // Object.is equality - Expected + Received - 24 + 21 ❯ src/clients/clients.spec.ts:64:36`
	});
	});