@dripfi/drip-sdk 1.1.27 → 1.2.0

package/README.md

@@ -23,20 +23,20 @@ npm i @dripfi/drip-sdk
 
 ```typescript
 import DripSdk from '@drip/sdk'
+import { DripConfig, Chain } from '@dripfi/drip-sdk'
 ```
 
 Initialize the SDK with your Drip configuration and an optional signer:
 
 ```typescript
-const dripConfig = new DripConfig(
-    subgraphUrl: string,
-    priceFeedApiUrl: string,
-    rewardsUrl: string,
-    fastRedeemApi: string,
-    contracts: Record<number, ContractAddresses>,
-    dripRoute: string);
+
+const chain: Chain = Chain.MAINNET // if targeting ethereum mainnet
+
+const chain: Chain = Chain.SEPOLIA // if targeting sepolia testnet
+
 const signer: ethers.Signer = /* your Signer instance */;
-const dripSdk = new DripSdk(dripConfig, signer);
+
+const dripSdk = new DripSdk(chain, signer);
 ```
 
 # Methods

package/dist/DripConfig.d.ts

@@ -1,7 +1,11 @@
-import { ContractAddresses, SDKConfig } from '@spool.fi/spool-v2-sdk';
+import { SDKConfig } from '@spool.fi/spool-v2-sdk';
 import { Signer } from 'ethers';
 export declare const NULL_ADDRESS = "0x0000000000000000000000000000000000000000";
 export declare const DRIP_TOKEN_DECIMALS = 18;
