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

package/contracts/index.ts

@@ -6,9 +6,11 @@ export type { BalanceResolver } from "./BalanceResolver";
 export type { Erc20 } from "./Erc20";
 export type { Forwarder } from "./Forwarder";
 export type { GaslessWallet } from "./GaslessWallet";
+export type { MultisigForwarder } from "./MultisigForwarder";
 export * as factories from "./factories";
 export { AvoFactoryProxy__factory } from "./factories/AvoFactoryProxy__factory";
 export { BalanceResolver__factory } from "./factories/BalanceResolver__factory";
 export { Erc20__factory } from "./factories/Erc20__factory";
 export { Forwarder__factory } from "./factories/Forwarder__factory";
 export { GaslessWallet__factory } from "./factories/GaslessWallet__factory";
+export { MultisigForwarder__factory } from "./factories/MultisigForwarder__factory";

package/nuxt.config.ts

@@ -1,4 +1,20 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
+import ViteComponents from "unplugin-vue-components/vite";
+
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss"],
+  modules: ["@nuxtjs/tailwindcss", "nuxt-svgo", "@vueuse/nuxt"],
+  svgo: {
+    defaultImport: "component",
+    autoImportPath: "./assets/images/icons",
+    svgoConfig: {
+      plugins: ["prefixIds"],
+    },
+  },
+  vite: {
+    plugins: [
+      ViteComponents({
+        dts: true,
+      }),
+    ],
+  },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.0f85f1a",
+  "version": "0.0.0-dev.1264496",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
@@ -16,12 +16,17 @@
     "@instadapp/avocado-dev": "npm:@instadapp/avocado@dev",
     "@nuxtjs/tailwindcss": "^6.6.5",
     "@typechain/ethers-v5": "^10.2.0",
-    "nuxt": "^3.3.3",
+    "nuxt": "^3.6.1",
+    "nuxt-svgo": "^3.1.0",
     "rimraf": "^3.0.2",
-    "typechain": "^8.1.1"
+    "typechain": "^8.1.1",
+    "unplugin-vue-components": "^0.25.1",
+    "vue-tippy": "^6.0.0"
   },
   "dependencies": {
+    "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
-    "ethers": "^5.7.2"
+    "ethers": "^5.7.2",
+    "xxhashjs": "^0.2.2"
   }
 }

package/utils/avocado.ts

@@ -20,3 +20,5 @@ export const AVO_STAGING_DEPOSIT_ADDRESS =
 export const AVO_PROD_RPC_URL = "https://rpc.avocado.instadapp.io";
 
 export const AVO_STAGING_RPC_URL = "https://rpc.avocado.instad.app";
+
+export const blockQueryURL = "https://blockquery.instadapp.io";

package/utils/bignumber.ts

@@ -1,6 +1,8 @@
 import { BigNumber } from "bignumber.js";
 import { BigNumber as BN } from "ethers";
 
+type CombinedBigNumber = BigNumber | string | number;
+
 export const toBN = (value: BigNumber.Value | BN) =>
   new BigNumber(BN.isBigNumber(value) ? value.toString() : value);
 export const isZero = (value: BigNumber.Value | BN) => toBN(value).isZero();
