blockworks-foundation
/
mango-ui-v3
mirror of https://github.com/blockworks-foundation/mango-ui-v3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Risk Calculator PERP loading unreliably (#289) 

* Fix Risk Calculator PERP loading unreliably

- Removed reliance on multiple variables for loading perp positions, notably making the MNGO-PERP fail to load correctly.
- Removed base position from Unsettled Funding calculation as it's displayed in quote token, not the perp token
- Fixed perps In Orders calculation so it was consistent in both places it's present

* Ran lint and prettier
This commit is contained in:
ImpossiblePairs 2022-05-28 08:35:23 -07:00 committed by GitHub
parent b2a49c58db
commit 21eb477e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/account_page/AccountPerformancePerToken.tsx
View File

@ -183,11 +183,11 @@ const AccountPerformance = () => {
// Normalise chart to start from 0 (except for account value)
if (parseInt(performanceRange) !== 90 && chartToShow !== 'account-value') {
const startValues = Object.assign({}, stats[0]);
for (let i = 0; i < stats.length; i++ ) {
const startValues = Object.assign({}, stats[0])
for (let i = 0; i < stats.length; i++) {
for (const key in stats[i]) {
if (key !== 'time') {
stats[i][key] = stats[i][key] - startValues[key];
stats[i][key] = stats[i][key] - startValues[key]
}
}
}

158
pages/risk-calculator.tsx
View File

@ -311,61 +311,44 @@ export default function RiskCalculator() {
}
if (!symbol) return
// Retrieve perp positions if present
const perpPosition =
perpMarketConfig?.publicKey && mangoAccount
? mangoAccount?.perpAccounts[i]
: null
const perpMarketIndex =
perpMarketConfig?.publicKey && mangoAccount
? getMarketIndexBySymbol(mangoConfig, symbol)
: null
const perpAccount =
perpMarketConfig?.publicKey && mangoAccount && perpMarketIndex
? mangoAccount?.perpAccounts[perpMarketIndex]
: null
const perpMarketCache =
perpMarketConfig?.publicKey && mangoAccount && perpMarketIndex
? mangoCache?.perpMarketCache[perpMarketIndex]
: null
const perpMarketInfo =
perpMarketConfig?.publicKey && mangoAccount && perpMarketIndex
? mangoGroup?.perpMarkets[perpMarketIndex]
: null
const perpPosition = mangoAccount?.perpAccounts[i] || null
const basePosition =
perpMarketConfig?.publicKey && mangoAccount
? Number(perpAccount?.basePosition) /
Math.pow(10, perpContractPrecision[symbol]) || 0
: 0
Number(
mangoAccount?.perpAccounts[
getMarketIndexBySymbol(mangoConfig, symbol)
]?.basePosition
) / Math.pow(10, perpContractPrecision[symbol]) || 0
const unsettledFunding =
perpMarketConfig?.publicKey && mangoAccount && perpMarketCache
? (Number(perpAccount?.getUnsettledFunding(perpMarketCache)) *
basePosition) /
Math.pow(10, 6) || 0
: 0
Number(
mangoAccount?.perpAccounts[
getMarketIndexBySymbol(mangoConfig, symbol)
]?.getUnsettledFunding(
mangoCache?.perpMarketCache[
getMarketIndexBySymbol(mangoConfig, symbol)
]
)
) / Math.pow(10, 6) || 0
const positionPnL =
perpMarketConfig?.publicKey &&
mangoAccount &&
perpMarketIndex &&
perpMarketInfo &&
perpMarketCache
? Number(
perpAccount?.getPnl(
perpMarketInfo,
perpMarketCache,
mangoCache.priceCache[perpMarketIndex].price
)
) / Math.pow(10, 6) || 0
: 0
Number(
mangoAccount?.perpAccounts[
getMarketIndexBySymbol(mangoConfig, symbol)
]?.getPnl(
mangoGroup?.perpMarkets[
getMarketIndexBySymbol(mangoConfig, symbol)
],
mangoCache?.perpMarketCache[
getMarketIndexBySymbol(mangoConfig, symbol)
],
mangoCache.priceCache[getMarketIndexBySymbol(mangoConfig, symbol)]
.price
)
) / Math.pow(10, 6) || 0
const perpBids =
perpMarketConfig?.publicKey && mangoAccount
? Number(perpPosition?.bidsQuantity) /
Math.pow(10, perpContractPrecision[symbol]) || 0
: Number(0)
Number(perpPosition?.bidsQuantity) /
Math.pow(10, perpContractPrecision[symbol]) || 0
const perpAsks =
perpMarketConfig?.publicKey && mangoAccount
? Number(perpPosition?.asksQuantity) /
Math.pow(10, perpContractPrecision[symbol]) || 0
: Number(0)
Number(perpPosition?.asksQuantity) /
Math.pow(10, perpContractPrecision[symbol]) || 0
if (
spotMarketConfig?.publicKey ||
@ -744,52 +727,39 @@ export default function RiskCalculator() {
// Retrieve perp positions if present
const perpPosition =
perpMarketConfig?.publicKey && mangoAccount
? mangoAccount?.perpAccounts[asset.oracleIndex]
: null
const perpMarketIndex =
perpMarketConfig?.publicKey && mangoAccount
? getMarketIndexBySymbol(mangoConfig, symbol)
: null
const perpAccount =
perpMarketConfig?.publicKey && mangoAccount && perpMarketIndex
? mangoAccount?.perpAccounts[perpMarketIndex]
: null
const perpMarketCache =
perpMarketConfig?.publicKey && mangoAccount && perpMarketIndex
? mangoCache?.perpMarketCache[perpMarketIndex]
: null
const perpMarketInfo =
perpMarketConfig?.publicKey && mangoAccount && perpMarketIndex
? mangoGroup?.perpMarkets[perpMarketIndex]
: null
mangoAccount?.perpAccounts[asset.oracleIndex] || null
const basePosition =
perpMarketConfig?.publicKey && mangoAccount
? Number(perpAccount?.basePosition) /
Math.pow(10, perpContractPrecision[symbol])
: 0
Number(
mangoAccount?.perpAccounts[
getMarketIndexBySymbol(mangoConfig, symbol)
]?.basePosition
) / Math.pow(10, perpContractPrecision[symbol]) || 0
const unsettledFunding =
perpMarketConfig?.publicKey && mangoAccount && perpMarketCache
? (Number(
perpAccount?.getUnsettledFunding(perpMarketCache)
) *
basePosition) /
Math.pow(10, 6)
: 0
Number(
mangoAccount?.perpAccounts[
getMarketIndexBySymbol(mangoConfig, symbol)
]?.getUnsettledFunding(
mangoCache?.perpMarketCache[
getMarketIndexBySymbol(mangoConfig, symbol)
]
)
) / Math.pow(10, 6) || 0
const positionPnL =
perpMarketConfig?.publicKey &&
mangoAccount &&
perpMarketIndex &&
perpMarketInfo &&
perpMarketCache
? Number(
perpAccount?.getPnl(
perpMarketInfo,
perpMarketCache,
mangoCache.priceCache[perpMarketIndex].price
)
) / Math.pow(10, 6)
: 0
Number(
mangoAccount?.perpAccounts[
getMarketIndexBySymbol(mangoConfig, symbol)
]?.getPnl(
mangoGroup?.perpMarkets[
getMarketIndexBySymbol(mangoConfig, symbol)
],
mangoCache?.perpMarketCache[
getMarketIndexBySymbol(mangoConfig, symbol)
],
mangoCache.priceCache[
getMarketIndexBySymbol(mangoConfig, symbol)
].price
)
) / Math.pow(10, 6) || 0
const perpInOrders = perpMarketConfig?.publicKey
? Number(perpPosition?.bidsQuantity) >
Math.abs(Number(perpPosition?.asksQuantity))
@ -798,7 +768,7 @@ export default function RiskCalculator() {
tokenPrecision[perpMarketConfig?.baseSymbol] || 6
)
: floorToDecimal(
-1 * Number(perpPosition?.asksQuantity),
Number(perpPosition?.asksQuantity),
tokenPrecision[perpMarketConfig?.baseSymbol] || 6
)
: 0