@instadapp/avocado-base 0.0.33 → 0.0.35

package/package.json

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

package/utils/metadata.ts

@@ -242,189 +242,217 @@ export const encodeMultipleActions = (...actionData: string[]) => {
   return ethers.utils.defaultAbiCoder.encode(multiMetadataTypes, [actionData]);
 };
 
-export const decodeMetadata = (data: string) => {
+export const decodeData = (data: string) => {
   try {
-    const iface = Forwarder__factory.createInterface();
-    let metadata = "0x";
-    let payload = {};
-
-    if (!data) return payload;
-
-    if (data.startsWith("0x18e7f485")) {
-      const executeData = iface.decodeFunctionData("execute", data);
-      if (executeData.metadata_ === "0x" || !executeData.metadata_) {
-        return null;
-      } else {
-        metadata = executeData.metadata_;
-      }
-    } else if (data.startsWith("0x14f80a8d")) {
-      const executeDataV2 = iface.decodeFunctionData("executeV2", data);
-      if (
-        executeDataV2.params_.metadata === "0x" ||
-        !executeDataV2.params_.metadata
-      ) {
-        return null;
-      } 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;
-      }
+    const metadata = getMetadataFromData(data) || "0x";
+
+    return parseMetadata(metadata);
+  } catch (e) {
+    // console.log(e);
+    return null;
+  }
+};
+
+export const decodeMetadata = (metadata: string) => {
+  try {
+    return parseMetadata(metadata);
+  } catch (e) {
+    return null;
+  }
+};
+
+const getMetadataFromData = (data: string) => {
+  const iface = Forwarder__factory.createInterface();
+  let metadata = "0x";
+
+  if (data.startsWith("0x18e7f485")) {
+    const executeData = iface.decodeFunctionData("execute", data);
+    if (executeData.metadata_ === "0x" || !executeData.metadata_) {
+      return null;
     } else {
-      const executeDataMultisigV3 = iface.decodeFunctionData(
-        "executeMultisigV3",
-        data
-      );
-      if (
-        executeDataMultisigV3.params_.metadata === "0x" ||
-        !executeDataMultisigV3.params_.metadata
-      ) {
-        return null;
-      } else {
-        metadata = executeDataMultisigV3.params_.metadata;
-      }
+      metadata = executeData.metadata_;
     }
+  } else if (data.startsWith("0x14f80a8d")) {
+    const executeDataV2 = iface.decodeFunctionData("executeV2", data);
+    if (
+      executeDataV2.params_.metadata === "0x" ||
+      !executeDataV2.params_.metadata
+    ) {
+      return null;
+    } 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",
+      data
+    );
+    if (
+      executeDataMultisigV3.params_.metadata === "0x" ||
+      !executeDataMultisigV3.params_.metadata
+    ) {
+      return null;
+    } else {
+      metadata = executeDataMultisigV3.params_.metadata;
+    }
+  }
+
+  return metadata;
+};
 
