@dripfi/drip-sdk 1.3.7 → 1.3.9

package/dist/DripSdk.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,8 +12,16 @@ const DripTokenRecyclerContract_1 = __importDefault(require("./contracts/DripTok
 const DripSwapAndRecyclerContract_1 = __importDefault(require("./contracts/DripSwapAndRecyclerContract"));
 const PerqVestingContract_1 = __importDefault(require("./contracts/PerqVestingContract"));
 const utils_1 = require("ethers/lib/utils");
-const WethTokenAbi_json_1 = __importDefault(require("./contracts/abi/WethTokenAbi.json"));
+const WethTokenAbi_json_1 = __importDefault(require("./abi/WethTokenAbi.json"));
 class DripSdk {
+    dripApi;
+    dripTokenContract;
+    dripTokenRecyclerContract;
+    dripSwapAndRecyclerContract;
+    perqVestingContract;
+    spoolSdk;
+    signer;
+    dripConfig;
     constructor(chain, signer, dripRoute) {
         this.signer = signer;
         this.dripConfig = new DripConfig_1.DripConfig(chain, dripRoute);
@@ -35,25 +34,17 @@ class DripSdk {
         this.dripSwapAndRecyclerContract = new DripSwapAndRecyclerContract_1.default(this.dripConfig.dripSwapAndRecyclerAddress, signer);
         this.perqVestingContract = new PerqVestingContract_1.default(this.dripConfig.perqVestingAddress, signer);
     }
-    getAllVaults() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.fetchAllVaults();
-        });
+    async getAllVaults() {
+        return this.dripApi.fetchAllVaults();
     }
-    getVaultDetails(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.fetchVaultDetails(vaultAddress);
-        });
+    async getVaultDetails(vaultAddress) {
+        return this.dripApi.fetchVaultDetails(vaultAddress);
     }
-    getVaultStats() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.fetchVaultStats();
-        });
+    async getVaultStats() {
+        return this.dripApi.fetchVaultStats();
     }
-    getTokenPrice(tokenName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.fetchTokenPrice(tokenName);
-        });
+    async getTokenPrice(tokenName) {
+        return this.dripApi.fetchTokenPrice(tokenName);
     }
     updateSigner(newSigner) {
         this.signer = newSigner;
@@ -61,623 +52,519 @@ class DripSdk {
         this.dripTokenContract.updateSigner(newSigner);
         this.dripTokenRecyclerContract.updateSigner(newSigner);
     }
-    newDeposit(tokenAddress, vaultAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.doDeposit(tokenAddress, vaultAddress, amount, false);
-        });
+    async newDeposit(tokenAddress, vaultAddress, amount) {
+        return this.doDeposit(tokenAddress, vaultAddress, amount, false);
     }
-    deposit(tokenAddress, vaultAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.doDeposit(tokenAddress, vaultAddress, amount, true);
-        });
+    async deposit(tokenAddress, vaultAddress, amount) {
+        return this.doDeposit(tokenAddress, vaultAddress, amount, true);
     }
-    doDeposit(tokenAddress, vaultAddress, amount, checkAllowance) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const decimals = yield this.getERC20Precission(tokenAddress);
-            const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
-            if (checkAllowance) {
-                const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(yield this.getTokenAllowanceForDeposit(tokenAddress), decimals));
-                if (amountWithDecimals > currentTokenAllowance) {
-                    yield this.approveTokenForDeposit(tokenAddress, amountWithDecimals.toString());
-                }
-            }
-            const amountToDeposit = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-            const signerAddress = yield this.signer.getAddress();
-            if (!signerAddress) {
-                throw Error('Error fetching address');
-            }
-            const depositBagStruct = {
-                smartVault: vaultAddress.toLowerCase(),
-                assets: [amountToDeposit],
-                receiver: signerAddress,
-                referral: ethers_1.ethers.constants.AddressZero,
-                doFlush: false,
-            };
-            const depositTx = yield this.spoolSdk.deposit(depositBagStruct);
-            const txReceipt = yield depositTx.wait();
-            return txReceipt.transactionHash;
-        });
-    }
-    getTokenAllowanceForCurrency(tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
+    async doDeposit(tokenAddress, vaultAddress, amount, checkAllowance) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const decimals = await this.getERC20Precission(tokenAddress);
+        const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
+        if (checkAllowance) {
+            const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(await this.getTokenAllowanceForDeposit(tokenAddress), decimals));
+            if (amountWithDecimals > currentTokenAllowance) {
+                await this.approveTokenForDeposit(tokenAddress, amountWithDecimals.toString());
             }
-            const currentTokenAllowance = yield this.getTokenAllowanceForDeposit(tokenAddress);
-            return currentTokenAllowance.toString();
-        });
+        }
+        const amountToDeposit = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
+        const signerAddress = await this.signer.getAddress();
+        if (!signerAddress) {
+            throw Error('Error fetching address');
+        }
+        const depositBagStruct = {
+            smartVault: vaultAddress.toLowerCase(),
+            assets: [amountToDeposit],
+            receiver: signerAddress,
+            referral: ethers_1.ethers.constants.AddressZero,
+            doFlush: false,
+        };
+        const depositTx = await this.spoolSdk.deposit(depositBagStruct);
+        const txReceipt = await depositTx.wait();
+        return txReceipt.transactionHash;
+    }
+    async getTokenAllowanceForCurrency(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const currentTokenAllowance = await this.getTokenAllowanceForDeposit(tokenAddress);
+        return currentTokenAllowance.toString();
     }
