@instadapp/avocado-base 0.0.0-dev.9dbd5b5 → 0.0.0-dev.9df0ab2

package/contracts/factories/index.ts

@@ -6,4 +6,5 @@ export { BalanceResolver__factory } from "./BalanceResolver__factory";
 export { Erc20__factory } from "./Erc20__factory";
 export { Forwarder__factory } from "./Forwarder__factory";
 export { GaslessWallet__factory } from "./GaslessWallet__factory";
+export { MultisigAgnosticForwarder__factory } from "./MultisigAgnosticForwarder__factory";
 export { MultisigForwarder__factory } from "./MultisigForwarder__factory";

package/contracts/index.ts

@@ -6,6 +6,7 @@ export type { BalanceResolver } from "./BalanceResolver";
 export type { Erc20 } from "./Erc20";
 export type { Forwarder } from "./Forwarder";
 export type { GaslessWallet } from "./GaslessWallet";
+export type { MultisigAgnosticForwarder } from "./MultisigAgnosticForwarder";
 export type { MultisigForwarder } from "./MultisigForwarder";
 export * as factories from "./factories";
 export { AvoFactoryProxy__factory } from "./factories/AvoFactoryProxy__factory";
@@ -13,4 +14,5 @@ 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 { MultisigAgnosticForwarder__factory } from "./factories/MultisigAgnosticForwarder__factory";
 export { MultisigForwarder__factory } from "./factories/MultisigForwarder__factory";

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.9dbd5b5",
+  "version": "0.0.0-dev.9df0ab2",
   "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,10 +1,11 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory, MultisigForwarder__factory } from "../contracts";