-    const metadataArr = [];
-
-    const [decodedMultiMetadata = []] =
-      (ethers.utils.defaultAbiCoder.decode(
-        multiMetadataTypes,
-        metadata
-      ) as string[]) || [];
-
-    for (let metadata of decodedMultiMetadata) {
-      const decodedMetadata = ethers.utils.defaultAbiCoder.decode(
-        metadataTypes,
-        metadata
-      );
-
-      const type = ethers.utils.parseBytes32String(
-        decodedMetadata.type
-      ) as keyof typeof actionMetadataTypes;
-
-      const decodedData = ethers.utils.defaultAbiCoder.decode(
-        actionMetadataTypes[type],
-        decodedMetadata.data
-      );
-
-      switch (type) {
-        case "transfer":
-          payload = {
-            type,
-            token: decodedData.token,
-            amount: toBN(decodedData.amount).toFixed(),
-            receiver: decodedData.receiver,
-          };
-          break;
-        case "bridge":
-          payload = {
-            type,
-            amount: toBN(decodedData.amount).toFixed(),
-            receiver: decodedData.receiver,
-            toToken: decodedData.toToken,
-            fromToken: decodedData.fromToken,
-            toChainId: decodedData.toChainId
-              ? decodedData.toChainId.toString()
-              : null,
-            bridgeFee: toBN(decodedData.bridgeFee).toFixed(),
-          };
-          break;
-        case "swap":
-          payload = {
-            type,
-            buyAmount: toBN(decodedData.buyAmount).toFixed(),
-            sellAmount: toBN(decodedData.sellAmount).toFixed(),
-            buyToken: decodedData.buyToken,
-            sellToken: decodedData.sellToken,
-            receiver: decodedData.receiver,
-            protocol: utils.parseBytes32String(decodedData?.protocol || ""),
-          };
-          break;
-        case "upgrade":
-          payload = {
-            type,
-            version: utils.parseBytes32String(decodedData?.version || ""),
-            walletImpl: decodedData?.walletImpl,
-          };
-          break;
-        case "gas-topup":
-          payload = {
-            type,
-            amount: toBN(decodedData.amount).toFixed(),
-            token: decodedData.token,
-            onBehalf: decodedData.onBehalf,
-          };
-          break;
-        case "dapp":
-          payload = {
-            type,
-            name: decodedData?.name,
-            url: decodedData?.url,
-          };
-          break;
-        case "deploy":
-          payload = {
-            type,
-          };
-          break;
-
-        case "permit2":
-          payload = {
-            type,
-            token: decodedData.token,
-            spender: decodedData.spender,
-            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;
-      }
-
-      metadataArr.push(payload);
+const parseMetadata = (metadata: string) => {
+  const metadataArr = [];
+  let payload = {};
+
+  const [decodedMultiMetadata = []] =
+    (ethers.utils.defaultAbiCoder.decode(
+      multiMetadataTypes,
+      metadata
+    ) as string[]) || [];
+
+  for (let metadata of decodedMultiMetadata) {
+    const decodedMetadata = ethers.utils.defaultAbiCoder.decode(
+      metadataTypes,
+      metadata
+    );
+
+    const type = ethers.utils.parseBytes32String(
+      decodedMetadata.type
+    ) as keyof typeof actionMetadataTypes;
+
+    const decodedData = ethers.utils.defaultAbiCoder.decode(
+      actionMetadataTypes[type],
+      decodedMetadata.data
+    );
+
+    switch (type) {
+      case "transfer":
+        payload = {
+          type,
+          token: decodedData.token,
+          amount: toBN(decodedData.amount).toFixed(),
+          receiver: decodedData.receiver,
+        };
+        break;
+      case "bridge":
+        payload = {
+          type,
+          amount: toBN(decodedData.amount).toFixed(),
+          receiver: decodedData.receiver,
+          toToken: decodedData.toToken,
+          fromToken: decodedData.fromToken,
+          toChainId: decodedData.toChainId
+            ? decodedData.toChainId.toString()
+            : null,
+          bridgeFee: toBN(decodedData.bridgeFee).toFixed(),
+        };
+        break;
+      case "swap":
+        payload = {
+          type,
+          buyAmount: toBN(decodedData.buyAmount).toFixed(),
+          sellAmount: toBN(decodedData.sellAmount).toFixed(),
+          buyToken: decodedData.buyToken,
+          sellToken: decodedData.sellToken,
+          receiver: decodedData.receiver,
+          protocol: utils.parseBytes32String(decodedData?.protocol || ""),
+        };
+        break;
+      case "upgrade":
+        payload = {
+          type,
+          version: utils.parseBytes32String(decodedData?.version || ""),
+          walletImpl: decodedData?.walletImpl,
+        };
+        break;
+      case "gas-topup":
+        payload = {
+          type,
+          amount: toBN(decodedData.amount).toFixed(),
+          token: decodedData.token,
+          onBehalf: decodedData.onBehalf,
+        };
+        break;
+      case "dapp":
+        payload = {
+          type,
+          name: decodedData?.name,
+          url: decodedData?.url,
+        };
+        break;
+      case "deploy":
+        payload = {
+          type,
+        };
+        break;
+
+      case "permit2":
+        payload = {
+          type,
+          token: decodedData.token,
+          spender: decodedData.spender,
+          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;
     }
 
-    return metadataArr;
-  } catch (e) {
-    // console.log(e);
-    return null;
+    metadataArr.push(payload);
   }
+
+  return metadataArr;
+};
+
+/**
+ * Replaces hyphens with spaces and capitalizes the first letter of each word in a sentence.
+ * @param {string} txType - The input sentence to modify
+ *
+ * @returns {string} - The modified sentence with hyphens replaced with spaces and the first letter of each word capitalized.
+ */
+export const formatTxType = (txType: string) => {
+  const finalSentence = txType
+    .replace("-", " ")
+    .replace(/(^\w{1})|(\s+\w{1})/g, (letter) => letter.toUpperCase());
+
+  return finalSentence;
 };