-    getTokenAllowanceForRecycler(tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const allowance = yield this.getERC20TokenAllowance(this.dripTokenRecyclerContract.getContractAddress(), tokenAddress);
-            return allowance;
-        });
+    async getTokenAllowanceForRecycler(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const allowance = await this.getERC20TokenAllowance(this.dripTokenRecyclerContract.getContractAddress(), tokenAddress);
+        return allowance;
     }
-    getTokenAllowanceForSwapAndRecycler(tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const allowance = yield this.getERC20TokenAllowance(this.dripSwapAndRecyclerContract.getContractAddress(), tokenAddress);
-            return allowance;
-        });
+    async getTokenAllowanceForSwapAndRecycler(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const allowance = await this.getERC20TokenAllowance(this.dripSwapAndRecyclerContract.getContractAddress(), tokenAddress);
+        return allowance;
     }
-    getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals);
-        });
+    async getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
+        return this.dripApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals);
     }
-    getUserBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            return this.dripApi.getUserBalance(userAddress);
-        });
+    async getUserBalance() {
+        const userAddress = await this.signer.getAddress();
+        return this.dripApi.getUserBalance(userAddress);
     }
-    getUserBoostedNfts(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            return this.dripApi.getUserBoostedNfts(userAddress, vaultAddress);
-        });
+    async getUserBoostedNfts(vaultAddress) {
+        const userAddress = await this.signer.getAddress();
+        return this.dripApi.getUserBoostedNfts(userAddress, vaultAddress);
     }
-    getRewardsPerHour(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            return this.dripApi.fetchRewardsPerHour(userAddress, vaultAddress);
-        });
+    async getRewardsPerHour(vaultAddress) {
+        const userAddress = await this.signer.getAddress();
+        return this.dripApi.fetchRewardsPerHour(userAddress, vaultAddress);
     }
-    getRewards() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            const userRewards = this.dripApi.fetchUserRewards(userAddress);
-            return userRewards;
-        });
+    async getRewards() {
+        const userAddress = await this.signer.getAddress();
+        const userRewards = this.dripApi.fetchUserRewards(userAddress);
+        return userRewards;
     }
-    getMyPerqBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            const myPerqBalance = this.dripApi.fetchMyPerqData(userAddress);
-            return myPerqBalance;
-        });
+    async getMyPerqBalance() {
+        const userAddress = await this.signer.getAddress();
+        const myPerqBalance = this.dripApi.fetchMyPerqData(userAddress);
+        return myPerqBalance;
     }
-    getUserVaultBalance(vaultAddress) {
-        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();
-            // Parallel fetch of vault, deposits and wnfts
-            const [vault, userVaultBalance, userWnftsForVault] = yield Promise.all([
-                this.getVaultDetails(vaultAddress),
-                this.dripApi.fetchUserVaultDeposits(userAddress, vaultAddress),
-                this.dripApi.fetchAllUserWNFTForVault(vaultAddress, userAddress),
-            ]);
-            const decimals = yield 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 = yield this.dripApi.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);
-                    }
+    async getUserVaultBalance(vaultAddress) {
+        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.dripApi.fetchUserVaultDeposits(userAddress, vaultAddress),
+            this.dripApi.fetchAllUserWNFTForVault(vaultAddress, userAddress),
+        ]);
+        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.dripApi.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);
                 }
