@instadapp/avocado-base 0.0.0-dev.02731e3 → 0.0.0-dev.0cd0f72

package/nuxt.config.ts

@@ -1,4 +1,20 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
+import ViteComponents from "unplugin-vue-components/vite";
+
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss"],
+  modules: ["@nuxtjs/tailwindcss", "nuxt-svgo", "@vueuse/nuxt"],
+  svgo: {
+    defaultImport: "component",
+    autoImportPath: "./assets/images/icons",
+    svgoConfig: {
+      plugins: ["prefixIds"],
+    },
+  },
+  vite: {
+    plugins: [
+      ViteComponents({
+        dts: true,
+      }),
+    ],
+  },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.02731e3",
+  "version": "0.0.0-dev.0cd0f72",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
@@ -16,11 +16,14 @@
     "@instadapp/avocado-dev": "npm:@instadapp/avocado@dev",
     "@nuxtjs/tailwindcss": "^6.6.5",
     "@typechain/ethers-v5": "^10.2.0",
-    "nuxt": "^3.3.3",
+    "nuxt": "^3.6.1",
+    "nuxt-svgo": "^3.1.0",
     "rimraf": "^3.0.2",
-    "typechain": "^8.1.1"
+    "typechain": "^8.1.1",
+    "unplugin-vue-components": "^0.25.1"
   },
   "dependencies": {
+    "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
     "ethers": "^5.7.2"
   }

package/utils/avocado.ts

@@ -20,3 +20,5 @@ export const AVO_STAGING_DEPOSIT_ADDRESS =
 export const AVO_PROD_RPC_URL = "https://rpc.avocado.instadapp.io";
 
 export const AVO_STAGING_RPC_URL = "https://rpc.avocado.instad.app";
+
+export const blockQueryURL = "https://blockquery.instadapp.io";

package/utils/bignumber.ts

@@ -1,6 +1,8 @@
 import { BigNumber } from "bignumber.js";
 import { BigNumber as BN } from "ethers";
 
+type CombinedBigNumber = BigNumber | string | number;
+
 export const toBN = (value: BigNumber.Value | BN) =>
   new BigNumber(BN.isBigNumber(value) ? value.toString() : value);
 export const isZero = (value: BigNumber.Value | BN) => toBN(value).isZero();
