Merge pull request #964 from mars-protocol/develop

v2.4.0

Author: linkielink

.env.example

@@ -5,8 +5,6 @@ NEXT_PUBLIC_WALLET_CONNECT_ID=0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x
 ### Optional Environment Variables
 NEXT_PUBLIC_OSMOSIS_RPC=https://rpc-osmosis.blockapsis.com
 NEXT_PUBLIC_OSMOSIS_REST=https://lcd-osmosis.blockapsis.com
-NEXT_PUBLIC_OSMOSIS_TEST_RPC=https://rpc.devnet.osmosis.zone
-NEXT_PUBLIC_OSMOSIS_TEST_REST=https://lcd.devnet.osmosis.zone
 NEXT_PUBLIC_NEUTRON_TEST_RPC=https://rpc-palvus.pion-1.ntrn.tech
 NEXT_PUBLIC_NEUTRON_TEST_REST=https://rest-palvus.pion-1.ntrn.tech
 

.eslintignore

@@ -0,0 +1,44 @@
+const ts = require('@typescript-eslint/eslint-plugin')
+const tsParser = require('@typescript-eslint/parser')
+const functional = require('eslint-plugin-functional')
+const imprt = require('eslint-plugin-import')
+
+module.exports = [
+  {
+    files: ['src/**/*.ts', 'src/**/*.tsx'],
+    ignores: [
+      'src/utils/charting_library/*',
+      'src/utils/datafeeds/*',
+      'src/utils/health_computer/*',
+      'src/types/generated/**/*',
+    ],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        ecmaFeatures: { modules: true },
+        ecmaVersion: 'latest',
+        project: './tsconfig.json',
+      },
+    },
+    plugins: {
+      functional,
+      import: imprt,
+      '@typescript-eslint': ts,
+      ts,
+    },
+    rules: {
+      '@typescript-eslint/no-empty-interface': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      'require-jsdoc': 'off',
+      'linebreak-style': ['warn', 'unix'],
+      'sort-imports': [
+        'warn',
+        {
+          ignoreCase: true,
+          ignoreDeclarationSort: true,
+        },
+      ],
+    },
+  },
+]