-            }
-            return {
-                hasWithdrawsToClaim: claimable.gt(0),
-                userBalance: ((_a = userVaultBalance.deposited) === null || _a === void 0 ? void 0 : _a.toString()) || '0',
-                pendingUserBalance: ((_b = userVaultBalance.pending) === null || _b === void 0 ? void 0 : _b.toString()) || '0',
-                pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(pendingWithdraws, decimals) || '0',
-                claimableBalance: ethers_1.ethers.utils.formatUnits(claimable, decimals) || '0',
-            };
-        });
-    }
-    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();
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const vault = yield this.getVaultDetails(vaultAddress);
-            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');
-            }
-            const redeemTx = yield ((_b = this.spoolSdk) === null || _b === void 0 ? void 0 : _b.redeemFast(redeemBagStruct, userAddress, currentBlockNumber));
-            const txReceipt = yield redeemTx.wait();
-            return txReceipt.transactionHash;
-        });
-    }
-    swapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, true, ethAmount);
-        });
-    }
-    newSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, false, ethAmount);
-        });
-    }
-    doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, checkAllowance, ethAmount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const decimals = yield this.getERC20Precission(fromTokenAddress);
-            const amountWithDecimals = parseFloat(parseFloat(fromTokenAmount).toFixed(decimals));
-            if (amountWithDecimals > 0 && checkAllowance) {
-                const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(yield this.getTokenAllowanceForSwapAndDeposit(fromTokenAddress), decimals));
-                if (amountWithDecimals > currentTokenAllowance) {
-                    yield this.approveTokenForSwapAndDeposit(fromTokenAddress, amountWithDecimals.toString());
+                else {
+                    // Not processed, pending withdrawal
+                    pendingWithdraws = pendingWithdraws.add(estimatedValueOfNFT);
                 }
             }
-            const fromToken = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-            const swapInfo = yield this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, userAddress);
-            const swapDepositBagStruct = {
-                inTokens: [fromTokenAddress],
-                inAmounts: [fromToken],
-                smartVault: vaultAddress.toLowerCase(),
-                swapInfo,
-                receiver: userAddress,
-                referral: ethers_1.ethers.constants.AddressZero,
-                doFlush: false,
-            };
-            const swapAndDepositRequest = ethAmount
-                ? yield this.spoolSdk.swapAndDeposit(swapDepositBagStruct, { value: ethers_1.ethers.utils.parseEther(ethAmount) })
-                : yield this.spoolSdk.swapAndDeposit(swapDepositBagStruct);
-            const txReceipt = yield swapAndDepositRequest.wait();
-            return txReceipt === null || txReceipt === void 0 ? void 0 : txReceipt.transactionHash;
-        });
-    }
-    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();
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const vault = yield this.getVaultDetails(vaultAddress);
-            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;
-        });
-    }
-    claimWithdraws(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const wnfts = yield this.dripApi.fetchEnrichedUserWNFTForVault(vaultAddress, userAddress);
-            //! Shares come as Strings instead of BigNumber from our Backend
-            const nftIds = wnfts
-                .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
-                .map((item) => item.nftId.toString());
-            const nftAmounts = wnfts
-                .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
-                .map((item) => item.shares.toString());
-            const claimWithdrawTx = yield this.spoolSdk.claimWithdrawal(vaultAddress.toLowerCase(), nftIds, nftAmounts, userAddress);
-            const txReceipt = yield claimWithdrawTx.wait();
-            return txReceipt.transactionHash;
-        });
-    }
-    getVaultsClaimableData() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const userAddress = yield this.signer.getAddress();
-            return yield this.dripApi.fetchVaultsClaimableData(userAddress);
-        });
-    }
-    getBeansBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            return this.dripApi.fetchBeansBalance(userAddress);
-        });
+        }
+        return {
+            hasWithdrawsToClaim: claimable.gt(0),
+            userBalance: userVaultBalance.deposited?.toString() || '0',
+            pendingUserBalance: userVaultBalance.pending?.toString() || '0',
+            pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(pendingWithdraws, decimals) || '0',
+            claimableBalance: ethers_1.ethers.utils.formatUnits(claimable, decimals) || '0',
+        };
+    }
+    async fastWithdraw(vaultAddress, amountToWithdraw) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const userAddress = await this.signer.getAddress();
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const vault = await this.getVaultDetails(vaultAddress);
+        const redeemBagStruct = await this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
+        const currentBlockNumber = await this.signer.provider?.getBlockNumber();
+        if (!currentBlockNumber) {
+            throw Error('Error fetching block number');
+        }
+        const redeemTx = await this.spoolSdk?.redeemFast(redeemBagStruct, userAddress, currentBlockNumber);
+        const txReceipt = await redeemTx.wait();
+        return txReceipt.transactionHash;
     }
