@augustdigital/sdk 4.21.0-alpha.0 → 4.22.0-alpha1

package/lib/modules/sub-accounts/main.d.ts

@@ -13,4 +13,106 @@ export declare class AugustSubAccounts extends AugustBase {
     getSubaccountLoans(subaccountAddress: IAddress, side: 'BOTH' | 'LENDER' | 'BORROWER', active: boolean): Promise<import("../../types").IWSSubaccountLoan[]>;
     getSubaccountCefiPositions(subaccountAddress: IAddress): Promise<import("../../types").IWSSubaccountCefi[]>;
     getSubaccountOtcPositions(subaccountAddress: IAddress): Promise<import("../../types").IOTCPosition[]>;
+    getSubaccountSummary(subaccountAddress: IAddress): Promise<{
+        address: `0x${string}`;
+        name: string;
+        type: "eoa" | "subaccount";
+        portfolio: {
+            tokens: {
+                value: number;
+                balance: number;
+                token: {
+                    type: string;
+                    name: string;
+                    address: string;
+                    chain: number;
+                    symbol: string;
+                    decimals: number;
+                    imgUrl: string;
+                };
+            }[];
+            marginBalances: unknown[];
+            collateralBalances: unknown[];
+            cefiPositions: unknown[];
+            defiPositions: unknown[];
+            trsPositions: unknown[];
+            strategyContractPositions: unknown[];
+            legacyHedgerPositions: unknown[];
+            otcPositions: unknown[];
+            totalValue: number;
+            discountedValue: number;
+        };
+        loanbook: {
+            loans: {
+                subaccountAddress: `0x${string}`;
+                book: {
+                    address: `0x${string}`;
+                    lender: `0x${string}`;
+                    borrower: `0x${string}`;
+                    state: string;
+                    totalRepaid: number;
+                    principalToken: {
+                        type: string;
+                        name: string;
+                        address: string;
+                        chain: number;
+                        symbol: string;
+                        decimals: number;
+                        imgUrl: string;
+                        tokenType: number;
+                        discountFactor: number;
+                        price: number;
+                    };
+                    principalAmount: number;
+                    interestAmount: number;
+                    upcomingPayment: {
+                        amount: number;
+                        dueDate: string;
+                    };
+                    apr: number;
+                    initialPrincipalAmount: number;
+                    deployedDate: string;
+                    paymentInterval: number;
+                    totalInterestPaymentFees: number;
+                };
+                isBorrow: boolean;
+                debtInfo: {
+                    interestOwed: number;
+                    principalDebtOwed: number;
+                    interestRepaid: number;
+                };
+                creditInfo: {
+                    netInterestOwed: number;
+                    principalDebtOwed: number;
+                    netInterestRepaid: number;
+                };
+            }[];
+            totalDebt: number;
+            totalCredit: number;
+            aggregatesByToken: unknown[];
+        };
+        chains: {
+            name: string;
+            chainId: number;
+        }[];
+        tokens: {
+            type: string;
+            name: string;
+            address: string;
+            chain: number;
+            symbol: string;
+            decimals: number;
+            imgUrl: string;
+            price: number;
+            rawBalance: number;
+            balance: number;
+            value: number;
+        }[];
+        totalAccountValue: number;
+        totalCollateralValue: number;
+        totalLoanValue: number;
+        healthFactor: number;
+        netAccountValue: number;
+        totalEquityValue: number;
+    }>;
 }

package/lib/modules/sub-accounts/main.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AugustSubAccounts = void 0;
 const fetcher_1 = require("./fetcher");
