@dripfi/drip-sdk 1.1.26 → 1.1.28

package/dist/DripSdk.d.ts

@@ -54,7 +54,6 @@ export default class DripSdk {
     approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     private generateRedeemBagStruct;
-    private getAllSvts;
     private getERC20Precission;
     private calculatePendingDeposits;
     private calculateAllDeposits;

package/dist/DripSdk.js

@@ -229,14 +229,17 @@ class DripSdk {
     fastWithdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
             const userAddress = yield this.signer.getAddress();
-            const authData = yield this.isUserAuthenticated();
+            // const authData = await this.isUserAuthenticated();
             // if (!authData.isAuthenticated) {throw Error(`User not authenticated: ${authData.message}`);}
             if (!this.signer) {
                 throw Error('No signer provided');
             }
             const vault = yield this.getVaultDetails(vaultAddress);
-            const redeemBagStruct = yield this.generateRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
+            const redeemBagStruct = yield this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
             const currentBlockNumber = yield ((_a = this.signer.provider) === null || _a === void 0 ? void 0 : _a.getBlockNumber());
             if (!currentBlockNumber) {
                 throw Error('Error fetching block number');
@@ -292,14 +295,17 @@ class DripSdk {
     }
     withdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw Error('No signer provided');
+            }
             const userAddress = yield this.signer.getAddress();
-            const authData = yield this.isUserAuthenticated();
+            // const authData = await this.isUserAuthenticated();
             // if (!authData.isAuthenticated) {throw Error(`User not authenticated: ${authData.message}`);}
             if (!this.signer) {
                 throw Error('No signer provided');
             }
             const vault = yield this.getVaultDetails(vaultAddress);
-            const redeemBagStruct = yield this.generateRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
+            const redeemBagStruct = yield this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
             const redeemTx = yield this.spoolSdk.redeem(redeemBagStruct, userAddress, false);
             const redeemTxReceipt = yield redeemTx.wait();
             return redeemTxReceipt.transactionHash;
@@ -428,62 +434,25 @@ class DripSdk {
             return yield this.approveToken(tokenAddress, amount, smartVaultManagerAddress);
         });
     }
