@dripfi/drip-sdk 1.1.9 → 1.1.10

package/dist/DripSdk.d.ts

@@ -20,7 +20,10 @@ export default class DripSdk {
     updateSigner(newSigner: Signer): void;
     isUserAuthenticated(): Promise<AuthenticationStatus>;
     authenticate(): Promise<boolean>;
+    newDeposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
+    private doDeposit;
+    getTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
     getUserBalance(headers?: Headers): Promise<UserBalance>;
     getUserBoostedNfts(vaultAddress: string, headers?: Headers): Promise<string[]>;
@@ -29,10 +32,14 @@ export default class DripSdk {
     getUserVaultBalance(vaultAddress: string, headers?: Headers): Promise<UserVaultBalance>;
     fastWithdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
     swapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
+    newSwapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
+    private doSwapAndDeposit;
     withdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
     claimWithdraws(vaultAddress: string): Promise<string>;
     getVaultsClaimableData(headers?: Headers): Promise<VaultClaimData>;
     private generateOldRedeemBagStruct;
+    approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<void>;
+    approveTokenForDeposit(tokenAddress: string, amount: string): Promise<void>;
     private generateNewRedeemBagStruct;
     private getAllSvts;
     private getERC20Precission;
@@ -45,8 +52,7 @@ export default class DripSdk {
     private checkIfUserHasWithdrawsToClaim;
     private shouldUseNewWithdrawLogic;
     private calculateAllWithdrawalBalances;
-    private getTokenAllowanceForSwapAndDepositContractAddress;
-    private approveTokenForSwapAndDepositContract;
     private getTokenAllowanceForDeposit;
-    private approveTokenForDeposit;
+    private getTokenAllowanceForSwapAndDeposit;
+    private getERC20TokenAllowance;
 }

package/dist/DripSdk.js

@@ -124,19 +124,30 @@ class DripSdk {
             return false;
         });
     }
+    newDeposit(tokenAddress, vaultAddress, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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);
+        });
+    }
+    doDeposit(tokenAddress, vaultAddress, amount, checkAllowance) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {
                 throw Error('No signer provided');
             }
-            const currentTokenAllowance = yield this.getTokenAllowanceForDeposit(tokenAddress);
             const decimals = yield this.getERC20Precission(tokenAddress);
-            const 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 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');
@@ -153,10 +164,19 @@ class DripSdk {
             return txReceipt.transactionHash;
         });
     }
+    getTokenAllowanceForCurrency(tokenAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
+            const currentTokenAllowance = yield this.getTokenAllowanceForDeposit(tokenAddress);
+            return currentTokenAllowance.toString();
+        });
+    }
     getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
         return __awaiter(this, void 0, void 0, function* () {
             const userAddress = yield this.signer.getAddress();
-            const authData = yield this.isUserAuthenticated();
+            yield this.isUserAuthenticated();
             // if (!authData.isAuthenticated) {throw Error(`User not authenticated: ${authData.message}`);}
             return this.dripApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, userAddress);
         });
@@ -260,22 +280,32 @@ class DripSdk {
         });
     }
     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();
-            const authData = yield this.isUserAuthenticated();
+            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);
-            if (fromToken.gt(ethers_1.BigNumber.from(0))) {
-                const currentTokenAllowance = yield this.getTokenAllowanceForSwapAndDepositContractAddress(fromTokenAddress, userAddress);
-                if (fromToken.gt(currentTokenAllowance)) {
-                    yield this.approveTokenForSwapAndDepositContract(fromTokenAddress, fromToken.sub(currentTokenAllowance));
+            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());
                 }
             }
+            const fromToken = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
             const swapInfo = yield this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, userAddress);
             const swapDepositBagStruct = {
                 inTokens: [fromTokenAddress],
@@ -380,6 +410,32 @@ class DripSdk {
             };
         });
     }
+    approveTokenForSwapAndDeposit(tokenAddress, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
+            const decimals = yield this.getERC20Precission(tokenAddress);
+            const amountToApprove = ethers_1.ethers.utils.parseUnits(amount.toString(), decimals);
+            const swapAndDepositContractAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
+            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+            const approveTx = yield erc20Instance.approve(swapAndDepositContractAddress, amountToApprove);
+            yield approveTx.wait();
+        });
+    }
+    approveTokenForDeposit(tokenAddress, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
+            const decimals = yield this.getERC20Precission(tokenAddress);
+            const amountToApprove = ethers_1.ethers.utils.parseUnits(amount.toString(), decimals);
+            const smartVaultManagerAddress = yield this.dripConfig.getSmartVaultManagerAddress(this.signer);
+            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
+            const approveTx = yield erc20Instance.approve(smartVaultManagerAddress, amountToApprove);
+            yield approveTx.wait();
+        });
+    }
     generateNewRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress.toLowerCase());
@@ -555,53 +611,36 @@ class DripSdk {
             return [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance, estimatedWithdrawals];
         });
     }
-    getTokenAllowanceForSwapAndDepositContractAddress(tokenAddress, userAddress) {
+    getTokenAllowanceForDeposit(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 swapAndDepositAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
-            const allowance = yield erc20Instance.allowance(userAddress, swapAndDepositAddress);
+            const smartVaultManagerAddress = yield this.dripConfig.getSmartVaultManagerAddress(this.signer);
+            const allowance = yield this.getERC20TokenAllowance(smartVaultManagerAddress, tokenAddress);
             return allowance;
         });
     }
-    approveTokenForSwapAndDepositContract(tokenAddress, amount) {
+    getTokenAllowanceForSwapAndDeposit(tokenAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {
                 throw Error('No signer provided');
             }
-            const swapAndDepositContractAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const approveTx = yield erc20Instance.approve(swapAndDepositContractAddress, amount);
-            yield approveTx.wait();
+            const swapAndDepositAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
+            const allowance = yield this.getERC20TokenAllowance(swapAndDepositAddress, tokenAddress);
+            return allowance;
         });
     }
-    getTokenAllowanceForDeposit(tokenAddress) {
+    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();
-            if (!signerAddress) {
-                throw Error('Error fetching address');
-            }
             const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const smartVaultManagerAddress = yield this.dripConfig.getSmartVaultManagerAddress(this.signer);
-            const allowance = yield erc20Instance.allowance(signerAddress, smartVaultManagerAddress);
+            const allowance = yield erc20Instance.allowance(signerAddress, spender);
             return allowance;
         });
     }
-    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);
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const approveTx = yield erc20Instance.approve(smartVaultManagerAddress, amount);
-            yield approveTx.wait();
-        });
-    }
 }
 exports.default = DripSdk;

package/package.json

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