@instadapp/avocado-base 0.0.0-dev.d8050bd → 0.0.0-dev.dcb4af3

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/eslint.config.mjs

@@ -0,0 +1,34 @@
+// @ts-check
+import antfu from '@antfu/eslint-config'
+import withNuxt from './.nuxt/eslint.config.mjs'
+
+export default withNuxt(
+  antfu({
+    ignores: [
+      '*.png',
+      '*.ico',
+      '*.toml',
+      '*.yml',
+      '.github/',
+      'deployments/',
+      '*.patch',
+      '*.txt',
+      'Dockerfile',
+      'public/',
+      'contracts/',
+      'yarn.lock',
+    ],
+    yaml: false,
+    rules: {
+      'style/max-statements-per-line': 'off',
+      'max-statements-per-line': 'off',
+      '@stylistic/max-statements-per-line': 'off',
+      'vue/return-in-computed-property': 'off',
+      'no-console': 'off',
+      'ts/ban-ts-comment': 'off',
+      'vue/prop-name-casing': 'off',
+      'node/prefer-global/process': 'off',
+      'eqeqeq': 'off',
+    },
+  }),
+)

package/nuxt.config.ts

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

package/package.json

@@ -1,32 +1,32 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.d8050bd",
   "type": "module",
+  "version": "0.0.0-dev.dcb4af3",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
+  "engines": {
+    "node": ">=v20.16.0"
+  },
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "generate:contracts": "rimraf contracts && typechain --target=ethers-v5 'abi/*.json' --out-dir 'contracts'"
-  },
-  "devDependencies": {
-    "@instadapp/avocado": "^0.1.10",
-    "@instadapp/avocado-dev": "npm:@instadapp/avocado@dev",
-    "@nuxtjs/tailwindcss": "^6.6.5",
-    "@typechain/ethers-v5": "^10.2.0",
-    "nuxt": "^3.6.1",
-    "nuxt-svgo": "^3.1.0",
-    "rimraf": "^3.0.2",
-    "typechain": "^8.1.1",
-    "unplugin-vue-components": "^0.25.1",
-    "vue-tippy": "^6.0.0"
+    "typecheck": "nuxi typecheck"
   },
   "dependencies": {
+    "@antfu/eslint-config": "^3.6.2",
     "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
     "ethers": "^5.7.2",
+    "viem": "^2.21.54",
     "xxhashjs": "^0.2.2"
+  },
+  "devDependencies": {
+    "@nuxt/eslint": "^0.5.7",
+    "@nuxtjs/tailwindcss": "^6.12.1",
+    "nuxt": "3.13.2",
+    "nuxt-svgo": "^4.0.6",
+    "vue-tippy": "^6.0.0"
   }
 }

package/server/utils/index.ts

@@ -1,4 +1,4 @@
-export * from "../../utils/avocado";
-export * from "../../utils/network";
-export * from "../../utils/bignumber";
-export * from "../../utils/formatter";
+export * from '../../utils/avocado'
+export * from '../../utils/bignumber'
+export * from '../../utils/formatter'
+export * from '../../utils/network'

package/utils/avocado.ts

@@ -1,24 +1,24 @@
-export const AVO_PROD_CHAIN_ID = 634;
-export const AVO_PROD_CHAIN_NAME = "Avocado";
+export const AVO_PROD_CHAIN_ID = 634
+export const AVO_PROD_CHAIN_NAME = 'Avocado'
 
-export const AVO_STAGING_CHAIN_ID = 63400;
-export const AVO_STAGING_CHAIN_NAME = "Avocado Testnet";
+export const AVO_STAGING_CHAIN_ID = 63400
+export const AVO_STAGING_CHAIN_NAME = 'Avocado Testnet'
 
-export const AVO_PROD_EXPLORER_URL = "https://avoscan.co";
-export const AVO_STAGING_EXPLORER_URL = "https://explorer.avocado.instad.app";
+export const AVO_PROD_EXPLORER_URL = 'https://avoscan.co'
+export const AVO_STAGING_EXPLORER_URL = 'https://explorer.avocado.instad.app'
 
