@instadapp/avocado-base 0.0.0-dev.2b4b2a8 → 0.0.0-dev.39149d7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.2b4b2a8",
+  "version": "0.0.0-dev.39149d7",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",

package/utils/metadata.ts

@@ -1,5 +1,5 @@
 import { ethers, utils } from "ethers";
-import { Forwarder__factory } from "@/contracts";
+import { Forwarder__factory } from "../contracts";
 
 const multiMetadataTypes = ["bytes[]"];
 
@@ -7,6 +7,13 @@ const metadataTypes = ["bytes32 type", "uint8 version", "bytes data"];
 
 const actionMetadataTypes = {
   transfer: ["address token", "uint256 amount", "address receiver"],
+  "cross-transfer": [
+    "address fromToken",
+    "address toToken",
+    "uint256 toChainId",
+    "uint256 amount",
+    "address receiver",
+  ],
   bridge: [
     "uint256 amount",
     "address receiver",
@@ -78,6 +85,29 @@ export const encodeTransferMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeCrossTransferMetadata = (
+  params: CrossSendMetadataProps,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["cross-transfer"],
+    [
+      params.fromToken,
+      params.toToken,
+      params.toChainId,
+      params.amount,
+      params.receiver,
+    ]
+  );
+
+  const data = encodeMetadata({
+    type: "cross-transfer",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
     type: "deploy",
@@ -208,7 +238,7 @@ export const decodeMetadata = (data: string) => {
       } else {
         metadata = executeData.metadata_;
       }
-    } else {
+    } else if (data.startsWith("0x14f80a8d")) {
       const executeDataV2 = iface.decodeFunctionData("executeV2", data);
       if (
         executeDataV2.params_.metadata === "0x" ||
@@ -218,6 +248,16 @@ export const decodeMetadata = (data: string) => {
       } else {
         metadata = executeDataV2.params_.metadata;
       }
+    } else {
+      const executeDataV3 = iface.decodeFunctionData("executeV3", data);
+      if (
+        executeDataV3.params_.metadata === "0x" ||
+        !executeDataV3.params_.metadata
+      ) {
+        return null;
+      } else {
+        metadata = executeDataV3.params_.metadata;
+      }
     }
 
     const metadataArr = [];
@@ -302,6 +342,7 @@ export const decodeMetadata = (data: string) => {
           payload = {
             type,
           };
+          break;
 
         case "permit2":
           payload = {
@@ -311,6 +352,19 @@ export const decodeMetadata = (data: string) => {
             amount: toBN(decodedData.amount).toFixed(),
             expiration: decodedData.expiration,
           };
+          break;
+
+        case "cross-transfer":
+          payload = {
+            type,
+            fromToken: decodedData.fromToken,
+            toToken: decodedData.toToken,
+            toChainId: decodedData.toChainId
+              ? decodedData.toChainId.toString()
+              : null,
+            amount: toBN(decodedData.amount).toFixed(),
+            receiver: decodedData.receiver,
+          };
 
           break;
       }

package/utils/network.ts

@@ -10,6 +10,7 @@ export const networks: Network[] = [
     zerionName: "ethereum",
     chainId: 1,
     explorerUrl: "https://etherscan.io",
+    color: "#5D5FEF",
     get serverRpcUrl() {
       return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
     },
@@ -29,6 +30,7 @@ export const networks: Network[] = [
     debankName: "matic",
     ankrName: "polygon",
     zerionName: "polygon",
+    color: "#7A4ADD",
     chainId: 137,
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
@@ -51,6 +53,7 @@ export const networks: Network[] = [
     debankName: "arb",
     ankrName: "arbitrum",
     zerionName: "arbitrum",
+    color: "#2D374B",
     chainId: 42161,
     usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
@@ -73,6 +76,7 @@ export const networks: Network[] = [
     debankName: "op",
     ankrName: "optimism",
     zerionName: "optimism",
+    color: "#FF0420",
     chainId: 10,
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
@@ -95,6 +99,7 @@ export const networks: Network[] = [
     debankName: "avax",
     ankrName: "avalanche",
     zerionName: "avalanche",
+    color: "#EB5757",
     chainId: 43114,
     usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
     balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
@@ -117,6 +122,7 @@ export const networks: Network[] = [
     debankName: "bsc",
     ankrName: "bsc",
     zerionName: "binance-smart-chain",
+    color: "#F3BA2F",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
@@ -138,6 +144,7 @@ export const networks: Network[] = [
     name: "Gnosis",
     debankName: "xdai",
     zerionName: "xdai",
+    color: "#04795C",
     chainId: 100,
     balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
     explorerUrl: "https://gnosisscan.io",
@@ -158,6 +165,7 @@ export const networks: Network[] = [
   {
     name: "Polygon zkEVM",
     chainId: 1101,
+    color: "#8544f6",
     explorerUrl: "https://zkevm.polygonscan.com",
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
     usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
@@ -175,32 +183,34 @@ export const networks: Network[] = [
       },
     },
   },
-  // {
-  //   name: "Aurora",
-  //   chainId: 1313161554,
-  //   zerionName: "aurora",
-  //   explorerUrl: "https://explorer.mainnet.aurora.dev",
-  //   get serverRpcUrl() {
-  //     return process.env?.AURORA_RPC_URL || this.params.rpcUrls[0];
-  //   },
-  //   usdcAddress: "0xB12BFcA5A55806AaF64E99521918A4bf0fC40802",
-  //   balanceResolverAddress: "0xdF19Da523DA64bBE82eE0E4DFf00d676A8386474",
-  //   params: {
-  //     rpcUrls: ["https://mainnet.aurora.dev"],
-  //     chainName: "Aurora",
-  //     nativeCurrency: {
-  //       decimals: 18,
-  //       name: "Aurora ETH",
-  //       symbol: "AETH",
-  //     },
-  //   },
-  // },
+  {
+    name: "Aurora",
+    chainId: 1313161554,
+    zerionName: "aurora",
+    color: "#78d64b",
+    explorerUrl: "https://explorer.mainnet.aurora.dev",
+    get serverRpcUrl() {
+      return process.env?.AURORA_RPC_URL || this.params.rpcUrls[0];
+    },
+    usdcAddress: "0xB12BFcA5A55806AaF64E99521918A4bf0fC40802",
+    balanceResolverAddress: "0xdF19Da523DA64bBE82eE0E4DFf00d676A8386474",
+    params: {
+      rpcUrls: ["https://mainnet.aurora.dev"],
+      chainName: "Aurora",
+      nativeCurrency: {
+        decimals: 18,
+        name: "Aurora ETH",
+        symbol: "AETH",
+      },
+    },
+  },
   {
     name: "Fantom",
     chainId: 250,
     zerionName: "fantom",
     explorerUrl: "https://ftmscan.com",
     ankrName: "fantom",
+    color: "#1969ff",
     get serverRpcUrl() {
       return process.env?.FANTOM_RPC_URL || this.params.rpcUrls[0];
     },
@@ -221,6 +231,7 @@ export const networks: Network[] = [
     chainId: AVO_PROD_CHAIN_ID,
     isAvocado: true,
     balanceResolverAddress: "",
+    color: "#16A34A",
     usdcAddress: "",
     serverRpcUrl: AVO_PROD_RPC_URL,
     explorerUrl: AVO_PROD_EXPLORER_URL,
@@ -239,6 +250,7 @@ export const networks: Network[] = [
     name: AVO_STAGING_CHAIN_NAME,
     chainId: AVO_STAGING_CHAIN_ID,
     serverRpcUrl: AVO_STAGING_RPC_URL,
+    color: "#16A34A",
     explorerUrl: AVO_STAGING_EXPLORER_URL,
     isAvocado: true,
     balanceResolverAddress: "",

package/utils/utils.d.ts

@@ -20,6 +20,7 @@ interface Network {
   ankrName?: string;
   zerionName?: string;
   chainId: ChainId;
+  color: string;
   isAvocado?: boolean;
   serverRpcUrl: string | undefined;
   balanceResolverAddress?: string;
@@ -55,6 +56,14 @@ type SendMetadataProps = {
   receiver: string;
 };
 
+type CrossSendMetadataProps = {
+  fromToken: string;
+  toToken: string;
+  toChainId: string;
+  amount: string;
+  receiver: string;
+};
+
 type UpgradeMetadataProps = {
   version: string;
   walletImpl: string;
@@ -95,7 +104,8 @@ type MetadataProps = {
     | "upgrade"
     | "dapp"
     | "deploy"
-    | "permit2";
+    | "permit2"
+    | "cross-transfer";
   encodedData: string;
   version?: string;
 };