@@ -29,3 +31,21 @@ export const ensureValue = (value: any) => {
 export const max = (...args: BigNumber.Value[]) => {
   return BigNumber.max(...args);
 };
+
+export function pow(value: CombinedBigNumber, exponent: string | number) {
+  return toBN(value).pow(toBN(exponent));
+}
+
+export function toWei(val: CombinedBigNumber, decimals: number): string {
+  const num = toBN(val);
+  const multiplier = pow(10, decimals);
+  return times(num, multiplier).toFixed(0);
+}
+
+export function fromWei(val: CombinedBigNumber, decimal = 18) {
+  return toBN(val).div(new BigNumber(10).pow(decimal));
+}
+
+export function abs(value: CombinedBigNumber) {
+  return toBN(value).abs();
+}

package/utils/formatter.ts

@@ -72,7 +72,7 @@ export function formatDecimal(value: string | number, fractionDigits?: number) {
     let decimals;
 
     if (num.lt(1)) {
-      decimals = 8;
+      decimals = 4;
     } else if (num.lt(10)) {
       decimals = 6;
     } else if (num.lt(100)) {

package/utils/helper.ts

@@ -52,3 +52,11 @@ export function onImageError(this: HTMLImageElement) {
     parentElement.classList.add("bg-gray-300");
   }
 }
+
+export function formatMultipleAddresses(addresses: string[], shorten = true) {
+  const formatter = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' })
+  const formattedString = formatter.format(addresses.map(i => shorten ? shortenHash(i) || '' : i))
+  
+  return formattedString
+}
+

package/utils/metadata.ts

@@ -1,11 +1,30 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory } from "../contracts";
+import { Forwarder__factory, MultisigForwarder__factory } from "../contracts";
+import { toBN } from "./bignumber";
+
+  export const MetadataEnums = {
+    "transfer": "transfer",
+    "bridge": "bridge",
+    "swap": "swap",
+    "gas-topup": "gas-topup",
+    "upgrade": "upgrade",
+    "dapp": "dapp",
+    "deploy": "deploy",
+    "permit2": "permit2",
+    "cross-transfer": "cross-transfer",
+    "auth": "auth",
+    "rejection": "rejection",
+    "instadapp-pro": "instadapp-pro",
+    "add-signers": "add-signers",
+    "remove-signers": "remove-signers",
+    "change-threshold": "change-threshold",
+  } as const;
 
 const multiMetadataTypes = ["bytes[]"];
 
 const metadataTypes = ["bytes32 type", "uint8 version", "bytes data"];
 
-const actionMetadataTypes = {
+const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   transfer: ["address token", "uint256 amount", "address receiver"],
   "cross-transfer": [
     "address fromToken",
@@ -43,6 +62,10 @@ const actionMetadataTypes = {
     "uint48 expiration",
   ],
   "instadapp-pro": ["string castDetails"],
+  'add-signers': ['address[] signers'],
+  'remove-signers': ['address[] signers'],
+  'change-threshold': ['uint8 count'],
+  'rejection': ['bytes32 id'],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -63,7 +86,7 @@ export const encodeDappMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "dapp",
+    type: MetadataEnums.dapp,
     encodedData,
   });
 
@@ -80,7 +103,21 @@ export const encodeTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "transfer",
+    type: MetadataEnums.transfer,
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeRejectionMetadata = (id: string, single = true) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes.rejection,
+    [id]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums.rejection,
     encodedData,
   });
 
@@ -103,7 +140,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "cross-transfer",
+    type: MetadataEnums["cross-transfer"],
     encodedData,
   });
 
@@ -120,7 +157,7 @@ export const encodeAuthMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "auth",
+    type: MetadataEnums.auth,
     encodedData,
   });
 
@@ -129,7 +166,7 @@ export const encodeAuthMetadata = (
 
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
-    type: "deploy",
+    type: MetadataEnums.deploy,
     encodedData: "0x",
   });
 
@@ -146,7 +183,7 @@ export const encodeWCSignMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "permit2",
+    type: MetadataEnums.permit2,
     encodedData,
   });
 
@@ -163,7 +200,7 @@ export const encodeUpgradeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "upgrade",
+    type: MetadataEnums.upgrade,
     encodedData,
   });
 
@@ -187,7 +224,7 @@ export const encodeSwapMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "swap",
+    type: MetadataEnums.swap,
     encodedData,
   });
 
@@ -203,10 +240,8 @@ export const encodeTopupMetadata = (
     [params.amount, params.token, params.onBehalf]
   );
 
-  console.log(params);
-
   const data = encodeMetadata({
-    type: "gas-topup",
+    type: MetadataEnums["gas-topup"],
     encodedData,
   });
 
