@instadapp/avocado-base 0.0.0-dev.fadc946 → 0.0.0-dev.fcdcc0f

package/contracts/index.ts

@@ -6,9 +6,11 @@ export type { BalanceResolver } from "./BalanceResolver";
 export type { Erc20 } from "./Erc20";
 export type { Forwarder } from "./Forwarder";
 export type { GaslessWallet } from "./GaslessWallet";
+export type { MultisigForwarder } from "./MultisigForwarder";
 export * as factories from "./factories";
 export { AvoFactoryProxy__factory } from "./factories/AvoFactoryProxy__factory";
 export { BalanceResolver__factory } from "./factories/BalanceResolver__factory";
 export { Erc20__factory } from "./factories/Erc20__factory";
 export { Forwarder__factory } from "./factories/Forwarder__factory";
 export { GaslessWallet__factory } from "./factories/GaslessWallet__factory";
+export { MultisigForwarder__factory } from "./factories/MultisigForwarder__factory";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.fadc946",
+  "version": "0.0.0-dev.fcdcc0f",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
-    "crypto-js": "^4.1.1",
-    "ethers": "^5.7.2"
+    "ethers": "^5.7.2",
+    "xxhashjs": "^0.2.2"
   }
 }

package/utils/helper.ts

@@ -1,5 +1,3 @@
-import * as CryptoJS from 'crypto-js';
-
 export const indexSorter = (aIndex: number, bIndex: number) => {
   if (aIndex === -1 && bIndex === -1) {
     return 0; // fallback to other sorting criteria
@@ -62,12 +60,3 @@ export function formatMultipleAddresses(addresses: string[], shorten = true) {
   return formattedString
 }
 
-export function generateColor(address: string) {
-  const hash = parseInt(CryptoJS.MD5(address).toString().substr(0, 8), 16);
-
-  const hue = hash % 360;
-  const saturation = 80 + (hash % 30);
-  const lightness = 70 + (hash % 20);
-
-  return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
-}

package/utils/metadata.ts

@@ -1,5 +1,5 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory } from "../contracts";
+import { Forwarder__factory, MultisigForwarder__factory } from "../contracts";
 
   export const MetadataEnums = {
     "transfer": "transfer",
@@ -346,8 +346,10 @@ export const decodeMetadata = (metadata: string) => {
   }
 };
 
+const iface = Forwarder__factory.createInterface();
+const ifaceMultisig = MultisigForwarder__factory.createInterface();
+
 const getMetadataFromData = (data: string) => {
-  const iface = Forwarder__factory.createInterface();
   let metadata = "0x";
 
   if (data.startsWith("0x18e7f485")) {
@@ -367,28 +369,18 @@ const getMetadataFromData = (data: string) => {
     } else {
       metadata = executeDataV2.params_.metadata;
     }
-  } else if (data.startsWith("0x85114d53")) {
-    const executeDataV3 = iface.decodeFunctionData("executeV3", data);
-    if (
-      executeDataV3.params_.metadata === "0x" ||
-      !executeDataV3.params_.metadata
-    ) {
-      return null;
-    } else {
-      metadata = executeDataV3.params_.metadata;
-    }
   } else {
-    const executeDataMultisigV3 = iface.decodeFunctionData(
-      "executeMultisigV3",
+    const executeDataMultisig = ifaceMultisig.decodeFunctionData(
+      "executeV1",
       data
     );
     if (
-      executeDataMultisigV3.params_.metadata === "0x" ||
-      !executeDataMultisigV3.params_.metadata
+      executeDataMultisig.params_.metadata === "0x" ||
+      !executeDataMultisig.params_.metadata
     ) {
       return null;
     } else {
-      metadata = executeDataMultisigV3.params_.metadata;
+      metadata = executeDataMultisig.params_.metadata;
     }
   }
 

package/utils/network.ts

@@ -1,30 +1,18 @@
 import { ethers } from "ethers";
+import {
+  AVO_PROD_CHAIN_NAME,
+  AVO_PROD_CHAIN_ID,
+  AVO_PROD_RPC_URL,
+  AVO_PROD_EXPLORER_URL,
+  AVO_STAGING_CHAIN_NAME,
+  AVO_STAGING_CHAIN_ID,
+  AVO_STAGING_RPC_URL,
+  AVO_STAGING_EXPLORER_URL,
+} from './avocado'
 
 export const bridgeDisabledNetworks = [1101];
 
 export const networks: Network[] = [
-  {
-    name: "Ethereum",
-    debankName: "eth",
-    ankrName: "eth",
-    zerionName: "ethereum",
-    chainId: 1,
-    explorerUrl: "https://etherscan.io",
-    color: "#5D5FEF",
-    get serverRpcUrl() {
-      return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
-    },
-    balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
-    usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-    params: {
-      rpcUrls: ["https://rpc.ankr.com/eth"],
-      nativeCurrency: {
-        name: "Ethereum",
-        symbol: "ETH",
-        decimals: 18,
-      },
-    },
-  },
   {
     name: "Polygon",
     debankName: "matic",
@@ -35,6 +23,7 @@ export const networks: Network[] = [
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
     explorerUrl: "https://polygonscan.com",
+    apiURL: 'https://api.polygonscan.com',
     get serverRpcUrl() {
       return process.env?.POLYGON_RPC_URL || this.params.rpcUrls[0];
     },
@@ -58,6 +47,7 @@ export const networks: Network[] = [
     usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
     explorerUrl: "https://arbiscan.io",
+    apiURL: 'https://api.arbiscan.io',
     get serverRpcUrl() {
       return process.env?.ARBITRUM_RPC_URL || this.params.rpcUrls[0];
     },
@@ -71,6 +61,50 @@ export const networks: Network[] = [
       rpcUrls: ["https://arb1.arbitrum.io/rpc"],
     },
   },
+  {
+    name: "Ethereum",
+    debankName: "eth",
+    ankrName: "eth",
+    zerionName: "ethereum",
+    chainId: 1,
+    explorerUrl: "https://etherscan.io",
+    apiURL: 'https://api.etherscan.io',
+    color: "#5D5FEF",
+    get serverRpcUrl() {
+      return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
+    },
+    balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
+    usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+    params: {
+      rpcUrls: ["https://rpc.ankr.com/eth"],
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      },
+    },
+  }, 
+  {
+    name: 'Base',
+    chainId: 8453,
+    color: '#1E2024',
+    explorerUrl: 'https://basescan.org',
+    apiURL: 'https://api.basescan.org',
+    get serverRpcUrl() {
+      return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
+     },
+     usdcAddress: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
+     balanceResolverAddress: '0x23c8EAb8a4373dD16b0947Ebe8bf76Ff7A49d13C',
+     params: {
+      rpcUrls: ['https://rpc.ankr.com/base'],
+      chainName: "Base",
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      },
+    }
+  },
   {
     name: "Optimism",
     debankName: "op",
@@ -78,6 +112,7 @@ export const networks: Network[] = [
     zerionName: "optimism",
     color: "#FF0420",
     chainId: 10,
+    apiURL: 'https://api-optimistic.etherscan.io',
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
     explorerUrl: "https://optimistic.etherscan.io",
@@ -95,26 +130,24 @@ export const networks: Network[] = [
     },
   },
   {
-    name: "Avalanche",
-    debankName: "avax",
-    ankrName: "avalanche",
-    zerionName: "avalanche",
-    color: "#EB5757",
-    chainId: 43114,
-    usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
-    balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
-    explorerUrl: "https://snowtrace.io",
+    name: "Polygon zkEVM",
+    chainId: 1101,
+    color: "#8544f6",
+    explorerUrl: "https://zkevm.polygonscan.com",
+    apiURL: 'https://api-zkevm.polygonscan.com',
+    balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
+    usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
     get serverRpcUrl() {
-      return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
+      return process.env?.POLYGON_ZKEVM_RPC_URL || this.params.rpcUrls[0];
     },
     params: {
-      chainName: "Avalanche Network",
+      chainName: "polygon zkEVM",
+      rpcUrls: ["https://zkevm-rpc.com"],
       nativeCurrency: {
-        name: "Avalanche",
-        symbol: "AVAX",
+        name: "Ethereum",
+        symbol: "ETH",
         decimals: 18,
       },
-      rpcUrls: ["https://rpc.ankr.com/avalanche"],
     },
   },
   {
@@ -125,6 +158,7 @@ export const networks: Network[] = [
     color: "#F3BA2F",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
+    apiURL: 'https://api.bscscan.com',
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
     balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
     get serverRpcUrl() {
@@ -140,6 +174,52 @@ export const networks: Network[] = [
       },
     },
   },
+  {
+    name: "Avalanche",
+    debankName: "avax",
+    ankrName: "avalanche",
+    zerionName: "avalanche",
+    color: "#EB5757",
+    chainId: 43114,
+    usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
+    balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
+    explorerUrl: "https://snowtrace.io",
+    apiURL: 'https://api.snowtrace.io',
+    get serverRpcUrl() {
+      return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
+    },
+    params: {
+      chainName: "Avalanche Network",
+      nativeCurrency: {
+        name: "Avalanche",
+        symbol: "AVAX",
+        decimals: 18,
+      },
+      rpcUrls: ["https://rpc.ankr.com/avalanche"],
+    },
+  },
+  {
+    name: "Fantom",
+    chainId: 250,
+    zerionName: "fantom",
+    explorerUrl: "https://ftmscan.com",
+    ankrName: "fantom",
+    color: "#1969ff",
+    get serverRpcUrl() {
+      return process.env?.FANTOM_RPC_URL || this.params.rpcUrls[0];
+    },
+    usdcAddress: "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
+    balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
+    params: {
+      rpcUrls: ["https://rpc.ankr.com/fantom"],
+      chainName: "Fantom",
+      nativeCurrency: {
+        name: "Fantom",
+        symbol: "FTM",
+        decimals: 18,
+      },
+    },
+  },
   {
     name: "Gnosis",
     debankName: "xdai",
@@ -148,6 +228,7 @@ export const networks: Network[] = [
     chainId: 100,
     balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
     explorerUrl: "https://gnosisscan.io",
+    apiURL:'https://api.gnosisscan.io',
     usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
     get serverRpcUrl() {
       return process.env?.GNOSIS_RPC_URL || this.params.rpcUrls[0];
@@ -162,26 +243,6 @@ export const networks: Network[] = [
       },
     },
   },
-  {
-    name: "Polygon zkEVM",
-    chainId: 1101,
-    color: "#8544f6",
-    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",
-      rpcUrls: ["https://zkevm-rpc.com"],
-      nativeCurrency: {
-        name: "Ethereum",
-        symbol: "ETH",
-        decimals: 18,
-      },
-    },
-  },
   {
     name: "Aurora",
     chainId: 1313161554,
@@ -203,48 +264,6 @@ export const networks: Network[] = [
       },
     },
   },
-  {
-    name: "Fantom",
-    chainId: 250,
-    zerionName: "fantom",
-    explorerUrl: "https://ftmscan.com",
-    ankrName: "fantom",
-    color: "#1969ff",
-    get serverRpcUrl() {
-      return process.env?.FANTOM_RPC_URL || this.params.rpcUrls[0];
-    },
-    usdcAddress: "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
-    balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
-    params: {
-      rpcUrls: ["https://rpc.ankr.com/fantom"],
-      chainName: "Fantom",
-      nativeCurrency: {
-        name: "Fantom",
-        symbol: "FTM",
-        decimals: 18,
-      },
-    },
-  },
-   {
-    name: 'Base',
-    chainId: 8453,
-    color: '#1E2024',
-    explorerUrl: 'https://basescan.org',
-    get serverRpcUrl() {
-      return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
-     },
-     usdcAddress: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
-     balanceResolverAddress: '0x23c8EAb8a4373dD16b0947Ebe8bf76Ff7A49d13C',
-     params: {
-      rpcUrls: ['https://rpc.ankr.com/base'],
-      chainName: "Base",
-      nativeCurrency: {
-        name: "Ethereum",
-        symbol: "ETH",
-        decimals: 18,
-      },
-    }
-  },
   {
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,

package/utils/utils.d.ts

@@ -34,6 +34,7 @@ declare global {
     balanceResolverAddress?: string;
     usdcAddress: string;
     explorerUrl: string;
+    apiURL?: string;
     params: {
       chainName?: string;
       iconUrls?: string[];