@dripfi/drip-sdk 1.0.13 → 1.0.15

package/README.md

@@ -43,18 +43,24 @@ const dripSdk = new DripSdk(dripConfig, signer);
 
 | Name | Requires authentication | Description |
 | ------ | ------ | ----------- |
-| `getAllVaults(): Promise<Vault[]>`| No | Fetches details of all Drip Vaults. |
+| `getAllVaults(): Promise<Vault[]>`| NO | Fetches details of all Drip Vaults. |
 | `getVaultDetails(vaultAddress: string): Promise<Vault>` | NO | Fetches details of a specific Drip Vault identified by its address. |
-| `authenticate(): Promise<boolean>` | NO | Initiates the user authentication process and returns a boolean indicating success. |
-| `isUserAuthenticated(): Promise<AuthenticationStatus>` | NO | Checks if the user is authenticated and returns authentication status along with relevant information. |
+| `getVaultStats(): Promise<VaultStats>`| NO | Returns some overall drip stats |
+| `getTokenPrice(tokenName: string): Promise<number>`| NO | Returns the price for the given token (only works for weth at the moment) |
 | `updateSigner(newSigner: Signer): Promise<void>`| NO | Updates the signer for the SDK instance. |
-| `getUserBalance(vault: Vault): Promise<UserBalance>` | YES | Fetches the user's balance for a specific Drip Vault. |
+| `isUserAuthenticated(): Promise<AuthenticationStatus>` | NO | Checks if the user is authenticated and returns authentication status along with relevant information. |
+| `authenticate(): Promise<boolean>` | NO | Initiates the user authentication process and returns a boolean indicating success. |
 | `deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>` | NO | The deposit function allows you to deposit tokens into a specific vault. Returns txHash. |
+| `getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>`| YES | Returns the expected amount of tokens to get from a swap |
+| `getUserBalance(): Promise<UserBalance>` | YES | Returns overall user balance information |
+| `getUserBoostedNfts(vaultAddress: string): Promise<string[]>` | YES | Returns an array of boosted nfts addresses owned by the user  |
+| `getRewardsPerHour(vaultAddress: string): Promise<string[]>` | YES | Returns an estimated amount of tokens the user will receive in 1 hour as reward. It considers boost nfts the user owns for the estimation. |
+| `getRewards(): Promise<UserRewards>` | YES | Fetches the current user's rewards points for each vault. |
+| `getUserVaultBalance(): Promise<UserVaultBalance>` | YES | Fetches the user's balance for a specific Drip Vault.  |
+| `fastWithdraw(vault: Vault, amountToWithdraw?: string): Promise<string>` | YES | For users who prefer not to wait for withdrawals to be processed, there is a Fast Withdrawal method. While this approach is more gas-intensive, as users bear the cost of executing the withdrawal process themselves, it allows for instant access to the withdrawn tokens. When utilizing Fast Withdrawal, users immediately receive the tokens, eliminating the need to initiate the 'claimWithdrawal' process separately. Returns txHash. |
 | `swapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>` | YES | The swapAndDeposit function allows you to deposit a different token or ether and it will take care of swapping to the correct token before making the deposit. Returns txHash. |
 | `withdraw(vault: Vault, amountToWithdraw?: string): Promise<string>` | YES | Withdraws tokens from a vault. After withdrawing, you must wait for the withdrawal to be processed by the 'DoHardWork' function, and then you can claim those tokens using claimWithdraws(). Returns txHash. |
 | `claimWithdraws(vaultAddress: string): Promise<string>` | YES | After the withdrawal has been processed by the 'DoHardWork' function, the 'claimWithdraws' function transfers the withdrawn tokens to their personal account. Returns txHash. |
-| `fastWithdraw(vault: Vault, amountToWithdraw?: string): Promise<string>` | YES | For users who prefer not to wait for withdrawals to be processed, there is a Fast Withdrawal method. While this approach is more gas-intensive, as users bear the cost of executing the withdrawal process themselves, it allows for instant access to the withdrawn tokens. When utilizing Fast Withdrawal, users immediately receive the tokens, eliminating the need to initiate the 'claimWithdrawal' process separately. Returns txHash. |
-| `getRewards(): Promise<UserRewards>` | YES | Fetches the current user's rewards points for each vault. |
 
 
 > [!IMPORTANT]
