@augustdigital/sdk 4.24.3-alpha.3 → 4.24.3-alpha.4

package/lib/core/helpers/vaults.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultSubgraphUrl = exports.SUBGRAPH_POOL_URLS = exports.AVAX_PRICE_FEED_ADDRESS = exports.REWARD_DISTRIBUTOR_ADDRESS = exports.isBadVault = exports.isBadTransaction = void 0;
+exports.getDefaultSubgraphUrl = exports.SUBGRAPH_POOL_URLS = exports.AVAX_PRICE_FEED_ADDRESS = exports.REWARD_DISTRIBUTOR_ADDRESS = exports.isBadVault = void 0;
 exports.getVaultVersion = getVaultVersion;
 exports.getVaultVersionV2 = getVaultVersionV2;
 exports.getVaultSymbol = getVaultSymbol;
@@ -10,24 +10,6 @@ const web3_1 = require("./web3");
 const solana_1 = require("../../adapters/solana");
 const utils_1 = require("../../adapters/sui/utils");
 const fetcher_1 = require("../../modules/vaults/fetcher");
-const isBadTransaction = (hash, chainId) => {
-    const badTxs = {
-        1: [
-            '0xaba75b16e74a7a2457bfdcded853edd2bb4d3b305919baf84fb1f6b54b864889',
-            '0xc4c30185198672cbc91a95520d1bf91634ece37c199b2f1f15d29e8290c7ed4b',
-            '0x8e319576413897d1750f16bb93c7f59759b5bbafcb5bd9ef956f6bc0b0314aef',
-            '0x49057f8ea86b84a21808269558474686c9de02d31dc9e03a201b61104afbcdd3',
-            '0x7146dd528423705e225dd508f06cc6b4dab490c767400652ef82e7c96031359d',
-            '0x826340b2f376e71795177e9d68fee07e0c45263b45d22c36327db81db36d70a6',
-            '0xd79f4cf16dd4a794809448bf021bb64b6bfd22fb42094403baad4da5664b7519',
-        ],
-    };
-    if (chainId in badTxs) {
-        return badTxs[chainId].includes(hash);
-    }
-    return false;
-};
-exports.isBadTransaction = isBadTransaction;
 const isBadVault = (address) => {
     if (!address)
         return false;

package/lib/core/helpers/vaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../../src.ts/core/helpers/vaults.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../../src.ts/core/helpers/vaults.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 import { IFetchAugustOptions } from '../../core';
-import { IAddress, IOTCPosition, IWSSubaccountCefi, IWSSubAccountHealthFactor, IWSSubaccountLoan, IWSSubaccountSummary } from '../../types';
+import { IAddress, IOTCPosition, IWSSubaccountCefi, IWSSubAccountHealthFactor, IWSSubaccountLoan } from '../../types';
 export declare const fetchSubaccountHeathFactor: (address: IAddress, augustKey: string, headers?: IFetchAugustOptions["headers"]) => Promise<IWSSubAccountHealthFactor>;
 export declare const fetchSubaccountLoans: (payload: {
     address: IAddress;
@@ -8,4 +8,3 @@ export declare const fetchSubaccountLoans: (payload: {
 }, augustKey: string, headers?: IFetchAugustOptions["headers"]) => Promise<IWSSubaccountLoan[]>;
 export declare const fetchSubaccountCefiPositions: (address: IAddress, augustKey: string, headers?: IFetchAugustOptions["headers"]) => Promise<IWSSubaccountCefi[]>;
 export declare const fetchSubaccountOtcPositions: (address: IAddress, augustKey: string, headers?: IFetchAugustOptions["headers"]) => Promise<IOTCPosition[]>;
-export declare const fetchSubaccountSummary: (address: IAddress, augustKey: string, headers?: IFetchAugustOptions["headers"]) => Promise<IWSSubaccountSummary>;

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

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchSubaccountSummary = exports.fetchSubaccountOtcPositions = exports.fetchSubaccountCefiPositions = exports.fetchSubaccountLoans = exports.fetchSubaccountHeathFactor = void 0;
+exports.fetchSubaccountOtcPositions = exports.fetchSubaccountCefiPositions = exports.fetchSubaccountLoans = exports.fetchSubaccountHeathFactor = void 0;
 const core_1 = require("../../core");
 const fetchSubaccountHeathFactor = async (address, augustKey, headers) => {
     const response = await (0, core_1.fetchAugustWithKey)(augustKey, core_1.WEBSERVER_ENDPOINTS.subaccount.health_factor(address), {
         headers,
     });
-    if (!response.ok || typeof response.json !== 'function') {
-        throw new Error(`Failed to fetch subaccount health factor: ${response.statusText || 'Unknown error'}`);
-    }
     return response.json();
 };
 exports.fetchSubaccountHeathFactor = fetchSubaccountHeathFactor;
@@ -16,9 +13,6 @@ const fetchSubaccountLoans = async (payload, augustKey, headers) => {
     const response = await (0, core_1.fetchAugustWithKey)(augustKey, core_1.WEBSERVER_ENDPOINTS.subaccount.loans(payload.address, payload.side, payload.active), {
         headers,
     });
-    if (!response.ok || typeof response.json !== 'function') {
-        throw new Error(`Failed to fetch subaccount loans: ${response.statusText || 'Unknown error'}`);
-    }
     return response.json();
 };
 exports.fetchSubaccountLoans = fetchSubaccountLoans;
@@ -26,9 +20,6 @@ const fetchSubaccountCefiPositions = async (address, augustKey, headers) => {
     const response = await (0, core_1.fetchAugustWithKey)(augustKey, core_1.WEBSERVER_ENDPOINTS.subaccount.cefi(address), {
         headers,
     });
-    if (!response.ok || typeof response.json !== 'function') {
-        throw new Error(`Failed to fetch subaccount CeFi positions: ${response.statusText || 'Unknown error'}`);
-    }
     return response.json();
 };
 exports.fetchSubaccountCefiPositions = fetchSubaccountCefiPositions;
@@ -36,20 +27,7 @@ const fetchSubaccountOtcPositions = async (address, augustKey, headers) => {
     const response = await (0, core_1.fetchAugustWithKey)(augustKey, core_1.WEBSERVER_ENDPOINTS.subaccount.otc_positions(address), {
         headers,
     });
-    if (!response.ok || typeof response.json !== 'function') {
-        throw new Error(`Failed to fetch subaccount OTC positions: ${response.statusText || 'Unknown error'}`);
-    }
     return response.json();
 };
 exports.fetchSubaccountOtcPositions = fetchSubaccountOtcPositions;
-const fetchSubaccountSummary = async (address, augustKey, headers) => {
-    const response = await (0, core_1.fetchAugustWithKey)(augustKey, core_1.WEBSERVER_ENDPOINTS.subaccount.summary(address), {
-        headers,
-    });
-    if (!response.ok || typeof response.json !== 'function') {
-        throw new Error(`Failed to fetch subaccount summary: ${response.statusText || 'Unknown error'}`);
-    }
-    return response.json();
-};
-exports.fetchSubaccountSummary = fetchSubaccountSummary;
 //# sourceMappingURL=fetcher.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src.ts/modules/sub-accounts/fetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src.ts/modules/sub-accounts/fetcher.ts"],"names":[],"mappings":";;;AAAA,qCAIoB;AAYb,MAAM,0BAA0B,GAAG,KAAK,EAC7C,OAAiB,EACjB,SAAiB,EACjB,OAAwC,EACJ,EAAE;IACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAkB,EACvC,SAAS,EACT,0BAAmB,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,EACrD;QACE,OAAO;KACR,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAKK,MAAM,oBAAoB,GAAG,KAAK,EACvC,OAIC,EACD,SAAiB,EACjB,OAAwC,EACV,EAAE;IAChC,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAkB,EACvC,SAAS,EACT,0BAAmB,CAAC,UAAU,CAAC,KAAK,CAClC,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,CACf,EACD;QACE,OAAO;KACR,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B;AAKK,MAAM,4BAA4B,GAAG,KAAK,EAC/C,OAAiB,EACjB,SAAiB,EACjB,OAAwC,EACV,EAAE;IAChC,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAkB,EACvC,SAAS,EACT,0BAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAC5C;QACE,OAAO;KACR,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAdW,QAAA,4BAA4B,gCAcvC;AAKK,MAAM,2BAA2B,GAAG,KAAK,EAC9C,OAAiB,EACjB,SAAiB,EACjB,OAAwC,EACf,EAAE;IAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAkB,EACvC,SAAS,EACT,0BAAmB,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,EACrD;QACE,OAAO;KACR,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAdW,QAAA,2BAA2B,+BActC"}

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

@@ -13,106 +13,4 @@ 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,7 +2,6 @@
 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) {
@@ -35,10 +34,6 @@ 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,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"}
+{"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"}

package/lib/modules/vaults/getters.js

@@ -1215,7 +1215,7 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
                 wallet,
                 options,
             }),
-            (0, core_1.fetchTokenizedVault)(vault, options?.headers, false, false),
+            (0, core_1.fetchTokenizedVault)(vault, options?.headers),
         ]);
         const tokenizedVault = tokenizedVaultResult?.[0];
         if (!tokenizedVault) {
@@ -1254,62 +1254,19 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
             }
             return { underlyingTokenSymbol, underlyingAssetAddress };
         })();
