@instadapp/avocado-base 0.0.0-dev.fa14908 → 0.0.0-dev.fb3d631

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,23 +1,25 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.fa14908",
+  "version": "0.0.0-dev.fb3d631",
   "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",
@@ -27,6 +29,7 @@
     "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
     "ethers": "^5.7.2",
+    "viem": "^2.10.5",
     "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;

package/utils/metadata.ts

@@ -1,23 +1,28 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory } from "../contracts";
-
-  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;
+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[]"];
 
@@ -52,8 +57,10 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   "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",
@@ -61,10 +68,12 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
     "uint48 expiration",
   ],
   "instadapp-pro": ["string castDetails"],
-  'add-signers': ['address[] signers'],
-  'remove-signers': ['address[] signers'],
-  'change-threshold': ['uint8 count'],
-  'rejection': ['bytes32 id'],
+  "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) => {
@@ -92,6 +101,24 @@ export const encodeDappMetadata = (
   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,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeTransferMetadata = (
   params: SendMetadataProps,
   single = true
@@ -172,6 +199,23 @@ export const encodeDeployMetadata = (single = true) => {
   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
@@ -306,6 +350,33 @@ export const encodeRemoveSignersMetadata = (
   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
@@ -346,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")) {
@@ -367,36 +440,30 @@ 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,
@@ -432,15 +499,19 @@ const typesPayload: IPayload = {
     token: data.token,
     onBehalf: data.onBehalf,
   }),
-  "dapp": (data, type) => ({
+  dapp: (data, type) => ({
     type,
     name: data.name,
     url: data.url,
   }),
-  "deploy": (data, type) => ({
+  deploy: (data, type) => ({
+    type,
+  }),
+  "tx-builder": (data, type) => ({
     type,
+    actionCount: utils.parseBytes32String(data.actionCount || ""),
   }),
-  "permit2": (data, type) => ({
+  permit2: (data, type) => ({
     type,
     token: data.token,
     spender: data.spender,
@@ -455,7 +526,7 @@ const typesPayload: IPayload = {
     amount: toBN(data.amount).toFixed(),
     receiver: data.receiver,
   }),
-  "auth": (data) => ({
+  auth: (data) => ({
     type: data.remove ? "remove-authority" : "add-authority",
     address: data.address,
     chainId: data.chainId ? data.chainId.toString() : null,
@@ -465,7 +536,7 @@ const typesPayload: IPayload = {
     type,
     castDetails: data.castDetails,
   }),
-  "rejection": (data, type) => ({
+  rejection: (data, type) => ({
     type,
     id: data.id,
   }),
@@ -481,6 +552,15 @@ const typesPayload: IPayload = {
     type,
     count: data.count,
   }),
+  "avocado-bridge": (data, type) => ({
+    type,
+    id: data.id,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+  }),
+  mass: (data, type) => ({
+    type,
+    data,
+  }),
 };
 
 const parseMetadata = (metadata: string) => {
@@ -502,25 +582,22 @@ const parseMetadata = (metadata: string) => {
       decodedMetadata.type
     ) as keyof typeof actionMetadataTypes;
 
-    const decodedData = ethers.utils.defaultAbiCoder.decode(
+    const decodedData = decodedMetadata?.data === '0x' ? '' : ethers.utils.defaultAbiCoder.decode(
       actionMetadataTypes[type],
       decodedMetadata.data
     );
 
-    const payloadFunc = typesPayload[type]
-    
+    const payloadFunc = typesPayload[type];
+
     if (payloadFunc) {
-      const payload = payloadFunc(decodedData, type)
+      const payload = payloadFunc(decodedData, type);
       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
@@ -528,6 +605,10 @@ const parseMetadata = (metadata: string) => {
  * @returns {string} - The modified sentence with hyphens replaced with spaces and the first letter of each word capitalized.
  */
 export const formatTxType = (txType: string) => {
+  if(txType === 'mass') {
+    return  'Chain Agnostic Payments'
+  }
+
   const finalSentence = txType
     .replace("-", " ")
     .replace(/(^\w{1})|(\s+\w{1})/g, (letter) => letter.toUpperCase());