diff --git a/ts/client/src/accounts/mangoAccount.ts b/ts/client/src/accounts/mangoAccount.ts index d783f199b..92c8569ba 100644 --- a/ts/client/src/accounts/mangoAccount.ts +++ b/ts/client/src/accounts/mangoAccount.ts @@ -985,10 +985,7 @@ export class MangoAccount { '\n perps:' + JSON.stringify( this.perpActive().map((p) => - p.toString( - group, - group?.getPerpMarketByMarketIndex(p.marketIndex), - ), + p.toString(group?.getPerpMarketByMarketIndex(p.marketIndex)), ), null, 4, @@ -1288,15 +1285,12 @@ export class PerpPosition { return ZERO_I80F48(); } - public getEquityUi(group: Group, perpMarket: PerpMarket): number { + public getEquityUi(perpMarket: PerpMarket): number { if (perpMarket.perpMarketIndex !== this.marketIndex) { throw new Error("PerpPosition doesn't belong to the given market!"); } - return toUiDecimals( - this.getEquity(perpMarket), - group.getMintDecimalsByTokenIndex(perpMarket.settleTokenIndex), - ); + return toUiDecimalsForQuote(this.getEquity(perpMarket)); } public getEquity(perpMarket: PerpMarket): I80F48 { @@ -1359,10 +1353,7 @@ export class PerpPosition { ); } - public cumulativePnlOverPositionLifetimeUi( - group: Group, - perpMarket: PerpMarket, - ): number { + public cumulativePnlOverPositionLifetimeUi(perpMarket: PerpMarket): number { if (perpMarket.perpMarketIndex !== this.marketIndex) { throw new Error("PerpPosition doesn't belong to the given market!"); } @@ -1371,11 +1362,10 @@ export class PerpPosition { this.getAverageEntryPrice(perpMarket), ); - return toUiDecimals( + return toUiDecimalsForQuote( this.realizedPnlForPositionNative.add( this.getBasePositionNative(perpMarket).mul(priceChange), ), - group.getMintDecimalsByTokenIndex(perpMarket.settleTokenIndex), ); } @@ -1389,11 +1379,8 @@ export class PerpPosition { ); } - public getUnsettledPnlUi(group: Group, perpMarket: PerpMarket): number { - return toUiDecimals( - this.getUnsettledPnl(perpMarket), - group.getMintDecimalsByTokenIndex(perpMarket.settleTokenIndex), - ); + public getUnsettledPnlUi(perpMarket: PerpMarket): number { + return toUiDecimalsForQuote(this.getUnsettledPnl(perpMarket)); } public updateSettleLimit(perpMarket: PerpMarket): void { @@ -1482,17 +1469,14 @@ export class PerpPosition { ); } - toString(group?: Group, perpMarket?: PerpMarket): string { - return perpMarket && group + toString(perpMarket?: PerpMarket): string { + return perpMarket ? 'market - ' + perpMarket.name + ', basePositionLots - ' + perpMarket.baseLotsToUi(this.basePositionLots) + - ', quotePositiveNative - ' + - toUiDecimals( - this.quotePositionNative.toNumber(), - group.getMintDecimalsByTokenIndex(perpMarket.settleTokenIndex), - ) + + ', quotePositive - ' + + toUiDecimalsForQuote(this.quotePositionNative.toNumber()) + ', bidsBaseLots - ' + perpMarket.baseLotsToUi(this.bidsBaseLots) + ', asksBaseLots - ' + @@ -1502,7 +1486,7 @@ export class PerpPosition { ', takerQuoteLots - ' + perpMarket.quoteLotsToUi(this.takerQuoteLots) + ', unsettled pnl - ' + - this.getUnsettledPnlUi(group!, perpMarket!).toString() + this.getUnsettledPnlUi(perpMarket!).toString() : ''; } }