Merge pull request #273 from axelarnetwork/chore/update-chain-configs

chore: update supported chains
axelarnetwork · Mar 12, 2024 · 9665458 · 9665458
2 parents 59c4478 + 323d6b0
commit 9665458
Show file tree

Hide file tree

Showing 11 changed files with 210 additions and 261 deletions.
diff --git a/apps/maestro/package.json b/apps/maestro/package.json
@@ -11,7 +11,7 @@
   },
   "type": "module",
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev --turbo",
     "build": "scripts/build.sh",
     "build:analyze": "ANALYZE=true pnpm build",
     "start": "next start",
@@ -42,14 +42,14 @@
     "@axelarjs/utils": "workspace:*",
     "@hookform/resolvers": "^3.3.4",
     "@sentry/nextjs": "^7.102.1",
-    "@tanstack/react-query": "^5.24.1",
-    "@trpc/client": "11.0.0-next-beta.294",
-    "@trpc/next": "11.0.0-next-beta.294",
-    "@trpc/react-query": "11.0.0-next-beta.294",
-    "@trpc/server": "11.0.0-next-beta.294",
+    "@tanstack/react-query": "^5.26.3",
+    "@trpc/client": "11.0.0-next-beta.318",
+    "@trpc/next": "11.0.0-next-beta.318",
+    "@trpc/react-query": "11.0.0-next-beta.318",
+    "@trpc/server": "11.0.0-next-beta.318",
     "@vercel/kv": "^1.0.1",
     "@vercel/postgres": "^0.7.2",
-    "@web3modal/wagmi": "^4.0.10",
+    "@web3modal/wagmi": "^4.1.0",
     "drizzle-orm": "^0.29.4",
     "lucide-react": "^0.265.0",
     "next": "^14.1.0",
@@ -68,7 +68,7 @@
     "swagger-ui-react": "^5.11.8",
     "trpc-openapi": "^1.2.0",
     "unfetch": "^4.2.0",
-    "viem": "^2.7.15",
+    "viem": "^2.8.1",
     "wagmi": "^2.5.7",
     "zod": "^3.22.4"
   },
@@ -92,7 +92,7 @@
     "@typescript-eslint/parser": "^6.21.0",
     "@vitejs/plugin-react": "^4.2.1",
     "@vitest/coverage-v8": "^1.3.1",
-    "@wagmi/cli": "^2.1.1",
+    "@wagmi/cli": "^2.1.2",
     "autoprefixer": "^10.4.17",
     "concurrently": "^8.2.2",
     "date-fns": "^3.3.1",

diff --git a/apps/maestro/src/config/evm-chains.ts b/apps/maestro/src/config/evm-chains.ts
@@ -1,24 +1,25 @@
-import { defineChain } from "viem";
-import { Chain } from "viem/chains";
 import {
   arbitrum,
-  arbitrumGoerli,
   arbitrumSepolia,
   aurora,
   auroraTestnet,
   avalanche,
   avalancheFuji,
   base,
-  baseGoerli,
+  baseSepolia,
+  blast,
+  blastSepolia,
   bsc,
   bscTestnet,
   celo,
   celoAlfajores,
+  Chain,
   fantom,
   fantomTestnet,
   filecoin,
   filecoinCalibration,
-  goerli,
+  fraxtal,
+  fraxtalTestnet,
   kava,
   kavaTestnet,
   linea,
@@ -29,15 +30,15 @@ import {
   moonbaseAlpha,
   moonbeam,
   optimism,
-  optimismGoerli,
+  optimismSepolia,
   polygon,
   polygonMumbai,
   polygonZkEvm,
   polygonZkEvmTestnet,
   scroll,
   scrollSepolia,
   sepolia,
-} from "wagmi/chains";
+} from "viem/chains";
 
 import { NEXT_PUBLIC_NETWORK_ENV } from "./env";
 
@@ -59,12 +60,6 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     axelarChainName: "ethereum",
     environment: ENVIRONMENTS.mainnet,
   },
-  {
-    ...goerli,
-    axelarChainId: "ethereum-2",
-    axelarChainName: "ethereum-2",
-    environment: ENVIRONMENTS.testnet,
-  },
   {
     ...sepolia,
     axelarChainId: "ethereum-sepolia",
@@ -153,12 +148,6 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     axelarChainName: "arbitrum",
     environment: ENVIRONMENTS.mainnet,
   },