-export const AVO_PROD_FORWARDER_ADDR =
-  "0x375F6B0CD12b34Dc28e34C26853a37012C24dDE5";
-export const AVO_STAGING_FORWARDER_ADDR =
-  "0x8CDaAC0371a443985c6Faf07938dDAa7A5818674";
+export const AVO_PROD_FORWARDER_ADDR
+  = '0x375F6B0CD12b34Dc28e34C26853a37012C24dDE5'
+export const AVO_STAGING_FORWARDER_ADDR
+  = '0x8CDaAC0371a443985c6Faf07938dDAa7A5818674'
 
-export const AVO_PROD_DEPOSIT_ADDRESS =
-  "0xE8385fB3A5F15dED06EB5E20E5A81BF43115eb8E";
-export const AVO_STAGING_DEPOSIT_ADDRESS =
-  "0x853e991d800Dfd6bC1F83AED3310e859482323dc";
+export const AVO_PROD_DEPOSIT_ADDRESS
+  = '0xE8385fB3A5F15dED06EB5E20E5A81BF43115eb8E'
+export const AVO_STAGING_DEPOSIT_ADDRESS
+  = '0x853e991d800Dfd6bC1F83AED3310e859482323dc'
 
-export const AVO_PROD_RPC_URL = "https://rpc.avocado.instadapp.io";
+export const AVO_PROD_RPC_URL = 'https://rpc.avocado.instadapp.io'
 
-export const AVO_STAGING_RPC_URL = "https://rpc.avocado.instad.app";
+export const AVO_STAGING_RPC_URL = 'https://rpc.avocado.instad.app'
 
-export const blockQueryURL = "https://blockquery.instadapp.io";
+export const blockQueryURL = 'https://blockquery.instadapp.io'

package/utils/bignumber.ts

@@ -1,51 +1,62 @@
-import { BigNumber } from "bignumber.js";
-import { BigNumber as BN } from "ethers";
+import { BigNumber } from 'bignumber.js'
+import { BigNumber as BN } from 'ethers'
 
-type CombinedBigNumber = BigNumber | string | number;
+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();
-export const times = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).times(toBN(b));
-export const minus = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).minus(toBN(b));
-export const plus = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).plus(toBN(b));
-export const lte = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).lte(toBN(b));
-export const gte = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).gte(toBN(b));
-export const div = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).div(toBN(b));
-export const lt = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).lt(toBN(b));
-export const gt = (a: BigNumber.Value | BN, b: BigNumber.Value | BN) =>
-  toBN(a).gt(toBN(b));
-export const ensureValue = (value: any) => {
-  if (!value) return toBN("0");
-  if (toBN(value).isNaN()) return toBN("0");
+export function toBN(value: BigNumber.Value | BN) {
+  return new BigNumber(BN.isBigNumber(value) ? value.toString() : value)
+}
+export const isZero = (value: BigNumber.Value | BN) => toBN(value).isZero()
+export function times(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).times(toBN(b))
+}
+export function minus(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).minus(toBN(b))
+}
+export function plus(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).plus(toBN(b))
+}
+export function lte(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).lte(toBN(b))
+}
+export function gte(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).gte(toBN(b))
+}
+export function div(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).div(toBN(b))
+}
+export function lt(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).lt(toBN(b))
+}
+export function gt(a: BigNumber.Value | BN, b: BigNumber.Value | BN) {
+  return toBN(a).gt(toBN(b))
+}
+export function ensureValue(value: any) {
+  if (!value)
+    return toBN('0')
+  if (toBN(value).isNaN())
+    return toBN('0')
 
-  return toBN(value);
-};
-export const max = (...args: BigNumber.Value[]) => {
-  return BigNumber.max(...args);
-};
+  return toBN(value)
+}
+export function max(...args: BigNumber.Value[]) {
+  return BigNumber.max(...args)
+}
 
 export function pow(value: CombinedBigNumber, exponent: string | number) {
-  return toBN(value).pow(toBN(exponent));
+  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);
+  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));
+  return toBN(val).div(new BigNumber(10).pow(decimal))
 }
 
 export function abs(value: CombinedBigNumber) {
-  return toBN(value).abs();
+  return toBN(value).abs()
 }

