@instadapp/avocado-base 0.0.0-dev.0e37fd2 → 0.0.0-dev.0f85f1a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.0e37fd2",
+  "version": "0.0.0-dev.0f85f1a",
   "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",
@@ -27,6 +34,7 @@ const actionMetadataTypes = {
   "gas-topup": ["uint256 amount", "address token", "address onBehalf"],
   upgrade: ["bytes32 version", "address walletImpl"],
   dapp: ["string name", "string url"],
+  auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
   permit2: [
     "address token",
@@ -34,6 +42,7 @@ const actionMetadataTypes = {
     "uint160 amount",
     "uint48 expiration",
   ],
+  "instadapp-pro": ["string castDetails"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -78,6 +87,46 @@ 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 encodeAuthMetadata = (
+  params: AuthMetadataProps,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["auth"],
+    [params.address, params.chainId, params.remove]
+  );
+
+  const data = encodeMetadata({
+    type: "auth",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
     type: "deploy",
@@ -208,7 +257,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 +267,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 +361,7 @@ export const decodeMetadata = (data: string) => {
           payload = {
             type,
           };
+          break;
 
         case "permit2":
           payload = {
@@ -311,6 +371,37 @@ 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;
+        case "auth":
+          payload = {
+            type: decodedData.remove ? "remove-authority" : "add-authority",
+            address: decodedData.address,
+            chainId: decodedData.chainId
+              ? decodedData.chainId.toString()
+              : null,
+            remove: decodedData.remove,
+          };
+
+          break;
+        case "instadapp-pro":
+          payload = {
+            type,
+            castDetails: decodedData.castDetails,
+          };
 
           break;
       }

package/utils/network.ts

@@ -7,8 +7,10 @@ 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];
     },
@@ -27,6 +29,8 @@ export const networks: Network[] = [
     name: "Polygon",
     debankName: "matic",
     ankrName: "polygon",
+    zerionName: "polygon",
+    color: "#7A4ADD",
     chainId: 137,
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
@@ -48,6 +52,8 @@ export const networks: Network[] = [
     name: "Arbitrum",
     debankName: "arb",
     ankrName: "arbitrum",
+    zerionName: "arbitrum",
+    color: "#2D374B",
     chainId: 42161,
     usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
@@ -69,6 +75,8 @@ export const networks: Network[] = [
     name: "Optimism",
     debankName: "op",
     ankrName: "optimism",
+    zerionName: "optimism",
+    color: "#FF0420",
     chainId: 10,
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
@@ -83,13 +91,15 @@ export const networks: Network[] = [
         symbol: "ETH",
         decimals: 18,
       },
-      rpcUrls: ["https://mainnet.optimism.io"],
+      rpcUrls: ["https://rpc.ankr.com/optimism"],
     },
   },
   {
     name: "Avalanche",
     debankName: "avax",
     ankrName: "avalanche",
+    zerionName: "avalanche",
+    color: "#EB5757",
     chainId: 43114,
     usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
     balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
@@ -104,13 +114,15 @@ export const networks: Network[] = [
         symbol: "AVAX",
         decimals: 18,
       },
-      rpcUrls: ["https://api.avax.network/ext/bc/C/rpc"],
+      rpcUrls: ["https://rpc.ankr.com/avalanche"],
     },
   },
   {
     name: "BSC",
     debankName: "bsc",
     ankrName: "bsc",
+    zerionName: "binance-smart-chain",
+    color: "#F3BA2F",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
@@ -131,7 +143,8 @@ export const networks: Network[] = [
   {
     name: "Gnosis",
     debankName: "xdai",
-    ankrName: "gnosis",
+    zerionName: "xdai",
+    color: "#04795C",
     chainId: 100,
     balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
     explorerUrl: "https://gnosisscan.io",
@@ -152,6 +165,7 @@ export const networks: Network[] = [
   {
     name: "Polygon zkEVM",
     chainId: 1101,
+    color: "#8544f6",
     explorerUrl: "https://zkevm.polygonscan.com",
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
     usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
@@ -160,7 +174,7 @@ export const networks: Network[] = [
     },
     params: {
       chainName: "polygon zkEVM",
-      rpcUrls: ["https://rpc.ankr.com/polygon_zkevm"],
+      rpcUrls: ["https://zkevm-rpc.com"],
 
       nativeCurrency: {
         name: "Ethereum",
@@ -172,6 +186,8 @@ 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];
@@ -189,9 +205,12 @@ export const networks: Network[] = [
     },
   },
   {
-    name: "Fantom Opera",
+    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];
     },
@@ -199,7 +218,7 @@ export const networks: Network[] = [
     balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
     params: {
       rpcUrls: ["https://rpc.ankr.com/fantom"],
-      chainName: "Fantom Opera",
+      chainName: "Fantom",
       nativeCurrency: {
         name: "Fantom",
         symbol: "FTM",
@@ -212,6 +231,7 @@ export const networks: Network[] = [
     chainId: AVO_PROD_CHAIN_ID,
     isAvocado: true,
     balanceResolverAddress: "",
+    color: "#16A34A",
     usdcAddress: "",
     serverRpcUrl: AVO_PROD_RPC_URL,
     explorerUrl: AVO_PROD_EXPLORER_URL,
@@ -230,6 +250,7 @@ export const networks: Network[] = [
     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: "",
@@ -274,13 +295,16 @@ 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(
+    serverRpcInstances[chainId] = new ethers.providers.StaticJsonRpcProvider(
       network?.serverRpcUrl
     );
   }
@@ -290,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))
     );
   }

package/utils/utils.d.ts

@@ -18,7 +18,9 @@ interface Network {
   name: string;
   debankName?: string;
   ankrName?: string;
+  zerionName?: string;
   chainId: ChainId;
+  color: string;
   isAvocado?: boolean;
   serverRpcUrl: string | undefined;
   balanceResolverAddress?: string;
@@ -54,6 +56,20 @@ type SendMetadataProps = {
   receiver: string;
 };
 
+type CrossSendMetadataProps = {
+  fromToken: string;
+  toToken: string;
+  toChainId: string;
+  amount: string;
+  receiver: string;
+};
+
+type AuthMetadataProps = {
+  address: string;
+  chainId: string;
+  remove: boolean;
+};
+
 type UpgradeMetadataProps = {
   version: string;
   walletImpl: string;
@@ -94,7 +110,9 @@ type MetadataProps = {
     | "upgrade"
     | "dapp"
     | "deploy"
-    | "permit2";
+    | "permit2"
+    | "cross-transfer"
+    | "auth";
   encodedData: string;
   version?: string;
 };