@dripfi/drip-sdk 1.0.9 → 1.0.10

package/dist/DripApi.d.ts

@@ -11,6 +11,7 @@ export default class DripApi {
     fetchUserSVTBalance(vaultAddress: string, walletAddress: string, token: string): Promise<BigNumber>;
     fetchUserBalance(vaultAddress: string, walletAddress: string, token: string): Promise<Record<string, string>>;
     fetchEnrichedUserDNFTForVault(vaultAddress: string, walletAddress: string, token: string): Promise<any[]>;
+    fetchEnrichedUserWNFTForVault(vaultAddress: string, walletAddress: string, token: string): Promise<any[]>;
     fetchUserSVTFromNfts(vaultAddress: string, userAddress: string, dnfts: number[], token: string): Promise<BigNumber[]>;
     fetchAllUserWNFTForVault(vaultAddress: string, walletAddress: string, token: string): Promise<any[]>;
     fetchAllUserDNFTForVault(vaultAddress: string, walletAddress: string, token: string): Promise<any[]>;

package/dist/DripApi.js

@@ -78,6 +78,17 @@ class DripApi {
             return data;
         });
     }
+    fetchEnrichedUserWNFTForVault(vaultAddress, walletAddress, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headers = new Headers();
+            headers.append('Authorization', token);
+            const res = yield fetch(`/api-be/api/spool/user/wNft/${walletAddress}/${vaultAddress}`, {
+                headers,
+            });
+            const data = yield res.json();
+            return data;
+        });
+    }
     fetchUserSVTFromNfts(vaultAddress, userAddress, dnfts, token) {
         return __awaiter(this, void 0, void 0, function* () {
             const headers = new Headers();

package/dist/DripSdk.d.ts

@@ -32,7 +32,6 @@ export default class DripSdk {
     private calculateBalanceForDNFT;
     private checkIfUserHasWithdrawsToClaim;
     private shouldUseNewWithdrawLogic;
-    private generateToken;
     private calculateAllWithdrawalBalances;
     private getTokenAllowanceForSwapAndDepositContractAddress;
     private approveTokenForSwapAndDepositContract;

package/dist/DripSdk.js

@@ -98,7 +98,7 @@ class DripSdk {
             const wnfts = yield this.dripApi.fetchAllUserWNFTForVault(vault.vaultAddress, userAddress, token);
             const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress);
             if (this.shouldUseNewWithdrawLogic(userAddress, vault)) {
-                const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance] = yield this.calculateAllWithdrawalBalances(wnfts, vault.vaultAddress, decimals);
+                const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance] = yield this.calculateAllWithdrawalBalances(wnfts, vault.vaultAddress, decimals, token);
                 const hasWithdrawsToClaim = this.checkIfUserHasWithdrawsToClaim(wnfts);
                 const pendingDeposits = this.calculatePendingDeposits(dnfts, decimals);
                 const userBalance = this.calculateAllDeposits(dnfts, decimals).sub(pendingDeposits);
@@ -113,8 +113,8 @@ class DripSdk {
             else {
                 const allDeposits = this.calculateDepositsOld(dnfts, decimals);
                 const pendingDeposits = this.calculatePendingDepositsOld(dnfts, decimals);
-                const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance, estimatedWithdrawals] = yield this.calculateAllWithdrawalBalances(wnfts, vault.vaultAddress, decimals);
-                const fastWithdrawBalance = yield this.calculateFastWithdrawBalancesOld(vault.vaultAddress, userAddress, decimals);
+                const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance, estimatedWithdrawals] = yield this.calculateAllWithdrawalBalances(wnfts, vault.vaultAddress, decimals, token);
+                const fastWithdrawBalance = yield this.calculateFastWithdrawBalancesOld(authData.token, vault.vaultAddress, userAddress, decimals);
                 const hasWithdrawsToClaim = this.checkIfUserHasWithdrawsToClaim(wnfts);
                 let balance = allDeposits
                     .sub(estimatedWithdrawals)
@@ -133,105 +133,144 @@ class DripSdk {
     }
     fastWithdraw(vault, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
-            // if (!this.signer) throw Error('No signer provided')
-            // try {
-            //     const signerAddress = await this.signer.getAddress()
-            //     if (!signerAddress) throw Error('Error fetching address')
-            //     const redeemBagStruct: RedeemBagStruct = this.shouldUseNewWithdrawLogic(signerAddress, vault)
-            //         ? await this.generateNewRedeemBagStruct(vault, signerAddress, amountToWithdraw)
-            //         : await this.generateOldRedeemBagStruct(vault, signerAddress, amountToWithdraw)
-            //     const currentBlockNumber = await this.signer.provider?.getBlockNumber()
-            //     if (!currentBlockNumber) throw Error('Error fetching block number')
-            //     const redeemTx = await this.spoolSdk?.redeemFast(
-            //         redeemBagStruct,
-            //         signerAddress.toLowerCase(),
-            //         currentBlockNumber,
-            //     )
-            //     const redeemTxReceipt = await redeemTx!.wait()
-            // } catch (error) {
-            //     console.log(error)
-            // }
+            var _a, _b;
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated)
+                throw Error(`User not authenticated: ${authData.message}`);
+            if (!this.signer)
+                throw Error('No signer provided');
+            try {
+                const signerAddress = yield this.signer.getAddress();
+                if (!signerAddress)
+                    throw Error('Error fetching address');
+                const redeemBagStruct = this.shouldUseNewWithdrawLogic(signerAddress, vault)
+                    ? yield this.generateNewRedeemBagStruct(authData.token, vault, signerAddress, amountToWithdraw)
+                    : yield this.generateOldRedeemBagStruct(authData.token, vault, signerAddress, 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, signerAddress.toLowerCase(), currentBlockNumber));
+                const redeemTxReceipt = yield redeemTx.wait();
+            }
+            catch (error) {
+                console.log(error);
+            }
         });
     }
     deposit(tokenAddress, vaultAddress, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // if (!this.signer) throw Error('No signer provided')
-            // const currentTokenAllowance = await this.getTokenAllowanceForDeposit(tokenAddress)
-            // const decimals = await this.getERC20Precission(tokenAddress)
-            // let amountToWithdrawFixedDecimals = parseFloat(amount).toFixed(decimals)
-            // const amountToDeposit = ethers.utils.parseUnits(amountToWithdrawFixedDecimals, decimals)
-            // if (amountToDeposit.gt(currentTokenAllowance)) {
-            //     const requiredTokenAllowance = amountToDeposit.sub(currentTokenAllowance)
-            //     await this.approveTokenForDeposit(tokenAddress, requiredTokenAllowance)
-            // }
-            // const signerAddress = await this.signer.getAddress()
-            // if (!signerAddress) throw Error('Error fetching address')
-            // const depositBagStruct: DepositBagStruct = {
-            //     smartVault: vaultAddress,
-            //     assets: [amountToDeposit],
-            //     receiver: signerAddress,
-            //     referral: ethers.constants.AddressZero,
-            //     doFlush: false,
-            // }
-            // const depositTx = await this.spoolSdk!.deposit(depositBagStruct)
-            // await depositTx.wait()
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated)
+                throw Error(`User not authenticated: ${authData.message}`);
+            if (!this.signer)
+                throw Error('No signer provided');
+            const currentTokenAllowance = yield this.getTokenAllowanceForDeposit(tokenAddress);
+            const decimals = yield this.getERC20Precission(tokenAddress);
+            let amountToWithdrawFixedDecimals = parseFloat(amount).toFixed(decimals);
+            const amountToDeposit = ethers_1.ethers.utils.parseUnits(amountToWithdrawFixedDecimals, decimals);
+            if (amountToDeposit.gt(currentTokenAllowance)) {
+                const requiredTokenAllowance = amountToDeposit.sub(currentTokenAllowance);
+                yield this.approveTokenForDeposit(tokenAddress, requiredTokenAllowance);
+            }
+            const signerAddress = yield this.signer.getAddress();
+            if (!signerAddress)
+                throw Error('Error fetching address');
+            const depositBagStruct = {
+                smartVault: vaultAddress,
+                assets: [amountToDeposit],
+                receiver: signerAddress,
+                referral: ethers_1.ethers.constants.AddressZero,
+                doFlush: false,
+            };
+            const depositTx = yield this.spoolSdk.deposit(depositBagStruct);
+            yield depositTx.wait();
         });
     }
     swapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // if (!this.signer) throw Error('No signer provided')
