@dripfi/drip-sdk 1.1.11 → 1.1.12

package/README.md

@@ -202,7 +202,6 @@ type Vault = {
   hasPoolEnded: boolean
   boosters: NFTBoost[]
   strategies: Strategy[]
-  newWithdraw: boolean
   tgePrice?: number
   maxAmountOfTokens?: number
   project: DeployedProject

package/dist/DripSdk.d.ts

@@ -37,10 +37,9 @@ export default class DripSdk {
     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 generateRedeemBagStruct;
     private getAllSvts;
     private getERC20Precission;
     private calculateFastWithdrawBalancesOld;
@@ -50,7 +49,6 @@ export default class DripSdk {
     private calculateAllDeposits;
     private calculateBalanceForDNFT;
     private checkIfUserHasWithdrawsToClaim;
-    private shouldUseNewWithdrawLogic;
     private calculateAllWithdrawalBalances;
     private getTokenAllowanceForDeposit;
     private getTokenAllowanceForSwapAndDeposit;

package/dist/DripSdk.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,9 +16,8 @@ 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 utils_1 = require("./utils");
-const DripApi_1 = __importStar(require("./DripApi"));
+const DripApi_1 = __importDefault(require("./DripApi"));
 const js_cookie_1 = __importDefault(require("js-cookie"));
-const KASU_USDC_VAULT_ADDRESS = '0xd8aa8099a53eddebe6a49c98ca12746ff19aa502';
 class DripSdk {
     constructor(dripConfig, signer) {
         this.signer = signer;
@@ -223,38 +199,17 @@ class DripSdk {
             const dnfts = yield this.dripApi.fetchAllUserDNFTForVault(vaultAddress, userAddress, token, headers);
             const wnfts = yield this.dripApi.fetchAllUserWNFTForVault(vaultAddress, userAddress, token, headers);
             const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress);
-            if (this.shouldUseNewWithdrawLogic(headers && headers.has(DripApi_1.IMPERSONATOR_HEADER) ? headers.get(DripApi_1.IMPERSONATOR_HEADER) : userAddress, vault)) {
-                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);
-                return {
-                    hasWithdrawsToClaim,
-                    userBalance: ethers_1.ethers.utils.formatUnits(userBalance, decimals),
-                    pendingUserBalance: ethers_1.ethers.utils.formatUnits(pendingDeposits, decimals),
-                    pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(estimatedPendingWithdrawalBalance, decimals),
-                    withdrawableBalance: ethers_1.ethers.utils.formatUnits(estimatedWithdrawableBalance, decimals),
-                };
-            }
-            else {
-                const allDeposits = this.calculateDepositsOld(dnfts, decimals);
-                const pendingDeposits = this.calculatePendingDepositsOld(dnfts, decimals);
-                const [estimatedPendingWithdrawalBalance, estimatedWithdrawableBalance, estimatedWithdrawals] = yield this.calculateAllWithdrawalBalances(wnfts, vault.vaultAddress, decimals, token);
-                const fastWithdrawBalance = yield this.calculateFastWithdrawBalancesOld(authData.token, vault.vaultAddress, userAddress, decimals, headers);
-                const hasWithdrawsToClaim = this.checkIfUserHasWithdrawsToClaim(wnfts);
-                const balance = allDeposits
-                    .sub(estimatedWithdrawals)
-                    .sub(estimatedWithdrawableBalance)
-                    .sub(estimatedPendingWithdrawalBalance)
-                    .sub(fastWithdrawBalance);
-                return {
-                    hasWithdrawsToClaim,
-                    userBalance: ethers_1.ethers.utils.formatUnits(balance, decimals),
-                    pendingUserBalance: ethers_1.ethers.utils.formatUnits(pendingDeposits, decimals),
-                    pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(estimatedPendingWithdrawalBalance, decimals),
-                    withdrawableBalance: ethers_1.ethers.utils.formatUnits(estimatedWithdrawableBalance, decimals),
-                };
-            }
+            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);
+            return {
+                hasWithdrawsToClaim,
+                userBalance: ethers_1.ethers.utils.formatUnits(userBalance, decimals),
+                pendingUserBalance: ethers_1.ethers.utils.formatUnits(pendingDeposits, decimals),
+                pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(estimatedPendingWithdrawalBalance, decimals),
+                withdrawableBalance: ethers_1.ethers.utils.formatUnits(estimatedWithdrawableBalance, decimals),
+            };
         });
     }
     fastWithdraw(vaultAddress, amountToWithdraw) {
@@ -267,9 +222,7 @@ class DripSdk {
                 throw Error('No signer provided');
             }
             const vault = yield this.getVaultDetails(vaultAddress);
-            const redeemBagStruct = this.shouldUseNewWithdrawLogic(userAddress, vault)
-                ? yield this.generateNewRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw)
-                : yield this.generateOldRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
+            const redeemBagStruct = yield this.generateRedeemBagStruct(authData.token, 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');
@@ -332,9 +285,7 @@ class DripSdk {
                 throw Error('No signer provided');
             }
             const vault = yield this.getVaultDetails(vaultAddress);
-            const redeemBagStruct = this.shouldUseNewWithdrawLogic(userAddress, vault)
-                ? yield this.generateNewRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw)
-                : yield this.generateOldRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
+            const redeemBagStruct = yield this.generateRedeemBagStruct(authData.token, vault, userAddress, amountToWithdraw);
             const redeemTx = yield this.spoolSdk.redeem(redeemBagStruct, userAddress, false);
             const redeemTxReceipt = yield redeemTx.wait();
             return redeemTxReceipt.transactionHash;
