@instadapp/avocado-base 0.0.0-dev.9d62a67 → 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,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.9d62a67",
+  "version": "0.0.0-dev.9df0ab2",
   "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",
@@ -37,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",
@@ -46,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",
@@ -154,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,
@@ -166,7 +199,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums["cross-transfer"],
+    type: MetadataEnums[type],
     encodedData,
   });
 
@@ -295,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,
@@ -309,7 +356,7 @@ export const encodeBridgeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums.bridge,
+    type,
     encodedData,
   });
 
@@ -419,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;
@@ -479,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(),
@@ -526,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,
@@ -559,6 +635,7 @@ const typesPayload: IPayload = {
   }),
   mass: (data, type) => ({
     type,
+    data,
   }),
 };
 
@@ -581,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
     );
@@ -604,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

@@ -15,6 +15,8 @@ import {
   scroll,
   opBNB,
   mode,
+  blast,
+  linea
 } from "viem/chains";
 import {
   AVO_PROD_CHAIN_NAME,
@@ -76,7 +78,7 @@ export const networks: Network[] = [
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
     explorerUrl: "https://polygonscan.com",
-    apiURL: "https://api.polygonscan.com",
+    apiURL: "https://api.polygonscan.com/api",
     fakeTransactionHash:
       "0x906c551abd5873a428505b6530ac14d91367820706c7ee525f6d7313265d1c92",
     get serverRpcUrl() {
@@ -105,7 +107,7 @@ export const networks: Network[] = [
     fakeTransactionHash:
       "0x9fa291c3b09d31f19b1fa5dd05f30169d1364036d5f7c14b026410bc07bd8843",
     explorerUrl: "https://arbiscan.io",
-    apiURL: "https://api.arbiscan.io",
+    apiURL: "https://api.arbiscan.io/api",
     get serverRpcUrl() {
       return process.env?.ARBITRUM_RPC_URL || this.params.rpcUrls[0];
     },
@@ -129,7 +131,7 @@ export const networks: Network[] = [
     explorerUrl: "https://etherscan.io",
     fakeTransactionHash:
       "0x13232dd32cef2f641ead890a507710c96560c8c9c3d5fab6facb5ec563c49433",
-    apiURL: "https://api.etherscan.io",
+    apiURL: "https://api.etherscan.io/api",
     color: "#5D5FEF",
     get serverRpcUrl() {
       return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
@@ -154,7 +156,7 @@ export const networks: Network[] = [
     explorerUrl: "https://basescan.org",
     fakeTransactionHash:
       "0xf7833d80da33730c4fc5d4c64151f0eaa64c0c0535be022af0228a44cc4e9c8e",
-    apiURL: "https://api.basescan.org",
+    apiURL: "https://api.basescan.org/api",
     get serverRpcUrl() {
       return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
     },
@@ -178,7 +180,7 @@ export const networks: Network[] = [
     color: "#FF0420",
     viemChain: optimism,
     chainId: 10,
-    apiURL: "https://api-optimistic.etherscan.io",
+    apiURL: "https://api-optimistic.etherscan.io/api",
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
     fakeTransactionHash:
@@ -204,7 +206,7 @@ export const networks: Network[] = [
     ankrName: "polygon_zkevm",
     viemChain: polygonZkEvm,
     explorerUrl: "https://zkevm.polygonscan.com",
-    apiURL: "https://api-zkevm.polygonscan.com",
+    apiURL: "https://api-zkevm.polygonscan.com/api",
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
     fakeTransactionHash:
       "0x1077130463ade91ad4e9c43c3195298e26a99970975238128912490eea12bf41",
@@ -233,7 +235,7 @@ export const networks: Network[] = [
     viemChain: bsc,
     fakeTransactionHash:
       "0x897d54bf8e492f840bd4d8f1e743bfcab8226ab4d5a899e47ee433dcd6d6abf7",
-    apiURL: "https://api.bscscan.com",
+    apiURL: "https://api.bscscan.com/api",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
     balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
     get serverRpcUrl() {
@@ -262,7 +264,7 @@ export const networks: Network[] = [
     explorerUrl: "https://snowtrace.io",
     fakeTransactionHash:
       "0x233aac7402558dd4e23f938a50f983e67f5c9604233981c7ac74e63737b8294e",
-    apiURL: "https://api.snowtrace.io",
+    apiURL: "https://api.routescan.io/v2/network/mainnet/evm/43114/etherscan/api",
     get serverRpcUrl() {
       return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
     },
@@ -281,6 +283,7 @@ export const networks: Network[] = [
     chainId: 250,
     zerionName: "fantom",
     explorerUrl: "https://ftmscan.com",
+    apiURL: 'https://api.ftmscan.com/api',
     ankrName: "fantom",
     color: "#1969ff",
     viemChain: fantom,
@@ -313,7 +316,7 @@ export const networks: Network[] = [
     explorerUrl: "https://gnosisscan.io",
     fakeTransactionHash:
       "0x1513033806310a2c3b29f2276f8aa7388461b0ef9f8499c297e68c12187c179b",
-    apiURL: "https://api.gnosisscan.io",
+    apiURL: "https://api.gnosisscan.io/api",
     usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
     get serverRpcUrl() {
       return process.env?.GNOSIS_RPC_URL || this.params.rpcUrls[0];
@@ -335,6 +338,7 @@ export const networks: Network[] = [
     color: "#78d64b",
     viemChain: aurora,
     explorerUrl: "https://explorer.mainnet.aurora.dev",
+    apiURL:'https://explorer.mainnet.aurora.dev/api/v2',
     fakeTransactionHash:
       "0x0923401c5a80c39a5cd57c098a6c4729edbefd0db6894def7d349493f4ff3ec6",
     get serverRpcUrl() {
@@ -358,6 +362,7 @@ export const networks: Network[] = [
     zerionName: "fuse",
     color: "#78d64b",
     explorerUrl: "https://explorer.fuse.io",
+    apiURL: 'https://explorer.fuse.io/api/v2',
     viemChain: fuse,
     fakeTransactionHash:
       "0xf22a8031de9b978a57c728e18c6b54633356c39db4d0466e53b9b7c3ee7f8def",
@@ -382,6 +387,7 @@ export const networks: Network[] = [
     color: "#78d64b",
     ankrName: 'scroll',
     explorerUrl: "https://scrollscan.com",
+    apiURL: 'https://api.scrollscan.com/api',
     viemChain: scroll,
     fakeTransactionHash:
       "0x6bf297c414264fc8cddd47224632b4426a02138df2f50fe891eca87f6aefea01",
@@ -403,6 +409,7 @@ export const networks: Network[] = [
     chainId: 204,
     color: "#78d64b",
     explorerUrl: "https://opbnbscan.com",
+    apiURL: null,
     viemChain: opBNB,
     fakeTransactionHash:
       "0xb9438a3eae61442bc7d419d79930370ce09ac0f46e0695025751e3bfe1a931e7",
@@ -425,6 +432,7 @@ export const networks: Network[] = [
     color: "#d7ff00",
     explorerUrl: 'https://explorer.mode.network',
     fakeTransactionHash: '0xb58002db3481f2c51855a91280ec940d0bebec075c4b362b9f90c21a2b14edbe',
+    apiURL: 'https://explorer.mode.network/api/v2',
     params: {
       rpcUrls: ["https://1rpc.io/mode"],
       chainName: "Mode",
@@ -439,6 +447,49 @@ export const networks: Network[] = [
     },
     viemChain: mode,
   },
+  {
+    chainId: 81457,
+    name: "Blast",
+    color: "#78d64b",
+    explorerUrl: 'https://blastscan.io',
+    apiURL:'https://api.blastscan.io/api',
+    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,
+  },
+  // {
+  //   chainId: 59144,
+  //   name: "Linea",
+  //   apiURL: "https://api.lineascan.build/api",
+  //   color: "#78d64b",
+  //   explorerUrl: "https://lineascan.build",
+  //   params: {
+  //     rpcUrls: ["https://linea-mainnet.public.blastapi.io"],
+  //     chainName: "Linea",
+  //     "nativeCurrency": {
+  //       "name": "Linea Ether",
+  //       "symbol": "ETH",
+  //       "decimals": 18
+  //     },
+  //   },
+  //   fakeTransactionHash: '0x62d068a66eb1515a09e993200e8a495c7fead512689ba78e50523c8e83bbf5b5',
+  //   get serverRpcUrl() {
+  //     return process.env?.LINEA_RPC_URL || this.params.rpcUrls[0];
+  //   },
+  //   viemChain: linea,
+  //   ankrName:'linea',
+  // },
   // {
   //   name: "Manta Pacific",
   //   chainId: 169,
@@ -461,6 +512,7 @@ export const networks: Network[] = [
   {
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
+    apiURL:null,
     isAvocado: true,
     balanceResolverAddress: "",
     fakeTransactionHash: "",
@@ -482,6 +534,7 @@ export const networks: Network[] = [
   },
   {
     name: AVO_STAGING_CHAIN_NAME,
+    apiURL: null,
     chainId: AVO_STAGING_CHAIN_ID,
     serverRpcUrl: AVO_STAGING_RPC_URL,
     color: "#16A34A",

package/utils/utils.d.ts

@@ -20,6 +20,8 @@ declare global {
     | 63400
     | 169
     | 34443
+    | 81457
+    | 59144
 
   type ISlackMessageType = "danger" | "error" | "success" | "banner";
 
@@ -43,7 +45,8 @@ declare global {
     explorerUrl: string;
     fakeTransactionHash: string;
     viemChain: Chain;
-    apiURL?: string;
+    // must start with https://
+    apiURL: `https://${string}` | null;
     params: {
       chainName?: string;
       iconUrls?: string[];
@@ -80,8 +83,10 @@ declare global {
     toChainId: string;
     amount: string;
     receiver: string;
+    provider?: string;
   };
 
+
   type AuthMetadataProps = {
     address: string;
     chainId: string;
@@ -107,6 +112,8 @@ declare global {
     toChainId: string;
     bridgeFee: string;
     nativeToken: string;
+    version?: string;
+    provider: string;
   };
 
   type SwapMetadataProps = {