@instadapp/avocado-base 0.0.0-dev.0a0d048 → 0.0.0-dev.0b204e7

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,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.0a0d048",
+  "version": "0.0.0-dev.0b204e7",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
@@ -29,7 +29,7 @@
     "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
     "ethers": "^5.7.2",
-    "viem": "^2.7.16",
+    "viem": "^2.10.5",
     "xxhashjs": "^0.2.2"
   }
 }

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,6 +21,7 @@ export const MetadataEnums = {
   "remove-signers": "remove-signers",
   "change-threshold": "change-threshold",
   import: "import",
+  mass: "mass",
   "tx-builder": "tx-builder",
   "avocado-bridge": "avocado-bridge",
 } as const;
@@ -36,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",
@@ -45,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",
@@ -72,6 +93,7 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   "change-threshold": ["uint8 count"],
   rejection: ["bytes32 id"],
   "avocado-bridge": ["bytes32 id", "uint256 toChainId"],
+  mass: ["bool isMass"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -152,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,
@@ -164,7 +199,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums["cross-transfer"],
+    type: MetadataEnums[type],
     encodedData,
   });
 
@@ -293,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,
@@ -307,7 +356,7 @@ export const encodeBridgeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums.bridge,
+    type,
     encodedData,
   });
 
@@ -366,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
@@ -408,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('0x320036b4')) {
+    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;
@@ -468,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(),
@@ -515,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,
@@ -546,6 +633,10 @@ const typesPayload: IPayload = {
     id: data.id,
     toChainId: data.toChainId ? data.toChainId.toString() : null,
   }),
+  mass: (data, type) => ({
+    type,
+    data,
+  }),
 };
 
 const parseMetadata = (metadata: string) => {
@@ -567,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
     );
@@ -590,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());

package/utils/network.ts

@@ -14,6 +14,8 @@ import {
   fuse,
   scroll,
   opBNB,
+  mode,
+  blast
 } from "viem/chains";
 import {
   AVO_PROD_CHAIN_NAME,
@@ -379,6 +381,7 @@ export const networks: Network[] = [
     name: "Scroll",
     chainId: 534352,
     color: "#78d64b",
+    ankrName: 'scroll',
     explorerUrl: "https://scrollscan.com",
     viemChain: scroll,
     fakeTransactionHash:
@@ -417,6 +420,46 @@ export const networks: Network[] = [
       },
     },
   },
+  {
+    chainId: 34443,
+    name: "Mode",
+    color: "#d7ff00",
+    explorerUrl: 'https://explorer.mode.network',
+    fakeTransactionHash: '0xb58002db3481f2c51855a91280ec940d0bebec075c4b362b9f90c21a2b14edbe',
+    params: {
+      rpcUrls: ["https://1rpc.io/mode"],
+      chainName: "Mode",
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      }
+    },
+    get serverRpcUrl() {
+      return process.env?.MODE_RPC_URL || this.params.rpcUrls[0];
+    },
+    viemChain: mode,
+  },
+  {
+    chainId: 81457,
+    name: "Blast",
+    color: "#78d64b",
+    explorerUrl: 'https://blastscan.io',
+    fakeTransactionHash: '0x934ed8516242f8c08bb9e0e90bb1f989d92ceb6b0333e86ac2d555f25ac27e58',
+    params: {
+      rpcUrls: ['https://rpc.ankr.com/blast'],
+      chainName: "Blast",
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      }
+    },
+    get serverRpcUrl() {
+      return process.env?.BLAST_RPC_URL || this.params.rpcUrls[0];
+    },
+    viemChain: blast,
+  },
   // {
   //   name: "Manta Pacific",
   //   chainId: 169,

package/utils/utils.d.ts

@@ -18,7 +18,9 @@ declare global {
     | 534352
     | 204
     | 63400
-    | 169;
+    | 169
+    | 34443
+    | 81457
 
   type ISlackMessageType = "danger" | "error" | "success" | "banner";
 
@@ -79,8 +81,10 @@ declare global {
     toChainId: string;
     amount: string;
     receiver: string;
+    provider?: string;
   };
 
+
   type AuthMetadataProps = {
     address: string;
     chainId: string;
@@ -106,6 +110,8 @@ declare global {
     toChainId: string;
     bridgeFee: string;
     nativeToken: string;
+    version?: string;
+    provider: string;
   };
 
   type SwapMetadataProps = {