env/devnet-amplifier

apps/maestro/package.json

@@ -34,13 +34,18 @@
     "release": "tsx scripts/release.ts"
   },
   "dependencies": {
-    "@axelar-network/axelarjs-sdk": "0.15.0",
+    "@axelar-network/axelar-cgp-sui": "0.0.0-snapshot.424bc13",
+    "@axelar-network/axelarjs-sdk": "0.17.1-alpha.5",
     "@axelarjs/api": "workspace:*",
     "@axelarjs/core": "workspace:*",
     "@axelarjs/evm": "workspace:*",
     "@axelarjs/ui": "workspace:*",
     "@axelarjs/utils": "workspace:*",
     "@hookform/resolvers": "^3.3.4",
+    "@mysten/bcs": "^1.1.0",
+    "@mysten/dapp-kit": "^0.14.39",
+    "@mysten/sui": "^1.11.0",
+    "@mysten/sui.js": "^0.54.1",
     "@sentry/nextjs": "^7.108.0",
     "@tanstack/react-query": "^5.28.6",
     "@trpc/client": "11.0.0-next.320",
@@ -51,6 +56,7 @@
     "@vercel/postgres": "^0.7.2",
     "@web3modal/wagmi": "^4.1.1",
     "drizzle-orm": "^0.29.5",
+    "hardhat": "^2.22.13",
     "lucide-react": "^0.265.0",
     "next": "^14.1.4",
     "nextjs-cors": "^2.2.0",

apps/maestro/src/config/env.ts

@@ -15,7 +15,7 @@ export const NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID = Maybe.of(
 
 export const NEXT_PUBLIC_NETWORK_ENV = String(
   process.env.NEXT_PUBLIC_NETWORK_ENV ?? "testnet"
-) as "mainnet" | "testnet";
+) as "mainnet" | "testnet" | "devnet-amplifier";
 
 export const NEXT_PUBLIC_AXELAR_CONFIGS_URL = Maybe.of(
   process.env.NEXT_PUBLIC_AXELAR_CONFIGS_URL

apps/maestro/src/config/evm-chains.ts

@@ -49,11 +49,12 @@ import { NEXT_PUBLIC_NETWORK_ENV } from "./env";
 export interface ExtendedWagmiChainConfig extends Chain {
   axelarChainId: string;
   axelarChainName: string;
-  environment: "mainnet" | "testnet";
+  environment: "mainnet" | "testnet" | "devnet-amplifier";
 }
 
 const ENVIRONMENTS = {
   mainnet: "mainnet",
+  devnet: "devnet-amplifier",
   testnet: "testnet",
 } as const;
 
@@ -76,8 +77,71 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     axelarChainName: "ethereum",
     environment: ENVIRONMENTS.mainnet,
   },
+  // TODO: correct this
+  {
+    id: 101,
+    axelarChainId: "sui",
+    axelarChainName: "sui",
+    environment: ENVIRONMENTS.mainnet,
+    name: "Sui",
+    nativeCurrency: {
+      name: "SUI",
+      symbol: "SUI",
+      decimals: 9,
+    },
+    rpcUrls: {
+      default: { http: ["https://sui-rpc.publicnode.com"] },
+      public: { http: ["https://sui-rpc.publicnode.com"] },
+    },
+    blockExplorers: {
+      default: { name: "Sui Explorer", url: "https://suiexplorer.com/" },
+    },
+  },
+  {
+    id: 103,
+    axelarChainId: "sui",
+    axelarChainName: "sui",
+    environment: ENVIRONMENTS.devnet,
+    name: "Sui Testnet",
+    nativeCurrency: {
+      name: "SUI",
+      symbol: "SUI",
+      decimals: 9,
+    },
+    rpcUrls: {
+      default: { http: ["https://fullnode.testnet.sui.io:443"] },
+      public: { http: ["https://fullnode.testnet.sui.io:443"] },
+    },
+    blockExplorers: {
+      default: { name: "Sui Explorer", url: "https://suiscan.xyz/testnet" },
+    },
+  },
+  //TODO: check if this is ok
+  {
+    id: 103,
+    axelarChainId: "sui",
+    axelarChainName: "sui",
+    environment: ENVIRONMENTS.testnet,
+    name: "Sui Testnet",
+    nativeCurrency: {
+      name: "SUI",
+      symbol: "SUI",
+      decimals: 9,
+    },
+    rpcUrls: {
+      default: { http: ["https://fullnode.testnet.sui.io:443"] },
+      public: { http: ["https://fullnode.testnet.sui.io:443"] },
+    },
+    blockExplorers: {
+      default: { name: "Sui Explorer", url: "https://suiscan.xyz/testnet" },
+    },
+  },
   {
     ...sepolia,
+    rpcUrls: {
+      default: { http: ["https://rpc-sepolia.rockx.com"] },
+      public: { http: ["https://rpc-sepolia.rockx.com"] },
+    },
     axelarChainId: "ethereum-sepolia",
     axelarChainName: "ethereum-sepolia",
     environment: ENVIRONMENTS.testnet,
@@ -348,6 +412,30 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     axelarChainName: "blast-sepolia",
     environment: ENVIRONMENTS.testnet,
   },
+  {
+    ...blastSepolia,
+    axelarChainId: "blast-sepolia",
+    axelarChainName: "blast-sepolia",
+    environment: ENVIRONMENTS.testnet,
+  },
+  {
+    ...avalancheFuji,
+    axelarChainId: "avalanche-fuji",
+    axelarChainName: "avalanche-fuji",
+    environment: ENVIRONMENTS.devnet,
+  },
+  {
+    ...optimismSepolia,
+    axelarChainId: "optimism-sepolia",
+    axelarChainName: "optimism-sepolia",
+    environment: ENVIRONMENTS.devnet,
+  },
+  {
+    ...sepolia,
+    axelarChainId: "eth-sepolia",
+    axelarChainName: "eth-sepolia",
+    environment: ENVIRONMENTS.devnet,
+  },
 ] as const;
 
 export const WAGMI_CHAIN_CONFIGS = ALL_CHAINS.filter(

apps/maestro/src/config/next-auth.ts

@@ -2,8 +2,9 @@ import { Maybe } from "@axelarjs/utils";
 import type { NextAuthOptions } from "next-auth";
 import CredentialsProvider from "next-auth/providers/credentials";
 
+import { verifyPersonalMessageSignature } from "@mysten/sui/verify";
 import { kv } from "@vercel/kv";
-import { getAddress, verifyMessage } from "viem";
+import { verifyMessage } from "viem";
 
 import db from "~/lib/drizzle/client";
 import { getSignInMessage } from "~/server/routers/auth/createSignInMessage";
@@ -43,15 +44,14 @@ export const NEXT_AUTH_OPTIONS: NextAuthOptions = {
       async authorize(credentials, req) {
         if (
           !credentials?.address ||
-          !getAddress(credentials?.address) ||
+          // !getAddress(credentials?.address) ||
           !credentials?.signature
         ) {
           return null;
         }
-
-        const address = getAddress(credentials.address);
+        //TODO: revert
+        const address = credentials.address as `0x${string}`;
         const signature = credentials.signature as `0x${string}`;
-
         const [accountNonce, accountStatus] = await Promise.all([
           kvClient.getAccountNonce(address),
           kvClient.getAccountStatus(address),
@@ -79,21 +79,30 @@ export const NEXT_AUTH_OPTIONS: NextAuthOptions = {
           }
           return null;
         }
-
+        let isMessageSigned;
         const message = getSignInMessage(accountNonce ?? 0);
-
-        const isMessageSigned = await verifyMessage({
-          message,
-          signature,
-          address,
-        });
+        // is SUI address
+        if (address.length === 66) {
+          const suiPublicKey = await verifyPersonalMessageSignature(
+            new TextEncoder().encode(message),
+            signature
+          );
+          isMessageSigned = suiPublicKey.toSuiAddress() === address;
+        }
+        // is EVM address
+        else if (address.length === 42) {
+          isMessageSigned = await verifyMessage({
+            message,
+            signature,
+            address,
+          });
+        }
 
         if (!isMessageSigned) {
           return null;
         }
 
         // increment nonce
-
         await kvClient.incrementAccountNonce(address);
 
         return {
@@ -110,7 +119,7 @@ export const NEXT_AUTH_OPTIONS: NextAuthOptions = {
   },
   callbacks: {
     async session({ session, token }) {
-      const address = getAddress(token.sub ?? "");
+      const address = token.sub as `0x${string}`;
 
       session.address = address;
       session.accountStatus = await kvClient

apps/maestro/src/features/CanonicalTokenDeployment/hooks/useDeployAndRegisterRemoteCanonicalTokenMutation.ts

@@ -4,7 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { reduce } from "rambda";
 import type { TransactionReceipt } from "viem";
-import { useAccount, useChainId, useWaitForTransactionReceipt } from "wagmi";
+import { useWaitForTransactionReceipt } from "wagmi";
 
 import {
   useReadInterchainTokenFactoryCanonicalInterchainTokenId,
@@ -15,6 +15,7 @@ import {
   decodeDeploymentMessageId,
   type DeploymentMessageId,
 } from "~/lib/drizzle/schema";
+import { useAccount, useChainId } from "~/lib/hooks";
 import { trpc } from "~/lib/trpc";
 import { isValidEVMAddress } from "~/lib/utils/validation";
 import { RecordInterchainTokenDeploymentInput } from "~/server/routers/interchainToken/recordInterchainTokenDeployment";

apps/maestro/src/features/CanonicalTokenDeployment/steps/deploy-and-register/DeployAndRegister.state.ts

@@ -2,12 +2,12 @@ import type { EVMChainConfig } from "@axelarjs/api/axelarscan";
 import { useEffect, useState } from "react";
 
 import { formatEther } from "viem";
-import { useChainId } from "wagmi";
 
 import {
   NEXT_PUBLIC_INTERCHAIN_DEPLOYMENT_EXECUTE_DATA,
   NEXT_PUBLIC_INTERCHAIN_DEPLOYMENT_GAS_LIMIT,
 } from "~/config/env";
+import { useChainId } from "~/lib/hooks";
 import { useEstimateGasFeeMultipleChainsQuery } from "~/services/axelarjsSDK/hooks";
 import { useEVMChainConfigsQuery } from "~/services/axelarscan/hooks";
 import { useCanonicalTokenDeploymentStateContainer } from "../../CanonicalTokenDeployment.state";

apps/maestro/src/features/CanonicalTokenDeployment/steps/deploy-and-register/DeployAndRegister.tsx

@@ -11,11 +11,11 @@ import React, {
 } from "react";
 
 import { parseUnits } from "viem";
-import { useAccount, useBalance, useChainId } from "wagmi";
 
 import { useCanonicalTokenDeploymentStateContainer } from "~/features/CanonicalTokenDeployment/CanonicalTokenDeployment.state";
 import { useDeployAndRegisterRemoteCanonicalTokenMutation } from "~/features/CanonicalTokenDeployment/hooks";
 import { useTransactionsContainer } from "~/features/Transactions";
+import { useBalance, useChainId } from "~/lib/hooks";
 import { handleTransactionResult } from "~/lib/transactions/handlers";
 import { getNativeToken } from "~/lib/utils/getNativeToken";
 import ChainPicker from "~/ui/compounds/ChainPicker";
@@ -143,9 +143,7 @@ export const Step3: FC = () => {
 
   const formSubmitRef = useRef<ComponentRef<"button">>(null);
 
-  const { address } = useAccount();
-
-  const { data: balance } = useBalance({ address });
+  const balance = useBalance();
 
   const nativeTokenSymbol = getNativeToken(state.sourceChainId);
 

apps/maestro/src/features/CanonicalTokenDeployment/steps/review/Review.tsx

@@ -10,9 +10,7 @@ import { maskAddress, Maybe } from "@axelarjs/utils";
 import { useCallback, useEffect, useState, type FC } from "react";
 import { useRouter } from "next/router";
 
-import { useAccount } from "wagmi";
-
-import { useChainFromRoute } from "~/lib/hooks";
+import { useAccount, useChainFromRoute } from "~/lib/hooks";
 import { useEVMChainConfigsQuery } from "~/services/axelarscan/hooks";
 import { useInterchainTokensQuery } from "~/services/gmp/hooks";
 import GMPTxStatusMonitor from "~/ui/compounds/GMPTxStatusMonitor";
@@ -47,7 +45,7 @@ const Review: FC = () => {
         chain.id,
         state.txState.txHash,
         state.selectedChains.map(
-          (axelarChainId) => computed.indexedById[axelarChainId].chain_id
+          (axelarChainId) => computed.indexedById[axelarChainId]?.chain_id
         )
       );
     }

apps/maestro/src/features/InterchainTokenDeployment/InterchainTokenDeployment.state.ts

@@ -5,9 +5,9 @@ import { useForm } from "react-hook-form";
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { uniq, without } from "rambda";
-import { useAccount } from "wagmi";
 import { z } from "zod";
 
+import { useAccount } from "~/lib/hooks";
 import { logger } from "~/lib/logger";
 import {
   hex64Literal,