-    getBeansHistory() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userAddress = yield this.signer.getAddress();
-            return this.dripApi.fetchBeansHistory(userAddress);
-        });
+    async swapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
+        return this.doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, true, ethAmount);
     }
-    recycleTokens() {
-        return __awaiter(this, arguments, void 0, function* (tokenAddress = this.dripConfig.dripTokenAddress, amountToRecycle, beneficiary = DripConfig_1.NULL_ADDRESS, price, deadline, signature) {
-            if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
-                throw Error('Recycler contract address not defined');
-            }
-            const decimals = yield this.getERC20Precission(tokenAddress);
-            const amountWithDecimals = ethers_1.ethers.utils.parseUnits(amountToRecycle, decimals).toString();
-            const recycleTx = yield this.dripTokenRecyclerContract.recycle(amountWithDecimals, beneficiary, price, deadline, signature);
-            const receipt = yield recycleTx.wait();
-            return receipt.transactionHash;
-        });
+    async newSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
+        return this.doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, false, ethAmount);
     }
-    swapAndRecycleETH(beneficiary, path, minAmountOutWithDecimals, amountOfEth, price, deadline, signature) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
-                throw Error('Recycler contract address not defined');
-            }
-            const swapAndRecycleTx = yield this.dripSwapAndRecyclerContract.swapETHAndRecycle(beneficiary, path, minAmountOutWithDecimals, amountOfEth, price, deadline, signature);
-            const receipt = yield swapAndRecycleTx.wait();
-            return receipt.transactionHash;
-        });
-    }
-    swapAndRecycleERC20(beneficiary, path, minAmountOutWithDecimals, amountInWithDecimals, price, deadline, signature) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
-                throw Error('Recycler contract address not defined');
+    async doSwapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, checkAllowance, ethAmount) {
+        const userAddress = await this.signer.getAddress();
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const decimals = await this.getERC20Precission(fromTokenAddress);
+        const amountWithDecimals = parseFloat(parseFloat(fromTokenAmount).toFixed(decimals));
+        if (amountWithDecimals > 0 && checkAllowance) {
+            const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(await this.getTokenAllowanceForSwapAndDeposit(fromTokenAddress), decimals));
+            if (amountWithDecimals > currentTokenAllowance) {
+                await this.approveTokenForSwapAndDeposit(fromTokenAddress, amountWithDecimals.toString());
             }
-            console.log('swap and recycle ERC-20 with this: ', {
-                beneficiary,
-                path,
-                amountInWithDecimals,
-                minAmountOutWithDecimals,
-                price,
-                deadline,
-                signature
-            });
-            const swapAndRecycleTx = yield this.dripSwapAndRecyclerContract.swapAndRecycle(beneficiary, path, amountInWithDecimals, minAmountOutWithDecimals, price, deadline, signature);
-            const receipt = yield swapAndRecycleTx.wait();
-            return receipt.transactionHash;
-        });
+        }
+        const fromToken = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
+        const swapInfo = await this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, userAddress);
+        const swapDepositBagStruct = {
+            inTokens: [fromTokenAddress],
+            inAmounts: [fromToken],
+            smartVault: vaultAddress.toLowerCase(),
+            swapInfo,
+            receiver: userAddress,
+            referral: ethers_1.ethers.constants.AddressZero,
+            doFlush: false,
+        };
+        const swapAndDepositRequest = ethAmount
+            ? await this.spoolSdk.swapAndDeposit(swapDepositBagStruct, { value: ethers_1.ethers.utils.parseEther(ethAmount) })
+            : await this.spoolSdk.swapAndDeposit(swapDepositBagStruct);
+        const txReceipt = await swapAndDepositRequest.wait();
+        return txReceipt?.transactionHash;
+    }
+    async withdraw(vaultAddress, amountToWithdraw) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const userAddress = await this.signer.getAddress();
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const vault = await this.getVaultDetails(vaultAddress);
+        const redeemBagStruct = await this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
+        const redeemTx = await this.spoolSdk.redeem(redeemBagStruct, userAddress, false);
+        const redeemTxReceipt = await redeemTx.wait();
+        return redeemTxReceipt.transactionHash;
+    }
+    async claimWithdraws(vaultAddress) {
+        const userAddress = await this.signer.getAddress();
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const wnfts = await this.dripApi.fetchEnrichedUserWNFTForVault(vaultAddress, userAddress);
+        //! Shares come as Strings instead of BigNumber from our Backend
+        const nftIds = wnfts
+            .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
+            .map((item) => item.nftId.toString());
+        const nftAmounts = wnfts
+            .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
+            .map((item) => item.shares.toString());
+        const claimWithdrawTx = await this.spoolSdk.claimWithdrawal(vaultAddress.toLowerCase(), nftIds, nftAmounts, userAddress);
+        const txReceipt = await claimWithdrawTx.wait();
+        return txReceipt.transactionHash;
+    }
+    async getVaultsClaimableData() {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const userAddress = await this.signer.getAddress();
+        return await this.dripApi.fetchVaultsClaimableData(userAddress);
     }