package/utils/formatter.ts

@@ -1,94 +1,88 @@
 export function formatPercent(
   value?: number | string,
   fractionDigits = 2,
-  maxValue = null
+  maxValue = null,
 ) {
-  if (!value || isZero(value)) return "0.00%";
+  if (!value || isZero(value))
+    return '0.00%'
 
-  const valueAsNumber = toBN(value).toNumber();
+  const valueAsNumber = toBN(value).toNumber()
 
-  if (maxValue && gt(times(valueAsNumber, "100"), maxValue))
-    return `>${maxValue}%`;
+  if (maxValue && gt(times(valueAsNumber, '100'), maxValue))
+    return `>${maxValue}%`
 
-  const formatter = new Intl.NumberFormat("en-US", {
-    style: "percent",
+  const formatter = new Intl.NumberFormat('en-US', {
+    style: 'percent',
     minimumFractionDigits: fractionDigits,
     maximumFractionDigits: fractionDigits,
-  });
+  })
 
-  return formatter.format(valueAsNumber);
+  return formatter.format(valueAsNumber)
 }
 
-export function shortenHash(hash: string, length: number = 4) {
-  if (!hash) return;
-  if (hash.length < 12) return hash;
-  const beginningChars = hash.startsWith("0x") ? length + 2 : length;
-  const shortened =
-    hash.substr(0, beginningChars) + "..." + hash.substr(-length);
-  return shortened;
+export function shortenHash(hash: string | `0x${string}`, length: number = 4) {
+  if (!hash)
+    return
+  if (hash.length < 12)
+    return hash
+  const beginningChars = hash.startsWith('0x') ? length + 2 : length
+  const shortened
+    = `${hash.substr(0, beginningChars)}...${hash.substr(-length)}`
+  return shortened
 }
 
 export function formatUsd(value: any, fractionDigits = 2) {
-  const formatter = new Intl.NumberFormat("en-US", {
-    style: "currency",
-    currency: "USD",
+  const formatter = new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: 'USD',
     minimumFractionDigits: fractionDigits,
     maximumFractionDigits: fractionDigits,
-  });
+  })
 