+const utils_1 = require("./utils");
 const core_1 = require("../../core");
 class AugustSubAccounts extends core_1.AugustBase {
     constructor(baseConfig) {
@@ -34,6 +35,10 @@ class AugustSubAccounts extends core_1.AugustBase {
         const response = await (0, fetcher_1.fetchSubaccountOtcPositions)(subaccountAddress, this.keys.august, this.headers);
         return response;
     }
+    async getSubaccountSummary(subaccountAddress) {
+        const response = await (0, fetcher_1.fetchSubaccountSummary)(subaccountAddress, this.keys.august, this.headers);
+        return (0, utils_1.transformSubaccountSummary)(response);
+    }
 }
 exports.AugustSubAccounts = AugustSubAccounts;
 //# sourceMappingURL=main.js.map

package/lib/modules/sub-accounts/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src.ts/modules/sub-accounts/main.ts"],"names":[],"mappings":";;;AAKA,uCAKmB;AACnB,qCAAqD;AASrD,MAAa,iBAAkB,SAAQ,iBAAU;IAG/C,YAAY,UAAuB;QACjC,KAAK,CAAC,UAAU,CAAC,CAAC;QAHZ,YAAO,GAAkC,IAAI,CAAC;QAIpD,IAAI,CAAC,OAAO,GAAG;YACb,eAAe,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,eAAe,CAAC;YACnD,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC;SAC5C,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,yBAAyB,CAAC,iBAA2B;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAA0B,EAC/C,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO;YACL,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,YAAY,EAAE,QAAQ,CAAC,aAAa;YACpC,eAAe,EAAE,QAAQ,CAAC,sBAAsB;YAChD,SAAS,EAAE,QAAQ,CAAC,gBAAgB;SACrC,CAAC;IACJ,CAAC;IASD,KAAK,CAAC,kBAAkB,CACtB,iBAA2B,EAC3B,IAAoC,EACpC,MAAe;QAEf,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAoB,EACzC,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,EAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,0BAA0B,CAAC,iBAA2B;QAC1D,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAA4B,EACjD,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,yBAAyB,CAAC,iBAA2B;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAA2B,EAChD,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AA9ED,8CA8EC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src.ts/modules/sub-accounts/main.ts"],"names":[],"mappings":";;;AAKA,uCAMmB;AACnB,mCAAqD;AACrD,qCAAqD;AASrD,MAAa,iBAAkB,SAAQ,iBAAU;IAG/C,YAAY,UAAuB;QACjC,KAAK,CAAC,UAAU,CAAC,CAAC;QAHZ,YAAO,GAAkC,IAAI,CAAC;QAIpD,IAAI,CAAC,OAAO,GAAG;YACb,eAAe,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,eAAe,CAAC;YACnD,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC;SAC5C,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,yBAAyB,CAAC,iBAA2B;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAA0B,EAC/C,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO;YACL,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,YAAY,EAAE,QAAQ,CAAC,aAAa;YACpC,eAAe,EAAE,QAAQ,CAAC,sBAAsB;YAChD,SAAS,EAAE,QAAQ,CAAC,gBAAgB;SACrC,CAAC;IACJ,CAAC;IASD,KAAK,CAAC,kBAAkB,CACtB,iBAA2B,EAC3B,IAAoC,EACpC,MAAe;QAEf,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAoB,EACzC,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,EAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,0BAA0B,CAAC,iBAA2B;QAC1D,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAA4B,EACjD,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,yBAAyB,CAAC,iBAA2B;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAA2B,EAChD,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,oBAAoB,CAAC,iBAA2B;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAsB,EAC3C,iBAAiB,EACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,IAAA,kCAA0B,EAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;CACF;AA5FD,8CA4FC"}

package/lib/modules/sub-accounts/utils.d.ts

@@ -0,0 +1,103 @@
+import { IWSSubaccountSummary } from '../../types';
+export declare const transformSubaccountSummary: (response: IWSSubaccountSummary) => {
+    address: `0x${string}`;
+    name: string;
+    type: "eoa" | "subaccount";
+    portfolio: {
+        tokens: {
+            value: number;
+            balance: number;
+            token: {
+                type: string;
+                name: string;
+                address: string;
+                chain: number;
+                symbol: string;
+                decimals: number;
+                imgUrl: string;
+            };
+        }[];
+        marginBalances: unknown[];
+        collateralBalances: unknown[];
+        cefiPositions: unknown[];
+        defiPositions: unknown[];
+        trsPositions: unknown[];
+        strategyContractPositions: unknown[];
+        legacyHedgerPositions: unknown[];
+        otcPositions: unknown[];
+        totalValue: number;
+        discountedValue: number;
+    };
+    loanbook: {
+        loans: {
+            subaccountAddress: `0x${string}`;
+            book: {
+                address: `0x${string}`;
+                lender: `0x${string}`;
+                borrower: `0x${string}`;
+                state: string;
+                totalRepaid: number;
+                principalToken: {
+                    type: string;
+                    name: string;
+                    address: string;
+                    chain: number;
+                    symbol: string;
+                    decimals: number;
+                    imgUrl: string;
+                    tokenType: number;
+                    discountFactor: number;
+                    price: number;
+                };
+                principalAmount: number;
+                interestAmount: number;
+                upcomingPayment: {
+                    amount: number;
+                    dueDate: string;
+                };
+                apr: number;
+                initialPrincipalAmount: number;
+                deployedDate: string;
+                paymentInterval: number;
+                totalInterestPaymentFees: number;
+            };
+            isBorrow: boolean;
+            debtInfo: {
+                interestOwed: number;
+                principalDebtOwed: number;
+                interestRepaid: number;
+            };
+            creditInfo: {
+                netInterestOwed: number;
+                principalDebtOwed: number;
+                netInterestRepaid: number;
+            };
+        }[];
+        totalDebt: number;
+        totalCredit: number;
+        aggregatesByToken: unknown[];
+    };
+    chains: {
+        name: string;
+        chainId: number;
+    }[];
+    tokens: {
+        type: string;
+        name: string;
+        address: string;
+        chain: number;
+        symbol: string;
+        decimals: number;
+        imgUrl: string;
+        price: number;
+        rawBalance: number;
+        balance: number;
+        value: number;
+    }[];
+    totalAccountValue: number;
+    totalCollateralValue: number;
+    totalLoanValue: number;
+    healthFactor: number;
+    netAccountValue: number;
+    totalEquityValue: number;
+};

package/lib/modules/sub-accounts/utils.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformSubaccountSummary = void 0;
+const transformSubaccountSummary = (response) => {
+    return {
+        address: response.address,
+        name: response.name,
+        type: response.type,
+        portfolio: {
+            tokens: response.portfolio.tokens.map((t) => ({
+                value: t.value,
+                balance: t.balance,
+                token: {
+                    type: t.token.type,
+                    name: t.token.name,
+                    address: t.token.address,
+                    chain: t.token.chain,
+                    symbol: t.token.symbol,
+                    decimals: t.token.decimals,
+                    imgUrl: t.token.img_url,
+                },
+            })),
+            marginBalances: response.portfolio.margin_balances,
+            collateralBalances: response.portfolio.collateral_balances,
+            cefiPositions: response.portfolio.cefi_positions,
+            defiPositions: response.portfolio.defi_positions,
+            trsPositions: response.portfolio.trs_positions,
+            strategyContractPositions: response.portfolio.strategy_contract_positions,
+            legacyHedgerPositions: response.portfolio.legacy_hedger_positions,
+            otcPositions: response.portfolio.otc_positions,
+            totalValue: response.portfolio.total_value,
+            discountedValue: response.portfolio.discounted_value,
+        },
+        loanbook: {
+            loans: response.loanbook.loans.map((loan) => ({
+                subaccountAddress: loan.subaccount_address,
+                book: {
+                    address: loan.book.address,
+                    lender: loan.book.lender,
+                    borrower: loan.book.borrower,
+                    state: loan.book.state,
+                    totalRepaid: loan.book.total_repaid,
+                    principalToken: {
+                        type: loan.book.principal_token.type,
+                        name: loan.book.principal_token.name,
+                        address: loan.book.principal_token.address,
+                        chain: loan.book.principal_token.chain,
+                        symbol: loan.book.principal_token.symbol,
+                        decimals: loan.book.principal_token.decimals,
+                        imgUrl: loan.book.principal_token.img_url,
+                        tokenType: loan.book.principal_token.token_type,
+                        discountFactor: loan.book.principal_token.discount_factor,
+                        price: loan.book.principal_token.price,
+                    },
+                    principalAmount: loan.book.principal_amount,
+                    interestAmount: loan.book.interest_amount,
+                    upcomingPayment: {
+                        amount: loan.book.upcoming_payment.amount,
+                        dueDate: loan.book.upcoming_payment.due_date,
+                    },
+                    apr: loan.book.apr,
+                    initialPrincipalAmount: loan.book.initial_principal_amount,
+                    deployedDate: loan.book.deployed_date,
+                    paymentInterval: loan.book.payment_interval,
+                    totalInterestPaymentFees: loan.book.total_interest_payment_fees,
+                },
+                isBorrow: loan.is_borrow,
+                debtInfo: {
+                    interestOwed: loan.debt_info.interest_owed,
+                    principalDebtOwed: loan.debt_info.principal_debt_owed,
+                    interestRepaid: loan.debt_info.interest_repaid,
+                },
+                creditInfo: {
+                    netInterestOwed: loan.credit_info.net_interest_owed,
+                    principalDebtOwed: loan.credit_info.principal_debt_owed,
+                    netInterestRepaid: loan.credit_info.net_interest_repaid,
+                },
+            })),
+            totalDebt: response.loanbook.total_debt,
+            totalCredit: response.loanbook.total_credit,
+            aggregatesByToken: response.loanbook.aggregates_by_token,
+        },
+        chains: response.chains.map((c) => ({
+            name: c.name,
+            chainId: c.chain_id,
+        })),
+        tokens: response.tokens.map((t) => ({
+            type: t.type,
+            name: t.name,
+            address: t.address,
+            chain: t.chain,
+            symbol: t.symbol,
+            decimals: t.decimals,
+            imgUrl: t.img_url,
+            price: t.price,
+            rawBalance: t.raw_balance,
+            balance: t.balance,
+            value: t.value,
+        })),
+        totalAccountValue: response.total_account_value,
+        totalCollateralValue: response.total_collateral_value,
+        totalLoanValue: response.total_loan_value,
+        healthFactor: response.health_factor,
+        netAccountValue: response.net_account_value,
+        totalEquityValue: response.total_equity_value,
+    };
+};
+exports.transformSubaccountSummary = transformSubaccountSummary;
+//# sourceMappingURL=utils.js.map

package/lib/modules/sub-accounts/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/modules/sub-accounts/utils.ts"],"names":[],"mappings":"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"}

package/lib/modules/vaults/getters.js

@@ -237,7 +237,7 @@ async function getVaultAllocations(vault, options) {
     catch (e) {
         core_1.Logger.log.error('getVaultAllocations:borrowers', e);
     }
-    const hardcodedSubaccount = Object.values(core_1.VAULT_ALLOCATION_SUBACCOUNTS).find((entry) => entry.address.toLowerCase() === vault.toLowerCase());
+    const hardcodedSubaccount = Object.values(core_1.VAULT_ALLOCATION_SUBACCOUNTS).find((entry) => entry.address.toLowerCase() === vault.toLowerCase() && !entry.useDebank);
     if (hardcodedSubaccount) {
         const debankRes = await (0, debank_1.fetchDebankResponse)(hardcodedSubaccount.subaccount);
         if (debankRes === false) {
@@ -1208,7 +1208,7 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
                 wallet,
                 options,
             }),
-            (0, core_1.fetchTokenizedVault)(vault, options?.headers),
+            (0, core_1.fetchTokenizedVault)(vault, options?.headers, false, false),
         ]);
         const tokenizedVault = tokenizedVaultResult?.[0];
         if (!tokenizedVault) {
@@ -1247,19 +1247,62 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
             }
             return { underlyingTokenSymbol, underlyingAssetAddress };
         })();