@@ -190,6 +196,7 @@ type Vault = {
   depositToken: VaultDepositToken
   type: VaultType
   rewards: VaultReward[]
+  rewardType: 'points' | 'token' | 'pnode shards'
   liveUntil: string
   liveUntilFormatted: string
   hasPoolEnded: boolean
@@ -199,8 +206,7 @@ type Vault = {
   newWithdraw: boolean
   tgePrice?: number
   maxAmountOfTokens?: number
-  rewardsInformation: RewardsInformation
-}
+};
 
 type VaultType = 'launch' | 'earn' | 'airdrop'
 
@@ -213,13 +219,17 @@ type VaultDepositToken = {
 }
 
 type VaultReward = {
-  type: 'token' | 'points'
-  name: string
-  symbol: string
-  decimals: number
-  tokenAddress: string
-  monthlyEmissionRate?: number
-}
+  type: 'token' | 'points';
+  name: string;
+  symbol: string;
+  decimals: number;
+  tokenAddress: string;
+  monthlyEmissionRate: number;
+  blockNumber: number;
+  rewardrate: number;
+  timestamp: number;
+  endTime: number;
+};
 
 type NFTBoost = {
   url: string
@@ -239,14 +249,6 @@ interface StretchGoal {
   amountOfTokens: number
 }
 
-type RewardsInformation = {
-  [tokenAddress: string]: { 
-    blockNumber: string; 
-    rewardrate: string; 
-    timestamp: string; 
-    endTime: string }
-}
-
 type Strategy = {
   address: string
   lastDoHardWorkTime: number | null
@@ -283,6 +285,22 @@ type SwapInfo = {
 }
 
 type UserBalance = {
+    assets: {
+            asset: string,
+            dripping: string,
+            deposits: number,
+            depositsUSD: number,
+            tvr: number,
+            apy: number,
+            decimals: number,
+            reward: number
+    }[],
+    available: { [symbol: string] : number},
+    claimed: { [symbol: string] : number},
+};
+
+
+type UserVaultBalance = {
   hasWithdrawsToClaim: boolean
   userBalance: string
   pendingUserBalance: string
@@ -290,8 +308,16 @@ type UserBalance = {
   withdrawableBalance: string
 };
 
+
 type UserRewards = {
    [vaultAddress: string]: { [rewardPointsName: string]: number } 
 };
 
+type VaultStats = {
+    totalTVL: number
+    totalUsers: number
+    activeVaults: number
+  };
+  
+
 ```

package/dist/DripApi.d.ts

@@ -3,11 +3,19 @@ import { Vault } from './types/Vault';
 import { SwapInfo } from './types/SwapInfo';
 import { QLFastRedeem } from './types/QLFastRedeem';
 import { UserRewards } from './types/UserRewards';
+import { VaultStats } from './types/VaultStats';
+import { UserBalance } from './types/UserBalance';
 export default class DripApi {
     route: string;
     constructor(route: string);
     fetchAllVaults(): Promise<Vault[]>;
+    fetchTokenPrice(tokenName: string): Promise<number>;
+    getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number, token: string): Promise<string>;
+    getUserBalance(walletAddress: string, token: string): Promise<UserBalance>;
+    getUserBoostedNfts(walletAddress: string, vaultAddress: string, token: string): Promise<string[]>;
+    fetchVaultStats(): Promise<VaultStats>;
     fetchVaultDetails(vaultAddress: string): Promise<Vault>;
+    fetchRewardsPerHour(vaultAddress: string, token: string): Promise<number>;
     getSwapInfo(fromTokenAddress: string, toTokenAddress: string, amount: BigNumber, fromAddress: string): Promise<SwapInfo[]>;
     fetchUserSVTBalance(vaultAddress: string, walletAddress: string, token: string): Promise<BigNumber>;
     fetchUserBalance(vaultAddress: string, walletAddress: string, token: string): Promise<Record<string, string>>;

package/dist/DripApi.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
 const WETH_TOKEN_ADDRESS = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
 class DripApi {
     constructor(route) {
@@ -21,6 +22,67 @@ class DripApi {
             return data;
         });
     }
+    fetchTokenPrice(tokenName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield fetch(`${this.route}/api-be/api/tokenPrice/?tokenName=${tokenName}`);
+            if (!res.ok) {
+                throw Error(yield res.text());
+            }
+            const data = yield res.json();
+            return data.usdPricePerToken;
+        });
+    }
+    getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headers = new Headers();
+            headers.append('Authorization', token);
+            const parsedAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
+            const queryParams = new URLSearchParams({
+                from: fromTokenAddress,
+                to: toTokenAddress,
+                amount: parsedAmount.toString(),
+            });
+            const res = yield fetch(`${this.route}/api-be/api/1inch/swap?${queryParams}`, {
+                headers,
+            });
+            const data = yield res.json();
+            if (res.ok) {
+                return data;
+            }
+            else {
+                throw new Error(`HTTP error! status: ${res.status}`);
+            }
+        });
+    }
+    getUserBalance(walletAddress, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headers = new Headers();
+            headers.append('Authorization', token);
+            const res = yield fetch(`${this.route}/api-be/api/user/deposits/${walletAddress}`, {
+                headers,
+            });
+            const data = yield res.json();
+            return data;
+        });
+    }
+    getUserBoostedNfts(walletAddress, vaultAddress, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headers = new Headers();
+            headers.append('Authorization', token);
+            const res = yield fetch(`${this.route}/api-be/api/user/nftBoost/${walletAddress}/${vaultAddress}`, {
+                headers,
+            });
+            const data = yield res.json();
+            return data;
+        });
+    }
+    fetchVaultStats() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield fetch(`${this.route}/api-be/api/vaultStats`);
+            const data = yield res.json();
+            return data;
+        });
+    }
     fetchVaultDetails(vaultAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield fetch(`${this.route}/api-be/api/vault/${vaultAddress}`);
@@ -28,6 +90,20 @@ class DripApi {
             return data;
         });
     }
+    fetchRewardsPerHour(vaultAddress, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headers = new Headers();
+            headers.append('Authorization', token);
+            const res = yield fetch(`${this.route}/api-be/api/user/rewardsPerHour/${vaultAddress}`, {
+                headers,
+            });
+            if (!res.ok) {
+                throw Error(yield res.text());
+            }
+            const data = yield res.json();
+            return data.rewardsPerHour;
+        });
+    }
     getSwapInfo(fromTokenAddress, toTokenAddress, amount, fromAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             if (fromTokenAddress === toTokenAddress && fromTokenAddress === WETH_TOKEN_ADDRESS) {
@@ -82,7 +158,7 @@ class DripApi {
         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}`, {
+            const res = yield fetch(`${this.route}/api-be/api/spool/user/wNft/${walletAddress}/${vaultAddress}`, {
                 headers,
             });
             const data = yield res.json();
@@ -148,7 +224,7 @@ class DripApi {
         return __awaiter(this, void 0, void 0, function* () {
             const headers = new Headers();
             headers.append('Authorization', token);
-            const res = yield fetch(`/api-be/api/user/rewards/${walletAddress}`, {
+            const res = yield fetch(`${this.route}/api-be/api/user/rewards/${walletAddress}`, {
                 headers,
             });
             const data = yield res.json();

package/dist/DripSdk.d.ts

@@ -1,9 +1,11 @@
-import { Vault } from './types/Vault';
 import { Signer } from 'ethers';
 import { DripConfig } from './DripConfig';
-import { UserBalance } from './types/UserBalance';
 import { AuthenticationStatus } from './types/AuthenticationStatus';
 import { UserRewards } from './types/UserRewards';
+import { VaultStats } from './types/VaultStats';
+import { UserBalance } from './types/UserBalance';
+import { UserVaultBalance } from './types/UserVaultBalance';
+import { Vault } from './types/Vault';
 export default class DripSdk {
     private dripApi;
     private spoolSdk?;
@@ -12,15 +14,21 @@ export default class DripSdk {
     constructor(dripConfig: DripConfig, signer?: Signer);
     getAllVaults(): Promise<Vault[]>;
     getVaultDetails(vaultAddress: string): Promise<Vault>;
-    authenticate(): Promise<boolean>;
-    isUserAuthenticated(): Promise<AuthenticationStatus>;
+    getVaultStats(): Promise<VaultStats>;
+    getTokenPrice(tokenName: string): Promise<number>;
     updateSigner(newSigner: Signer): void;
-    getRewards(): Promise<UserRewards>;
-    getUserBalance(vault: Vault): Promise<UserBalance>;
-    fastWithdraw(vault: Vault, amountToWithdraw?: string): Promise<string>;
+    isUserAuthenticated(): Promise<AuthenticationStatus>;
+    authenticate(): Promise<boolean>;
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
+    getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
+    getUserBalance(): Promise<UserBalance>;
+    getUserBoostedNfts(vaultAddress: string): Promise<string[]>;
+    getRewardsPerHour(vaultAddress: string): Promise<number>;
+    getRewards(): Promise<UserRewards>;
+    getUserVaultBalance(vaultAddress: string): Promise<UserVaultBalance>;
+    fastWithdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
     swapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
-    withdraw(vault: Vault, amountToWithdraw?: string): Promise<string>;
+    withdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
     claimWithdraws(vaultAddress: string): Promise<string>;
     private generateOldRedeemBagStruct;
     private generateNewRedeemBagStruct;

package/dist/DripSdk.js

@@ -38,27 +38,20 @@ class DripSdk {
             return this.dripApi.fetchVaultDetails(vaultAddress);
         });
     }
-    authenticate() {
+    getVaultStats() {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                if (!this.signer) {
-                    throw Error('No signer provided');
-                }
-                const address = yield this.signer.getAddress();
-                const cookieName = `auth_${address.toLowerCase()}`;
-                const token = yield web3_token_1.default.sign((msg) => __awaiter(this, void 0, void 0, function* () { return yield this.signer.signMessage(msg); }), {
-                    statement: 'Please sign this message to authenticate.',
-                    expires_in: '30d',
-                });
-                js_cookie_1.default.set(cookieName, token, { expires: 30 });
-                return true;
-            }
-            catch (error) {
-                console.error('Error obtaining token:', error);
-            }
-            return false;
+            return this.dripApi.fetchVaultStats();
         });
     }
+    getTokenPrice(tokenName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.dripApi.fetchTokenPrice(tokenName);
+        });
+    }
+    updateSigner(newSigner) {
+        this.signer = newSigner;
+        this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(this.dripConfig.internalConfig, newSigner);
+    }
     isUserAuthenticated() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -84,9 +77,91 @@ class DripSdk {
             return { isAuthenticated: false };
         });
     }
-    updateSigner(newSigner) {
-        this.signer = newSigner;
-        this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(this.dripConfig.internalConfig, newSigner);
+    authenticate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (!this.signer) {
+                    throw Error('No signer provided');
+                }
+                const address = yield this.signer.getAddress();
+                const cookieName = `auth_${address.toLowerCase()}`;
+                const token = yield web3_token_1.default.sign((msg) => __awaiter(this, void 0, void 0, function* () { return yield this.signer.signMessage(msg); }), {
+                    statement: 'Please sign this message to authenticate.',
+                    expires_in: '30d',
+                });
+                js_cookie_1.default.set(cookieName, token, { expires: 30 });
+                return true;
+            }
+            catch (error) {
+                console.error('Error obtaining token:', error);
+            }
+            return false;
+        });
+    }
+    deposit(tokenAddress, vaultAddress, amount) {
+        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 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);
+            const txReceipt = yield depositTx.wait();
+            return txReceipt.transactionHash;
+        });
+    }
+    getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated) {
+                throw Error(`User not authenticated: ${authData.message}`);
+            }
+            return this.dripApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, authData.token);
+        });
+    }
+    getUserBalance() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated) {
+                throw Error(`User not authenticated: ${authData.message}`);
+            }
+            return this.dripApi.getUserBalance(authData.address, authData.token);
+        });
+    }
+    getUserBoostedNfts(vaultAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated) {
+                throw Error(`User not authenticated: ${authData.message}`);
+            }
+            return this.dripApi.getUserBoostedNfts(authData.address, vaultAddress, authData.token);
+        });
+    }
+    getRewardsPerHour(vaultAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated) {
+                throw Error(`User not authenticated: ${authData.message}`);
+            }
+            return this.dripApi.fetchRewardsPerHour(vaultAddress, authData.token);
+        });
     }
     getRewards() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -98,19 +173,20 @@ class DripSdk {
             return userRewards;
         });
     }