.eslintrc.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.3.5",
+  "version": "2.4.0",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",
@@ -21,10 +21,10 @@
   },
   "dependencies": {
     "@cosmjs/cosmwasm-stargate": "^0.32.3",
-    "@delphi-labs/shuttle-react": "^3.22.0",
-    "@keplr-wallet/cosmos": "^0.12.88",
+    "@delphi-labs/shuttle-react": "^3.24.0",
+    "@keplr-wallet/cosmos": "^0.12.101",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@tanstack/react-table": "^8.16.0",
+    "@tanstack/react-table": "^8.17.3",
     "@tippyjs/react": "^4.2.6",
     "bignumber.js": "^9.1.2",
     "classnames": "^2.5.1",
@@ -35,17 +35,17 @@
     "mobx": "^6.12.3",
     "moment": "^2.30.1",
     "next": "^14.2.3",
-    "react": "^18.3.1",
+    "react": "18.3.1",
     "react-device-detect": "^2.2.3",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-draggable": "^4.4.6",
-    "react-helmet-async": "^2.0.4",
-    "react-qr-code": "^2.0.12",
+    "react-helmet-async": "^2.0.5",
+    "react-qr-code": "^2.0.14",
     "react-router-dom": "^6.23.1",
     "react-spring": "^9.7.3",
     "react-toastify": "^10.0.5",
     "react-use-clipboard": "^1.0.9",
-    "recharts": "^2.12.6",
+    "recharts": "^2.12.7",
     "swr": "^2.2.5",
     "tailwind-scrollbar-hide": "^1.1.7",
     "zustand": "^4.5.2"
@@ -55,24 +55,29 @@
     "@types/debounce-promise": "^3.1.9",
     "@types/lodash.debounce": "^4.0.9",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/node": "^20.12.11",
-    "@types/react": "18.3.1",
+    "@types/node": "^20.14.2",
+    "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@types/react-helmet": "^6.1.11",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "eslint-plugin-functional": "^6.5.1",
+    "eslint-plugin-import": "^2.29.1",
     "autoprefixer": "^10.4.19",
     "dotenv": "^16.4.5",
-    "dotenv-cli": "^7.4.1",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^14.2.3",
-    "eslint-plugin-import": "^2.29.1",
+    "dotenv-cli": "^7.4.2",
+    "eslint": "^9.4.0",
     "husky": "^9.0.11",
     "identity-obj-proxy": "^3.0.0",
-    "lint-staged": "^15.2.2",
-    "prettier": "^3.2.5",
-    "prettier-plugin-tailwindcss": "^0.5.14",
+    "lint-staged": "^15.2.5",
+    "prettier": "^3.3.1",
+    "prettier-plugin-tailwindcss": "^0.6.2",
     "shelljs": "^0.8.5",
-    "tailwindcss": "^3.4.3",
-    "typescript": "5.3.3"
+    "tailwindcss": "^3.4.4",
+    "typescript": "5.4.5"
+  },
+  "resolutions": {
+    "@cosmjs/encoding": "0.32.3"
   },
   "engines": {
     "npm": "please-use-yarn",

eslint.config.js

@@ -1,13 +1,13 @@
 import { cacheFn, positionsCache } from 'api/cache'
 import { getCreditManagerQueryClient } from 'api/cosmwasm-client'
-import getPrices from 'api/prices/getPrices'
 import getDepositedVaults from 'api/vaults/getDepositedVaults'
 import { BNCoin } from 'types/classes/BNCoin'
 import { Positions } from 'types/generated/mars-credit-manager/MarsCreditManager.types'
 import { resolvePerpsPositions, resolvePerpsVaultPositions } from 'utils/resolvers'
 
 export default async function getAccount(
   chainConfig: ChainConfig,
+  assets: Asset[],
   accountId?: string,
 ): Promise<Account> {
   if (!accountId) return new Promise((_, reject) => reject('No account ID found'))
@@ -20,11 +20,9 @@ export default async function getAccount(
     `${chainConfig.id}/account/${accountId}`,
   )
 
-  const prices = await getPrices(chainConfig)
-
   const accountKind = await creditManagerQueryClient.accountKind({ accountId: accountId })
 
-  const depositedVaults = await getDepositedVaults(accountId, chainConfig, accountPosition)
+  const depositedVaults = await getDepositedVaults(accountId, chainConfig, assets, accountPosition)
 
   if (accountPosition) {
     return {
@@ -34,7 +32,7 @@ export default async function getAccount(
       deposits: accountPosition.deposits.map((deposit) => new BNCoin(deposit)),
       vaults: depositedVaults,
       perpsVault: resolvePerpsVaultPositions(accountPosition.perp_vault),
-      perps: resolvePerpsPositions(accountPosition.perps, prices),
+      perps: resolvePerpsPositions(accountPosition.perps, assets),
       kind: accountKind,
     }
   }

package.json

@@ -0,0 +1,15 @@
+import { convertAstroportAssetsResponse } from 'utils/assets'
+
+export default async function getAssets(chainConfig: ChainConfig) {
+  const uri = new URL(chainConfig.endpoints.dexAssets)
+  try {
+    const assets = await fetch(uri.toString()).then(async (res) => {
+      const data = (await res.json()) as AstroportAsset[]
+      return convertAstroportAssetsResponse(data)
+    })
+    return assets
+  } catch (e) {
+    console.error(e)
+  }
+  return []
+}

src/api/accounts/getAccount.ts

@@ -17,14 +17,14 @@ import {
 
 interface Cache<T> extends Map<string, { data: T | null; timestamp: number }> {}
 
-let totalRequests: number = 0
-let cachedRequests: number = 0
+let totalRequests = 0
+let cachedRequests = 0
 
 export async function cacheFn<T>(
   fn: () => Promise<T>,
   cache: Cache<T>,
   key: string,
-  staleAfter: number = 5,
+  staleAfter = 5,
 ) {
   const cachedData = cache.get(key)?.data
   const isStale = (cache.get(key)?.timestamp || 0) + 1000 * staleAfter < new Date().getTime()

src/api/assets/getAstroportAssets.ts

@@ -1,16 +1,15 @@
 import getHLSStakingAssets from 'api/hls/getHLSStakingAssets'
-import getPrices from 'api/prices/getPrices'
 import getAccounts from 'api/wallets/getAccounts'
 import { calculateAccountLeverage, getAccountPositionValues, isAccountEmpty } from 'utils/accounts'
 
 export default async function getHLSStakingAccounts(
   chainConfig: ChainConfig,
+  assets: Asset[],
   address?: string,
 ): Promise<HLSAccountWithStrategy[]> {
-  const accounts = await getAccounts('high_levered_strategy', chainConfig, address)
+  const accounts = await getAccounts('high_levered_strategy', chainConfig, assets, address)
   const activeAccounts = accounts.filter((account) => !isAccountEmpty(account))
-  const hlsStrategies = await getHLSStakingAssets(chainConfig)
-  const prices = await getPrices(chainConfig)
+  const hlsStrategies = await getHLSStakingAssets(chainConfig, assets)
   const hlsAccountsWithStrategy: HLSAccountWithStrategy[] = []
 
   activeAccounts.forEach((account) => {
@@ -22,11 +21,7 @@ export default async function getHLSStakingAccounts(
 
     if (!strategy) return
 
-    const [deposits, lends, debts, vaults] = getAccountPositionValues(
-      account,
-      prices,
-      chainConfig.assets,
-    )
+    const [deposits, _, debts, __] = getAccountPositionValues(account, assets)
 
     hlsAccountsWithStrategy.push({
       ...account,
@@ -36,7 +31,7 @@ export default async function getHLSStakingAccounts(
         debt: debts,
         total: deposits,
       },
-      leverage: calculateAccountLeverage(account, prices, chainConfig.assets).toNumber(),
+      leverage: calculateAccountLeverage(account, assets).toNumber(),
     })
   })
 

src/api/cache.ts

@@ -5,10 +5,8 @@ import { byDenom } from 'utils/array'
 import { BN } from 'utils/helpers'
 import { resolveHLSStrategies } from 'utils/resolvers'
 
-export default async function getHLSStakingAssets(chainConfig: ChainConfig) {
-  const stakingAssetDenoms = chainConfig.assets
-    .filter((asset) => asset.isStaking)
-    .map((asset) => asset.denom)
+export default async function getHLSStakingAssets(chainConfig: ChainConfig, assets: Asset[]) {
+  const stakingAssetDenoms = assets.filter((asset) => asset.isStaking).map((asset) => asset.denom)
   const assetParams = await getAssetParams(chainConfig)
   const HLSAssets = assetParams
     .filter((asset) => asset.credit_manager.hls)
@@ -37,7 +35,7 @@ export default async function getHLSStakingAssets(chainConfig: ChainConfig) {
 
   return Promise.all(depositCaps$).then((depositCaps) => {
     return depositCaps.map((depositCap, index) => {
-      const borrowSymbol = chainConfig.assets.find(byDenom(strategies[index].denoms.borrow))?.symbol
+      const borrowSymbol = assets.find(byDenom(strategies[index].denoms.borrow))?.symbol
       return {
         ...strategies[index],
         depositCap: {