@@ -373,46 +324,6 @@ class DripSdk {
             return yield this.dripApi.fetchVaultsClaimableData(authData.address, authData.token, headers);
         });
     }
-    generateOldRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const dnfts = yield this.dripApi.fetchEnrichedUserDNFTForVault(vault.vaultAddress, signerAddress, token);
-            if (dnfts.length === 0) {
-                throw Error('User has no deposits');
-            }
-            const userBalance = yield this.dripApi.fetchUserBalance(vault.vaultAddress, signerAddress, token);
-            const totalTokenBalance = ethers_1.BigNumber.from(userBalance[vault.depositToken.tokenAddress]);
-            const totalSharesFetched = yield this.dripApi.fetchUserSVTBalance(vault.vaultAddress, signerAddress, token);
-            const totalShares = ethers_1.BigNumber.from(totalSharesFetched);
-            const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress);
-            let sharesToWithdraw = ethers_1.BigNumber.from(0);
-            if (!amountToWithdraw) {
-                sharesToWithdraw = totalShares;
-            }
-            else {
-                //! Not a MAX Withdraw (calculate the shares to withdraw)
-                const amountToWithdrawFixedDecimals = parseFloat(amountToWithdraw).toFixed(decimals);
-                sharesToWithdraw = ethers_1.ethers.utils
-                    .parseUnits(amountToWithdrawFixedDecimals, decimals)
-                    .mul(totalShares)
-                    .div(totalTokenBalance);
-                if (sharesToWithdraw.gt(totalShares)) {
-                    sharesToWithdraw = totalShares;
-                }
-            }
-            const nftIds = dnfts
-                .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
-                .map((item) => item.nftId.toString());
-            const nftAmounts = dnfts
-                .filter((item) => !item.isBurned && ethers_1.BigNumber.from(item.shares).gt(ethers_1.BigNumber.from('0')) && item.isDHWFinished)
-                .map((item) => item.shares.toString());
-            return {
-                smartVault: vault.vaultAddress,
-                shares: sharesToWithdraw,
-                nftIds,
-                nftAmounts,
-            };
-        });
-    }
     approveTokenForSwapAndDeposit(tokenAddress, amount) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {
@@ -439,7 +350,7 @@ class DripSdk {
             yield approveTx.wait();
         });
     }