-    getUserBalance(vault) {
+    getUserVaultBalance(vaultAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const authData = yield this.isUserAuthenticated();
             if (!authData.isAuthenticated) {
                 throw Error(`User not authenticated: ${authData.message}`);
             }
+            const vault = yield this.getVaultDetails(vaultAddress);
             const userAddress = authData.address;
             const token = authData.token;
-            const dnfts = yield this.dripApi.fetchAllUserDNFTForVault(vault.vaultAddress, userAddress, token);
-            const wnfts = yield this.dripApi.fetchAllUserWNFTForVault(vault.vaultAddress, userAddress, token);
+            const dnfts = yield this.dripApi.fetchAllUserDNFTForVault(vaultAddress, userAddress, token);
+            const wnfts = yield this.dripApi.fetchAllUserWNFTForVault(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, token);
+                const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance] = yield this.calculateAllWithdrawalBalances(wnfts, vaultAddress, decimals, token);
                 const hasWithdrawsToClaim = this.checkIfUserHasWithdrawsToClaim(wnfts);
                 const pendingDeposits = this.calculatePendingDeposits(dnfts, decimals);
                 const userBalance = this.calculateAllDeposits(dnfts, decimals).sub(pendingDeposits);
@@ -143,7 +219,7 @@ class DripSdk {
             }
         });
     }
-    fastWithdraw(vault, amountToWithdraw) {
+    fastWithdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const authData = yield this.isUserAuthenticated();
@@ -153,6 +229,7 @@ class DripSdk {
             if (!this.signer) {
                 throw Error('No signer provided');
             }
+            const vault = yield this.getVaultDetails(vaultAddress);
             const redeemBagStruct = this.shouldUseNewWithdrawLogic(authData.address, vault)
                 ? yield this.generateNewRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw)
                 : yield this.generateOldRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw);
@@ -165,35 +242,6 @@ class DripSdk {
             return txReceipt.transactionHash;
         });
     }
-    deposit(tokenAddress, vaultAddress, amount) {
-        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 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);
-            const txReceipt = yield depositTx.wait();
-            return txReceipt.transactionHash;
-        });
-    }
     swapAndDeposit(fromTokenAddress, toTokenAddress, fromTokenAmount, vaultAddress, ethAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             const authData = yield this.isUserAuthenticated();
@@ -229,7 +277,7 @@ class DripSdk {
             return txReceipt === null || txReceipt === void 0 ? void 0 : txReceipt.transactionHash;
         });
     }
-    withdraw(vault, amountToWithdraw) {
+    withdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             const authData = yield this.isUserAuthenticated();
             if (!authData.isAuthenticated) {
@@ -238,6 +286,7 @@ class DripSdk {
             if (!this.signer) {
                 throw Error('No signer provided');
             }
+            const vault = yield this.getVaultDetails(vaultAddress);
             const redeemBagStruct = this.shouldUseNewWithdrawLogic(authData.address, vault)
                 ? yield this.generateNewRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw)
                 : yield this.generateOldRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw);

package/dist/index.d.ts

@@ -1,5 +1,15 @@
 import DripSdk from './DripSdk';
 import { Vault } from './types/Vault';
+import { VaultReward } from './types/VaultReward';
+import { AuthenticationStatus } from './types/AuthenticationStatus';
+import { NFTBoost } from './types/NFTBoost';
+import { Strategy } from './types/Strategy';
+import { StretchGoal } from './types/StretchGoal';
+import { SwapInfo } from './types/SwapInfo';
+import { VaultDepositToken } from './types/VaultDepositToken';
+import { VaultType } from './types/VaultType';
+import { UserVaultBalance } from './types/UserVaultBalance';
 import { UserBalance } from './types/UserBalance';
+import { VaultStats } from './types/VaultStats';
 import { DripConfig } from './DripConfig';
-export { Vault, DripSdk, DripConfig, UserBalance };
+export { Vault, VaultReward, DripSdk, DripConfig, UserVaultBalance, UserBalance, VaultStats, AuthenticationStatus, NFTBoost, Strategy, StretchGoal, SwapInfo, VaultDepositToken, VaultType };

package/dist/types/NFTBoost.d.ts

@@ -0,0 +1,9 @@
+export type NFTBoost = {
+    url: string;
+    tokenAddress: string;
+    multiplier: number;
+    nftAddress: string;
+    network: string;
+    initialBlock: number;
+    imagePath: string;
+};

package/dist/types/NFTBoost.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/Strategy.d.ts

@@ -0,0 +1,5 @@
+export type Strategy = {
+    address: string;
+    lastDoHardWorkTime: number | null;
+    lastDoHardWorkBlock: number | null;
+};

package/dist/types/Strategy.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/StretchGoal.d.ts

@@ -0,0 +1,7 @@
+export interface StretchGoal {
+    threshhold: number;
+    threshholdDescription: string;
+    rewardTooltip: string;
+    rewardDescription: string;
+    amountOfTokens: number;
+}

package/dist/types/StretchGoal.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/UserBalance.d.ts

@@ -1,7 +1,18 @@
 export type UserBalance = {
-    hasWithdrawsToClaim: boolean;
-    userBalance: string;
-    pendingUserBalance: string;
-    pendingWithdrawalBalance: string;
-    withdrawableBalance: string;
+    assets: {
+        asset: string;
+        dripping: string;
+        deposits: number;
+        depositsUSD: number;
+        tvr: number;
+        apy: number;
+        decimals: number;
+        reward: number;
+    }[];
+    available: {
+        [symbol: string]: number;
+    };
+    claimed: {
+        [symbol: string]: number;
+    };
 };

package/dist/types/UserVaultBalance.d.ts

@@ -0,0 +1,7 @@
+export type UserVaultBalance = {
+    hasWithdrawsToClaim: boolean;
+    userBalance: string;
+    pendingUserBalance: string;
+    pendingWithdrawalBalance: string;
+    withdrawableBalance: string;
+};

package/dist/types/UserVaultBalance.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/Vault.d.ts

@@ -1,3 +1,9 @@
+import { NFTBoost } from './NFTBoost';
+import { Strategy } from './Strategy';
+import { StretchGoal } from './StretchGoal';
+import { VaultDepositToken } from './VaultDepositToken';
+import { VaultReward } from './VaultReward';
+import { VaultType } from './VaultType';
 export type Vault = {
     vaultName: string;
     vaultAddress: string;
@@ -8,6 +14,7 @@ export type Vault = {
     depositToken: VaultDepositToken;
     type: VaultType;
     rewards: VaultReward[];
+    rewardType: 'points' | 'token' | 'pnode shards';
     liveUntil: string;
     liveUntilFormatted: string;
     hasPoolEnded: boolean;
@@ -17,50 +24,4 @@ export type Vault = {
     newWithdraw: boolean;
     tgePrice?: number;
     maxAmountOfTokens?: number;
-    rewardsInformation: RewardsInformation;
-};
-export type VaultType = 'launch' | 'earn' | 'airdrop';
-export type VaultDepositToken = {
-    name: string;
-    symbol: string;
-    roundingDecimals: number;
-    precisionDecimals: number;
-    tokenAddress: string;
-};
-export type VaultReward = {
-    type: 'token' | 'points';
-    name: string;
-    symbol: string;
-    decimals: number;
-    tokenAddress: string;
-    monthlyEmissionRate?: number;
-};
-export type NFTBoost = {
-    url: string;
-    tokenAddress: string;
-    multiplier: number;
-    nftAddress: string;
-    network: string;
-    initialBlock: number;
-    imagePath: string;
-};
-export interface StretchGoal {
-    threshhold: number;
-    threshholdDescription: string;
-    rewardTooltip: string;
-    rewardDescription: string;
-    amountOfTokens: number;
-}
-export type RewardsInformation = {
-    [tokenAddress: string]: {
-        blockNumber: string;
-        rewardrate: string;
-        timestamp: string;
-        endTime: string;
-    };
-};
-export type Strategy = {
-    address: string;
-    lastDoHardWorkTime: number | null;
-    lastDoHardWorkBlock: number | null;
 };

package/dist/types/VaultDepositToken.d.ts

@@ -0,0 +1,7 @@
+export type VaultDepositToken = {
+    name: string;
+    symbol: string;
+    roundingDecimals: number;
+    precisionDecimals: number;
+    tokenAddress: string;
+};

package/dist/types/VaultDepositToken.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/VaultReward.d.ts

@@ -0,0 +1,12 @@
+export type VaultReward = {
+    type: 'token' | 'points';
+    name: string;
+    symbol: string;
+    decimals: number;
+    tokenAddress: string;
+    monthlyEmissionRate: number;
+    blockNumber: number;
+    rewardrate: number;
+    timestamp: number;
+    endTime: number;
+};

package/dist/types/VaultReward.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/VaultStats.d.ts

@@ -0,0 +1,5 @@
+export type VaultStats = {
+    totalTVL: number;
+    totalUsers: number;
+    activeVaults: number;
+};

package/dist/types/VaultStats.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/VaultType.d.ts

@@ -0,0 +1 @@
+export type VaultType = 'launch' | 'earn' | 'airdrop';

package/dist/types/VaultType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertDot = void 0;
+exports.insertDot = insertDot;
 function insertDot(numberString, decimals) {
     if (numberString.length < decimals + 1) {
         numberString = '0'.repeat(decimals + 1 - numberString.length) + numberString;
@@ -11,4 +11,3 @@ function insertDot(numberString, decimals) {
     const afterDecimal = numberString.slice(indexToInsertDot);
     return `${beforeDecimal}.${afterDecimal}`;
 }
-exports.insertDot = insertDot;

package/package.json

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