-    upgradeLoyaltyCard(index) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const payload = {
-                index
-            };
-            const signedPayload = yield this.signPayload(payload);
-            return this.dripApi.upgradeLoyaltyCard(signedPayload);
-        });
+    async getBeansBalance() {
+        const userAddress = await this.signer.getAddress();
+        return this.dripApi.fetchBeansBalance(userAddress);
     }
-    getOwnedLoyaltyCard() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signerAddress = yield this.signer.getAddress();
-            return this.dripApi.fetchOwnedLoyaltyCard(signerAddress);
-        });
+    async getBeansHistory() {
+        const userAddress = await this.signer.getAddress();
+        return this.dripApi.fetchBeansHistory(userAddress);
     }
-    getAllLoyaltyCards() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.fetchAllLoyaltyCards();
-        });
+    async recycleTokens(tokenAddress = this.dripConfig.dripTokenAddress, amountToRecycle, beneficiary = DripConfig_1.NULL_ADDRESS, price, deadline, signature) {
+        if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+            throw Error('Recycler contract address not defined');
+        }
+        const decimals = await this.getERC20Precission(tokenAddress);
+        const amountWithDecimals = ethers_1.ethers.utils.parseUnits(amountToRecycle, decimals).toString();
+        const recycleTx = await this.dripTokenRecyclerContract.recycle(amountWithDecimals, beneficiary, price, deadline, signature);
+        const receipt = await recycleTx.wait();
+        return receipt.transactionHash;
+    }
+    async swapAndRecycleETH(beneficiary, path, minAmountOutWithDecimals, amountOfEth, price, deadline, signature) {
+        if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+            throw Error('Recycler contract address not defined');
+        }
+        const swapAndRecycleTx = await this.dripSwapAndRecyclerContract.swapETHAndRecycle(beneficiary, path, minAmountOutWithDecimals, amountOfEth, price, deadline, signature);
+        const receipt = await swapAndRecycleTx.wait();
+        return receipt.transactionHash;
     }
-    approveTokenForRecycler(tokenAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
-                throw Error('Recycler contract address not defined');
-            }
-            return yield this.approveToken(tokenAddress, amount, this.dripConfig.dripTokenRecyclerAddress);
-        });
+    async swapAndRecycleERC20(beneficiary, path, minAmountOutWithDecimals, amountInWithDecimals, price, deadline, signature) {
+        if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+            throw Error('Recycler contract address not defined');
+        }
+        console.log('swap and recycle ERC-20 with this: ', {
+            beneficiary,
+            path,
+            amountInWithDecimals,
+            minAmountOutWithDecimals,
+            price,
+            deadline,
+            signature,
+        });
+        const swapAndRecycleTx = await this.dripSwapAndRecyclerContract.swapAndRecycle(beneficiary, path, amountInWithDecimals, minAmountOutWithDecimals, price, deadline, signature);
+        const receipt = await swapAndRecycleTx.wait();
+        return receipt.transactionHash;
+    }
+    async upgradeLoyaltyCard(index) {
+        const payload = {
+            index,
+        };
+        const signedPayload = await this.signPayload(payload);
+        return this.dripApi.upgradeLoyaltyCard(signedPayload);
+    }
+    async getOwnedLoyaltyCard() {
+        const signerAddress = await this.signer.getAddress();
+        return this.dripApi.fetchOwnedLoyaltyCard(signerAddress);
+    }
+    async getAllLoyaltyCards() {
+        return this.dripApi.fetchAllLoyaltyCards();
+    }
+    async approveTokenForRecycler(tokenAddress, amount) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+            throw Error('Recycler contract address not defined');
+        }
+        return await this.approveToken(tokenAddress, amount, this.dripConfig.dripTokenRecyclerAddress);
     }
-    approveTokenForSwapAndRecycler(tokenAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
-                throw Error('Recycler contract address not defined');
-            }
-            return yield this.approveToken(tokenAddress, amount, this.dripConfig.dripSwapAndRecyclerAddress);
-        });
+    async approveTokenForSwapAndRecycler(tokenAddress, amount) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        if (this.dripConfig.dripSwapAndRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
+            throw Error('Recycler contract address not defined');
+        }
+        return await this.approveToken(tokenAddress, amount, this.dripConfig.dripSwapAndRecyclerAddress);
     }