-    generateNewRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
+    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;
@@ -574,17 +485,6 @@ class DripSdk {
             .map((item) => item.shares.toString());
         return nftIds.length !== 0 || nftAmounts.length !== 0;
     }
-    shouldUseNewWithdrawLogic(userAddress, vault) {
-        // Users that already withdrew using the old approach should keep using the same
-        const usersWhoAlreadyWithdraw = {
-            '0x5ae62d2bc40e9119aee9cd4ed50e3d9378c9a191': KASU_USDC_VAULT_ADDRESS,
-        };
-        if (usersWhoAlreadyWithdraw[userAddress.toLowerCase()] &&
-            usersWhoAlreadyWithdraw[userAddress.toLowerCase()] === vault.vaultAddress.toLowerCase()) {
-            return false;
-        }
-        return vault.newWithdraw;
-    }
     calculateAllWithdrawalBalances(wnfts, vaultAddress, decimals, token) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {

package/dist/test.js

@@ -17,7 +17,7 @@ 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
-const privKey = 'b0236d5a72786eb1d256713482103d49ba0fecafaf18da8df45eac8a66bcf1af';
+const privKey = '6ffc226f7b7769e27124317372c9dbb579a324e67e97bf07131bf2f59ec0f4fe';
 const configParams = {
     subgraphUrl: 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api',
     priceFeedApiUrl: 'https://pricefeed.dev.spool.fi/',
@@ -39,12 +39,16 @@ const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider('https://rp
 exports.signer = new ethers_1.ethers.Wallet(privKey, provider);
 // const random_address = '0x25dFcFB061956c6f33B1ee032cc33837d0b83257';
 const vaultAddress = '0x457d29df2449439a86521a1cea1561d24cc67a93'; // USDC AUKI
-const dripSdk = new DripSdk_1.default(new DripConfig_1.DripConfig(configParams.subgraphUrl, configParams.priceFeedApiUrl, configParams.rewardsUrl, configParams.fastRedeemApi, configParams.contracts, 'http://localhost:3000'), exports.signer);
+const daiVaultPerq = '0x1977efe478ba17da8be6e93fdfadbd3055d30111'; // DAI PERQ SEPOLIA
+const usdcVaultPerq = '0xf9795bfbf7c40981c372d0fb25a87e0b694c4fcd'; // USDC PERQ SEPOLIA
+const daiTokenAddress = '0x2a3a3872c242c35093a8fc48dac838c4b2d24a03'; // DAI TOKEN
+const usdcTokenAddress = '0xa6b92fcd4ee124353c8a6acf1edb574f46f3f8df'; // USDC TOKEN
+const dripSdk = new DripSdk_1.default(new DripConfig_1.DripConfig(configParams.subgraphUrl, configParams.priceFeedApiUrl, configParams.rewardsUrl, configParams.fastRedeemApi, configParams.contracts, 'https://dev.dripfi.io'), exports.signer);
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            // const res = await dripSdk.deposit('0xa6b92FCD4Ee124353C8A6AcF1Edb574F46F3f8DF',vaultAddress, '1500');
-            const res = yield dripSdk.withdraw(vaultAddress, '150');
+            // const res = await dripSdk.deposit(usdcTokenAddress,usdcVaultPerq, '1000');
+            const res = yield dripSdk.withdraw(usdcVaultPerq, '1');
             console.log(res);
         }
         catch (error) {

package/dist/types/DeployedVault.d.ts

@@ -8,7 +8,6 @@ export type DeployedVault = {
     liveFrom: string;
     type: VaultType;
     depositTokenId: string;
-    newWithdraw: boolean;
     rewards: VaultReward[];
     project?: DeployedProject;
     coingeckoId?: string;

package/dist/types/Vault.d.ts

@@ -20,7 +20,6 @@ export type Vault = {
     hasPoolEnded: boolean;
     boosters: NFTBoost[];
     strategies: Strategy[];
-    newWithdraw: boolean;
     tgePrice?: number;
     maxAmountOfTokens?: number;
     project: DeployedProject;

package/package.json

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