@augustdigital/sdk 4.24.1 → 4.24.3-alpha.2

package/lib/modules/vaults/getters.js

@@ -199,13 +199,13 @@ async function getVaultLoans(vault, options) {
     }
 }
 async function getVaultAllocations(vault, options) {
-    const protocolExposure = [];
-    const tokenExposure = [];
+    let protocolExposure = [];
+    let tokenExposure = [];
     let cefiExposure = [];
-    const cefiBorrowerResponses = {};
-    const otcPositions = {};
-    const defiPerBorrower = {};
-    const exposurePerCategory = {
+    let cefiBorrowerResponses = {};
+    let otcPositions = {};
+    let defiPerBorrower = {};
+    let exposurePerCategory = {
         supplying: [],
         borrowing: [],
         wallet: [],
@@ -215,7 +215,7 @@ async function getVaultAllocations(vault, options) {
         lending: [],
         loanBalance: 0,
     };
-    const netValue = { value: 0 };
+    let 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() && !entry.useDebank);
+    const hardcodedSubaccount = Object.values(core_1.VAULT_ALLOCATION_SUBACCOUNTS).find((entry) => entry.address.toLowerCase() === vault.toLowerCase());
     if (hardcodedSubaccount) {
         const debankRes = await (0, debank_1.fetchDebankResponse)(hardcodedSubaccount.subaccount);
         if (debankRes === false) {
@@ -364,20 +364,27 @@ 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: abis_1.ABI_LENDING_POOL_V2,
+            abi: abi,
             provider,
         });
-        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 ld = await vaultContract['lagDuration']();
+        const lagDuration = parseInt(ld);
         const { withdrawalRequesteds, withdrawalProcesseds } = await (0, subgraph_1.getSubgraphAllWithdrawals)(vault, provider);
         const availableRedemptions = [];
         const pendingRedemptions = [];
@@ -551,7 +558,7 @@ async function getVaultAvailableRedemptions({ vault, wallet, options, }) {
                 }
             }
             else {
-                if (foundRedemptionAgainstClaim) {
+                if (!!foundRedemptionAgainstClaim) {
                     availableRedemptions.push({
                         id: ev.transactionHash_ || ev.id,
                         hash: ev.transactionHash_ || ev.id,
@@ -606,7 +613,7 @@ async function getVaultRedemptionHistory({ vault, wallet, options, }) {
             abi: abis_1.ABI_LENDING_POOL_V2,
             provider,
         });
-        const logPromises = [];
+        let logPromises = [];
         const currentBlock = await provider.getBlockNumber();
         let startingBlock = currentBlock - (0, core_1.determineBlockSkipInternal)(chainId);
         let endBlock = currentBlock;
@@ -692,28 +699,41 @@ 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: abis_1.ABI_LENDING_POOL_V2,
+                    abi: abi,
                     address: v.address,
                 });
                 let bal = BigInt(0);
-                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);
+                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;
+                        }
                     }
                 }
                 const balance = (0, core_1.toNormalizedBn)(bal, decimals);
@@ -782,7 +802,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,
             });
@@ -920,7 +940,7 @@ async function getVaultTvl({ vault, options, historical, }) {
                         abi: TokenizedVaultV2Receipt_1.ABI_TOKENIZED_VAULT_V2_RECEIPT,
                         provider,
                     });
-                    const totalSupply = await receiptTokenContract.totalSupply();
+                    const totalSupply = await receiptTokenContract.getTotalSupply();
                     return [
                         {
                             value: (0, core_1.toNormalizedBn)(totalSupply, receiptTokenDecimals),
@@ -939,7 +959,7 @@ async function getVaultTvl({ vault, options, historical, }) {
                 default: {
                     const vaultContract = (0, core_1.createContract)({
                         address: vault,
-                        abi: abis_1.ABI_LENDING_POOL_V2,
+                        abi: TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2,
                         provider,
                     });
                     const decimals = await (0, core_1.getDecimals)(provider, vault);
@@ -1041,14 +1061,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)),
     ];
-    const borrowerResponses = {};
+    let 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) {
@@ -1208,7 +1228,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) {
@@ -1223,10 +1243,10 @@ async function getVaultUserLifetimePnl({ vault, wallet, options, }) {
                 const vaultContract = (0, core_1.createContract)({
                     provider,
                     address: vault,
-                    abi: abis_1.ABI_LENDING_POOL_V2,
+                    abi: version === 'evm-2' ? TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2 : abis_1.ABI_LENDING_POOL_V2,
                 });
                 try {
-                    underlyingAssetAddress = (await vaultContract.asset());
+                    underlyingAssetAddress = await vaultContract.asset();
                     const underlyingContract = (0, core_1.createContract)({
                         provider,
                         address: underlyingAssetAddress,
@@ -1247,62 +1267,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;
-            }
-            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);
+                totalDepositedRaw += amount;
             }
-            else {
-                const dec = await (0, core_1.getDecimals)(provider, assetAddress, false);
-                assetDecimals.set(assetAddress, dec);
+            else if (historyItem.type === 'withdraw-request' ||
+                (historyItem.type === 'withdraw-processed' && historyItem.isInstant)) {
+                totalWithdrawalsRequestedRaw += amount;
             }
-        }));
-        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
@@ -1315,9 +1292,7 @@ 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)({
@@ -1354,42 +1329,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;
@@ -1601,7 +1559,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,