-    approveTokenForSwapAndDeposit(tokenAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const swapAndDepositContractAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
-            return yield this.approveToken(tokenAddress, amount, swapAndDepositContractAddress);
-        });
+    async approveTokenForSwapAndDeposit(tokenAddress, amount) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const swapAndDepositContractAddress = await this.dripConfig.getSwapAndDepositContractAddress(this.signer);
+        return await this.approveToken(tokenAddress, amount, swapAndDepositContractAddress);
     }
-    approveTokenForDeposit(tokenAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const smartVaultManagerAddress = yield this.dripConfig.getSmartVaultManagerAddress(this.signer);
-            return yield this.approveToken(tokenAddress, amount, smartVaultManagerAddress);
-        });
+    async approveTokenForDeposit(tokenAddress, amount) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const smartVaultManagerAddress = await this.dripConfig.getSmartVaultManagerAddress(this.signer);
+        return await this.approveToken(tokenAddress, amount, smartVaultManagerAddress);
     }
     getDripTokenContractAddress() {
         return this.dripConfig.dripTokenAddress;
     }
-    getSwapPerqForBeansInfo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.getSwapPerqForBeansInfo();
-        });
-    }
-    transferErc20Token(tokenAddress, amount, receiver) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const decimals = yield this.getERC20Precission(tokenAddress);
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const approveTx = yield erc20Instance.transfer(receiver, ethers_1.ethers.utils.parseUnits(amount, decimals));
-            const receipt = yield approveTx.wait();
-            return receipt.transactionHash;
-        });
-    }
-    wrapEther(amount, tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const wethContract = new ethers_1.ethers.Contract(tokenAddress, WethTokenAbi_json_1.default, this.signer);
-            const decimals = yield wethContract.decimals();
-            const amountWithDecimals = ethers_1.ethers.utils.parseUnits(amount, decimals);
-            const depositTx = yield wethContract.deposit({ value: amountWithDecimals });
-            const receipt = yield depositTx.wait();
-            return receipt.transactionHash;
-        });
-    }
-    getVestingStart() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const startBigNumber = yield this.perqVestingContract.start();
-                return startBigNumber.toString();
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get vesting start time: ${error.message}`);
-                }
-                throw new Error('Failed to get vesting start time: Unknown error');
-            }
-        });
+    async getSwapPerqForBeansInfo() {
+        return this.dripApi.getSwapPerqForBeansInfo();
     }
-    getVestingEnd() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const endBigNumber = yield this.perqVestingContract.end();
-                return endBigNumber.toString();
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get vesting end time: ${error.message}`);
-                }
-                throw new Error('Failed to get vesting end time: Unknown error');
-            }
-        });
-    }
-    getVestedAmount(beneficiary) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const vestedAmount = yield this.perqVestingContract.vested(beneficiary);
-                return (0, utils_1.formatUnits)(vestedAmount, 18);
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get vested amount: ${error.message}`);
-                }
-                throw new Error('Failed to get vested amount: Unknown error');
+    async transferErc20Token(tokenAddress, amount, receiver) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const decimals = await this.getERC20Precission(tokenAddress);
+        const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+        const approveTx = await erc20Instance.transfer(receiver, ethers_1.ethers.utils.parseUnits(amount, decimals));
+        const receipt = await approveTx.wait();
+        return receipt.transactionHash;
+    }
+    async wrapEther(amount, tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const wethContract = new ethers_1.ethers.Contract(tokenAddress, WethTokenAbi_json_1.default, this.signer);
+        const decimals = await wethContract.decimals();
+        const amountWithDecimals = ethers_1.ethers.utils.parseUnits(amount, decimals);
+        const depositTx = await wethContract.deposit({ value: amountWithDecimals });
+        const receipt = await depositTx.wait();
+        return receipt.transactionHash;
+    }
+    async getVestingStart() {
+        try {
+            const startBigNumber = await this.perqVestingContract.start();
+            return startBigNumber.toString();
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get vesting start time: ${error.message}`);
             }
-        });
+            throw new Error('Failed to get vesting start time: Unknown error');
+        }
     }
