@dripfi/drip-sdk 1.0.11 → 1.0.12

package/README.md

@@ -54,6 +54,7 @@ const dripSdk = new DripSdk(dripConfig, signer);
 | `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]
@@ -289,4 +290,8 @@ type UserBalance = {
   withdrawableBalance: string
 };
 
+type UserRewards = {
+   [key: string]: { [key: string]: number } 
+};
+
 ```

package/dist/DripApi.d.ts

@@ -2,6 +2,7 @@ import { BigNumber } from 'ethers';
 import { Vault } from './types/Vault';
 import { SwapInfo } from './types/SwapInfo';
 import { QLFastRedeem } from './types/QLFastRedeem';
+import { UserRewards } from './types/UserRewards';
 export default class DripApi {
     route: string;
     constructor(route: string);
@@ -17,4 +18,5 @@ export default class DripApi {
     fetchAllUserDNFTForVault(vaultAddress: string, walletAddress: string, token: string): Promise<any[]>;
     fetchAssetPerSvtAtBlock(vaultAddress: string, blocknumber: number, token: string): Promise<BigNumber>;
     fetchFastWithdrawNFTs(vaultAddress: string, walletAddress: string, token: string): Promise<QLFastRedeem[]>;
+    fetchUserRewards(walletAddress: string, token: string): Promise<UserRewards>;
 }

package/dist/DripApi.js

@@ -144,5 +144,16 @@ class DripApi {
             return data;
         });
     }
+    fetchUserRewards(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/user/rewards/${walletAddress}`, {
+                headers,
+            });
+            const data = yield res.json();
+            return data;
+        });
+    }
 }
 exports.default = DripApi;

package/dist/DripSdk.d.ts

@@ -3,6 +3,7 @@ import { Signer } from 'ethers';
 import { DripConfig } from './DripConfig';
 import { UserBalance } from './types/UserBalance';
 import { AuthenticationStatus } from './types/AuthenticationStatus';
+import { UserRewards } from './types/UserRewards';
 export default class DripSdk {
     private dripApi;
     private spoolSdk?;
@@ -14,6 +15,7 @@ export default class DripSdk {
     authenticate(): Promise<boolean>;
     isUserAuthenticated(): Promise<AuthenticationStatus>;
     updateSigner(newSigner: Signer): void;
+    getRewards(): Promise<UserRewards>;
     getUserBalance(vault: Vault): Promise<UserBalance>;
     fastWithdraw(vault: Vault, amountToWithdraw?: string): Promise<string>;
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;

package/dist/DripSdk.js

@@ -88,6 +88,16 @@ class DripSdk {
         this.signer = newSigner;
         this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(this.dripConfig.internalConfig, newSigner);
     }
+    getRewards() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const authData = yield this.isUserAuthenticated();
+            if (!authData.isAuthenticated) {
+                throw Error(`User not authenticated: ${authData.message}`);
+            }
+            const userRewards = this.dripApi.fetchUserRewards(authData.address, authData.token);
+            return userRewards;
+        });
+    }
     getUserBalance(vault) {
         return __awaiter(this, void 0, void 0, function* () {
             const authData = yield this.isUserAuthenticated();
@@ -143,18 +153,14 @@ class DripSdk {
             if (!this.signer) {
                 throw Error('No signer provided');
             }
-            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 redeemBagStruct = this.shouldUseNewWithdrawLogic(authData.address, vault)
+                ? yield this.generateNewRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw)
+                : yield this.generateOldRedeemBagStruct(authData.token, vault, authData.address, 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 redeemTx = yield ((_b = this.spoolSdk) === null || _b === void 0 ? void 0 : _b.redeemFast(redeemBagStruct, authData.address, currentBlockNumber));
             const txReceipt = yield redeemTx.wait();
             return txReceipt.transactionHash;
         });
@@ -200,20 +206,19 @@ class DripSdk {
             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);
+                const currentTokenAllowance = yield this.getTokenAllowanceForSwapAndDepositContractAddress(fromTokenAddress, authData.address);
                 if (fromToken.gt(currentTokenAllowance)) {
                     yield this.approveTokenForSwapAndDepositContract(fromTokenAddress, fromToken.sub(currentTokenAllowance));
                 }
             }
-            const swapInfo = yield this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, signerAddress);
+            const swapInfo = yield this.dripApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, authData.address);
             const swapDepositBagStruct = {
                 inTokens: [fromTokenAddress],
                 inAmounts: [fromToken],
                 smartVault: vaultAddress,
                 swapInfo,
-                receiver: signerAddress,
+                receiver: authData.address,
                 referral: ethers_1.ethers.constants.AddressZero,
                 doFlush: false,
             };
@@ -233,14 +238,10 @@ class DripSdk {
             if (!this.signer) {
                 throw Error('No signer provided');
             }
-            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 redeemBagStruct = this.shouldUseNewWithdrawLogic(authData.address, vault)
+                ? yield this.generateNewRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw)
+                : yield this.generateOldRedeemBagStruct(authData.token, vault, authData.address, amountToWithdraw);
+            const redeemTx = yield this.spoolSdk.redeem(redeemBagStruct, authData.address, false);
             const redeemTxReceipt = yield redeemTx.wait();
             return redeemTxReceipt.transactionHash;
         });
@@ -254,11 +255,7 @@ class DripSdk {
             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);
+            const wnfts = yield this.dripApi.fetchEnrichedUserWNFTForVault(vaultAddress, authData.address, 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)
@@ -266,7 +263,7 @@ class DripSdk {
             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());
+            const claimWithdrawTx = yield this.spoolSdk.claimWithdrawal(vaultAddress, nftIds, nftAmounts, authData.address);
             const txReceipt = yield claimWithdrawTx.wait();
             return txReceipt.transactionHash;
         });
@@ -368,10 +365,6 @@ class DripSdk {
             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 decimals = yield erc20Instance.decimals();
             return decimals;
@@ -487,18 +480,14 @@ class DripSdk {
             return [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance, estimatedWithdrawals];
         });
     }
-    getTokenAllowanceForSwapAndDepositContractAddress(tokenAddress) {
+    getTokenAllowanceForSwapAndDepositContractAddress(tokenAddress, userAddress) {
         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 swapAndDepositAddress = yield this.dripConfig.getSwapAndDepositContractAddress(this.signer);
-            const allowance = yield erc20Instance.allowance(signerAddress, swapAndDepositAddress);
+            const allowance = yield erc20Instance.allowance(userAddress, swapAndDepositAddress);
             return allowance;
         });
     }

package/dist/types/UserRewards.d.ts

@@ -0,0 +1,5 @@
+export type UserRewards = {
+    [key: string]: {
+        [key: string]: number;
+    };
+};

package/dist/types/UserRewards.js

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

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dripfi/drip-sdk",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Drip SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "prepublish": "npm run build",
     "build": "tsc",
+    "publish": "npm publish --access public",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {