@dripfi/drip-sdk 1.1.17 → 1.1.18

package/dist/DripSdk.d.ts

@@ -1,4 +1,4 @@
-import { BigNumber, Signer } from 'ethers';
+import { Signer } from 'ethers';
 import { DripConfig } from './DripConfig';
 import { AuthenticationStatus } from './types/AuthenticationStatus';
 import { UserRewards } from './types/UserRewards';
@@ -41,20 +41,17 @@ export default class DripSdk {
     claimWithdraws(vaultAddress: string): Promise<string>;
     getVaultsClaimableData(headers?: Headers): Promise<VaultClaimData>;
     getBeansBalance(walletAddress: string, headers?: Headers): Promise<any>;
-    recycleTokens(amount: BigNumber): Promise<string>;
+    recycleTokens(amount: string): Promise<string>;
     upgradeLoyaltyCard(): Promise<LoyaltyCard>;
     getNextLoyaltyCard(headers?: Headers): Promise<LoyaltyCard>;
     getOwnedLoyaltyCards(headers?: Headers): Promise<LoyaltyCard>;
     getAllLoyaltyCards(headers?: Headers): Promise<LoyaltyCard[]>;
-    approveTokenForRecycler(tokenAddress: string, amount: string): Promise<void>;
-    approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<void>;
-    approveTokenForDeposit(tokenAddress: string, amount: string): Promise<void>;
+    approveTokenForRecycler(tokenAddress: string, amount: string): Promise<string>;
+    approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
+    approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     private generateRedeemBagStruct;
     private getAllSvts;
     private getERC20Precission;
-    private calculateFastWithdrawBalancesOld;
-    private calculatePendingDepositsOld;
-    private calculateDepositsOld;
     private calculatePendingDeposits;
     private calculateAllDeposits;
     private calculateBalanceForDNFT;
@@ -63,4 +60,5 @@ export default class DripSdk {
     private getTokenAllowanceForDeposit;
     private getTokenAllowanceForSwapAndDeposit;
     private getERC20TokenAllowance;
+    private approveToken;
 }

package/dist/DripSdk.js

@@ -16,7 +16,6 @@ const web3_token_1 = __importDefault(require("web3-token"));
 const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 const ethers_1 = require("ethers");
 const DripConfig_1 = require("./DripConfig");
-const utils_1 = require("./utils");
 const DripApi_1 = __importDefault(require("./DripApi"));
 const js_cookie_1 = __importDefault(require("js-cookie"));
 const DripTokenContract_1 = __importDefault(require("./contracts/DripTokenContract"));
@@ -349,7 +348,9 @@ class DripSdk {
             if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
                 throw Error('Recycler contract address not defined');
             }
-            const recycleTx = yield this.dripTokenRecyclerContract.recycle(amount);
+            const decimals = yield this.getERC20Precission(this.dripConfig.dripTokenAddress);
+            const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
+            const recycleTx = yield this.dripTokenRecyclerContract.recycle(amountWithDecimals.toString());
             const receipt = yield recycleTx.wait();
             return receipt.transactionHash;
         });
@@ -398,11 +399,7 @@ class DripSdk {
             if (this.dripConfig.dripTokenRecyclerAddress === DripConfig_1.NULL_ADDRESS) {
                 throw Error('Recycler contract address not defined');
             }
-            const decimals = yield this.getERC20Precission(tokenAddress);
-            const amountToApprove = ethers_1.ethers.utils.parseUnits(amount.toString(), decimals);
-            const erc20Instance = spool_v2_sdk_1.ERC20__factory.connect(tokenAddress, this.signer);
-            const approveTx = yield erc20Instance.approve(this.dripConfig.dripTokenRecyclerAddress, amountToApprove);
-            yield approveTx.wait();
+            return yield this.approveToken(tokenAddress, amount.toString(), this.dripConfig.dripTokenRecyclerAddress);
         });
     }
     approveTokenForSwapAndDeposit(tokenAddress, amount) {
@@ -410,12 +407,8 @@ class DripSdk {
             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();
+            return yield this.approveToken(tokenAddress, amount, swapAndDepositContractAddress);
         });
     }
     approveTokenForDeposit(tokenAddress, amount) {
@@ -423,12 +416,8 @@ class DripSdk {
             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();
+            return yield this.approveToken(tokenAddress, amount, smartVaultManagerAddress);
         });
     }
     generateRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
@@ -499,39 +488,6 @@ class DripSdk {
             return decimals;
         });
     }
-    calculateFastWithdrawBalancesOld(token, vaultAddress, userAddress, decimals, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fastWithdrawNFTs = yield this.dripApi.fetchFastWithdrawNFTs(vaultAddress, userAddress, token, headers);
-            let fastWithdrawBalance = 0;
-            for (const wnft of fastWithdrawNFTs) {
-                if (wnft.assetsWithdrawn[0].asset && wnft.assetsWithdrawn[0].claimed) {
-                    const value = +(0, utils_1.insertDot)(wnft.assetsWithdrawn[0].claimed, decimals);
-                    fastWithdrawBalance += value;
-                }
-            }
-            return ethers_1.ethers.utils.parseUnits(fastWithdrawBalance.toFixed(decimals), decimals);
-        });
-    }
-    calculatePendingDepositsOld(dnfts, decimals) {
-        let pendingDeposits = 0;
-        for (const nft of dnfts) {
-            if (nft['assets'] && nft['assets'][0] && !nft.isDHWFinished) {
-                pendingDeposits += nft['assets'][0];
-            }
-        }
-        pendingDeposits = +pendingDeposits.toFixed(decimals);
-        return ethers_1.ethers.utils.parseUnits(pendingDeposits.toString(), decimals);
-    }
-    calculateDepositsOld(dnfts, decimals) {
-        let deposits = 0;
-        for (const nft of dnfts) {
-            if (nft['assets'] && nft['assets'][0] && nft.isDHWFinished) {
-                deposits += nft['assets'][0];
-            }
-        }
-        deposits = +deposits.toFixed(decimals);
-        return ethers_1.ethers.utils.parseUnits(deposits.toString(), decimals);
-    }
     calculatePendingDeposits(dnfts, decimals) {
         let pendingDeposits = ethers_1.BigNumber.from(0);
         for (const nft of dnfts) {
@@ -629,5 +585,17 @@ class DripSdk {
             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;
+        });
+    }
 }
 exports.default = DripSdk;

package/dist/contracts/DripTokenRecyclerContract.d.ts

@@ -1,6 +1,6 @@
-import { BigNumber, ContractTransaction, ethers } from 'ethers';
+import { ContractTransaction, ethers } from 'ethers';
 import BaseDripContract from './BaseDripContract';
 export default class DripTokenRecyclerContract extends BaseDripContract {
     constructor(address: string, signer?: ethers.Signer);
-    recycle(amount: BigNumber): Promise<ContractTransaction>;
+    recycle(amount: string): Promise<ContractTransaction>;
 }

package/dist/contracts/DripTokenRecyclerContract.js

@@ -24,7 +24,7 @@ class DripTokenRecyclerContract extends BaseDripContract_1.default {
             if (!this.contract.signer) {
                 throw Error('No signer provided');
             }
-            return yield this.contract.recycle(amount.toString());
+            return yield this.contract.recycle(amount);
         });
     }
 }

package/package.json

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