@instadapp/avocado-base 0.0.0-dev.9853aa2 → 0.0.0-dev.9d62a67

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/package.json

@@ -1,30 +1,35 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.9853aa2",
+  "version": "0.0.0-dev.9d62a67",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
+  "engines": {
+    "node": ">=v18.18.0"
+  },
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "generate:contracts": "rimraf contracts && typechain --target=ethers-v5 'abi/*.json' --out-dir 'contracts'"
+    "generate:contracts": "rimraf contracts && typechain --target=ethers-v5 'abi/*.json' --out-dir 'contracts'",
+    "typecheck": "nuxi typecheck"
   },
   "devDependencies": {
-    "@instadapp/avocado": "^0.1.10",
-    "@instadapp/avocado-dev": "npm:@instadapp/avocado@dev",
-    "@nuxtjs/tailwindcss": "^6.6.5",
+    "@nuxtjs/tailwindcss": "^6.11.3",
     "@typechain/ethers-v5": "^10.2.0",
-    "nuxt": "^3.6.1",
-    "nuxt-svgo": "^3.1.0",
+    "nuxt": "^3.10.1",
+    "nuxt-svgo": "^4.0.0",
     "rimraf": "^3.0.2",
     "typechain": "^8.1.1",
-    "unplugin-vue-components": "^0.25.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",
+    "viem": "^2.7.16",
+    "xxhashjs": "^0.2.2"
   }
 }

package/utils/formatter.ts

@@ -19,7 +19,7 @@ export function formatPercent(
   return formatter.format(valueAsNumber);
 }
 
-export function shortenHash(hash: string, length: number = 4) {
+export function shortenHash(hash: string | `0x${string}`, length: number = 4) {
   if (!hash) return;
   if (hash.length < 12) return hash;
   const beginningChars = hash.startsWith("0x") ? length + 2 : length;
@@ -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,34 @@
 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",
+  import: "import",
+  mass: "mass",
+  "tx-builder": "tx-builder",
+  "avocado-bridge": "avocado-bridge",
+} 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",
@@ -34,8 +57,10 @@ const actionMetadataTypes = {
   "gas-topup": ["uint256 amount", "address token", "address onBehalf"],
   upgrade: ["bytes32 version", "address walletImpl"],
   dapp: ["string name", "string url"],
+  import: ["bytes32 protocol", "uint256 valueInUsd"],
   auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
+  "tx-builder": ["bytes32 actionCount"],
   permit2: [
     "address token",
     "address spender",
@@ -43,7 +68,12 @@ const actionMetadataTypes = {
     "uint48 expiration",
   ],
   "instadapp-pro": ["string castDetails"],
-  reject: ["string reason"],
+  "add-signers": ["address[] signers"],
+  "remove-signers": ["address[] signers"],
+  "change-threshold": ["uint8 count"],
+  rejection: ["bytes32 id"],
+  "avocado-bridge": ["bytes32 id", "uint256 toChainId"],
+  mass: ["bool isMass"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -64,7 +94,25 @@ export const encodeDappMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "dapp",
+    type: MetadataEnums.dapp,
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeAvocadoBridgeMetadata = (
+  id: string,
+  toChainId: string | number,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["avocado-bridge"],
+    [id, toChainId]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["avocado-bridge"],
     encodedData,
   });
 
@@ -81,21 +129,21 @@ export const encodeTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "transfer",
+    type: MetadataEnums.transfer,
     encodedData,
   });
 
   return single ? encodeMultipleActions(data) : data;
 };
 
-export const encodeRejectMetadata = (reason: string, single = true) => {
+export const encodeRejectionMetadata = (id: string, single = true) => {
   const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes.reject,
-    [reason]
+    actionMetadataTypes.rejection,
+    [id]
   );
 
   const data = encodeMetadata({
-    type: "reject",
+    type: MetadataEnums.rejection,
     encodedData,
   });
 
@@ -118,7 +166,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "cross-transfer",
+    type: MetadataEnums["cross-transfer"],
     encodedData,
   });
 
