Merge pull request #1311 from mars-protocol/develop

linkielink · web-flow · commit 8bccad963055 · 2025-01-14T15:53:43.000+01:00
diff --git a/src/components/account/AccountComposition.tsx b/src/components/account/AccountComposition.tsx
@@ -19,6 +19,7 @@ import useVaultAprs from 'hooks/vaults/useVaultAprs'
 import useStore from 'store'
 import { BNCoin } from 'types/classes/BNCoin'
 import { getAccountSummaryStats, getAccountUnrealizedPnlValue } from 'utils/accounts'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 interface Props {
   account: Account
@@ -56,6 +57,7 @@ export default function AccountComposition(props: Props) {
     [lendingAvailableAssets, accountLentAssets],
   )
   const assetParams = useAssetParams()
+  const perpsMarketStates = usePerpsMarketStates()
 
   const { positionValue, debts, netWorth, collateralValue, apy, leverage } = useMemo(
     () =>
@@ -68,6 +70,7 @@ export default function AccountComposition(props: Props) {
         astroLpAprs,
         assetParams.data || [],
         perpsVault?.apy || 0,
+        perpsMarketStates.data || [],
       ),
     [
       account,
@@ -78,6 +81,7 @@ export default function AccountComposition(props: Props) {
       astroLpAprs,
       assetParams.data,
       perpsVault?.apy,
+      perpsMarketStates,
     ],
   )
 
@@ -108,6 +112,7 @@ export default function AccountComposition(props: Props) {
       astroLpAprs,
       assetParams.data || [],
       perpsVault?.apy || 0,
+      perpsMarketStates.data || [],
     )
   }, [
     updatedAccount,
@@ -118,6 +123,7 @@ export default function AccountComposition(props: Props) {
     astroLpAprs,
     assetParams.data,
     perpsVault?.apy,
+    perpsMarketStates.data,
     positionValue,
     debts,
     netWorth,
diff --git a/src/components/account/AccountDetails/index.tsx b/src/components/account/AccountDetails/index.tsx
@@ -34,6 +34,7 @@ import {
   calculateAccountBalanceValue,
   calculateAccountLeverage,
 } from 'utils/accounts'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 interface Props {
   account: Account
@@ -84,6 +85,7 @@ function AccountDetails(props: Props) {
     () => calculateAccountBalanceValue(updatedAccount ?? account, assets),
     [updatedAccount, account, assets],
   )
+
   const coin = BNCoin.fromDenomAndBigNumber(ORACLE_DENOM, accountBalanceValue)
   const leverage = useMemo(() => calculateAccountLeverage(account, assets), [account, assets])
   const updatedLeverage = useMemo(() => {
@@ -100,6 +102,8 @@ function AccountDetails(props: Props) {
   const { availableAssets: lendingAvailableAssets, accountLentAssets } =
     useLendingMarketAssetsTableData()
 
+  const perpsMarketStates = usePerpsMarketStates()
+
   const lendingAssetsData = useMemo(
     () => [...lendingAvailableAssets, ...accountLentAssets],
     [lendingAvailableAssets, accountLentAssets],
@@ -114,6 +118,7 @@ function AccountDetails(props: Props) {
         vaultAprs,
         astroLpAprs,
         perpsVault?.apy || 0,
+        perpsMarketStates.data || [],
       ),
     [
       updatedAccount,
@@ -124,6 +129,7 @@ function AccountDetails(props: Props) {
       vaultAprs,
       astroLpAprs,
       perpsVault?.apy,
+      perpsMarketStates.data,
     ],
   )
   const isFullWidth =
diff --git a/src/components/account/AccountList/AccountStats.tsx b/src/components/account/AccountList/AccountStats.tsx
@@ -16,6 +16,7 @@ import useVaultAprs from 'hooks/vaults/useVaultAprs'
 import useStore from 'store'
 import { calculateAccountApy, calculateAccountBalanceValue } from 'utils/accounts'
 import { mergeBNCoinArrays } from 'utils/helpers'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 interface Props {
   accountId: string
@@ -30,6 +31,8 @@ export default function AccountStats(props: Props) {
   const { data: vaultAprs } = useVaultAprs()
   const { data: perpsVault } = usePerpsVault()
   const astroLpAprs = useAstroLpAprs()
+  const perpsMarketStates = usePerpsMarketStates()
+
   const positionBalance = useMemo(
     () => (!account ? null : calculateAccountBalanceValue(account, assets)),
     [account, assets],
@@ -55,8 +58,18 @@ export default function AccountStats(props: Props) {
             vaultAprs,
             astroLpAprs,
             perpsVault?.apy || 0,
+            perpsMarketStates.data || [],
           ),
-    [account, borrowAssetsData, lendingAssetsData, assets, vaultAprs, astroLpAprs, perpsVault?.apy],
+    [
+      account,
+      borrowAssetsData,
+      lendingAssetsData,
+      assets,
+      vaultAprs,
+      astroLpAprs,
+      perpsVault?.apy,
+      perpsMarketStates.data,
+    ],
   )
 
   const deleteAccountHandler = useCallback(() => {
diff --git a/src/components/account/AccountSummary/index.tsx b/src/components/account/AccountSummary/index.tsx
@@ -22,6 +22,7 @@ import usePerpsVault from 'hooks/perps/usePerpsVault'
 import useVaultAprs from 'hooks/vaults/useVaultAprs'
 import useStore from 'store'
 import { calculateAccountApy, getAccountSummaryStats } from 'utils/accounts'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 interface Props {
   account: Account
@@ -56,6 +57,7 @@ export default function AccountSummary(props: Props) {
     () => [...lendingAvailableAssets, ...accountLentAssets],
     [lendingAvailableAssets, accountLentAssets],
   )
+  const perpsMarketStates = usePerpsMarketStates()
   const { health, healthFactor } = useHealthComputer(account)
   const { health: updatedHealth, healthFactor: updatedHealthFactor } = useHealthComputer(
     updatedAccount || account,
@@ -72,6 +74,7 @@ export default function AccountSummary(props: Props) {
         astroLpAprs,
         assetParams.data || [],
         perpsVault?.apy || 0,
+        perpsMarketStates.data || [],
       ),
     [
       updatedAccount,
@@ -83,6 +86,7 @@ export default function AccountSummary(props: Props) {
       astroLpAprs,
       assetParams.data,
       perpsVault?.apy,
+      perpsMarketStates.data,
     ],
   )
 
@@ -97,6 +101,7 @@ export default function AccountSummary(props: Props) {
       astroLpAprs,
       assetParams.data || [],
       perpsVault?.apy || 0,
+      perpsMarketStates.data || [],
     )
 
     if (updatedLeverage.eq(leverage)) return null
@@ -111,6 +116,7 @@ export default function AccountSummary(props: Props) {
     assetParams.data,
     perpsVault?.apy,
     leverage,
+    perpsMarketStates.data,
   ])
 
   const handleToggle = useCallback(
@@ -134,6 +140,7 @@ export default function AccountSummary(props: Props) {
         vaultAprs,
         astroLpAprs,
         perpsVault?.apy || 0,
+        perpsMarketStates.data || [],
       ),
     [
       updatedAccount,
@@ -145,6 +152,7 @@ export default function AccountSummary(props: Props) {
       vaultAprs,
       astroLpAprs,
       perpsVault?.apy,
+      perpsMarketStates.data,
     ],
   )
 
diff --git a/src/components/portfolio/Account/Summary.tsx b/src/components/portfolio/Account/Summary.tsx
@@ -14,6 +14,7 @@ import usePerpsVault from 'hooks/perps/usePerpsVault'
 import useVaultAprs from 'hooks/vaults/useVaultAprs'
 import { getAccountSummaryStats } from 'utils/accounts'
 import { DEFAULT_PORTFOLIO_STATS } from 'utils/constants'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 interface Props {
   account: Account
@@ -31,6 +32,7 @@ function Content(props: Props) {
   const { data: perpsVault } = usePerpsVault()
   const astroLpAprs = useAstroLpAprs()
   const assetParams = useAssetParams()
+  const perpsMarketStates = usePerpsMarketStates()
 
   const stats = useMemo(() => {
     if (!account || !borrowAssets.length || !lendingAssets.length) return DEFAULT_PORTFOLIO_STATS
@@ -44,6 +46,7 @@ function Content(props: Props) {
         astroLpAprs,
         assetParams.data || [],
         perpsVault?.apy || 0,
+        perpsMarketStates.data || [],
       )
 
     return [
@@ -97,6 +100,7 @@ function Content(props: Props) {
     astroLpAprs,
     assetParams.data,
     perpsVault?.apy,
+    perpsMarketStates.data,
     props.v1,
   ])
 
diff --git a/src/components/portfolio/Card/index.tsx b/src/components/portfolio/Card/index.tsx
@@ -21,6 +21,7 @@ import usePerpsVault from 'hooks/perps/usePerpsVault'
 import useVaultAprs from 'hooks/vaults/useVaultAprs'
 import { getAccountSummaryStats } from 'utils/accounts'
 import { getRoute } from 'utils/route'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 interface Props {
   accountId: string
@@ -45,6 +46,7 @@ export default function PortfolioCard(props: Props) {
     getDefaultChainSettings(chainConfig).reduceMotion,
   )
   const assetParams = useAssetParams()
+  const perpsMarketStates = usePerpsMarketStates()
 
   const stats: { title: ReactNode; sub: string }[] = useMemo(() => {
     if (!account || !assets.length || !lendingAssets.length || !borrowAssets.length) {
@@ -63,6 +65,7 @@ export default function PortfolioCard(props: Props) {
       astroLpAprs,
       assetParams.data || [],
       perpsVault?.apy || 0,
+      perpsMarketStates.data || [],
     )
 
     return [
@@ -88,6 +91,7 @@ export default function PortfolioCard(props: Props) {
     astroLpAprs,
     assetParams.data,
     perpsVault?.apy,
+    perpsMarketStates.data,
   ])
 
   if (!account) {
diff --git a/src/components/portfolio/Overview/Summary.tsx b/src/components/portfolio/Overview/Summary.tsx
@@ -17,6 +17,7 @@ import useStore from 'store'
 import { getAccountSummaryStats } from 'utils/accounts'
 import { DEFAULT_PORTFOLIO_STATS } from 'utils/constants'
 import { mergeBNCoinArrays, mergePerpsVaults } from 'utils/helpers'
+import usePerpsMarketStates from 'hooks/perps/usePerpsMarketStates'
 
 export default function PortfolioSummary() {
   const { address: urlAddress } = useParams()
@@ -31,6 +32,7 @@ export default function PortfolioSummary() {
   const astroLpAprs = useAstroLpAprs()
   const assetParams = useAssetParams()
   const { data: perpsVault } = usePerpsVault()
+  const perpsMarketStates = usePerpsMarketStates()
 
   const allAccounts = useMemo(() => {
     return [...(defaultAccounts || []), ...(hlsAccounts || [])]
@@ -48,7 +50,7 @@ export default function PortfolioSummary() {
           combinedAccount.stakedAstroLps,
           account.stakedAstroLps,
         )
-
+        combinedAccount.perps = combinedAccount.perps.concat(account.perps)
         return combinedAccount
       },
       {
@@ -76,6 +78,7 @@ export default function PortfolioSummary() {
         astroLpAprs,
         assetParams.data || [],
         perpsVault?.apy || 0,
+        perpsMarketStates.data || [],
       )
 
     return [
@@ -129,6 +132,7 @@ export default function PortfolioSummary() {
     astroLpAprs,
     assetParams,
     perpsVault?.apy,
+    perpsMarketStates.data,
   ])
 
   if (!walletAddress && !urlAddress) return null
diff --git a/src/utils/accounts.ts b/src/utils/accounts.ts
@@ -4,6 +4,7 @@ import { PRICE_ORACLE_DECIMALS } from 'constants/query'
 import { BNCoin } from 'types/classes/BNCoin'
 import { VaultPosition } from 'types/generated/mars-credit-manager/MarsCreditManager.types'
 import { AssetParamsBaseForAddr } from 'types/generated/mars-params/MarsParams.types'
+import { MarketResponse } from 'types/generated/mars-perps/MarsPerps.types'
 import { Positions } from 'types/generated/mars-rover-health-computer/MarsRoverHealthComputer.types'
 import { byDenom } from 'utils/array'
 import { getCoinValue } from 'utils/formatters'
@@ -137,21 +138,48 @@ export const calculateAccountApy = (
   vaultAprs: Apr[],
   astroLpAprs: Apr[],
   perpsVaultApy: number,
+  perpsMarketStates?: MarketResponse[],
 ): BigNumber => {
   const totalValue = getAccountTotalValue(account, assets)
-
   const debtsValue = calculateAccountValue('debts', account, assets)
   const totalDenominatorValue = totalValue.minus(debtsValue.abs())
 
   if (totalDenominatorValue.isLessThanOrEqualTo(0)) return BN_ZERO
-  const { vaults, lends, debts, deposits, stakedAstroLps, perpsVault } = account
+
+  const { vaults, lends, debts, deposits, stakedAstroLps, perpsVault, perps } = account
 
   let totalDepositsInterestValue = BN_ZERO
   let totalLendsInterestValue = BN_ZERO
   let totalVaultsInterestValue = BN_ZERO
   let totalDebtInterestValue = BN_ZERO
   let totalAstroStakedLpsInterestValue = BN_ZERO
   let totalPerpsVaultInterestValue = BN_ZERO
+  let totalPerpsFundingInterestValue = BN_ZERO
+
+  if (perps?.length && perpsMarketStates?.length) {
+    perps.forEach((position) => {
+      const marketState = perpsMarketStates.find((state) => state.denom === position.denom)
+
+      if (!marketState?.current_funding_rate) return
+
+      const positionValue = position.amount
+        .abs()
+        .multipliedBy(position.currentPrice)
+        .shiftedBy(-PRICE_ORACLE_DECIMALS)
+      const annualizedFundingRate = BN(marketState.current_funding_rate)
+        .multipliedBy(100)
+        .multipliedBy(365)
+
+      const fundingMultiplier = position.tradeDirection === 'long' ? -1 : 1
+
+      const fundingInterest = positionValue
+        .multipliedBy(annualizedFundingRate)
+        .multipliedBy(fundingMultiplier)
+        .dividedBy(100)
+
+      totalPerpsFundingInterestValue = totalPerpsFundingInterestValue.plus(fundingInterest)
+    })
+  }
 
   deposits?.forEach((deposit) => {
     const asset = assets.find(byDenom(deposit.denom))
@@ -233,6 +261,7 @@ export const calculateAccountApy = (
     .plus(totalDepositsInterestValue)
     .plus(totalAstroStakedLpsInterestValue)
     .plus(totalPerpsVaultInterestValue)
+    .plus(totalPerpsFundingInterestValue)
     .minus(totalDebtInterestValue)
 
   if (totalInterestValue.isEqualTo(0)) return BN_ZERO
@@ -443,6 +472,7 @@ export function getAccountSummaryStats(
   astroLpAprs: Apr[],
   assetParams: AssetParamsBaseForAddr[] | undefined,
   perpsVaultApy: number,
+  perpsMarketStates?: MarketResponse[],
 ) {
   const totalValue = getAccountTotalValue(account, assets)
 
@@ -472,6 +502,7 @@ export function getAccountSummaryStats(
     vaultAprs,
     astroLpAprs,
     perpsVaultApy,
+    perpsMarketStates,
   )
   const leverage = calculateAccountLeverage(account, assets)
 
diff --git a/src/utils/generateToast.ts b/src/utils/generateToast.ts
@@ -119,6 +119,7 @@ export async function generateToast(
 }
 
 export function beautifyErrorMessage(error: string) {
+  console.error(error)
   if (error.includes('too old'))
     return 'The oracle prices are stale. Please wait until the prices in the oracle contract are updated again.'
 

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ export async function generateToast(`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`export function beautifyErrorMessage(error: string) {`
	`122`	`+ console.error(error)`
`122`	`123`	`if (error.includes('too old'))`
`123`	`124`	`return 'The oracle prices are stale. Please wait until the prices in the oracle contract are updated again.'`
`124`	`125`