-        let totalDepositedRaw = BigInt(0);
-        let totalWithdrawalsRequestedRaw = BigInt(0);
+        const depositsByAsset = new Map();
+        let totalWithdrawalsInShares = BigInt(0);
+        let totalWithdrawalsInAssets = BigInt(0);
         for (const historyItem of userHistory) {
             const amount = BigInt(historyItem.amount);
+            if ((0, core_1.isBadTransaction)(historyItem.transactionHash_, tokenizedVault.chain)) {
+                continue;
+            }
             if (historyItem.type === 'deposit') {
-                totalDepositedRaw += amount;
+                const assetKey = 'assetIn' in historyItem && typeof historyItem.assetIn === 'string'
+                    ? historyItem.assetIn.toLowerCase()
+                    : 'default';
+                const current = depositsByAsset.get(assetKey) ?? BigInt(0);
+                depositsByAsset.set(assetKey, current + amount);
+            }
+            else if (historyItem.type === 'withdraw-request') {
+                totalWithdrawalsInShares += amount;
             }
-            else if (historyItem.type === 'withdraw-request' ||
-                (historyItem.type === 'withdraw-processed' && historyItem.isInstant)) {
-                totalWithdrawalsRequestedRaw += amount;
+            else if (historyItem.type === 'withdraw-processed' &&
+                historyItem.isInstant) {
+                totalWithdrawalsInAssets += amount;
             }
         }
-        const totalDeposited = (0, core_1.toNormalizedBn)(totalDepositedRaw, decimals);
+        const assetDecimals = new Map();
+        await Promise.all(Array.from(depositsByAsset.keys()).map(async (assetAddress) => {
+            if (assetAddress === 'default') {
+                assetDecimals.set(assetAddress, decimals);
+            }
+            else {
+                const dec = await (0, core_1.getDecimals)(provider, assetAddress, false);
+                assetDecimals.set(assetAddress, dec);
+            }
+        }));
+        const totalDepositedRaw = new Map();
+        for (const [assetAddress, rawAmount] of depositsByAsset) {
+            const assetDec = assetDecimals.get(assetAddress) ?? decimals;
+            totalDepositedRaw.set(assetAddress, (0, core_1.toNormalizedBn)(rawAmount, assetDec));
+        }
+        const assetPrices = new Map();
+        if (tokenizedVault.chain) {
+            await Promise.all(Array.from(depositsByAsset.keys()).map(async (assetAddress) => {
+                if (assetAddress === 'default') {
+                    assetPrices.set(assetAddress, 0);
+                }
+                else {
+                    try {
+                        const price = await (0, core_1.fetchTokenPriceByAddress)(assetAddress, tokenizedVault.chain, options?.headers);
+                        assetPrices.set(assetAddress, price);
+                    }
+                    catch (error) {
+                        core_1.Logger.log.warn('getVaultUserLifetimePnl:fetchAssetPrice', `Failed to fetch price for ${assetAddress}: ${error}`);
+                        assetPrices.set(assetAddress, 0);
+                    }
+                }
+            }));
+        }
         const { underlyingTokenSymbol, underlyingAssetAddress } = await underlyingSymbolPromise;
         let currentPositionValue = (0, core_1.toNormalizedBn)(0, decimals);
         const pricePromise = underlyingAssetAddress && tokenizedVault.chain
@@ -1311,25 +1354,42 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
                 currentPositionValue = currentPosition.walletBalance;
             }
         }