+export declare enum Chain {
+    MAINNET = "mainnet",
+    SEPOLIA = "sepolia"
+}
 export declare class DripConfig {
     internalConfig: SDKConfig;
     dripRoute: string;
@@ -9,7 +13,7 @@ export declare class DripConfig {
     smartVaultManagerAddress: string | undefined;
     dripTokenAddress: string;
     dripTokenRecyclerAddress: string;
-    constructor(subgraphUrl: string, priceFeedApiUrl: string, rewardsUrl: string, fastRedeemApi: string, contracts: Record<number, ContractAddresses>, dripRoute: string, dripTokenAddress?: string, dripTokenRecyclerAddress?: string);
+    constructor(chain: Chain, dripRoute?: string);
     getSwapAndDepositContractAddress(signer: Signer): Promise<string>;
     getSmartVaultManagerAddress(signer: Signer): Promise<string>;
 }

package/dist/DripConfig.js

@@ -9,16 +9,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DripConfig = exports.DRIP_TOKEN_DECIMALS = exports.NULL_ADDRESS = void 0;
+exports.DripConfig = exports.Chain = exports.DRIP_TOKEN_DECIMALS = exports.NULL_ADDRESS = void 0;
 const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 exports.NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
 exports.DRIP_TOKEN_DECIMALS = 18;
+var Chain;
+(function (Chain) {
+    Chain["MAINNET"] = "mainnet";
+    Chain["SEPOLIA"] = "sepolia";
+})(Chain || (exports.Chain = Chain = {}));
+const SUBGRAPH_URL_SEPOLIA = 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api';
+const RECYCLER_ADDRESS_SEPOLIA = '0x463aea273644AfF560da07c7c09f3142b87E12f1';
+const DRIP_TOKEN_ADDRESS_SEPOLIA = '0xc9C66052327523d6A7a2ee5D50CF07e4415e27c7';
+const SUBGRAPH_URL_MAINNET = 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2/api';
+// const RECYCLER_ADDRESS_MAINNET = '';
+// const DRIP_TOKEN_ADDRESS_MAINNET = '';
+const DEV_BACKEND_ROUTE = 'https://dev.drip.fi.io';
+const PROD_BACKEND_ROUTE = 'https://perq.finance';
 class DripConfig {
-    constructor(subgraphUrl, priceFeedApiUrl, rewardsUrl, fastRedeemApi, contracts, dripRoute, dripTokenAddress, dripTokenRecyclerAddress) {
-        this.internalConfig = new spool_v2_sdk_1.SDKConfig(subgraphUrl, priceFeedApiUrl, rewardsUrl, fastRedeemApi, contracts);
-        this.dripRoute = dripRoute;
-        this.dripTokenAddress = dripTokenAddress ? dripTokenAddress : exports.NULL_ADDRESS;
-        this.dripTokenRecyclerAddress = dripTokenRecyclerAddress ? dripTokenRecyclerAddress : exports.NULL_ADDRESS;
+    constructor(chain, dripRoute) {
+        switch (chain) {
+            case Chain.MAINNET:
+                this.internalConfig = (0, spool_v2_sdk_1.getMainnetConfig)(SUBGRAPH_URL_MAINNET);
+                this.dripRoute = dripRoute ? dripRoute : PROD_BACKEND_ROUTE;
+                this.dripTokenAddress = exports.NULL_ADDRESS;
+                this.dripTokenRecyclerAddress = exports.NULL_ADDRESS;
+                break;
+            case Chain.SEPOLIA:
+                this.internalConfig = (0, spool_v2_sdk_1.getSepoliaConfig)(SUBGRAPH_URL_SEPOLIA);
+                this.dripRoute = dripRoute ? dripRoute : DEV_BACKEND_ROUTE;
+                this.dripTokenAddress = DRIP_TOKEN_ADDRESS_SEPOLIA;
+                this.dripTokenRecyclerAddress = RECYCLER_ADDRESS_SEPOLIA;
+                break;
+        }
     }
     getSwapAndDepositContractAddress(signer) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/DripSdk.d.ts

@@ -1,5 +1,4 @@
 import { Signer } from 'ethers';
-import { DripConfig } from './DripConfig';
 import { AuthenticationStatus } from './types/AuthenticationStatus';
 import { UserRewards } from './types/UserRewards';
 import { VaultStats } from './types/VaultStats';
@@ -9,6 +8,7 @@ import { VaultClaimData } from './types/VaultClaimData';
 import { Vault } from './types/Vault';
 import { LoyaltyCard } from './types/LoyaltyCard';
 import MyPerqData from './types/MyPerqData';
+import { Chain } from './DripConfig';
 export default class DripSdk {
     private dripApi;
     private dripTokenContract;
@@ -16,7 +16,7 @@ export default class DripSdk {
     private spoolSdk?;
     private signer?;
     private dripConfig;
-    constructor(dripConfig: DripConfig, signer?: Signer);
+    constructor(chain: Chain, signer?: Signer, dripRoute?: string);
     getAllVaults(): Promise<Vault[]>;
     getVaultDetails(vaultAddress: string): Promise<Vault>;
     getVaultStats(): Promise<VaultStats>;
@@ -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

@@ -21,15 +21,15 @@ const js_cookie_1 = __importDefault(require("js-cookie"));
 const DripTokenContract_1 = __importDefault(require("./contracts/DripTokenContract"));
 const DripTokenRecyclerContract_1 = __importDefault(require("./contracts/DripTokenRecyclerContract"));
 class DripSdk {
-    constructor(dripConfig, signer) {
+    constructor(chain, signer, dripRoute) {
         this.signer = signer;
-        this.dripConfig = dripConfig;
+        this.dripConfig = new DripConfig_1.DripConfig(chain, dripRoute);
         if (signer) {
-            this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(dripConfig.internalConfig, signer);
+            this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(this.dripConfig.internalConfig, signer);
         }
-        this.dripApi = new DripApi_1.default(dripConfig.dripRoute);
-        this.dripTokenContract = new DripTokenContract_1.default(dripConfig.dripTokenAddress, signer);
-        this.dripTokenRecyclerContract = new DripTokenRecyclerContract_1.default(dripConfig.dripTokenRecyclerAddress, signer);
+        this.dripApi = new DripApi_1.default(this.dripConfig.dripRoute);
+        this.dripTokenContract = new DripTokenContract_1.default(this.dripConfig.dripTokenAddress, signer);
+        this.dripTokenRecyclerContract = new DripTokenRecyclerContract_1.default(this.dripConfig.dripTokenRecyclerAddress, signer);
     }
     getAllVaults() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -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/index.d.ts

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

package/dist/index.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DripConfig = exports.DripSdk = void 0;
+exports.Chain = exports.DripSdk = void 0;
 const DripSdk_1 = __importDefault(require("./DripSdk"));
 exports.DripSdk = DripSdk_1.default;
 const DripConfig_1 = require("./DripConfig");
-Object.defineProperty(exports, "DripConfig", { enumerable: true, get: function () { return DripConfig_1.DripConfig; } });
+Object.defineProperty(exports, "Chain", { enumerable: true, get: function () { return DripConfig_1.Chain; } });

package/dist/test.js

@@ -70,7 +70,7 @@ const daiVaultPerq = '0x1977efe478ba17da8be6e93fdfadbd3055d30111'; // DAI PERQ S
 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(testConfigParams.subgraphUrl, testConfigParams.priceFeedApiUrl, testConfigParams.rewardsUrl, testConfigParams.fastRedeemApi, testConfigParams.spoolContracts, 'https://localhost:3000', testConfigParams.dripContracts.DripTokenAddress, testConfigParams.dripContracts.DripTokenRecyclerAddress), exports.signer);
+const dripSdk = new DripSdk_1.default(DripConfig_1.Chain.SEPOLIA, exports.signer, 'https://localhost:3000');
 // 0x689Baa4821865Cb328F5E847fB6133DEB315A832
 // 0x9E9B6899Ea314dD553A99f4F49440d2CeD2b2848
 function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dripfi/drip-sdk",
-  "version": "1.1.27",
+  "version": "1.2.0",
   "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": "2.0.31",
     "ethers": "^5.7.2",
     "js-cookie": "^3.0.5",
     "web3-token": "^1.0.6"