@dripfi/drip-sdk 1.1.27 → 1.1.28

package/dist/DripSdk.d.ts

@@ -54,7 +54,6 @@ export default class DripSdk {
     approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     private generateRedeemBagStruct;
-    private getAllSvts;
     private getERC20Precission;
     private calculatePendingDeposits;
     private calculateAllDeposits;

package/dist/DripSdk.js

@@ -229,14 +229,17 @@ class DripSdk {
     fastWithdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
             const userAddress = yield this.signer.getAddress();
-            const authData = yield this.isUserAuthenticated();
+            // const authData = await this.isUserAuthenticated();
             // if (!authData.isAuthenticated) {throw Error(`User not authenticated: ${authData.message}`);}
             if (!this.signer) {
                 throw Error('No signer provided');
             }
             const vault = yield this.getVaultDetails(vaultAddress);
-            const redeemBagStruct = yield this.generateRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
+            const redeemBagStruct = yield this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
             const currentBlockNumber = yield ((_a = this.signer.provider) === null || _a === void 0 ? void 0 : _a.getBlockNumber());
             if (!currentBlockNumber) {
                 throw Error('Error fetching block number');
@@ -292,14 +295,17 @@ class DripSdk {
     }
     withdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
             const userAddress = yield this.signer.getAddress();
-            const authData = yield this.isUserAuthenticated();
+            // const authData = await this.isUserAuthenticated();
             // if (!authData.isAuthenticated) {throw Error(`User not authenticated: ${authData.message}`);}
             if (!this.signer) {
                 throw Error('No signer provided');
             }
             const vault = yield this.getVaultDetails(vaultAddress);
-            const redeemBagStruct = yield this.generateRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
+            const redeemBagStruct = yield this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
             const redeemTx = yield this.spoolSdk.redeem(redeemBagStruct, userAddress, false);
             const redeemTxReceipt = yield redeemTx.wait();
             return redeemTxReceipt.transactionHash;
@@ -428,62 +434,25 @@ class DripSdk {
             return yield this.approveToken(tokenAddress, amount, smartVaultManagerAddress);
         });
     }
-    generateRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress.toLowerCase());
-            const withdrawAll = !amountToWithdraw;
-            const initialAmountToWithdraw = ethers_1.ethers.utils.parseUnits(amountToWithdraw || '0', decimals);
-            let totalAmountToWithdraw = initialAmountToWithdraw;
-            let dnfts = yield this.dripApi.fetchEnrichedUserDNFTForVault(vault.vaultAddress.toLowerCase(), signerAddress, token);
-            if (dnfts.length === 0) {
-                throw Error('User has no deposits');
-            }
-            dnfts = yield this.getAllSvts(vault.vaultAddress.toLowerCase(), signerAddress, dnfts, token);
-            let shares = ethers_1.BigNumber.from(0);
-            const nftIds = [];
-            const nftAmounts = [];
-            let index = 0;
-            while (dnfts[index] && (totalAmountToWithdraw.gt(0) || withdrawAll)) {
-                const dnft = dnfts[index];
-                const userBalance = this.calculateBalanceForDNFT(dnft, decimals);
-                if (userBalance.gt(0)) {
-                    const amountToWithdraw = totalAmountToWithdraw;
-                    const userSvts = dnft.svts;
-                    let svtsToWithdraw = ethers_1.BigNumber.from(0);
-                    let nftAmount = ethers_1.BigNumber.from(0);
-                    if (amountToWithdraw.gte(userBalance) || withdrawAll) {
-                        nftAmount = dnft.shares;
-                        svtsToWithdraw = userSvts;
-                        if (!withdrawAll) {
-                            totalAmountToWithdraw = totalAmountToWithdraw.sub(userBalance);
-                        }
-                    }
-                    else {
-                        nftAmount = amountToWithdraw.mul(dnft.shares).div(userBalance);
-                        svtsToWithdraw = nftAmount.mul(userSvts).div(dnft.shares);
-                        totalAmountToWithdraw = totalAmountToWithdraw.sub(amountToWithdraw);
-                    }
-                    shares = shares.add(svtsToWithdraw);
-                    nftIds.push(dnft.nftId);
-                    nftAmounts.push(nftAmount);
-                }
-                index++;
-            }
-            return {
-                smartVault: vault.vaultAddress.toLowerCase(),
-                shares: shares,
-                nftIds,
-                nftAmounts,
-            };
-        });
-    }
-    getAllSvts(vaultAddress, userAddress, dnfts, token) {
+    generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
-            const svts = yield this.dripApi.fetchUserSVTFromNfts(vaultAddress, userAddress, dnfts.map((element) => parseInt(element.nftId)), token);
-            const result = dnfts.map((element, index) => {
-                return { nftId: element.nftId, assets: element.assets, shares: element.shares, svts: svts[index] };
-            });
-            return result;
+            if (!this.spoolSdk) {
+                throw Error('No spool sdk provided');
+            }
+            const isFullWithdraw = !amountToWithdraw;
+            if (isFullWithdraw) {
+                return this.spoolSdk.views.userInfo.getMaxRedeemBag({
+                    userAddress: signerAddress.toLowerCase(),
+                    vaultAddress: vault.vaultAddress,
+                });
+            }
+            else {
+                return this.spoolSdk.views.userInfo.getMinimumBurnRedeemBag({
+                    userAddress: signerAddress.toLowerCase(),
+                    vaultAddress: vault.vaultAddress,
+                    assetsToWithdraw: [Number(amountToWithdraw)]
+                });
+            }
         });
     }
     getERC20Precission(tokenAddress) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dripfi/drip-sdk",
-  "version": "1.1.27",
+  "version": "1.1.28",
   "description": "Drip SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@spool.fi/spool-v2-sdk": "1.0.14",
+    "@spool.fi/spool-v2-sdk": "1.0.27",
     "ethers": "^5.7.2",
     "js-cookie": "^3.0.5",
     "web3-token": "^1.0.6"