@instadapp/avocado-base 0.0.0-dev.0e696bd → 0.0.0-dev.10012b3

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.0e696bd",
+  "version": "0.0.0-dev.10012b3",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",

package/utils/helper.ts

@@ -1,5 +1,3 @@
-import * as XXH from 'xxhashjs';
-
 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): string {
-  const hash = XXH.h32(address, 0xABCD).toNumber()
-
-  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,6 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory } from "../contracts";
+import { Forwarder__factory, MultisigForwarder__factory } from "../contracts";
+import { toBN } from "./bignumber";
 
   export const MetadataEnums = {
     "transfer": "transfer",
@@ -17,6 +18,7 @@ import { Forwarder__factory } from "../contracts";
     "add-signers": "add-signers",
     "remove-signers": "remove-signers",
     "change-threshold": "change-threshold",
+    "import": "import",
   } as const;
 
 const multiMetadataTypes = ["bytes[]"];
@@ -52,6 +54,7 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   "gas-topup": ["uint256 amount", "address token", "address onBehalf"],
   upgrade: ["bytes32 version", "address walletImpl"],
   dapp: ["string name", "string url"],
+  "import": ["bytes32 protocol", "uint256 valueInUsd"],
   auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
   permit2: [
@@ -306,6 +309,24 @@ export const encodeRemoveSignersMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeImportMetadata = (
+  protocol: string,
+  valueInUsd: string,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["import"],
+    [protocol, valueInUsd]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["import"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeAddSignersMetadata = (
   addresses: string[],
   single = true
@@ -346,8 +367,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 +390,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;
     }
   }
 
@@ -397,6 +410,11 @@ const getMetadataFromData = (data: string) => {
 
 
 const typesPayload: IPayload = {
+  import: (data, type) => ({
+    type,
+    protocol: utils.parseBytes32String(data.protocol || ""),
+    valueInUsd: toBN(data.valueInUsd).toFixed(),
+  }),
   transfer: (data, type) => ({
     type,
     token: data.token,

package/utils/network.ts

@@ -1,6 +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 bridgeDisabledNetworks = [];
+
+export const networksSimulationNotSupported = [1313161554, 1101]
 
 export const networks: Network[] = [
   {
@@ -13,6 +25,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];
     },
@@ -36,6 +49,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];
     },
@@ -56,6 +70,7 @@ export const networks: Network[] = [
     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];
@@ -75,7 +90,9 @@ export const networks: Network[] = [
     name: 'Base',
     chainId: 8453,
     color: '#1E2024',
+    ankrName:'base',
     explorerUrl: 'https://basescan.org',
+    apiURL: 'https://api.basescan.org',
     get serverRpcUrl() {
       return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
      },
@@ -98,6 +115,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",
@@ -118,7 +136,9 @@ export const networks: Network[] = [
     name: "Polygon zkEVM",
     chainId: 1101,
     color: "#8544f6",
+    ankrName: 'polygon_zkevm',
     explorerUrl: "https://zkevm.polygonscan.com",
+    apiURL: 'https://api-zkevm.polygonscan.com',
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
     usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
     get serverRpcUrl() {
@@ -142,6 +162,7 @@ export const networks: Network[] = [
     color: "#F3BA2F",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
+    apiURL: 'https://api.bscscan.com',
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
     balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
     get serverRpcUrl() {
@@ -167,6 +188,7 @@ export const networks: Network[] = [
     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];
     },
@@ -207,9 +229,11 @@ export const networks: Network[] = [
     debankName: "xdai",
     zerionName: "xdai",
     color: "#04795C",
+    ankrName: 'gnosis',
     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];

package/utils/utils.d.ts

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