@instadapp/avocado-base 0.1.1 → 0.1.3

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.1.1",
+  "version": "0.1.3",
   "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",
@@ -46,6 +47,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",
@@ -295,7 +306,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 +334,7 @@ export const encodeBridgeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums.bridge,
+    type,
     encodedData,
   });
 
@@ -419,11 +444,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;
@@ -479,6 +514,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(),
@@ -582,7 +627,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
     );
@@ -605,6 +650,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,7 @@ import {
   scroll,
   opBNB,
   mode,
+  blast
 } from "viem/chains";
 import {
   AVO_PROD_CHAIN_NAME,
@@ -439,6 +440,26 @@ export const networks: Network[] = [
     },
     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

@@ -20,6 +20,7 @@ declare global {
     | 63400
     | 169
     | 34443
+    | 81457
 
   type ISlackMessageType = "danger" | "error" | "success" | "banner";
 
@@ -107,6 +108,8 @@ declare global {
     toChainId: string;
     bridgeFee: string;
     nativeToken: string;
+    version?: string;
+    provider: string;
   };
 
   type SwapMetadataProps = {