@instadapp/avocado-base 0.0.0-dev.9807f71 → 0.0.0-dev.aceef3f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.9807f71",
+  "version": "0.0.0-dev.aceef3f",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",

package/utils/network.ts

@@ -8,14 +8,14 @@ export const networks: Network[] = [
     debankName: "eth",
     ankrName: "eth",
     chainId: 1,
-    explorerUrl: "https://etherscan.io",
-    get serverRpcUrl() {
-      return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
-    },
-    balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
-    usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
     params: {
       rpcUrls: ["https://rpc.ankr.com/eth"],
+      explorerUrl: "https://etherscan.io",
+      get serverRpcUrl() {
+        return process.env?.MAINNET_RPC_URL || this.rpcUrls[0];
+      },
+      balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
+      usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
       nativeCurrency: {
         name: "Ethereum",
         symbol: "ETH",
@@ -28,12 +28,6 @@ export const networks: Network[] = [
     debankName: "matic",
     ankrName: "polygon",
     chainId: 137,
-    balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
-    usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
-    explorerUrl: "https://polygonscan.com",
-    get serverRpcUrl() {
-      return process.env?.POLYGON_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "Matic(Polygon) Mainnet",
       nativeCurrency: {
@@ -41,7 +35,13 @@ export const networks: Network[] = [
         symbol: "MATIC",
         decimals: 18,
       },
+      balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
+      usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
       rpcUrls: ["https://polygon-rpc.com"],
+      get serverRpcUrl() {
+        return process.env?.POLYGON_RPC_URL || this.rpcUrls[0];
+      },
+      explorerUrl: "https://polygonscan.com",
     },
   },
   {
@@ -49,12 +49,6 @@ export const networks: Network[] = [
     debankName: "arb",
     ankrName: "arbitrum",
     chainId: 42161,
-    usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
-    balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
-    explorerUrl: "https://arbiscan.io",
-    get serverRpcUrl() {
-      return process.env?.ARBITRUM_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "Arbitrum One",
       nativeCurrency: {
@@ -62,7 +56,13 @@ export const networks: Network[] = [
         symbol: "ETH",
         decimals: 18,
       },
+      usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
+      balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
+      get serverRpcUrl() {
+        return process.env?.ARBITRUM_RPC_URL || this.rpcUrls[0];
+      },
       rpcUrls: ["https://arb1.arbitrum.io/rpc"],
+      explorerUrl: "https://arbiscan.io",
     },
   },
   {
@@ -70,12 +70,6 @@ export const networks: Network[] = [
     debankName: "op",
     ankrName: "optimism",
     chainId: 10,
-    usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
-    balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
-    explorerUrl: "https://optimistic.etherscan.io",
-    get serverRpcUrl() {
-      return process.env?.OPTIMISM_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "Optimistic Ethereum",
       nativeCurrency: {
@@ -83,7 +77,13 @@ export const networks: Network[] = [
         symbol: "ETH",
         decimals: 18,
       },
+      usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
+      balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
+      get serverRpcUrl() {
+        return process.env?.OPTIMISM_RPC_URL || this.rpcUrls[0];
+      },
       rpcUrls: ["https://mainnet.optimism.io"],
+      explorerUrl: "https://optimistic.etherscan.io",
     },
   },
   {
@@ -91,20 +91,20 @@ export const networks: Network[] = [
     debankName: "avax",
     ankrName: "avalanche",
     chainId: 43114,
-    usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
-    balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
-    explorerUrl: "https://snowtrace.io",
-    get serverRpcUrl() {
-      return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "Avalanche Network",
+      get serverRpcUrl() {
+        return process.env?.AVALANCHE_RPC_URL || this.rpcUrls[0];
+      },
       nativeCurrency: {
         name: "Avalanche",
         symbol: "AVAX",
         decimals: 18,
       },
+      usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
+      balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
       rpcUrls: ["https://api.avax.network/ext/bc/C/rpc"],
+      explorerUrl: "https://snowtrace.io",
     },
   },
   {
@@ -112,15 +112,15 @@ export const networks: Network[] = [
     debankName: "bsc",
     ankrName: "bsc",
     chainId: 56,
-    explorerUrl: "https://bscscan.com",
-    usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
-    balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
-    get serverRpcUrl() {
-      return process.env?.BSC_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "Binance Smart Chain",
+      explorerUrl: "https://bscscan.com",
       rpcUrls: ["https://rpc.ankr.com/bsc"],
+      get serverRpcUrl() {
+        return process.env?.BSC_RPC_URL || this.rpcUrls[0];
+      },
+      usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+      balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
       nativeCurrency: {
         name: "Binance Coin",
         symbol: "BNB",
@@ -133,15 +133,15 @@ export const networks: Network[] = [
     debankName: "xdai",
     ankrName: "gnosis",
     chainId: 100,
-    balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
-    explorerUrl: "https://gnosisscan.io",
-    usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
-    get serverRpcUrl() {
-      return process.env?.GNOSIS_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "Gnosis Safe",
+      explorerUrl: "https://gnosisscan.io",
       rpcUrls: ["https://rpc.ankr.com/gnosis"],
+      get serverRpcUrl() {
+        return process.env?.GNOSIS_RPC_URL || this.rpcUrls[0];
+      },
+      balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
+      usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
       nativeCurrency: {
         name: "xdaistable",
         symbol: "xDAI",
@@ -152,16 +152,15 @@ export const networks: Network[] = [
   {
     name: "Polygon zkEVM",
     chainId: 1101,
-    explorerUrl: "https://zkevm.polygonscan.com",
-    balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
-    usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
-    get serverRpcUrl() {
-      return process.env?.POLYGON_ZKEVM_RPC_URL || this.params.rpcUrls[0];
-    },
     params: {
       chainName: "polygon zkEVM",
+      explorerUrl: "https://zkevm.polygonscan.com",
       rpcUrls: ["https://rpc.ankr.com/polygon_zkevm"],
-
+      get serverRpcUrl() {
+        return process.env?.POLYGON_ZKEVM_RPC_URL || this.rpcUrls[0];
+      },
+      balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
+      usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
       nativeCurrency: {
         name: "Ethereum",
         symbol: "ETH",
@@ -173,10 +172,6 @@ export const networks: Network[] = [
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
     isAvocado: true,
-    balanceResolverAddress: "",
-    usdcAddress: "",
-    serverRpcUrl: AVO_PROD_RPC_URL,
-    explorerUrl: AVO_PROD_EXPLORER_URL,
     params: {
       chainName: AVO_PROD_CHAIN_NAME,
       nativeCurrency: {
@@ -185,17 +180,17 @@ export const networks: Network[] = [
         decimals: 18,
       },
       iconUrls: ["https://avocado.instadapp.io/logo.svg"],
+      balanceResolverAddress: "",
+      usdcAddress: "",
+      serverRpcUrl: AVO_PROD_RPC_URL,
       rpcUrls: [AVO_PROD_RPC_URL],
+      explorerUrl: AVO_PROD_EXPLORER_URL,
     },
   },
   {
     name: AVO_STAGING_CHAIN_NAME,
     chainId: AVO_STAGING_CHAIN_ID,
-    serverRpcUrl: AVO_STAGING_RPC_URL,
-    explorerUrl: AVO_STAGING_EXPLORER_URL,
     isAvocado: true,
-    balanceResolverAddress: "",
-    usdcAddress: "",
     params: {
       chainName: AVO_STAGING_CHAIN_NAME,
       nativeCurrency: {
@@ -203,8 +198,12 @@ export const networks: Network[] = [
         symbol: "USDC",
         decimals: 18,
       },
+      serverRpcUrl: AVO_STAGING_RPC_URL,
+      balanceResolverAddress: "",
+      usdcAddress: "",
       iconUrls: ["https://avocado.instadapp.io/logo.svg"],
       rpcUrls: [AVO_STAGING_RPC_URL],
+      explorerUrl: AVO_STAGING_EXPLORER_URL,
     },
   },
 ];
@@ -243,7 +242,7 @@ export const getServerRpcProvider = (chainId: number | string) => {
   if (!rpcInstances[chainId]) {
     const network = networks.find((n) => n.chainId == chainId);
     serverRpcInstances[chainId] = new ethers.providers.JsonRpcProvider(
-      network?.serverRpcUrl
+      network?.params.serverRpcUrl
     );
   }
 
@@ -265,5 +264,5 @@ export const getExplorerUrl = (
   suffix: `/${string}` = "/"
 ) => {
   const network = getNetworkByChainId(chainId);
-  return `${network.explorerUrl}${suffix}`;
+  return `${network.params.explorerUrl}${suffix}`;
 };

package/utils/utils.d.ts

@@ -8,14 +8,14 @@ interface Network {
   ankrName?: string;
   chainId: ChainId;
   isAvocado?: boolean;
-  serverRpcUrl: string | undefined;
-  balanceResolverAddress?: string;
-  usdcAddress: string;
-  explorerUrl: string;
   params: {
     chainName?: string;
-    iconUrls?: string[];
     rpcUrls: string[];
+    serverRpcUrl: string | undefined;
+    balanceResolverAddress?: string;
+    usdcAddress: string;
+    explorerUrl: string;
+    iconUrls?: string[];
     nativeCurrency?: {
       name: string;
       symbol: string;