@@ -29,3 +31,21 @@ export const ensureValue = (value: any) => {
 export const max = (...args: BigNumber.Value[]) => {
   return BigNumber.max(...args);
 };
+
+export function pow(value: CombinedBigNumber, exponent: string | number) {
+  return toBN(value).pow(toBN(exponent));
+}
+
+export function toWei(val: CombinedBigNumber, decimals: number): string {
+  const num = toBN(val);
+  const multiplier = pow(10, decimals);
+  return times(num, multiplier).toFixed(0);
+}
+
+export function fromWei(val: CombinedBigNumber, decimal = 18) {
+  return toBN(val).div(new BigNumber(10).pow(decimal));
+}
+
+export function abs(value: CombinedBigNumber) {
+  return toBN(value).abs();
+}

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[]"];
 
@@ -34,6 +34,7 @@ const actionMetadataTypes = {
   "gas-topup": ["uint256 amount", "address token", "address onBehalf"],
   upgrade: ["bytes32 version", "address walletImpl"],
   dapp: ["string name", "string url"],
+  auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
   permit2: [
     "address token",
@@ -41,6 +42,7 @@ const actionMetadataTypes = {
     "uint160 amount",
     "uint48 expiration",
   ],
+  "instadapp-pro": ["string castDetails"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -108,6 +110,23 @@ export const encodeCrossTransferMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeAuthMetadata = (
+  params: AuthMetadataProps,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["auth"],
+    [params.address, params.chainId, params.remove]
+  );
+
+  const data = encodeMetadata({
+    type: "auth",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
     type: "deploy",
@@ -238,7 +257,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" ||
@@ -248,6 +267,29 @@ export const decodeMetadata = (data: string) => {
       } else {
         metadata = executeDataV2.params_.metadata;
       }
+    } else if (data.startsWith("0x85114d53")) {
+      const executeDataV3 = iface.decodeFunctionData("executeV3", data);
+      if (
+        executeDataV3.params_.metadata === "0x" ||
+        !executeDataV3.params_.metadata
+      ) {
+        return null;
+      } else {
+        metadata = executeDataV3.params_.metadata;
+      }
+    } else {
+      const executeDataMultisigV3 = iface.decodeFunctionData(
+        "executeMultisigV3",
+        data
+      );
+      if (
+        executeDataMultisigV3.params_.metadata === "0x" ||
+        !executeDataMultisigV3.params_.metadata
+      ) {
+        return null;
+      } else {
+        metadata = executeDataMultisigV3.params_.metadata;
+      }
     }
 
     const metadataArr = [];
@@ -356,6 +398,24 @@ export const decodeMetadata = (data: string) => {
             receiver: decodedData.receiver,
           };
 
+          break;
+        case "auth":
+          payload = {
+            type: decodedData.remove ? "remove-authority" : "add-authority",
+            address: decodedData.address,
+            chainId: decodedData.chainId
+              ? decodedData.chainId.toString()
+              : null,
+            remove: decodedData.remove,
+          };
+
+          break;
+        case "instadapp-pro":
+          payload = {
+            type,
+            castDetails: decodedData.castDetails,
+          };
+
           break;
       }
 
@@ -364,7 +424,7 @@ export const decodeMetadata = (data: string) => {
 
     return metadataArr;
   } catch (e) {
-    console.log(e);
+    // console.log(e);
     return null;
   }
 };

package/utils/network.ts

@@ -4,7 +4,7 @@ export const bridgeDisabledNetworks = [1101];
 
 export const networks: Network[] = [
   {
-    name: "Mainnet",
+    name: "Ethereum",
     debankName: "eth",
     ankrName: "eth",
     zerionName: "ethereum",
@@ -114,7 +114,7 @@ export const networks: Network[] = [
         symbol: "AVAX",
         decimals: 18,
       },
-      rpcUrls: ["https://api.avax.network/ext/bc/C/rpc"],
+      rpcUrls: ["https://rpc.ankr.com/avalanche"],
     },
   },
   {
@@ -174,7 +174,7 @@ export const networks: Network[] = [
     },
     params: {
       chainName: "polygon zkEVM",
-      rpcUrls: ["https://rpc.ankr.com/polygon_zkevm"],
+      rpcUrls: ["https://zkevm-rpc.com"],
 
       nativeCurrency: {
         name: "Ethereum",
@@ -183,26 +183,27 @@ 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,

package/utils/services.ts

@@ -0,0 +1,14 @@
+export const fetchTokenByAddress = async (
+  address: string,
+  chainId: string | number
+) => {
+  if (!address || !chainId) return null;
+  const [token] = (await $fetch(`${blockQueryURL}/${chainId}/tokens`, {
+    params: {
+      sparkline: false,
+      "addresses[]": [address],
+    },
+  })) as ITokenPrice[];
+
+  return token;
+};

package/utils/utils.d.ts

@@ -64,6 +64,12 @@ type CrossSendMetadataProps = {
   receiver: string;
 };
 
+type AuthMetadataProps = {
+  address: string;
+  chainId: string;
+  remove: boolean;
+};
+
 type UpgradeMetadataProps = {
   version: string;
   walletImpl: string;
@@ -105,7 +111,20 @@ type MetadataProps = {
     | "dapp"
     | "deploy"
     | "permit2"
-    | "cross-transfer";
+    | "cross-transfer"
+    | "auth";
   encodedData: string;
   version?: string;
 };
+
+interface ITokenPrice {
+  address: string;
+  chain_id: string;
+  name: string;
+  symbol: string;
+  decimals: number;
+  logo_url: string;
+  price: string;
+  coingecko_id: string;
+  sparkline_price_7d: number[];
+}