@augustdigital/sdk 4.24.3-alpha.2 → 4.24.3

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/adapter.helpers.js

@@ -56,7 +56,8 @@ async function buildNativeDepositTransaction({ signer, srcToken, amount, poolNam
     const wrapperContract = (0, core_1.createContract)({
         address: adapterConfig.wrapperAddress,
         provider: signer,
-        abi: adapterConfig.abi || abis_1.ABI_WRAPPER_ADAPTER,
+        abi: (adapterConfig.abi ||
+            abis_1.ABI_WRAPPER_ADAPTER),
     });
     if (poolName === adapters_1.POOL_NAMES.ETH_TREEHOUSE_GROWTH) {
         if (isNative) {

package/lib/modules/vaults/adapter.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.helpers.js","sourceRoot":"","sources":["../../../src.ts/modules/vaults/adapter.helpers.ts"],"names":[],"mappings":";;AA6BA,4CAoCC;AAQD,wEA4CC;AAKD,sEAoFC;AAKD,sDAgEC;AAzQD,4DAA2D;AAC3D,qCAAmE;AACnE,qCAA4C;AAK5C,MAAM,mBAAmB,GAAG,gCAAgC,CAAC;AAK7D,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AAClC,MAAM,wBAAwB,GAAG,4CAA4C,CAAC;AAC9E,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAKxB,KAAK,UAAU,gBAAgB,CAAC,EACrC,QAAQ,EACR,SAAS,EACT,MAAM,EACN,OAAO,EACP,WAAW,EACX,YAAY,GAQb;IACC,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAC3C,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAC1D,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,GAAG,mBAAmB,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACrC,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;KACF,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEnC,OAAO,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC;AAChC,CAAC;AAQM,KAAK,UAAU,8BAA8B,CAAC,EACnD,MAAM,EACN,QAAQ,EACR,WAAW,EACX,SAAS,EACT,YAAY,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,WAAW,GAWZ;IAEC,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC;QACxC,QAAQ;QACR,SAAS;QACT,MAAM;QACN,OAAO;QACP,WAAW;QACX,YAAY;KACb,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAID,MAAM,eAAe,GAAG,IAAA,qBAAc,EAAC;QACrC,OAAO,EAAE,aAAa,CAAC,cAAe;QACtC,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,uBAAgB;KACtB,CAAwB,CAAC;IAE1B,OAAO,eAAe,CAAC;AACzB,CAAC;AAKM,KAAK,UAAU,6BAA6B,CAAC,EAClD,MAAM,EACN,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,aAAa,EACb,WAAW,GAQZ;IAMC,MAAM,QAAQ,GAAG,QAAQ,KAAK,4CAA4C,CAAC;IAC3E,MAAM,eAAe,GAAG,IAAA,qBAAc,EAAC;QACrC,OAAO,EAAE,aAAa,CAAC,cAAe;QACtC,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,aAAa,CAAC,GAAG,IAAI,0BAAmB;KAC9C,CAAwB,CAAC;IAG1B,IAAI,QAAQ,KAAK,qBAAU,CAAC,oBAAoB,EAAE,CAAC;QACjD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO;gBACL,QAAQ,EAAE,eAAe;gBACzB,YAAY,EAAE,YAAY;gBAC1B,IAAI,EAAE,CAAC,aAAa,CAAC,UAAsB,CAAC;gBAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;aACtB,CAAC;QACJ,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,eAAe;YACzB,YAAY,EAAE,aAAa;YAC3B,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,UAAsB,CAAC;SAC7D,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,KAAK,qBAAU,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO;YACL,QAAQ,EAAE,eAAe;YACzB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,KAAK,qBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO;gBACL,QAAQ,EAAE,eAAe;gBACzB,YAAY,EAAE,iBAAiB;gBAC/B,IAAI,EAAE,CAAC,aAAa,CAAC,UAAsB,CAAC;gBAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;aACtB,CAAC;QACJ,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,eAAe;YACzB,YAAY,EAAE,mBAAmB;YACjC,IAAI,EAAE;gBACJ,aAAa,CAAC,mBAA+B;gBAC7C,MAAM,CAAC,MAAM,CAAC;gBACd,aAAa,CAAC,UAAoB;aACnC;SACF,CAAC;IACJ,CAAC;IAGD,IAAI,QAAQ,IAAI,aAAa,CAAC,oBAAoB,EAAE,CAAC;QACnD,OAAO;YACL,QAAQ,EAAE,eAAe;YACzB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;YAChE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;SACtB,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;AACvD,CAAC;AAKM,KAAK,UAAU,qBAAqB,CAAC,EAC1C,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,WAAW,EACX,SAAS,EACT,YAAY,EACZ,aAAa,EACb,OAAO,GAWR;IAEC,IAAI,aAAa,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC;YACnC,QAAQ;YACR,SAAS;YACT,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,WAAW;YACX,YAAY;SACb,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAGD,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC;YAClC,OAAO,EAAE,aAAa,CAAC,WAAW;YAClC,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE;gBACH;oBACE,MAAM,EAAE;wBACN,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;wBAC3D,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;qBACpE;oBACD,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE;wBACP,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;qBAClE;oBACD,eAAe,EAAE,MAAM;oBACvB,IAAI,EAAE,UAAU;iBACjB;aACF;SACF,CAAwB,CAAC;QAE1B,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,oBAAoB,CACpD,QAAQ,EACR,MAAM,CAAC,SAAS,CAAC,CAClB,CAAC;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAGD,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"adapter.helpers.js","sourceRoot":"","sources":["../../../src.ts/modules/vaults/adapter.helpers.ts"],"names":[],"mappings":"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"}

package/lib/modules/vaults/getters.js

@@ -199,13 +199,13 @@ async function getVaultLoans(vault, options) {
     }
 }
 async function getVaultAllocations(vault, options) {
-    let protocolExposure = [];
-    let tokenExposure = [];
+    const protocolExposure = [];
+    const tokenExposure = [];
     let cefiExposure = [];
-    let cefiBorrowerResponses = {};
-    let otcPositions = {};
-    let defiPerBorrower = {};
-    let exposurePerCategory = {
+    const cefiBorrowerResponses = {};
+    const otcPositions = {};
+    const defiPerBorrower = {};
+    const exposurePerCategory = {
         supplying: [],
         borrowing: [],
         wallet: [],
@@ -215,7 +215,7 @@ async function getVaultAllocations(vault, options) {
         lending: [],
         loanBalance: 0,
     };
-    let netValue = { value: 0 };
+    const netValue = { value: 0 };
     let debankErr = false;
     let unfilteredTokens = [];
     let uniqueBorrowers;
@@ -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) {
@@ -364,27 +364,20 @@ async function getVaultAvailableRedemptions({ vault, wallet, options, }) {
             };
         }
         const version = (0, core_1.getVaultVersionV2)(tokenizedVault);
-        let abi;
         let decimals;
-        switch (version) {
-            case 'evm-2': {
-                abi = TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2;
-                decimals = await (0, core_1.getDecimals)(provider, await (0, core_1.getReceiptTokenAddress)(provider, vault), false);
-                break;
-            }
-            default: {
-                abi = abis_1.ABI_LENDING_POOL_V2;
-                decimals = await (0, core_1.getDecimals)(provider, vault);
-                break;
-            }
-        }
         const vaultContract = (0, core_1.createContract)({
             address: vault,
-            abi: abi,
+            abi: abis_1.ABI_LENDING_POOL_V2,
             provider,
         });
-        const ld = await vaultContract['lagDuration']();
-        const lagDuration = parseInt(ld);
+        if (version === 'evm-2') {
+            decimals = await (0, core_1.getDecimals)(provider, await (0, core_1.getReceiptTokenAddress)(provider, vault), false);
+        }
+        else {
+            decimals = await (0, core_1.getDecimals)(provider, vault);
+        }
+        const ld = await vaultContract.lagDuration();
+        const lagDuration = Number(ld);
         const { withdrawalRequesteds, withdrawalProcesseds } = await (0, subgraph_1.getSubgraphAllWithdrawals)(vault, provider);
         const availableRedemptions = [];
         const pendingRedemptions = [];
@@ -558,7 +551,7 @@ async function getVaultAvailableRedemptions({ vault, wallet, options, }) {
                 }
             }
             else {
-                if (!!foundRedemptionAgainstClaim) {
+                if (foundRedemptionAgainstClaim) {
                     availableRedemptions.push({
                         id: ev.transactionHash_ || ev.id,
                         hash: ev.transactionHash_ || ev.id,
@@ -613,7 +606,7 @@ async function getVaultRedemptionHistory({ vault, wallet, options, }) {
             abi: abis_1.ABI_LENDING_POOL_V2,
             provider,
         });
-        let logPromises = [];
+        const logPromises = [];
         const currentBlock = await provider.getBlockNumber();
         let startingBlock = currentBlock - (0, core_1.determineBlockSkipInternal)(chainId);
         let endBlock = currentBlock;
@@ -699,41 +692,28 @@ async function getVaultPositions({ vault, wallet, solanaWallet, options, }) {
                 }
                 const provider = (0, core_1.createProvider)(options.rpcUrl);
                 let decimals;
-                let abi;
                 const version = (0, core_1.getVaultVersionV2)(v);
-                switch (version) {
-                    case 'evm-2': {
-                        decimals = await (0, core_1.getDecimals)(provider, await (0, core_1.getReceiptTokenAddress)(provider, vault), false);
-                        abi = TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2;
-                        break;
-                    }
-                    default: {
-                        decimals = await (0, core_1.getDecimals)(provider, vault);
-                        abi = abis_1.ABI_LENDING_POOL_V2;
-                        break;
-                    }
-                }
                 const vaultContract = (0, core_1.createContract)({
                     provider,
-                    abi: abi,
+                    abi: abis_1.ABI_LENDING_POOL_V2,
                     address: v.address,
                 });
                 let bal = BigInt(0);
-                if (wallet && (0, ethers_1.isAddress)(wallet)) {
-                    switch (version) {
-                        case 'evm-2': {
-                            const receiptContract = (0, core_1.createContract)({
-                                provider,
-                                abi: TokenizedVaultV2Receipt_1.ABI_TOKENIZED_VAULT_V2_RECEIPT,
-                                address: await (0, core_1.getReceiptTokenAddress)(provider, vault),
-                            });
-                            bal = await receiptContract.balanceOf(wallet);
-                            break;
-                        }
-                        default: {
-                            bal = await vaultContract.balanceOf(wallet);
-                            break;
-                        }
+                if (version === 'evm-2') {
+                    decimals = await (0, core_1.getDecimals)(provider, await (0, core_1.getReceiptTokenAddress)(provider, vault), false);
+                    if (wallet && (0, ethers_1.isAddress)(wallet)) {
+                        const receiptContract = (0, core_1.createContract)({
+                            provider,
+                            abi: TokenizedVaultV2Receipt_1.ABI_TOKENIZED_VAULT_V2_RECEIPT,
+                            address: await (0, core_1.getReceiptTokenAddress)(provider, vault),
+                        });
+                        bal = await receiptContract.balanceOf(wallet);
+                    }
+                }
+                else {
+                    decimals = await (0, core_1.getDecimals)(provider, vault);
+                    if (wallet && (0, ethers_1.isAddress)(wallet)) {
+                        bal = await vaultContract.balanceOf(wallet);
                     }
                 }
                 const balance = (0, core_1.toNormalizedBn)(bal, decimals);
@@ -802,7 +782,7 @@ async function getVaultApy({ vault, options, historical, }) {
             }
             const baseUrl = core_1.WEBSERVER_ENDPOINTS.public.tokenizedVault.historicalApy(vault);
             const historicalApy = await (0, core_1.fetchAugustPublic)(`${baseUrl}${paramBuilder(historical, baseUrl)}`, {
-                headers: !!options?.headers
+                headers: options?.headers
                     ? options?.headers
                     : undefined,
             });
@@ -940,7 +920,7 @@ async function getVaultTvl({ vault, options, historical, }) {
                         abi: TokenizedVaultV2Receipt_1.ABI_TOKENIZED_VAULT_V2_RECEIPT,
                         provider,
                     });
-                    const totalSupply = await receiptTokenContract.getTotalSupply();
+                    const totalSupply = await receiptTokenContract.totalSupply();
                     return [
                         {
                             value: (0, core_1.toNormalizedBn)(totalSupply, receiptTokenDecimals),
@@ -959,7 +939,7 @@ async function getVaultTvl({ vault, options, historical, }) {
                 default: {
                     const vaultContract = (0, core_1.createContract)({
                         address: vault,
-                        abi: TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2,
+                        abi: abis_1.ABI_LENDING_POOL_V2,
                         provider,
                     });
                     const decimals = await (0, core_1.getDecimals)(provider, vault);
@@ -1061,14 +1041,14 @@ async function getVaultBorrowerHealthFactor({ vault, options, }) {
             abi: abis_1.ABI_LOAN,
         });
         return {
-            borrower: await loanContract.borrower(),
+            borrower: (await loanContract.borrower()),
             loan: l,
         };
     }));
     const uniqueBorrowers = [
         ...new Set(formattedLoansArray.map((l) => l.borrower)),
     ];
-    let borrowerResponses = {};
+    const borrowerResponses = {};
     for (const b of uniqueBorrowers) {
         const response = await (0, core_1.fetchAugustWithKey)(options.augustKey, core_1.WEBSERVER_ENDPOINTS.subaccount.health_factor(b));
         if (response.status === 200) {
@@ -1228,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) {
@@ -1243,10 +1223,10 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
                 const vaultContract = (0, core_1.createContract)({
                     provider,
                     address: vault,
-                    abi: version === 'evm-2' ? TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2 : abis_1.ABI_LENDING_POOL_V2,
+                    abi: abis_1.ABI_LENDING_POOL_V2,
                 });
                 try {
-                    underlyingAssetAddress = await vaultContract.asset();
+                    underlyingAssetAddress = (await vaultContract.asset());
                     const underlyingContract = (0, core_1.createContract)({
                         provider,
                         address: underlyingAssetAddress,
@@ -1267,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-processed' &&
+                historyItem.isInstant) {
+                totalWithdrawalsInAssets += amount;
+            }
+        }
+        const assetDecimals = new Map();
+        await Promise.all(Array.from(depositsByAsset.keys()).map(async (assetAddress) => {
+            if (assetAddress === 'default') {
+                assetDecimals.set(assetAddress, decimals);
             }
-            else if (historyItem.type === 'withdraw-request' ||
-                (historyItem.type === 'withdraw-processed' && historyItem.isInstant)) {
-                totalWithdrawalsRequestedRaw += amount;
+            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
@@ -1292,7 +1315,9 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
         });
         let sharePriceRaw = BigInt(0);
         try {
-            const lpTokenAddress = version === 'evm-2' ? await vaultContract.lpTokenAddress() : vault;
+            const lpTokenAddress = version === 'evm-2'
+                ? (await vaultContract.lpTokenAddress())
+                : vault;
             let currentShares = BigInt(0);
             if (version === 'evm-2') {
                 const lpTokenContract = (0, core_1.createContract)({
@@ -1329,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;
@@ -1559,7 +1601,7 @@ async function getPreviewRedemption({ vault, sharesAmount, options, }) {
                 abi: TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2,
                 provider,
             });
-            const lpTokenAddress = await contract.lpTokenAddress();
+            const lpTokenAddress = (await contract.lpTokenAddress());
             const lpTokenContract = (0, core_1.createContract)({
                 address: lpTokenAddress,
                 abi: abis_1.ABI_LENDING_POOL_V2,