@dripfi/drip-sdk 1.4.3 → 1.4.4

package/CHANGELOG.md

@@ -78,3 +78,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Instantiation of the `SpoolSDK`
+
+## [1.4.3] - 2025-02-02
+
+### Fixed
+
+- Calculation of users vault balance in vaults with extracted strategies by using the `getUserBalanceBreakdown` method in the `SpoolSDK`

package/dist/PerqSdk.js

@@ -130,37 +130,38 @@ class PerqSdk {
         if (!this.signer) {
             throw Error('No signer provided');
         }
-        const userAddress = await this.signer.getAddress();
-        // Parallel fetch of vault, deposits and wnfts
-        const [vault, userVaultBalance, userWnftsForVault] = await Promise.all([
-            this.getVaultDetails(vaultAddress),
-            this.perqApi.fetchUserVaultDeposits(userAddress, vaultAddress),
-            this.perqApi.fetchAllUserWNFTForVault(vaultAddress, userAddress),
+        const [userAddress, vault] = await Promise.all([this.signer.getAddress(), this.getVaultDetails(vaultAddress)]);
+        const [decimals, userBalanceBreakdown] = await Promise.all([
+            this.getERC20Precission(vault.depositToken.tokenAddress),
+            this.spoolSdk?.getUserBalanceBreakdown({ userAddress, vaultAddress }),
         ]);
-        const decimals = await this.getERC20Precission(vault.depositToken.tokenAddress);
-        // Calculate withdrawals
-        let pendingWithdraws = ethers_1.BigNumber.from(0);
-        let claimable = ethers_1.BigNumber.from(0);
-        for (const wnft of userWnftsForVault) {
-            if (!wnft.isBurned && wnft.svtWithdrawn) {
-                const currentBlockNumber = wnft.blockNumber - 1;
-                const assetsPerSvtAtBlock = await this.perqApi.fetchAssetPerSvtAtBlock(vaultAddress, currentBlockNumber);
-                const estimatedValueOfNFT = ethers_1.BigNumber.from(ethers_1.ethers.utils.formatUnits(ethers_1.BigNumber.from(wnft.svtWithdrawn).mul(assetsPerSvtAtBlock), 36).split('.')[0]);
-                if (wnft.isDHWFinished) {
-                    // Processed and claimable
-                    claimable = claimable.add(estimatedValueOfNFT);
-                }
-                else {
-                    // Not processed, pending withdrawal
-                    pendingWithdraws = pendingWithdraws.add(estimatedValueOfNFT);
-                }
-            }
+        if (!userBalanceBreakdown) {
+            return {
+                hasWithdrawsToClaim: false,
+                userBalance: '0',
+                pendingUserBalance: '0',
+                pendingWithdrawalBalance: '0',
+                claimableBalance: '0',
+            };
         }
+        let claimable = ethers_1.BigNumber.from(0);
+        for (const wnft of userBalanceBreakdown.claimableWNFTs) {
+            const currentBlockNumber = wnft.blockNumber - 1;
+            const assetsPerSvtAtBlock = await this.perqApi.fetchAssetPerSvtAtBlock(vaultAddress, currentBlockNumber);
+            const estimatedValueOfNFT = ethers_1.BigNumber.from(ethers_1.ethers.utils.formatUnits(ethers_1.BigNumber.from(wnft.svtWithdrawn).mul(assetsPerSvtAtBlock), 36).split('.')[0]);
+            claimable = claimable.add(estimatedValueOfNFT);
+        }
+        const currentBalance = Object.values(userBalanceBreakdown.withdrawableAssets)
+            .reduce((acc, curr) => acc + curr, 0)
+            .toString();
+        const pendingDepositBalance = Object.values(userBalanceBreakdown.pendingAssets)
+            .reduce((acc, curr) => acc + curr, 0)
+            .toString();
         return {
             hasWithdrawsToClaim: claimable.gt(0),
-            userBalance: userVaultBalance.deposited?.toString() || '0',
-            pendingUserBalance: userVaultBalance.pending?.toString() || '0',
-            pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(pendingWithdraws, decimals) || '0',
+            userBalance: currentBalance,
+            pendingUserBalance: pendingDepositBalance,
+            pendingWithdrawalBalance: userBalanceBreakdown.pendingWithdrawal || '0',
             claimableBalance: ethers_1.ethers.utils.formatUnits(claimable, decimals) || '0',
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dripfi/drip-sdk",
-	"version": "1.4.3",
+	"version": "1.4.4",
 	"description": "Drip SDK",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
 		"pretty": "prettier --write \"./**/*.{js,jsx,mjs,cjs,ts,tsx,json}\""
 	},
 	"dependencies": {
-		"@spool.fi/spool-v2-sdk": "2.0.44",
+		"@spool.fi/spool-v2-sdk": "2.0.50",
 		"@yelay-lite/sdk": "0.0.11",
 		"ethers": "^5.7.2"
 	},