@@ -231,7 +266,58 @@ export const encodeBridgeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "bridge",
+    type: MetadataEnums.bridge,
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeChangeThresholdMetadata = (
+  threshold: string | number,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["change-threshold"],
+    [toBN(threshold).toNumber()]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["change-threshold"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeRemoveSignersMetadata = (
+  addresses: string[],
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["remove-signers"],
+    [addresses]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["remove-signers"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeAddSignersMetadata = (
+  addresses: string[],
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["add-signers"],
+    [addresses]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["add-signers"],
     encodedData,
   });
 
@@ -242,176 +328,202 @@ export const encodeMultipleActions = (...actionData: string[]) => {
   return ethers.utils.defaultAbiCoder.encode(multiMetadataTypes, [actionData]);
 };
 
-export const decodeMetadata = (data: string) => {
+export const decodeData = (data: string) => {
+  try {
+    const metadata = getMetadataFromData(data) || "0x";
+
+    return parseMetadata(metadata);
+  } catch (e) {
+    // console.log(e);
+    return null;
+  }
+};
+
+export const decodeMetadata = (metadata: 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;
-      }
+    return parseMetadata(metadata);
+  } catch (e) {
+    return null;
+  }
+};
+
+const iface = Forwarder__factory.createInterface();
+const ifaceMultisig = MultisigForwarder__factory.createInterface();
+
+const getMetadataFromData = (data: string) => {
+  let metadata = "0x";
+
+  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 {
+    const executeDataMultisig = ifaceMultisig.decodeFunctionData(
+      "executeV1",
+      data
+    );
+    if (
+      executeDataMultisig.params_.metadata === "0x" ||
+      !executeDataMultisig.params_.metadata
+    ) {
+      return null;
     } else {
-      const executeDataV3 = iface.decodeFunctionData("executeV3", data);
-      if (
-        executeDataV3.params_.metadata === "0x" ||
-        !executeDataV3.params_.metadata
-      ) {
-        return null;
-      } else {
-        metadata = executeDataV3.params_.metadata;
-      }
+      metadata = executeDataMultisig.params_.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;
-      }
+  return metadata;
+};
 
+
+const typesPayload: IPayload = {
+  transfer: (data, type) => ({
+    type,
+    token: data.token,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+  }),
+  bridge: (data, type) => ({
+    type,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+    toToken: data.toToken,
+    fromToken: data.fromToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    bridgeFee: toBN(data.bridgeFee).toFixed(),
+  }),
+  swap: (data, type) => ({
+    type,
+    buyAmount: toBN(data.buyAmount).toFixed(),
+    sellAmount: toBN(data.sellAmount).toFixed(),
+    buyToken: data.buyToken,
+    sellToken: data.sellToken,
+    receiver: data.receiver,
+    protocol: utils.parseBytes32String(data.protocol || ""),
+  }),
+  upgrade: (data, type) => ({
+    type,
+    version: utils.parseBytes32String(data.version || ""),
+    walletImpl: data.walletImpl,
+  }),
+  "gas-topup": (data, type) => ({
+    type,
+    amount: toBN(data.amount).toFixed(),
+    token: data.token,
+    onBehalf: data.onBehalf,
+  }),
+  "dapp": (data, type) => ({
+    type,
+    name: data.name,
+    url: data.url,
+  }),
+  "deploy": (data, type) => ({
+    type,
+  }),
+  "permit2": (data, type) => ({
+    type,
+    token: data.token,
+    spender: data.spender,
+    amount: toBN(data.amount).toFixed(),
+    expiration: data.expiration,
+  }),
+  "cross-transfer": (data, type) => ({
+    type,
+    fromToken: data.fromToken,
+    toToken: data.toToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+  }),
+  "auth": (data) => ({
+    type: data.remove ? "remove-authority" : "add-authority",
+    address: data.address,
+    chainId: data.chainId ? data.chainId.toString() : null,
+    remove: data.remove,
+  }),
+  "instadapp-pro": (data, type) => ({
+    type,
+    castDetails: data.castDetails,
+  }),
+  "rejection": (data, type) => ({
+    type,
+    id: data.id,
+  }),
+  "add-signers": (data, type) => ({
+    type,
+    addresses: data.signers,
+  }),
+  "remove-signers": (data, type) => ({
+    type,
+    addresses: data.signers,
+  }),
+  "change-threshold": (data, type) => ({
+    type,
+    count: data.count,
+  }),
+};
+
+const parseMetadata = (metadata: string) => {
+  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
+    );
+
+    const payloadFunc = typesPayload[type]
+    
+    if (payloadFunc) {
+      const payload = payloadFunc(decodedData, type)
       metadataArr.push(payload);
     }
 
-    return metadataArr;
-  } catch (e) {
-    console.log(e);
-    return null;
   }
+
+  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;
 };