-            // const decimals = await this.getERC20Precission(fromTokenAddress)
-            // const amountToWithdrawFixedDecimals = parseFloat(fromTokenAmount).toFixed(decimals)
-            // const fromToken = ethers.utils.parseUnits(amountToWithdrawFixedDecimals, decimals)
-            // const signerAddress = await this.signer.getAddress()
-            // if (fromToken.gt(BigNumber.from(0))) {
-            //     const currentTokenAllowance = await this.getTokenAllowanceForSwapAndDepositContractAddress(fromTokenAddress)
-            //     if (fromToken.gt(currentTokenAllowance)) {
-            //         await this.approveTokenForSwapAndDepositContract(fromTokenAddress, fromToken.sub(currentTokenAllowance))
-            //     }
-            // }
-            // const swapInfo = await this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, signerAddress)
-            // const swapDepositBagStruct = {
-            //     inTokens: [fromTokenAddress],
-            //     inAmounts: [fromToken],
-            //     smartVault: vaultAddress,
-            //     swapInfo,
-            //     receiver: signerAddress,
-            //     referral: ethers.constants.AddressZero,
-            //     doFlush: false,
-            // }
-            // let swapAndDepositRequest: ethers.ContractTransaction | undefined
-            // if (ethAmount) {
-            //     const eth = ethers.utils.parseEther(ethAmount)
-            //     swapAndDepositRequest = await this.spoolSdk?.swapAndDeposit(swapDepositBagStruct, { value: eth })
-            // } else {
-            //     swapAndDepositRequest = await this.spoolSdk?.swapAndDeposit(swapDepositBagStruct)
-            // }
-            // await swapAndDepositRequest?.wait()
+            var _a, _b;
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated)
+                throw Error(`User not authenticated: ${authData.message}`);
+            if (!this.signer)
+                throw Error('No signer provided');
+            const decimals = yield this.getERC20Precission(fromTokenAddress);
+            const amountToWithdrawFixedDecimals = parseFloat(fromTokenAmount).toFixed(decimals);
+            const fromToken = ethers_1.ethers.utils.parseUnits(amountToWithdrawFixedDecimals, decimals);
+            const signerAddress = yield this.signer.getAddress();
+            if (fromToken.gt(ethers_1.BigNumber.from(0))) {
+                const currentTokenAllowance = yield this.getTokenAllowanceForSwapAndDepositContractAddress(fromTokenAddress);
+                if (fromToken.gt(currentTokenAllowance)) {
+                    yield this.approveTokenForSwapAndDepositContract(fromTokenAddress, fromToken.sub(currentTokenAllowance));
+                }
+            }
+            const swapInfo = yield this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, signerAddress);
+            const swapDepositBagStruct = {
+                inTokens: [fromTokenAddress],
+                inAmounts: [fromToken],
+                smartVault: vaultAddress,
+                swapInfo,
+                receiver: signerAddress,
+                referral: ethers_1.ethers.constants.AddressZero,
+                doFlush: false,
+            };
+            let swapAndDepositRequest;
+            if (ethAmount) {
+                const eth = ethers_1.ethers.utils.parseEther(ethAmount);
+                swapAndDepositRequest = yield ((_a = this.spoolSdk) === null || _a === void 0 ? void 0 : _a.swapAndDeposit(swapDepositBagStruct, { value: eth }));
+            }
+            else {
+                swapAndDepositRequest = yield ((_b = this.spoolSdk) === null || _b === void 0 ? void 0 : _b.swapAndDeposit(swapDepositBagStruct));
+            }
+            yield (swapAndDepositRequest === null || swapAndDepositRequest === void 0 ? void 0 : swapAndDepositRequest.wait());
         });
     }
     withdraw(vault, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
-            // if (!this.signer) throw Error('No signer provided')
-            // try {
-            //     const signerAddress = await this.signer.getAddress()
-            //     if (!signerAddress) throw Error('Error fetching address')
-            //     const redeemBagStruct: RedeemBagStruct = this.shouldUseNewWithdrawLogic(signerAddress, vault)
-            //         ? await this.generateNewRedeemBagStruct(vault, signerAddress, amountToWithdraw)
-            //         : await this.generateOldRedeemBagStruct(vault, signerAddress, amountToWithdraw)
-            //     const redeemTx = await this.spoolSdk!.redeem(redeemBagStruct, signerAddress.toLowerCase(), false)
-            //     const redeemTxReceipt = await redeemTx.wait()
-            // } catch (error) {
-            //     console.log(error)
-            // }
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated)
+                throw Error(`User not authenticated: ${authData.message}`);
+            if (!this.signer)
+                throw Error('No signer provided');
+            try {
+                const signerAddress = yield this.signer.getAddress();
+                if (!signerAddress)
+                    throw Error('Error fetching address');
+                const redeemBagStruct = this.shouldUseNewWithdrawLogic(signerAddress, vault)
+                    ? yield this.generateNewRedeemBagStruct(authData.token, vault, signerAddress, amountToWithdraw)
+                    : yield this.generateOldRedeemBagStruct(authData.token, vault, signerAddress, amountToWithdraw);
+                const redeemTx = yield this.spoolSdk.redeem(redeemBagStruct, signerAddress.toLowerCase(), false);
+                const redeemTxReceipt = yield redeemTx.wait();
+            }
+            catch (error) {
+                console.log(error);
+            }
         });
     }
     claimWithdraws(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () { });
