@instadapp/avocado-base 0.0.0-dev.30dac02 → 0.0.0-dev.37aef1c

package/contracts/factories/Forwarder__factory.ts

@@ -535,7 +535,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -545,7 +545,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],
@@ -788,7 +788,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -798,7 +798,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],
@@ -1122,7 +1122,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -1132,7 +1132,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],
@@ -1393,7 +1393,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -1403,7 +1403,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],

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.30dac02",
+  "version": "0.0.0-dev.37aef1c",
   "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

@@ -42,6 +42,7 @@ const actionMetadataTypes = {
     "uint160 amount",
     "uint48 expiration",
   ],
+  "instadapp-pro": ["string castDetails"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -266,7 +267,7 @@ export const decodeMetadata = (data: string) => {
       } else {
         metadata = executeDataV2.params_.metadata;
       }
-    } else {
+    } else if (data.startsWith("0x85114d53")) {
       const executeDataV3 = iface.decodeFunctionData("executeV3", data);
       if (
         executeDataV3.params_.metadata === "0x" ||
@@ -276,6 +277,19 @@ export const decodeMetadata = (data: string) => {
       } 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 = [];
@@ -395,6 +409,13 @@ export const decodeMetadata = (data: string) => {
             remove: decodedData.remove,
           };
 
+          break;
+        case "instadapp-pro":
+          payload = {
+            type,
+            castDetails: decodedData.castDetails,
+          };
+
           break;
       }
 
@@ -403,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",

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

@@ -116,3 +116,15 @@ type MetadataProps = {
   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[];
+}