-    getReleasableAmount(beneficiary) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const releasableAmount = yield this.perqVestingContract.releasable(beneficiary);
-                return (0, utils_1.formatUnits)(releasableAmount, 18);
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get releasable amount: ${error.message}`);
-                }
-                throw new Error('Failed to get releasable amount: Unknown error');
+    async getVestingEnd() {
+        try {
+            const endBigNumber = await this.perqVestingContract.end();
+            return endBigNumber.toString();
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get vesting end time: ${error.message}`);
             }
-        });
+            throw new Error('Failed to get vesting end time: Unknown error');
+        }
     }
-    getReleasableTotalAmount(beneficiary) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const releasableTotalAmount = yield this.perqVestingContract.releasableTotal(beneficiary);
-                return (0, utils_1.formatUnits)(releasableTotalAmount, 18);
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get total releasable amount: ${error.message}`);
-                }
-                throw new Error('Failed to get total releasable amount: Unknown error');
+    async getVestedAmount(beneficiary) {
+        try {
+            const vestedAmount = await this.perqVestingContract.vested(beneficiary);
+            return (0, utils_1.formatUnits)(vestedAmount, 18);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get vested amount: ${error.message}`);
             }
-        });
-    }
-    getAllVestingInfo(beneficiaryAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [startTimestamp, endTimestamp, vested, releasable, releasableTotal] = yield Promise.all([
-                this.getVestingStart(),
-                this.getVestingEnd(),
-                this.getVestedAmount(beneficiaryAddress),
-                this.getReleasableAmount(beneficiaryAddress),
-                this.getReleasableTotalAmount(beneficiaryAddress),
-            ]);
-            return {
-                startTimestamp,
-                endTimestamp,
-                vested,
-                releasable,
-                releasableTotal,
-            };
-        });
+            throw new Error('Failed to get vested amount: Unknown error');
+        }
     }
-    claimVestedPerq(amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const claimTx = yield this.perqVestingContract.claim(amount);
-                const txReceipt = yield claimTx.wait();
-                return txReceipt.transactionHash;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get total releasable amount: ${error.message}`);
-                }
-                throw new Error('Failed to get total releasable amount: Unknown error');
+    async getReleasableAmount(beneficiary) {
+        try {
+            const releasableAmount = await this.perqVestingContract.releasable(beneficiary);
+            return (0, utils_1.formatUnits)(releasableAmount, 18);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get releasable amount: ${error.message}`);
             }
-        });
+            throw new Error('Failed to get releasable amount: Unknown error');
+        }
     }
-    burnVestedPerq(amount, price, deadline, signature) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const burnTx = yield this.perqVestingContract.burn(amount, price, deadline, signature);
-                const txReceipt = yield burnTx.wait();
-                return txReceipt.transactionHash;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new Error(`Failed to get total releasable amount: ${error.message}`);
-                }
-                throw new Error('Failed to get total releasable amount: Unknown error');
+    async getReleasableTotalAmount(beneficiary) {
+        try {
+            const releasableTotalAmount = await this.perqVestingContract.releasableTotal(beneficiary);
+            return (0, utils_1.formatUnits)(releasableTotalAmount, 18);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get total releasable amount: ${error.message}`);
             }
-        });
+            throw new Error('Failed to get total releasable amount: Unknown error');
+        }
     }
-    signPayload(payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw new Error('No signer provided');
+    async getAllVestingInfo(beneficiaryAddress) {
+        const [startTimestamp, endTimestamp, vested, releasable, releasableTotal] = await Promise.all([
+            this.getVestingStart(),
+            this.getVestingEnd(),
+            this.getVestedAmount(beneficiaryAddress),
+            this.getReleasableAmount(beneficiaryAddress),
+            this.getReleasableTotalAmount(beneficiaryAddress),
+        ]);
+        return {
+            startTimestamp,
+            endTimestamp,
+            vested,
+            releasable,
+            releasableTotal,
+        };
+    }
+    async claimVestedPerq(amount) {
+        try {
+            const claimTx = await this.perqVestingContract.claim(amount);
+            const txReceipt = await claimTx.wait();
+            return txReceipt.transactionHash;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get total releasable amount: ${error.message}`);
             }
-            // Wrap the payload in a Basepayload to enrich it later on
-            const basePayload = {
-                payload
-            };
-            const signerAddress = yield this.signer.getAddress();
-            // Get enriched payload with nonce before signing
-            const enrichedPayload = yield this.getEnrichedPayload(basePayload);
-            // Create message to sign
-            const message = JSON.stringify(enrichedPayload);
-            // Sign the message
-            const signature = yield this.signer.signMessage(message);
-            return {
-                signature,
-                signerAddress,
-                payload: enrichedPayload,
-            };
-        });
-    }
-    getEnrichedPayload(payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.getNonceEnrichedPayload(payload.payload);
-        });
+            throw new Error('Failed to get total releasable amount: Unknown error');
+        }
     }