+        return __awaiter(this, void 0, void 0, function* () {
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated)
+                throw Error(`User not authenticated: ${authData.message}`);
+            if (!this.signer)
+                throw Error('No signer provided');
+            const signerAddress = yield this.signer.getAddress();
+            if (!signerAddress)
+                throw Error('Error fetching address');
+            const wnfts = yield this.dripApi.fetchEnrichedUserWNFTForVault(vaultAddress, signerAddress, authData.token);
+            //! 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, nftIds, nftAmounts, signerAddress.toLowerCase());
+            yield claimWithdrawTx.wait();
+        });
     }
-    generateOldRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
+    generateOldRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.generateToken();
             const dnfts = yield this.dripApi.fetchEnrichedUserDNFTForVault(vault.vaultAddress, signerAddress, token);
             const userBalance = yield this.dripApi.fetchUserBalance(vault.vaultAddress, signerAddress, token);
             const totalTokenBalance = ethers_1.BigNumber.from(userBalance[vault.depositToken.tokenAddress]);
@@ -267,15 +306,14 @@ class DripSdk {
             };
         });
     }
-    generateNewRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
+    generateNewRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.generateToken();
             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);
-            dnfts = yield this.getAllSvts(vault.vaultAddress.toLowerCase(), signerAddress, dnfts);
+            dnfts = yield this.getAllSvts(vault.vaultAddress.toLowerCase(), signerAddress, dnfts, token);
             let shares = ethers_1.BigNumber.from(0);
             let nftIds = [];
             let nftAmounts = [];