+import { Forwarder__factory, MultisigForwarder__factory, MultisigAgnosticForwarder__factory } from "../contracts";
 import { toBN } from "./bignumber";
 
 export const MetadataEnums = {
   transfer: "transfer",
   bridge: "bridge",
+  'bridge-v2': 'bridge-v2',
   swap: "swap",
   "gas-topup": "gas-topup",
   upgrade: "upgrade",
@@ -12,6 +13,7 @@ export const MetadataEnums = {
   deploy: "deploy",
   permit2: "permit2",
   "cross-transfer": "cross-transfer",
+  'cross-transfer-v2': 'cross-transfer-v2',
   auth: "auth",
   rejection: "rejection",
   "instadapp-pro": "instadapp-pro",
@@ -19,7 +21,9 @@ export const MetadataEnums = {
   "remove-signers": "remove-signers",
   "change-threshold": "change-threshold",
   import: "import",
-  "transaction-builder": "transaction-builder",
+  mass: "mass",
+  "tx-builder": "tx-builder",
+  "avocado-bridge": "avocado-bridge",
 } as const;
 
 const multiMetadataTypes = ["bytes[]"];
@@ -35,6 +39,14 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
     "uint256 amount",
     "address receiver",
   ],
+  "cross-transfer-v2": [
+    "address fromToken",
+    "address toToken",
+    "uint256 toChainId",
+    "uint256 amount",
+    "address receiver",
+    "bytes32 provider",
+  ],
   bridge: [
     "uint256 amount",
     "address receiver",
@@ -44,6 +56,16 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
     "uint256 bridgeFee",
     "address nativeToken",
   ],
+  'bridge-v2': [
+    "uint256 amount",
+    "address receiver",
+    "address fromToken",
+    "address toToken",
+    "uint256 toChainId",
+    "uint256 bridgeFee",
+    "address nativeToken",
+    "bytes32 provider",
+  ],
   swap: [
     "address sellToken",
     "address buyToken",
@@ -58,7 +80,7 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   import: ["bytes32 protocol", "uint256 valueInUsd"],
   auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
-  "transaction-builder": ["bytes32 actionCount"],
+  "tx-builder": ["bytes32 actionCount"],
   permit2: [
     "address token",
     "address spender",
@@ -70,6 +92,8 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   "remove-signers": ["address[] signers"],
   "change-threshold": ["uint8 count"],
   rejection: ["bytes32 id"],
+  "avocado-bridge": ["bytes32 id", "uint256 toChainId"],
+  mass: ["bool isMass"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -97,6 +121,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
@@ -132,8 +174,21 @@ export const encodeCrossTransferMetadata = (
   params: CrossSendMetadataProps,
   single = true
 ) => {
-  const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes["cross-transfer"],
+
+  const type = params.provider ? MetadataEnums["cross-transfer-v2"] : MetadataEnums["cross-transfer"]
+
+  const encodedData = params.provider ? ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes[type],
+    [
+      params.fromToken,
+      params.toToken,
+      params.toChainId,
+      params.amount,
+      params.receiver,
+      params.provider
+    ]
+  ) : ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes[type],
     [
       params.fromToken,
       params.toToken,
@@ -144,7 +199,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums["cross-transfer"],
+    type: MetadataEnums[type],
     encodedData,
   });
 
@@ -182,12 +237,12 @@ export const encodeTransactionBuilderMetadata = (
   single = true
 ) => {
   const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes["transaction-builder"],
+    actionMetadataTypes["tx-builder"],
     [actionCount]
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums["transaction-builder"],
+    type: MetadataEnums["tx-builder"],
     encodedData,
   });
 
@@ -273,7 +328,21 @@ export const encodeBridgeMetadata = (
   params: BridgeMetadataProps,
   single = true
 ) => {
-  const encodedData = ethers.utils.defaultAbiCoder.encode(
+  const type = params.version === '2' ? MetadataEnums["bridge-v2"] : MetadataEnums.bridge
+
+  const encodedData = params.version === '2' ?  ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["bridge-v2"],
+    [
+      params.amount,
+      params.receiver,
+      params.fromToken,
+      params.toToken,
+      params.toChainId,
+      params.bridgeFee,
+      params.nativeToken,
+      params.provider
+    ]
+  ): ethers.utils.defaultAbiCoder.encode(
     actionMetadataTypes.bridge,
     [
       params.amount,
@@ -287,7 +356,7 @@ export const encodeBridgeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums.bridge,
+    type,
     encodedData,
   });
 
@@ -346,6 +415,15 @@ export const encodeImportMetadata = (
   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
@@ -388,11 +466,21 @@ export const decodeMetadata = (metadata: string) => {
 
 const iface = Forwarder__factory.createInterface();
 const ifaceMultisig = MultisigForwarder__factory.createInterface();
+const ifaceAgnostic = MultisigAgnosticForwarder__factory.createInterface();
 
 const getMetadataFromData = (data: string) => {
   let metadata = "0x";
 
-  if (data.startsWith("0x18e7f485")) {
+
+  if(data.startsWith('0xc5e15557')) {
+    const executeData = ifaceAgnostic.decodeFunctionData("executeChainAgnosticV1", data);
+
+    const metadata = executeData?.params_?.params?.metadata
+
+    return metadata === '0x' || !metadata ? null : metadata
+  }
+
+  else if (data.startsWith("0x18e7f485")) {
     const executeData = iface.decodeFunctionData("execute", data);
     if (executeData.metadata_ === "0x" || !executeData.metadata_) {
       return null;
@@ -448,6 +536,16 @@ const typesPayload: IPayload = {
     toChainId: data.toChainId ? data.toChainId.toString() : null,
     bridgeFee: toBN(data.bridgeFee).toFixed(),
   }),
+  'bridge-v2': (data, type) => ({
+    type: 'bridge',
+    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(),
+    provider: utils.parseBytes32String(data.provider || ""),
+  }),
   swap: (data, type) => ({
     type,
     buyAmount: toBN(data.buyAmount).toFixed(),
@@ -476,9 +574,9 @@ const typesPayload: IPayload = {
   deploy: (data, type) => ({
     type,
   }),
-  "transaction-builder": (data, type) => ({
+  "tx-builder": (data, type) => ({
     type,
-    actionCount: data.actionCount ? toBN(data.actionCount).toNumber() : 0,
+    actionCount: utils.parseBytes32String(data.actionCount || ""),
   }),
   permit2: (data, type) => ({
     type,
@@ -495,6 +593,15 @@ const typesPayload: IPayload = {
     amount: toBN(data.amount).toFixed(),
     receiver: data.receiver,
   }),
+  "cross-transfer-v2": (data, type) => ({
+    type: 'cross-transfer',
+    fromToken: data.fromToken,
+    toToken: data.toToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+    provider: utils.parseBytes32String(data.provider || ""),
+  }),
   auth: (data) => ({
     type: data.remove ? "remove-authority" : "add-authority",
     address: data.address,
@@ -521,6 +628,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) => {
@@ -542,7 +658,7 @@ 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
     );
@@ -565,6 +681,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());