-        const depositsByAsset = new Map();
-        let totalWithdrawalsInShares = BigInt(0);
-        let totalWithdrawalsInAssets = BigInt(0);
+        let totalDepositedRaw = BigInt(0);
+        let totalWithdrawalsRequestedRaw = 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') {
-                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;
+                totalDepositedRaw += amount;
             }
-            else if (historyItem.type === 'withdraw-processed' &&
-                historyItem.isInstant) {
-                totalWithdrawalsInAssets += amount;
+            else if (historyItem.type === 'withdraw-request' ||
+                (historyItem.type === 'withdraw-processed' && historyItem.isInstant)) {
+                totalWithdrawalsRequestedRaw += amount;
             }
         }
-        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 totalDeposited = (0, core_1.toNormalizedBn)(totalDepositedRaw, decimals);
         const { underlyingTokenSymbol, underlyingAssetAddress } = await underlyingSymbolPromise;
         let currentPositionValue = (0, core_1.toNormalizedBn)(0, decimals);
         const pricePromise = underlyingAssetAddress && tokenizedVault.chain
@@ -1361,42 +1318,25 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
                 currentPositionValue = currentPosition.walletBalance;
             }
         }
-        let totalWithdrawnRaw = totalWithdrawalsInAssets;
+        let totalWithdrawalsRequestedInAssetsRaw = totalWithdrawalsRequestedRaw;
         if (version === 'evm-2' && sharePriceRaw > BigInt(0)) {
-            totalWithdrawnRaw +=
-                (totalWithdrawalsInShares * sharePriceRaw) / BigInt(10 ** decimals);
-        }
-        else {
-            totalWithdrawnRaw += totalWithdrawalsInShares;
+            totalWithdrawalsRequestedInAssetsRaw =
+                (totalWithdrawalsRequestedRaw * sharePriceRaw) / BigInt(10 ** decimals);
         }
-        const totalWithdrawn = (0, core_1.toNormalizedBn)(totalWithdrawnRaw, decimals);
         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 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 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;