@@ -313,9 +351,8 @@ class DripSdk {
             };
         });
     }
-    getAllSvts(vaultAddress, userAddress, dnfts) {
+    getAllSvts(vaultAddress, userAddress, dnfts, token) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.generateToken();
             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] };
@@ -335,9 +372,8 @@ class DripSdk {
             return decimals;
         });
     }
-    calculateFastWithdrawBalancesOld(vaultAddress, userAddress, decimals) {
+    calculateFastWithdrawBalancesOld(token, vaultAddress, userAddress, decimals) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.generateToken();
             const fastWithdrawNFTs = yield this.dripApi.fetchFastWithdrawNFTs(vaultAddress, userAddress, token);
             let fastWithdrawBalance = 0;
             for (const wnft of fastWithdrawNFTs) {
@@ -414,15 +450,7 @@ class DripSdk {
         }
         return vault.newWithdraw;
     }
-    generateToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer)
-                throw Error('No signer provided');
-            const token = yield web3_token_1.default.sign((msg) => __awaiter(this, void 0, void 0, function* () { return yield this.signer.signMessage(msg); }), '1d');
-            return token;
-        });
-    }
-    calculateAllWithdrawalBalances(wnfts, vaultAddress, decimals) {
+    calculateAllWithdrawalBalances(wnfts, vaultAddress, decimals, token) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer)
                 throw Error('No signer provided');
@@ -437,7 +465,6 @@ class DripSdk {
                     continue;
                 }
                 const currentBlockNumber = wnft.blockNumber - 1;
-                const token = yield this.generateToken();
                 const assetsPerSvtAtBlock = yield this.dripApi.fetchAssetPerSvtAtBlock(vaultAddress, currentBlockNumber, token);
                 const estimatedValueOfNFT = ethers_1.BigNumber.from(parseInt(ethers_1.ethers.utils.formatUnits(ethers_1.BigNumber.from(wnft.svtWithdrawn).mul(assetsPerSvtAtBlock), 36)).toString());
                 if (wnft.isDHWFinished) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dripfi/drip-sdk",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Drip SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",