@instadapp/avocado-base 0.0.17 → 0.0.19

package/package.json

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

package/utils/formatter.ts

@@ -61,25 +61,34 @@ function getFractionDigits(value: string | number) {
   }
 }
 
-export function formatDecimal(
-  value: string | number,
-  fractionDigits = getFractionDigits(value)
-) {
+export function formatDecimal(value: string | number, fractionDigits?: number) {
   if (!value) {
     value = "0";
   }
-  let formatter;
   if (lt(value, "0.0001") && gt(value, "0")) {
     return "< 0.0001";
   } else {
-    formatter = new Intl.NumberFormat("en-US", {
-      style: "decimal",
-      minimumFractionDigits: fractionDigits,
-      maximumFractionDigits: fractionDigits,
-    });
-  }
+    const num = toBN(value);
+    let decimals;
 
-  const valueAsNumber = toBN(value).toNumber();
+    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 formatter.format(valueAsNumber);
+    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/utils.d.ts

@@ -55,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;
@@ -95,7 +103,8 @@ type MetadataProps = {
     | "upgrade"
     | "dapp"
     | "deploy"
-    | "permit2";
+    | "permit2"
+    | "cross-transfer";
   encodedData: string;
   version?: string;
 };