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

package/components/ChainLogo.vue

@@ -427,7 +427,7 @@
   </svg>
 
   <svg
-    v-else-if="chain === 250"
+    v-else-if="chain == 250"
     width="24"
     height="24"
     viewBox="0 0 24 24"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.0e37fd2",
+  "version": "0.0.0-dev.17ef354",
   "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

@@ -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",
@@ -302,6 +332,7 @@ export const decodeMetadata = (data: string) => {
           payload = {
             type,
           };
+          break;
 
         case "permit2":
           payload = {
@@ -311,6 +342,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,6 +7,7 @@ export const networks: Network[] = [
     name: "Mainnet",
     debankName: "eth",
     ankrName: "eth",
+    zerionName: "ethereum",
     chainId: 1,
     explorerUrl: "https://etherscan.io",
     get serverRpcUrl() {
@@ -27,6 +28,7 @@ export const networks: Network[] = [
     name: "Polygon",
     debankName: "matic",
     ankrName: "polygon",
+    zerionName: "polygon",
     chainId: 137,
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
@@ -48,6 +50,7 @@ export const networks: Network[] = [
     name: "Arbitrum",
     debankName: "arb",
     ankrName: "arbitrum",
+    zerionName: "arbitrum",
     chainId: 42161,
     usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
@@ -69,6 +72,7 @@ export const networks: Network[] = [
     name: "Optimism",
     debankName: "op",
     ankrName: "optimism",
+    zerionName: "optimism",
     chainId: 10,
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
@@ -83,13 +87,14 @@ 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",
     chainId: 43114,
     usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
     balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
@@ -111,6 +116,7 @@ export const networks: Network[] = [
     name: "BSC",
     debankName: "bsc",
     ankrName: "bsc",
+    zerionName: "binance-smart-chain",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
@@ -131,7 +137,7 @@ export const networks: Network[] = [
   {
     name: "Gnosis",
     debankName: "xdai",
-    ankrName: "gnosis",
+    zerionName: "xdai",
     chainId: 100,
     balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
     explorerUrl: "https://gnosisscan.io",
@@ -169,29 +175,32 @@ export const networks: Network[] = [
       },
     },
   },
+  // {
+  //   name: "Aurora",
+  //   chainId: 1313161554,
+  //   zerionName: "aurora",
+  //   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: "Aurora",
-    chainId: 1313161554,
-    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 Opera",
+    name: "Fantom",
     chainId: 250,
+    zerionName: "fantom",
     explorerUrl: "https://ftmscan.com",
+    ankrName: "fantom",
     get serverRpcUrl() {
       return process.env?.FANTOM_RPC_URL || this.params.rpcUrls[0];
     },
@@ -199,7 +208,7 @@ export const networks: Network[] = [
     balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
     params: {
       rpcUrls: ["https://rpc.ankr.com/fantom"],
-      chainName: "Fantom Opera",
+      chainName: "Fantom",
       nativeCurrency: {
         name: "Fantom",
         symbol: "FTM",
@@ -274,13 +283,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 +302,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,6 +18,7 @@ interface Network {
   name: string;
   debankName?: string;
   ankrName?: string;
+  zerionName?: string;
   chainId: ChainId;
   isAvocado?: boolean;
   serverRpcUrl: string | undefined;
@@ -54,6 +55,14 @@ type SendMetadataProps = {
   receiver: string;
 };
 
+type CrossSendMetadataProps = {
+  fromToken: string;
+  toToken: string;
+  toChainId: string;
+  amount: string;
+  receiver: string;
+};
+
 type UpgradeMetadataProps = {
   version: string;
   walletImpl: string;
@@ -94,7 +103,8 @@ type MetadataProps = {
     | "upgrade"
     | "dapp"
     | "deploy"
-    | "permit2";
+    | "permit2"
+    | "cross-transfer";
   encodedData: string;
   version?: string;
 };