@instadapp/avocado-base 0.0.0-dev.aceef3f → 0.0.0-dev.b9e4c6c

package/package.json

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

package/utils/formatter.ts

@@ -1,11 +1,14 @@
 export function formatPercent(
-  value: number,
+  value?: number | string,
   fractionDigits = 2,
   maxValue = null
 ) {
-  if (isZero(value)) return "0.00%";
+  if (!value || isZero(value)) return "0.00%";
 
-  if (maxValue && gt(times(value, "100"), maxValue)) return `>${maxValue}%`;
+  const valueAsNumber = toBN(value).toNumber();
+
+  if (maxValue && gt(times(valueAsNumber, "100"), maxValue))
+    return `>${maxValue}%`;
 
   const formatter = new Intl.NumberFormat("en-US", {
     style: "percent",
@@ -13,7 +16,7 @@ export function formatPercent(
     maximumFractionDigits: fractionDigits,
   });
 
-  return formatter.format(value);
+  return formatter.format(valueAsNumber);
 }
 
 export function shortenHash(hash: string, length: number = 4) {
@@ -42,10 +45,50 @@ export function signedNumber(numb: string | number) {
   }).format(toBN(numb).toNumber());
 }
 
-export function formatDecimal(value: string | number, decimalPlaces = 5) {
+function getFractionDigits(value: string | number) {
+  const absoluteValue = toBN(value).abs();
+
+  if (isZero(absoluteValue)) {
+    return 2;
+  } else if (lt(absoluteValue, 0.01)) {
+    return 6;
+  } else if (lt(absoluteValue, 1)) {
+    return 4;
+  } else if (lt(absoluteValue, 10000)) {
+    return 2;
+  } else {
+    return 0;
+  }
+}
+
+export function formatDecimal(value: string | number, fractionDigits?: number) {
   if (!value) {
     value = "0";
   }
+  if (lt(value, "0.0001") && gt(value, "0")) {
+    return "< 0.0001";
+  } else {
+    const num = toBN(value);
+    let decimals;
+
+    if (num.lt(1)) {
+      decimals = 8;
+    } else if (num.lt(10)) {
+      decimals = 6;
+    } else if (num.lt(100)) {
+      decimals = 4;
+    } else if (num.lt(1000)) {
+      decimals = 3;
+    } else if (num.lt(10000)) {
+      decimals = 2;
+    } else if (num.lt(100000)) {
+      decimals = 1;
+    } else {
+      decimals = 0;
+    }
 
-  return toBN(value).decimalPlaces(decimalPlaces).toFormat();
+    const formattedNumber = num.toFixed(fractionDigits || decimals);
+
+    return toBN(formattedNumber).toFormat();
+  }
 }

package/utils/metadata.ts

@@ -1,5 +1,5 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory } from "@/contracts";
+import { Forwarder__factory } from "../contracts";
 
 const multiMetadataTypes = ["bytes[]"];
 