-    generateRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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);
-            if (dnfts.length === 0) {
-                throw Error('User has no deposits');
-            }
-            dnfts = yield this.getAllSvts(vault.vaultAddress.toLowerCase(), signerAddress, dnfts, token);
-            let shares = ethers_1.BigNumber.from(0);
-            const nftIds = [];
-            const nftAmounts = [];
-            let index = 0;
-            while (dnfts[index] && (totalAmountToWithdraw.gt(0) || withdrawAll)) {
-                const dnft = dnfts[index];
-                const userBalance = this.calculateBalanceForDNFT(dnft, decimals);
-                if (userBalance.gt(0)) {
-                    const amountToWithdraw = totalAmountToWithdraw;
-                    const userSvts = dnft.svts;
-                    let svtsToWithdraw = ethers_1.BigNumber.from(0);
-                    let nftAmount = ethers_1.BigNumber.from(0);
-                    if (amountToWithdraw.gte(userBalance) || withdrawAll) {
-                        nftAmount = dnft.shares;
-                        svtsToWithdraw = userSvts;
-                        if (!withdrawAll) {
-                            totalAmountToWithdraw = totalAmountToWithdraw.sub(userBalance);
-                        }
-                    }
-                    else {
-                        nftAmount = amountToWithdraw.mul(dnft.shares).div(userBalance);
-                        svtsToWithdraw = nftAmount.mul(userSvts).div(dnft.shares);
-                        totalAmountToWithdraw = totalAmountToWithdraw.sub(amountToWithdraw);
-                    }
-                    shares = shares.add(svtsToWithdraw);
-                    nftIds.push(dnft.nftId);
-                    nftAmounts.push(nftAmount);
-                }
-                index++;
-            }
-            return {
-                smartVault: vault.vaultAddress.toLowerCase(),
-                shares: shares,
-                nftIds,
-                nftAmounts,
-            };
-        });
-    }
-    getAllSvts(vaultAddress, userAddress, dnfts, token) {
+    generateRedeemBagStruct(vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
-            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] };
-            });
-            return result;
+            if (!this.spoolSdk) {
+                throw Error('No spool sdk provided');
+            }
+            const isFullWithdraw = !amountToWithdraw;
+            if (isFullWithdraw) {
+                return this.spoolSdk.views.userInfo.getMaxRedeemBag({
+                    userAddress: signerAddress.toLowerCase(),
+                    vaultAddress: vault.vaultAddress,
+                });
+            }
+            else {
+                return this.spoolSdk.views.userInfo.getMinimumBurnRedeemBag({
+                    userAddress: signerAddress.toLowerCase(),
+                    vaultAddress: vault.vaultAddress,
+                    assetsToWithdraw: [Number(amountToWithdraw)]
+                });
+            }
         });
     }
     getERC20Precission(tokenAddress) {

package/dist/test.js

@@ -17,17 +17,9 @@ const ethers_1 = require("ethers");
 const DripConfig_1 = require("./DripConfig");
 const DripSdk_1 = __importDefault(require("./DripSdk"));
 // This is script to test locally the drip sdk methods
-// OLD RECYCLER ADDRESS
-// RECYCLER_ADDRESS='0xe943A1320402fcf41cDc04275e842654165dAB78'
-// DRIP_TOKEN_ADDRESS='0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7'        
-// NEW RECYCLER ADDRESS:
-// RECYCLER_ADDRESS=0x463aea273644AfF560da07c7c09f3142b87E12f1
-// TOKEN_ADDRESS: 0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E
-const RECYCLER_ADDRESS = '0x463aea273644AfF560da07c7c09f3142b87E12f1';
-const DRIP_TOKEN_ADDRESS = '0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E';
 const account2 = '0x9E9B6899Ea314dD553A99f4F49440d2CeD2b2848'; // privKey 92eb90257aa76cc56ead18dd52dd3433689712ebe7356a70308b760bfcbdd787
-const privKey = '6ffc226f7b7769e27124317372c9dbb579a324e67e97bf07131bf2f59ec0f4fe';
-// const privKey: string = '92eb90257aa76cc56ead18dd52dd3433689712ebe7356a70308b760bfcbdd787';
+// const privKey: string = '6ffc226f7b7769e27124317372c9dbb579a324e67e97bf07131bf2f59ec0f4fe';
+const privKey = '92eb90257aa76cc56ead18dd52dd3433689712ebe7356a70308b760bfcbdd787';
 const testConfigParams = {
     subgraphUrl: 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api',
     priceFeedApiUrl: 'https://pricefeed.dev.spool.fi/',
@@ -45,8 +37,8 @@ const testConfigParams = {
         }
     },
     dripContracts: {
-        DripTokenAddress: DRIP_TOKEN_ADDRESS, // Sepolia contract address
-        DripTokenRecyclerAddress: RECYCLER_ADDRESS // Sepolia contract address
+        DripTokenAddress: '0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7', // Sepolia contract address
+        DripTokenRecyclerAddress: '0xe943A1320402fcf41cDc04275e842654165dAB78' // Sepolia contract address
     }
 };
 const configParams = {
@@ -66,8 +58,8 @@ const configParams = {
         },
     },
     dripContracts: {
-        DripTokenAddress: '0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E', // Sepolia contract address
-        DripTokenRecyclerAddress: '0x463aea273644AfF560da07c7c09f3142b87E12f1' // Sepolia contract address
+        DripTokenAddress: '0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7', // Sepolia contract address
+        DripTokenRecyclerAddress: '0xe943A1320402fcf41cDc04275e842654165dAB78' // Sepolia contract address
     }
 };
 const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider('https://rpc.ankr.com/eth_sepolia', 11155111);
@@ -84,9 +76,6 @@ const dripSdk = new DripSdk_1.default(new DripConfig_1.DripConfig(testConfigPara
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            // const res = await dripSdk.approveTokenForRecycler(DRIP_TOKEN_ADDRESS.toLowerCase(), '100000000000000000000');
-            const res = yield dripSdk.recycleTokens('100000000000000000000');
-            console.log(res);
             // const res = await dripSdk.deposit(usdcTokenAddress,usdcVaultPerq, '1000');
             // const res = await dripSdk.withdraw(usdcVaultPerq, '1');
             // await dripSdk.authenticate()

package/dist/types/DeployedProject.d.ts

@@ -2,6 +2,7 @@ import { StretchGoal } from './StretchGoal';
 export type DeployedProject = {
     id: number | undefined;
     projectName: string;
+    owners: string[];
     logo: string;
     telegramLink: string;
     twitterLink: string;
@@ -23,20 +24,17 @@ export type DeployedProject = {
     networks: string[];
     content: string;
     tgeDate?: string;
+    tgePrice?: number;
+    vAPY?: number;
     wikiLink: string;
     youTubeLink: string;
     tikTokLink: string;
-    isMoonMathDisabled: boolean;
-    isFastWithdrawDisabled: boolean;
+    stretchGoals: StretchGoal[];
     projectInfoText: string;
     projectRewardText: string;
-    stretchGoals: StretchGoal[];
-    owners: string[];
     coingeckoId?: string;
     projectType: string;
     isFeatured: boolean;
-    tgePrice?: number;
-    vAPY?: number;
 };
 export type ProjectBacker = {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dripfi/drip-sdk",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "description": "Drip SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@spool.fi/spool-v2-sdk": "1.0.14",
+    "@spool.fi/spool-v2-sdk": "1.0.27",
     "ethers": "^5.7.2",
     "js-cookie": "^3.0.5",
     "web3-token": "^1.0.6"