-  return formatter.format(value);
+  return formatter.format(value)
 }
 
 export function signedNumber(numb: string | number) {
-  return new Intl.NumberFormat("en-US", {
-    signDisplay: "exceptZero",
-  }).format(toBN(numb).toNumber());
-}
-
-function getFractionDigits(value: string | number) {
-  const absoluteValue = toBN(value).abs();
-
-  if (isZero(absoluteValue)) {
-    return 2;
-  } else if (lt(absoluteValue, 0.01)) {
-    return 6;
-  } else if (lt(absoluteValue, 1)) {
-    return 4;
-  } else if (lt(absoluteValue, 10000)) {
-    return 2;
-  } else {
-    return 0;
-  }
+  return new Intl.NumberFormat('en-US', {
+    signDisplay: 'exceptZero',
+  }).format(toBN(numb).toNumber())
 }
 
 export function formatDecimal(value: string | number, fractionDigits?: number) {
   if (!value) {
-    value = "0";
+    value = '0'
+  }
+  if (lt(value, '0.0001') && gt(value, '0')) {
+    return '< 0.0001'
   }
-  if (lt(value, "0.0001") && gt(value, "0")) {
-    return "< 0.0001";
-  } else {
-    const num = toBN(value);
-    let decimals;
+  else {
+    const num = toBN(value)
+    let decimals
 
     if (num.lt(1)) {
-      decimals = 4;
-    } else if (num.lt(10)) {
-      decimals = 6;
-    } else if (num.lt(100)) {
-      decimals = 4;
-    } else if (num.lt(1000)) {
-      decimals = 3;
-    } else if (num.lt(10000)) {
-      decimals = 2;
-    } else if (num.lt(100000)) {
-      decimals = 1;
-    } else {
-      decimals = 0;
+      decimals = 4
+    }
+    else if (num.lt(10)) {
+      decimals = 6
+    }
+    else if (num.lt(100)) {
+      decimals = 4
+    }
+    else if (num.lt(1000)) {
+      decimals = 3
+    }
+    else if (num.lt(10000)) {
+      decimals = 2
+    }
+    else if (num.lt(100000)) {
+      decimals = 1
+    }
+    else {
+      decimals = 0
     }
 
-    const formattedNumber = num.toFixed(fractionDigits || decimals);
+    const formattedNumber = num.toFixed(fractionDigits || decimals)
 
-    return toBN(formattedNumber).toFormat();
+    return toBN(formattedNumber).toFormat()
   }
 }

package/utils/helper.ts

@@ -1,62 +1,65 @@
-export const indexSorter = (aIndex: number, bIndex: number) => {
+export function indexSorter(aIndex: number, bIndex: number) {
   if (aIndex === -1 && bIndex === -1) {
-    return 0; // fallback to other sorting criteria
-  } else if (aIndex === -1) {
-    return 1; // b comes first if a is not in the priority list
-  } else if (bIndex === -1) {
-    return -1; // a comes first if b is not in the priority list
-  } else {
-    return aIndex - bIndex; // sort by the index in the priority list
+    return 0 // fallback to other sorting criteria
   }
-};
+  else if (aIndex === -1) {
+    return 1 // b comes first if a is not in the priority list
+  }
+  else if (bIndex === -1) {
+    return -1 // a comes first if b is not in the priority list
+  }
+  else {
+    return aIndex - bIndex // sort by the index in the priority list
+  }
+}
 
 export function sortByMany<T>(
   items: T[],
-  callback: ((a: T, b: T) => number)[]
+  callback: ((a: T, b: T) => number)[],
 ) {
-  return items.sort(function (a, b) {
-    var result = 0;
-    for (var i = 0; i < callback.length; i++) {
-      var func = callback[i];
-      result = func(a, b);
+  return items.sort((a, b) => {
+    let result = 0
+    for (let i = 0; i < callback.length; i++) {
+      const func = callback[i]
+      result = func(a, b)
       if (result !== 0) {
-        break;
+        break
       }
     }
-    return result;
-  });
+    return result
+  })
 }
 
 export function cloneDeep<T>(value: T): T {
-  return JSON.parse(JSON.stringify(value));
+  return JSON.parse(JSON.stringify(value))
 }
 
 export function filterArray(array: any, filters: any) {
-  const filterKeys = Object.keys(filters);
+  const filterKeys = Object.keys(filters)
   return array.filter((item: any) => {
     // validates all filter criteria
     return filterKeys.every((key) => {
       // ignores non-function predicates
-      if (typeof filters[key] !== "function") return true;
-      return filters[key](item[key], item);
-    });
-  });
+      if (typeof filters[key] !== 'function')
+        return true
+      return filters[key](item[key], item)
+    })
+  })
 }
 
 export function onImageError(this: HTMLImageElement) {
-  const parentElement = this.parentElement;
-  this.onerror = null;
-  this.remove();
+  const parentElement = this.parentElement
+  this.onerror = null
+  this.remove()
 
   if (parentElement) {
-    parentElement.classList.add("bg-gray-300");
+    parentElement.classList.add('bg-gray-300')
   }
 }
 
 export function formatMultipleAddresses(addresses: string[], shorten = true) {
   const formatter = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' })
   const formattedString = formatter.format(addresses.map(i => shorten ? shortenHash(i) || '' : i))
-  
+
   return formattedString
 }
-