-        let totalWithdrawalsRequestedInAssetsRaw = totalWithdrawalsRequestedRaw;
+        let totalWithdrawnRaw = totalWithdrawalsInAssets;
         if (version === 'evm-2' && sharePriceRaw > BigInt(0)) {
-            totalWithdrawalsRequestedInAssetsRaw =
-                (totalWithdrawalsRequestedRaw * sharePriceRaw) / BigInt(10 ** decimals);
+            totalWithdrawnRaw +=
+                (totalWithdrawalsInShares * sharePriceRaw) / BigInt(10 ** decimals);
+        }
+        else {
+            totalWithdrawnRaw += totalWithdrawalsInShares;
         }
-        const tokenPriceUsd = await pricePromise;
-        const totalWithdrawnRaw = totalWithdrawalsRequestedInAssetsRaw;
         const totalWithdrawn = (0, core_1.toNormalizedBn)(totalWithdrawnRaw, decimals);
-        const totalWithdrawalsRequestedInAssets = (0, core_1.toNormalizedBn)(totalWithdrawalsRequestedInAssetsRaw, decimals);
-        const totalDepositedUsd = Number(totalDeposited.normalized) * tokenPriceUsd;
-        const totalWithdrawnUsd = Number(totalWithdrawn.normalized) * tokenPriceUsd;
-        const currentPositionValueUsd = Number(currentPositionValue.normalized) * tokenPriceUsd;
-        const lifetimePnlRaw = BigInt(currentPositionValue.raw) +
-            totalWithdrawalsRequestedInAssetsRaw -
-            totalDepositedRaw;
+        const tokenPriceUsd = await pricePromise;
+        const effectiveTokenPrice = tokenPriceUsd > 0 ? tokenPriceUsd : 1;
+        if (tokenPriceUsd <= 0) {
+            core_1.Logger.log.warn('getVaultUserLifetimePnl:tokenPrice', `Invalid underlying token price: ${tokenPriceUsd}, using fallback of 1`);
+        }
+        let totalDepositedUsd = 0;
+        for (const [assetAddress, normalizedAmount] of totalDepositedRaw) {
+            const assetPrice = assetAddress === 'default'
+                ? effectiveTokenPrice
+                : assetPrices.get(assetAddress) || effectiveTokenPrice;
+            totalDepositedUsd += Number(normalizedAmount.normalized) * assetPrice;
+        }
+        const totalWithdrawnUsd = Number(totalWithdrawn.normalized) * effectiveTokenPrice;
+        const currentPositionValueUsd = Number(currentPositionValue.normalized) * effectiveTokenPrice;
+        const lifetimePnlUsd = currentPositionValueUsd + totalWithdrawnUsd - totalDepositedUsd;
+        const scaleFactor = BigInt(10 ** 18);
+        const tokenPriceScaled = BigInt(Math.round(effectiveTokenPrice * Number(scaleFactor)));
+        const totalDepositedUsdScaled = BigInt(Math.round(totalDepositedUsd * Number(scaleFactor)));
+        const totalDepositedNativeRaw = tokenPriceScaled > BigInt(0)
+            ? (totalDepositedUsdScaled * BigInt(10 ** decimals)) / tokenPriceScaled
+            : BigInt(0);
+        const totalDeposited = (0, core_1.toNormalizedBn)(totalDepositedNativeRaw, decimals);
+        const lifetimePnlUsdScaled = BigInt(Math.round(lifetimePnlUsd * Number(scaleFactor)));
+        const lifetimePnlRaw = tokenPriceScaled > BigInt(0)
+            ? (lifetimePnlUsdScaled * BigInt(10 ** decimals)) / tokenPriceScaled
+            : BigInt(0);
         const lifetimePnl = (0, core_1.toNormalizedBn)(lifetimePnlRaw, decimals);
-        const lifetimePnlUsd = currentPositionValueUsd +
-            Number(totalWithdrawalsRequestedInAssets.normalized) * tokenPriceUsd -
-            totalDepositedUsd;
         const pnlPercentage = totalDepositedUsd > 0
             ? Number.parseFloat(((lifetimePnlUsd / totalDepositedUsd) * 100).toFixed(2))
             : 0;