-    generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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.toLowerCase(),
-                });
-            }
-            else {
-                return this.spoolSdk.views.userInfo.getMinimumBurnRedeemBag({
-                    userAddress: signerAddress.toLowerCase(),
-                    vaultAddress: vault.vaultAddress.toLowerCase(),
-                    assetsToWithdraw: [Number(amountToWithdraw)]
-                });
+    async burnVestedPerq(amount, price, deadline, signature) {
+        try {
+            const burnTx = await this.perqVestingContract.burn(amount, price, deadline, signature);
+            const txReceipt = await burnTx.wait();
+            return txReceipt.transactionHash;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to get total releasable amount: ${error.message}`);
             }
-        });
+            throw new Error('Failed to get total releasable amount: Unknown error');
+        }
     }
-    getERC20Precission(tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const decimals = yield erc20Instance.decimals();
-            return decimals;
-        });
+    async signPayload(payload) {
+        if (!this.signer) {
+            throw new Error('No signer provided');
+        }
+        // Wrap the payload in a Basepayload to enrich it later on
+        const basePayload = {
+            payload,
+        };
+        const signerAddress = await this.signer.getAddress();
+        // Get enriched payload with nonce before signing
+        const enrichedPayload = await this.getEnrichedPayload(basePayload);
+        // Create message to sign
+        const message = JSON.stringify(enrichedPayload);
+        // Sign the message
+        const signature = await this.signer.signMessage(message);
+        return {
+            signature,
+            signerAddress,
+            payload: enrichedPayload,
+        };
+    }
+    async getEnrichedPayload(payload) {
+        return this.dripApi.getNonceEnrichedPayload(payload.payload);
+    }
+    async generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
+        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.toLowerCase(),
+            });
+        }
+        else {
+            return this.spoolSdk.views.userInfo.getMinimumBurnRedeemBag({
+                userAddress: signerAddress.toLowerCase(),
+                vaultAddress: vault.vaultAddress.toLowerCase(),
+                assetsToWithdraw: [Number(amountToWithdraw)],
+            });
+        }
     }
-    getTokenAllowanceForDeposit(tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const smartVaultManagerAddress = yield this.dripConfig.getSmartVaultManagerAddress(this.signer);
-            const allowance = yield this.getERC20TokenAllowance(smartVaultManagerAddress, tokenAddress);
-            return allowance;
-        });
+    async getERC20Precission(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+        const decimals = await erc20Instance.decimals();
+        return decimals;
     }
-    getTokenAllowanceForSwapAndDeposit(tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const swapAndDepositAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
-            const allowance = yield this.getERC20TokenAllowance(swapAndDepositAddress, tokenAddress);
-            return allowance;
-        });
+    async getTokenAllowanceForDeposit(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const smartVaultManagerAddress = await this.dripConfig.getSmartVaultManagerAddress(this.signer);
+        const allowance = await this.getERC20TokenAllowance(smartVaultManagerAddress, tokenAddress);
+        return allowance;
     }
-    getERC20TokenAllowance(spender, tokenAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const signerAddress = yield this.signer.getAddress();
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const allowance = yield erc20Instance.allowance(signerAddress, spender);
-            return allowance;
-        });
+    async getTokenAllowanceForSwapAndDeposit(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const swapAndDepositAddress = await this.dripConfig.getSwapAndDepositContractAddress(this.signer);
+        const allowance = await this.getERC20TokenAllowance(swapAndDepositAddress, tokenAddress);
+        return allowance;
     }
-    approveToken(tokenAddress, amount, spender) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const decimals = yield this.getERC20Precission(tokenAddress);
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const approveTx = yield erc20Instance.approve(spender, ethers_1.ethers.utils.parseUnits(amount, decimals));
-            const receipt = yield approveTx.wait();
-            return receipt.transactionHash;
-        });
+    async getERC20TokenAllowance(spender, tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const signerAddress = await this.signer.getAddress();
+        const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+        const allowance = await erc20Instance.allowance(signerAddress, spender);
+        return allowance;
+    }
+    async approveToken(tokenAddress, amount, spender) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const decimals = await this.getERC20Precission(tokenAddress);
+        const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+        const approveTx = await erc20Instance.approve(spender, ethers_1.ethers.utils.parseUnits(amount, decimals));
+        const receipt = await approveTx.wait();
+        return receipt.transactionHash;
     }
 }
 exports.default = DripSdk;