-  {
-    ...arbitrumGoerli,
-    axelarChainId: "arbitrum",
-    axelarChainName: "arbitrum",
-    environment: ENVIRONMENTS.testnet,
-  },
   {
     ...arbitrumSepolia,
     axelarChainId: "arbitrum-sepolia",
@@ -196,9 +185,9 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     environment: ENVIRONMENTS.mainnet,
   },
   {
-    ...optimismGoerli,
-    axelarChainId: "optimism",
-    axelarChainName: "optimism",
+    ...optimismSepolia,
+    axelarChainId: "optimism-sepolia",
+    axelarChainName: "optimism-sepolia",
     environment: ENVIRONMENTS.testnet,
   },
   {
@@ -232,9 +221,9 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     environment: ENVIRONMENTS.mainnet,
   },
   {
-    ...baseGoerli,
-    axelarChainId: "base",
-    axelarChainName: "base",
+    ...baseSepolia,
+    axelarChainId: "base-sepolia",
+    axelarChainName: "base-sepolia",
     environment: ENVIRONMENTS.testnet,
   },
   {
@@ -274,49 +263,29 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
     environment: ENVIRONMENTS.testnet,
   },
   {
-    ...defineChain({
-      id: 252,
-      name: "Fraxtal",
-      nativeCurrency: { name: "Frax Ether", symbol: "frxETH", decimals: 18 },
-      rpcUrls: {
-        default: {
-          http: ["https://rpc.frax.com"],
-        },
-      },
-      blockExplorers: {
-        default: {
-          name: "Fraxscan",
-          url: "https://fraxscan.com",
-          apiUrl: "https://api.fraxscan.com/api",
-        },
-      },
-    }),
+    ...fraxtal,
     axelarChainId: "fraxtal",
-    axelarChainName: "Fraxtal",
+    axelarChainName: "fraxtal",
     environment: ENVIRONMENTS.mainnet,
   },
   {
-    ...defineChain({
-      id: 81457,
-      name: "Blast",
-      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
-      rpcUrls: {
-        default: {
-          http: ["https://rpc.blast.io"],
-        },
-      },
-      blockExplorers: {
-        default: {
-          name: "Blastscan",
-          url: "https://blastscan.io",
-          apiUrl: "https://api.blastscan.io/api",
-        },
-      },
-    }),
+    ...fraxtalTestnet,
+    axelarChainId: "fraxtal",
+    axelarChainName: "fraxtal",
+    environment: ENVIRONMENTS.testnet,
+  },
+  {
+    ...blast,
     axelarChainId: "blast",
-    axelarChainName: "Blast",
+    axelarChainName: "blast",
     environment: ENVIRONMENTS.mainnet,
   },
+  {
+    ...blastSepolia,
+    axelarChainId: "blast-sepolia",
+    axelarChainName: "blast-sepolia",
+    environment: ENVIRONMENTS.testnet,
+  },
 ] as const;
 
 export const WAGMI_CHAIN_CONFIGS = ALL_CHAINS.filter(

diff --git a/apps/maestro/src/config/wagmi.ts b/apps/maestro/src/config/wagmi.ts
@@ -34,7 +34,9 @@ export const wagmiConfig = defaultWagmiConfig({
     icons: ["/icons/favicon-32x32.png"],
     url: "",
   },
-  enableCoinbase: true,
+  enableInjected: true,
+  enableCoinbase: false,
+  enableWalletConnect: false,
 });
 
 export const WEB3_MODAL = createWeb3Modal({

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -100,6 +100,6 @@
     "@axelarjs/core": "workspace:*",
     "isomorphic-unfetch": "^4.0.2",
     "rambda": "^9.1.0",
-    "viem": "^2.7.15"
+    "viem": "^2.8.1"
   }
 }
diff --git a/packages/api/src/axelar-query/fee/getL1Fee.ts b/packages/api/src/axelar-query/fee/getL1Fee.ts
@@ -5,16 +5,16 @@ import {
   createPublicClient,
   http,
   parseAbi,
-  PublicClient,
   type Chain,
   type HttpTransport,
+  type PublicClient,
 } from "viem";
 
 import {
-  EstimateL1FeeParams,
-  L2Chain,
   MAINNET_L2_CHAINS,
   TESTNET_L2_CHAINS,
+  type EstimateL1FeeParams,
+  type L2Chain,
 } from "./types";
 
 /**
@@ -30,6 +30,7 @@ export function getL1FeeForL2(
   params: EstimateL1FeeParams
 ): Promise<bigint> {
   const chains = env === "mainnet" ? MAINNET_L2_CHAINS : TESTNET_L2_CHAINS;
+
   const publicClient = createPublicClient({
     chain: chains[chain],
     transport: http(),

diff --git a/packages/api/src/axelar-query/fee/types.ts b/packages/api/src/axelar-query/fee/types.ts
@@ -1,12 +1,13 @@
+import type { Chain } from "viem";
 import {
   arbitrum,
-  arbitrumGoerli,
+  arbitrumSepolia,
   base,
-  baseGoerli,
+  baseSepolia,
   mantle,
   mantleTestnet,
   optimism,
-  optimismGoerli,
+  optimismSepolia,
   scroll,
   scrollSepolia,
 } from "viem/chains";
@@ -21,15 +22,15 @@ export const MAINNET_L2_CHAINS = {
   optimism,
   scroll,
   mantle,
-} as const;
+} as Record<L2Chain, Chain>;
 
 export const TESTNET_L2_CHAINS = {
-  arbitrum: arbitrumGoerli,
-  base: baseGoerli,
-  optimism: optimismGoerli,
+  arbitrum: arbitrumSepolia,
+  base: baseSepolia,
+  optimism: optimismSepolia,
   scroll: scrollSepolia,
   mantle: mantleTestnet,
-} as const;
+} as Record<L2Chain, Chain>;
 
 export type EstimateL1FeeParams = {
   destinationContractAddress?: `0x${string}` | undefined;

diff --git a/packages/deposit-address/package.json b/packages/deposit-address/package.json
@@ -56,6 +56,6 @@
     "@axelarjs/utils": "workspace:*",
     "@axelarjs/proto": "workspace:*",
     "bech32": "^2.0.0",
-    "viem": "^2.7.15"
+    "viem": "^2.8.1"
   }
 }
diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -47,7 +47,7 @@
     "@axelarjs/utils": "workspace:*",
     "package-json": "^8.1.1",
     "tsx": "^4.7.1",
-    "viem": "^2.7.15",
+    "viem": "^2.8.1",
     "zx": "^7.2.3"
   },
   "devDependencies": {