@@ -7,6 +7,13 @@ const metadataTypes = ["bytes32 type", "uint8 version", "bytes data"];
 
 const actionMetadataTypes = {
   transfer: ["address token", "uint256 amount", "address receiver"],
+  "cross-transfer": [
+    "address fromToken",
+    "address toToken",
+    "uint256 toChainId",
+    "uint256 amount",
+    "address receiver",
+  ],
   bridge: [
     "uint256 amount",
     "address receiver",
@@ -78,6 +85,29 @@ export const encodeTransferMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeCrossTransferMetadata = (
+  params: CrossSendMetadataProps,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["cross-transfer"],
+    [
+      params.fromToken,
+      params.toToken,
+      params.toChainId,
+      params.amount,
+      params.receiver,
+    ]
+  );
+
+  const data = encodeMetadata({
+    type: "cross-transfer",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
     type: "deploy",
@@ -208,7 +238,7 @@ export const decodeMetadata = (data: string) => {
       } else {
         metadata = executeData.metadata_;
       }
-    } else {
+    } else if (data.startsWith("0x14f80a8d")) {
       const executeDataV2 = iface.decodeFunctionData("executeV2", data);
       if (
         executeDataV2.params_.metadata === "0x" ||
@@ -218,6 +248,16 @@ export const decodeMetadata = (data: string) => {
       } else {
         metadata = executeDataV2.params_.metadata;
       }
+    } else {
+      const executeDataV3 = iface.decodeFunctionData("executeV3", data);
+      if (
+        executeDataV3.params_.metadata === "0x" ||
+        !executeDataV3.params_.metadata
+      ) {
+        return null;
+      } else {
+        metadata = executeDataV3.params_.metadata;
+      }
     }
 
     const metadataArr = [];
@@ -302,6 +342,7 @@ export const decodeMetadata = (data: string) => {
           payload = {
             type,
           };
+          break;
 
         case "permit2":
           payload = {
@@ -311,6 +352,19 @@ export const decodeMetadata = (data: string) => {
             amount: toBN(decodedData.amount).toFixed(),
             expiration: decodedData.expiration,
           };
+          break;
+
+        case "cross-transfer":
+          payload = {
+            type,
+            fromToken: decodedData.fromToken,
+            toToken: decodedData.toToken,
+            toChainId: decodedData.toChainId
+              ? decodedData.toChainId.toString()
+              : null,
+            amount: toBN(decodedData.amount).toFixed(),
+            receiver: decodedData.receiver,
+          };
 
           break;
       }

package/utils/network.ts

@@ -7,15 +7,17 @@ export const networks: Network[] = [
     name: "Mainnet",
     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"],
-      explorerUrl: "https://etherscan.io",
-      get serverRpcUrl() {
-        return process.env?.MAINNET_RPC_URL || this.rpcUrls[0];
-      },
-      balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
-      usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
       nativeCurrency: {
         name: "Ethereum",
         symbol: "ETH",
@@ -27,7 +29,15 @@ export const networks: Network[] = [
     name: "Polygon",
     debankName: "matic",
     ankrName: "polygon",
+    zerionName: "polygon",
+    color: "#7A4ADD",
     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: {
@@ -35,20 +45,22 @@ 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",
     },
   },
   {
     name: "Arbitrum",
     debankName: "arb",
     ankrName: "arbitrum",
+    zerionName: "arbitrum",
+    color: "#2D374B",
     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: {
@@ -56,20 +68,22 @@ 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",
     },
   },
   {
     name: "Optimism",
     debankName: "op",
     ankrName: "optimism",
+    zerionName: "optimism",
+    color: "#FF0420",
     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: {
@@ -77,50 +91,48 @@ 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",
+      rpcUrls: ["https://rpc.ankr.com/optimism"],
     },
   },
   {
     name: "Avalanche",
     debankName: "avax",
     ankrName: "avalanche",
+    zerionName: "avalanche",
+    color: "#EB5757",
     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",
     },
   },
   {
     name: "BSC",
     debankName: "bsc",
     ankrName: "bsc",
+    zerionName: "binance-smart-chain",
+    color: "#F3BA2F",
     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",
@@ -131,17 +143,18 @@ export const networks: Network[] = [
   {
     name: "Gnosis",
     debankName: "xdai",
-    ankrName: "gnosis",
+    zerionName: "xdai",
+    color: "#04795C",
     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,15 +165,17 @@ 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",
-      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",
@@ -168,10 +183,58 @@ export const networks: Network[] = [
       },
     },
   },
+  {
+    name: "Aurora",
+    chainId: 1313161554,
+    zerionName: "aurora",
+    color: "#78d64b",
+    explorerUrl: "https://explorer.mainnet.aurora.dev",
+    get serverRpcUrl() {
+      return process.env?.AURORA_RPC_URL || this.params.rpcUrls[0];
+    },
+    usdcAddress: "0xB12BFcA5A55806AaF64E99521918A4bf0fC40802",
+    balanceResolverAddress: "0xdF19Da523DA64bBE82eE0E4DFf00d676A8386474",
+    params: {
+      rpcUrls: ["https://mainnet.aurora.dev"],
+      chainName: "Aurora",
+      nativeCurrency: {
+        decimals: 18,
+        name: "Aurora ETH",
+        symbol: "AETH",
+      },
+    },
+  },
+  {
+    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: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
     isAvocado: true,
+    balanceResolverAddress: "",
+    color: "#16A34A",
+    usdcAddress: "",
+    serverRpcUrl: AVO_PROD_RPC_URL,
+    explorerUrl: AVO_PROD_EXPLORER_URL,
     params: {
       chainName: AVO_PROD_CHAIN_NAME,
       nativeCurrency: {
@@ -180,17 +243,18 @@ 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,
+    color: "#16A34A",
+    explorerUrl: AVO_STAGING_EXPLORER_URL,
     isAvocado: true,
+    balanceResolverAddress: "",
+    usdcAddress: "",
     params: {
       chainName: AVO_STAGING_CHAIN_NAME,
       nativeCurrency: {
@@ -198,12 +262,8 @@ 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,
     },
   },
 ];
@@ -235,14 +295,17 @@ export const RPCMap = networks.reduce((acc, network) => {
 
 export const networkIds = networks.map((network) => network.chainId);
 
-const rpcInstances: Record<string, ethers.providers.JsonRpcProvider> = {};
-const serverRpcInstances: Record<string, ethers.providers.JsonRpcProvider> = {};
+const rpcInstances: Record<string, ethers.providers.StaticJsonRpcProvider> = {};
+const serverRpcInstances: Record<
+  string,
+  ethers.providers.StaticJsonRpcProvider
+> = {};
 
 export const getServerRpcProvider = (chainId: number | string) => {
   if (!rpcInstances[chainId]) {
     const network = networks.find((n) => n.chainId == chainId);
-    serverRpcInstances[chainId] = new ethers.providers.JsonRpcProvider(
-      network?.params.serverRpcUrl
+    serverRpcInstances[chainId] = new ethers.providers.StaticJsonRpcProvider(
+      network?.serverRpcUrl
     );
   }
 
@@ -251,7 +314,7 @@ export const getServerRpcProvider = (chainId: number | string) => {
 
 export const getRpcProvider = (chainId: number | string) => {
   if (!rpcInstances[chainId]) {
-    rpcInstances[chainId] = new ethers.providers.JsonRpcProvider(
+    rpcInstances[chainId] = new ethers.providers.StaticJsonRpcProvider(
       getRpcURLByChainId(Number(chainId))
     );
   }
@@ -264,5 +327,5 @@ export const getExplorerUrl = (
   suffix: `/${string}` = "/"
 ) => {
   const network = getNetworkByChainId(chainId);
-  return `${network.params.explorerUrl}${suffix}`;
+  return `${network.explorerUrl}${suffix}`;
 };

package/utils/utils.d.ts

@@ -1,4 +1,16 @@
-type ChainId = 1 | 137 | 42161 | 10 | 56 | 43114 | 100 | 1101 | 634 | 63400;
+type ChainId =
+  | 1
+  | 137
+  | 42161
+  | 10
+  | 56
+  | 43114
+  | 100
+  | 1101
+  | 250
+  | 634
+  | 1313161554
+  | 63400;
 
 type ISlackMessageType = "danger" | "error" | "success" | "banner";
 
@@ -6,16 +18,18 @@ interface Network {
   name: string;
   debankName?: string;
   ankrName?: string;
+  zerionName?: string;
   chainId: ChainId;
+  color: string;
   isAvocado?: boolean;
+  serverRpcUrl: string | undefined;
+  balanceResolverAddress?: string;
+  usdcAddress: string;
+  explorerUrl: string;
   params: {
     chainName?: string;
-    rpcUrls: string[];
-    serverRpcUrl: string | undefined;
-    balanceResolverAddress?: string;
-    usdcAddress: string;
-    explorerUrl: string;
     iconUrls?: string[];
+    rpcUrls: string[];
     nativeCurrency?: {
       name: string;
       symbol: string;
@@ -42,6 +56,14 @@ type SendMetadataProps = {
   receiver: string;
 };
 
+type CrossSendMetadataProps = {
+  fromToken: string;
+  toToken: string;
+  toChainId: string;
+  amount: string;
+  receiver: string;
+};
+
 type UpgradeMetadataProps = {
   version: string;
   walletImpl: string;
@@ -82,7 +104,8 @@ type MetadataProps = {
     | "upgrade"
     | "dapp"
     | "deploy"
-    | "permit2";
+    | "permit2"
+    | "cross-transfer";
   encodedData: string;
   version?: string;
 };