@@ -135,7 +183,7 @@ export const encodeAuthMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "auth",
+    type: MetadataEnums.auth,
     encodedData,
   });
 
@@ -144,13 +192,30 @@ export const encodeAuthMetadata = (
 
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
-    type: "deploy",
+    type: MetadataEnums.deploy,
     encodedData: "0x",
   });
 
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeTransactionBuilderMetadata = (
+  actionCount: string,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["tx-builder"],
+    [actionCount]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["tx-builder"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeWCSignMetadata = (
   params: SignMetadataProps,
   single = true
@@ -161,7 +226,7 @@ export const encodeWCSignMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "permit2",
+    type: MetadataEnums.permit2,
     encodedData,
   });
 
@@ -178,7 +243,7 @@ export const encodeUpgradeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "upgrade",
+    type: MetadataEnums.upgrade,
     encodedData,
   });
 
@@ -202,7 +267,7 @@ export const encodeSwapMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "swap",
+    type: MetadataEnums.swap,
     encodedData,
   });
 
@@ -218,10 +283,8 @@ export const encodeTopupMetadata = (
     [params.amount, params.token, params.onBehalf]
   );
 
-  console.log(params);
-
   const data = encodeMetadata({
-    type: "gas-topup",
+    type: MetadataEnums["gas-topup"],
     encodedData,
   });
 
@@ -246,7 +309,85 @@ 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 encodeImportMetadata = (
+  protocol: string,
+  valueInUsd: string,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["import"],
+    [protocol, valueInUsd]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["import"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeMassMetadata = (single = true) => {
+  const data = encodeMetadata({
+    type: MetadataEnums.mass,
+    encodedData: '0x',
+  });
+
+  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,
   });
 
@@ -276,8 +417,10 @@ export const decodeMetadata = (metadata: string) => {
   }
 };
 
+const iface = Forwarder__factory.createInterface();
+const ifaceMultisig = MultisigForwarder__factory.createInterface();
+
 const getMetadataFromData = (data: string) => {
-  const iface = Forwarder__factory.createInterface();
   let metadata = "0x";
 
   if (data.startsWith("0x18e7f485")) {
@@ -297,37 +440,130 @@ const getMetadataFromData = (data: string) => {
     } 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",
+    const executeDataMultisig = ifaceMultisig.decodeFunctionData(
+      "executeV1",
       data
     );
     if (
-      executeDataMultisigV3.params_.metadata === "0x" ||
-      !executeDataMultisigV3.params_.metadata
+      executeDataMultisig.params_.metadata === "0x" ||
+      !executeDataMultisig.params_.metadata
     ) {
       return null;
     } else {
-      metadata = executeDataMultisigV3.params_.metadata;
+      metadata = executeDataMultisig.params_.metadata;
     }
   }
 
   return metadata;
 };
 
+const typesPayload: IPayload = {
+  import: (data, type) => ({
+    type,
+    protocol: utils.parseBytes32String(data.protocol || ""),
+    valueInUsd: toBN(data.valueInUsd).toFixed(),
+  }),
+  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,
+  }),
+  "tx-builder": (data, type) => ({
+    type,
+    actionCount: utils.parseBytes32String(data.actionCount || ""),
+  }),
+  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,
+  }),
+  "avocado-bridge": (data, type) => ({
+    type,
+    id: data.id,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+  }),
+  mass: (data, type) => ({
+    type,
+  }),
+};
+
 const parseMetadata = (metadata: string) => {
   const metadataArr = [];
-  let payload = {};
 
   const [decodedMultiMetadata = []] =
     (ethers.utils.defaultAbiCoder.decode(
@@ -350,116 +586,12 @@ const parseMetadata = (metadata: string) => {
       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;
-
-      case "reject":
-        payload = {
-          type,
-          reason: decodedData.reason,
-        };
-        break;
-    }
+    const payloadFunc = typesPayload[type];
 
-    metadataArr.push(payload);
+    if (payloadFunc) {
+      const payload = payloadFunc(decodedData, type);
+      metadataArr.push(payload);
+    }
   }
 
   return metadataArr;