@dripfi/drip-sdk 1.1.22-dev.1 → 1.1.23

package/dist/DripApi.d.ts

@@ -7,21 +7,17 @@ import { VaultStats } from './types/VaultStats';
 import { UserBalance } from './types/UserBalance';
 import { VaultClaimData } from './types/VaultClaimData';
 import MyPerqData from './types/MyPerqData';
-import { MetaVault } from './types/MetaVault';
-import { UserMetaVaultBalance } from './types/UserMetaVaultBalance';
 export declare const IMPERSONATOR_HEADER = "impersonatorAddress";
 export default class DripApi {
     route: string;
     constructor(route: string);
     fetchAllVaults(): Promise<Vault[]>;
-    fetchAllMetaVaults(): Promise<MetaVault[]>;
     fetchTokenPrice(tokenName: string): Promise<number>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number, token: string): Promise<string>;
     getUserBalance(walletAddress: string, token: string, headers?: Headers): Promise<UserBalance>;
     getUserBoostedNfts(walletAddress: string, vaultAddress: string, token: string, headers?: Headers): Promise<string[]>;
     fetchVaultStats(): Promise<VaultStats>;
     fetchVaultDetails(vaultAddress: string): Promise<Vault>;
-    fetchMetaVaultDetails(metaVaultAddress: string): Promise<MetaVault>;
     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>;
@@ -60,9 +56,5 @@ export default class DripApi {
         cost: number;
         boost: any;
     }>;
-    fetchUserMetaVaultBalance(userAddress: string, metaVaultAddress: string, token: string, headers?: Headers): Promise<UserMetaVaultBalance>;
     fetchMyPerqData(userAddress: string, token: string, headers?: Headers): Promise<MyPerqData>;
-    fetchAllUserMetaVaultBalance(userAddress: string, token: string, headers?: Headers): Promise<{
-        [metaVaultAddress: string]: UserMetaVaultBalance;
-    }>;
 }

package/dist/DripApi.js

@@ -31,18 +31,6 @@ class DripApi {
             }
         });
     }
-    fetchAllMetaVaults() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield fetch(`${this.route}/api-be/api/metavault`);
-            if (res.ok) {
-                const data = (yield res.json());
-                return data;
-            }
-            else {
-                throw Error(`${yield res.text()}`);
-            }
-        });
-    }
     fetchTokenPrice(tokenName) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield fetch(`${this.route}/api-be/api/tokenPrice?tokenName=${tokenName}`);
@@ -139,18 +127,6 @@ class DripApi {
             }
         });
     }
-    fetchMetaVaultDetails(metaVaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield fetch(`${this.route}/api-be/api/metavault/${metaVaultAddress}`);
-            if (res.ok) {
-                const data = (yield res.json());
-                return data;
-            }
-            else {
-                throw Error(`${yield res.text()}`);
-            }
-        });
-    }
     fetchRewardsPerHour(vaultAddress, token) {
         return __awaiter(this, void 0, void 0, function* () {
             const headers = new Headers();
@@ -463,20 +439,6 @@ class DripApi {
             };
         });
     }
-    fetchUserMetaVaultBalance(userAddress, metaVaultAddress, token, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const reqHeaders = headers ? headers : new Headers();
-            reqHeaders.append(AUTHORIZATION_HEADER, token);
-            if (reqHeaders.has(exports.IMPERSONATOR_HEADER)) {
-                userAddress = reqHeaders.get(exports.IMPERSONATOR_HEADER);
-            }
-            const res = yield fetch(`${this.route}/api-be/api/user/metavault/balance/${userAddress}/${metaVaultAddress}`, {
-                headers: reqHeaders,
-            });
-            const data = yield res.json();
-            return data;
-        });
-    }
     fetchMyPerqData(userAddress, token, headers) {
         return __awaiter(this, void 0, void 0, function* () {
             const reqHeaders = headers ? headers : new Headers();
@@ -496,19 +458,5 @@ class DripApi {
             }
         });
     }
-    fetchAllUserMetaVaultBalance(userAddress, token, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const reqHeaders = headers ? headers : new Headers();
-            reqHeaders.append(AUTHORIZATION_HEADER, token);
-            if (reqHeaders.has(exports.IMPERSONATOR_HEADER)) {
-                userAddress = reqHeaders.get(exports.IMPERSONATOR_HEADER);
-            }
-            const res = yield fetch(`${this.route}/api-be/api/user/metavault/balance/${userAddress}`, {
-                headers: reqHeaders,
-            });
-            const data = yield res.json();
-            return data;
-        });
-    }
 }
 exports.default = DripApi;

package/dist/DripSdk.d.ts

@@ -9,8 +9,6 @@ import { VaultClaimData } from './types/VaultClaimData';
 import { Vault } from './types/Vault';
 import { LoyaltyCard } from './types/LoyaltyCard';
 import MyPerqData from './types/MyPerqData';
-import { MetaVault } from './types/MetaVault';
-import { UserMetaVaultBalance } from './types/UserMetaVaultBalance';
 export default class DripSdk {
     private dripApi;
     private dripTokenContract;
@@ -20,7 +18,6 @@ export default class DripSdk {
     private dripConfig;
     constructor(dripConfig: DripConfig, signer?: Signer);
     getAllVaults(): Promise<Vault[]>;
-    getAllMetaVaults(): Promise<MetaVault[]>;
     getVaultDetails(vaultAddress: string): Promise<Vault>;
     getVaultStats(): Promise<VaultStats>;
     getTokenPrice(tokenName: string): Promise<number>;
@@ -29,7 +26,6 @@ export default class DripSdk {
     authenticate(): Promise<boolean>;
     newDeposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
-    depositMetaVault(metaVaultAddress: string, amount: string): Promise<string>;
     private doDeposit;
     getTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
@@ -39,16 +35,11 @@ export default class DripSdk {
     getRewards(headers?: Headers): Promise<UserRewards>;
     getMyPerqBalance(headers?: Headers): Promise<MyPerqData>;
     getUserVaultBalance(vaultAddress: string, headers?: Headers): Promise<UserVaultBalance>;
-    getUserMetaVaultBalance(metaVaultAddress: string, headers?: Headers): Promise<UserMetaVaultBalance>;
-    getAllUserMetaVaultBalance(headers?: Headers): Promise<{
-        [metaVaultAddress: string]: UserMetaVaultBalance;
-    }>;
     fastWithdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
     swapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
     newSwapAndDeposit(fromTokenAddress: string, toTokenAddress: string, fromTokenAmount: string, vaultAddress: string, ethAmount?: string): Promise<string>;
     private doSwapAndDeposit;
     withdraw(vaultAddress: string, amountToWithdraw?: string): Promise<string>;
-    withdrawMetavault(metaVaultAddress: string): Promise<string>;
     claimWithdraws(vaultAddress: string): Promise<string>;
     getVaultsClaimableData(headers?: Headers): Promise<VaultClaimData>;
     getBeansBalance(headers?: Headers): Promise<{
@@ -62,7 +53,6 @@ export default class DripSdk {
     approveTokenForRecycler(tokenAddress: string, amount: string): Promise<string>;
     approveTokenForSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
-    approveTokenForMetaVaultDeposit(tokenAddress: string, metaVaultAddress: string, amount: string): Promise<string>;
     private generateRedeemBagStruct;
     private getAllSvts;
     private getERC20Precission;

package/dist/DripSdk.js

@@ -36,11 +36,6 @@ class DripSdk {
             return this.dripApi.fetchAllVaults();
         });
     }
-    getAllMetaVaults() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.dripApi.fetchAllMetaVaults();
-        });
-    }
     getVaultDetails(vaultAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.dripApi.fetchVaultDetails(vaultAddress);
@@ -121,23 +116,6 @@ class DripSdk {
             return this.doDeposit(tokenAddress, vaultAddress, amount, true);
         });
     }
-    depositMetaVault(metaVaultAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const metavault = yield this.dripApi.fetchMetaVaultDetails(metaVaultAddress);
-            if (!metavault) {
-                throw Error('Metavault not found');
-            }
-            const decimals = yield this.getERC20Precission(metavault.depositToken.tokenAddress);
-            const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
-            const amountToDeposit = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-            const depositTx = yield this.spoolSdk.metaVaultDeposit(metaVaultAddress.toLowerCase(), amountToDeposit);
-            const txReceipt = yield depositTx.wait();
-            return txReceipt.transactionHash;
-        });
-    }
     doDeposit(tokenAddress, vaultAddress, amount, checkAllowance) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.signer) {
@@ -248,18 +226,6 @@ class DripSdk {
             };
         });
     }
-    getUserMetaVaultBalance(metaVaultAddress, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const authData = yield this.isUserAuthenticated();
-            return this.dripApi.fetchUserMetaVaultBalance(authData.address, metaVaultAddress, authData.token, headers);
-        });
-    }
-    getAllUserMetaVaultBalance(headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const authData = yield this.isUserAuthenticated();
-            return this.dripApi.fetchAllUserMetaVaultBalance(authData.address, authData.token, headers);
-        });
-    }
     fastWithdraw(vaultAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -339,16 +305,6 @@ class DripSdk {
             return redeemTxReceipt.transactionHash;
         });
     }
-    withdrawMetavault(metaVaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            const depositTx = yield this.spoolSdk.metaVaultWithdraw(metaVaultAddress, []);
-            const txReceipt = yield depositTx.wait();
-            return txReceipt.transactionHash;
-        });
-    }
     claimWithdraws(vaultAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const userAddress = yield this.signer.getAddress();
@@ -472,14 +428,6 @@ class DripSdk {
             return yield this.approveToken(tokenAddress, amount, smartVaultManagerAddress);
         });
     }
-    approveTokenForMetaVaultDeposit(tokenAddress, metaVaultAddress, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.signer) {
-                throw Error('No signer provided');
-            }
-            return yield this.approveToken(tokenAddress, amount, metaVaultAddress);
-        });
-    }
     generateRedeemBagStruct(token, vault, signerAddress, amountToWithdraw) {
         return __awaiter(this, void 0, void 0, function* () {
             const decimals = yield this.getERC20Precission(vault.depositToken.tokenAddress.toLowerCase());

package/dist/index.d.ts

@@ -9,10 +9,8 @@ import { SwapInfo } from './types/SwapInfo';
 import { VaultDepositToken } from './types/VaultDepositToken';
 import { VaultType } from './types/VaultType';
 import { UserVaultBalance } from './types/UserVaultBalance';
-import { UserMetaVaultBalance } from './types/UserMetaVaultBalance';
 import { UserBalance } from './types/UserBalance';
 import { VaultStats } from './types/VaultStats';
 import { DripConfig } from './DripConfig';
 import MyPerqData from './types/MyPerqData';
-import { MetaVault } from './types/MetaVault';
-export { Vault, VaultReward, DripSdk, DripConfig, UserVaultBalance, UserBalance, VaultStats, AuthenticationStatus, NFTBoost, Strategy, StretchGoal, SwapInfo, VaultDepositToken, VaultType, MetaVault, UserMetaVaultBalance, MyPerqData };
+export { Vault, VaultReward, DripSdk, DripConfig, UserVaultBalance, UserBalance, VaultStats, AuthenticationStatus, NFTBoost, Strategy, StretchGoal, SwapInfo, VaultDepositToken, VaultType, MyPerqData };

package/dist/test.js

@@ -16,11 +16,10 @@ exports.signer = void 0;
 const ethers_1 = require("ethers");
 const DripConfig_1 = require("./DripConfig");
 const DripSdk_1 = __importDefault(require("./DripSdk"));
-const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 // This is script to test locally the drip sdk methods
 const account2 = '0x9E9B6899Ea314dD553A99f4F49440d2CeD2b2848'; // privKey 92eb90257aa76cc56ead18dd52dd3433689712ebe7356a70308b760bfcbdd787
-const privKey = '6ffc226f7b7769e27124317372c9dbb579a324e67e97bf07131bf2f59ec0f4fe'; // Deployer
-// 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/',
@@ -35,7 +34,6 @@ const testConfigParams = {
             IRewardManager: '0xcE7F66BD505a80129Ef25b06207Ac49620A55522',
             IStrategyRegistry: '0xf978853Db777d00b1130Ea21d8d98E8710b0Bc56',
             ISpoolLens: '0x33Df6cf08Fbb10047e318989fE687294CD45A7B4',
-            IMetaVaultFactory: '0x28a3a4f4D469Fb33601639Db40a800ca6776A3d0',
         }
     },
     dripContracts: {
@@ -43,7 +41,7 @@ const testConfigParams = {
         DripTokenRecyclerAddress: '0xe943A1320402fcf41cDc04275e842654165dAB78' // Sepolia contract address
     }
 };
-const sepoliaConfigParams = {
+const configParams = {
     subgraphUrl: 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api',
     priceFeedApiUrl: 'https://pricefeed.dev.spool.fi/',
     rewardsUrl: 'https://rewards.dev.spool.fi/sepolia',
@@ -57,7 +55,6 @@ const sepoliaConfigParams = {
             IRewardManager: '0xcE7F66BD505a80129Ef25b06207Ac49620A55522',
             IStrategyRegistry: '0xf978853Db777d00b1130Ea21d8d98E8710b0Bc56',
             ISpoolLens: '0x33Df6cf08Fbb10047e318989fE687294CD45A7B4',
-            IMetaVaultFactory: '0xe07a896CFD8FEdFb6d7515480853c5D5ED30EBFE',
         },
     },
     dripContracts: {
@@ -65,24 +62,6 @@ const sepoliaConfigParams = {
         DripTokenRecyclerAddress: '0xe943A1320402fcf41cDc04275e842654165dAB78' // Sepolia contract address
     }
 };
-const mainnetConfigParams = {
-    subgraphUrl: 'https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2/api',
-    priceFeedApiUrl: 'https://pricefeed.v2.spool.fi/',
-    rewardsUrl: 'https://rewards.v2.spool.fi/',
-    fastRedeemApi: 'https://fastwithdraw.v2.spool.fi/',
-    contracts: {
-        1: {
-            ISmartVaultManager: '0x23Daf34e2b9Af02A74dC19cB52Af727B19403874',
-            IDepositSwap: '0xd8534197Bd587F8226d12E0C864ef2CaE6f82f5C',
-            ISmartVaultFactory: '0x362599Cdc123e3FFEB7c0812d769128D180667E8',
-            IDepositManager: '0x823Ba38992825FF37E72B6c3D669a09173B8F7bf',
-            IRewardManager: '0xd8d2C1C3C7982272e3e12dEC5aF681433fdcf003',
-            IStrategyRegistry: '0x554c6bCB54656390aca0a0af38CA954dbE653F15',
-            ISpoolLens: '0x8aa6174333F75421903b2B5c70DdF8DA5D84f74F',
-            IMetaVaultFactory: '0x28a3a4f4D469Fb33601639Db40a800ca6776A3d0'
-        },
-    }
-};
 const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider('https://rpc.ankr.com/eth_sepolia', 11155111);
 exports.signer = new ethers_1.ethers.Wallet(privKey, provider);
 // const random_address = '0x25dFcFB061956c6f33B1ee032cc33837d0b83257';
@@ -91,24 +70,21 @@ const daiVaultPerq = '0x1977efe478ba17da8be6e93fdfadbd3055d30111'; // DAI PERQ S
 const usdcVaultPerq = '0xf9795bfbf7c40981c372d0fb25a87e0b694c4fcd'; // USDC PERQ SEPOLIA
 const daiTokenAddress = '0x2a3a3872c242c35093a8fc48dac838c4b2d24a03'; // DAI TOKEN
 const usdcTokenAddress = '0xa6b92fcd4ee124353c8a6acf1edb574f46f3f8df'; // USDC TOKEN
-const dripConfig = new DripConfig_1.DripConfig(testConfigParams.subgraphUrl, testConfigParams.priceFeedApiUrl, testConfigParams.rewardsUrl, testConfigParams.fastRedeemApi, testConfigParams.spoolContracts, 'http://localhost:3000', testConfigParams.dripContracts.DripTokenAddress, testConfigParams.dripContracts.DripTokenRecyclerAddress);
-const dripSdk = new DripSdk_1.default(dripConfig, exports.signer);
+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);
 // 0x689Baa4821865Cb328F5E847fB6133DEB315A832
 // 0x9E9B6899Ea314dD553A99f4F49440d2CeD2b2848
-const usdcMetaVaultAddress = '0x89845afce65a62a4411c7ed9d0729e06147b47ca';
-const wethMetaVautlAddress = '0xecf5325ccd0cf71b9d400ebbefd84f70b76a56f2';
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            // ==================================================
-            const spoolSdk = new spool_v2_sdk_1.SpoolSdk(dripConfig.internalConfig, exports.signer);
-            const res = yield spoolSdk.getOffchainRewards('drip_s');
-            console.log(JSON.stringify(res, null, 2));
-            // ==================================================
-            // const res = await dripSdk.getUserMetaVaultBalance('0x89845afce65a62a4411c7ed9d0729e06147b47ca');
-            // const res = await dripSdk.approveTokenForMetaVaultDeposit('0x88b25a14dae46c33ae3eef2b45a5ec758d9a5ec6', wethMetaVautlAddress, '0.002');
-            // const res = await dripSdk.depositMetaVault(wethMetaVautlAddress, '0.002');
-            // console.log(res);
+            // const res = await dripSdk.deposit(usdcTokenAddress,usdcVaultPerq, '1000');
+            // const res = await dripSdk.withdraw(usdcVaultPerq, '1');
+            // await dripSdk.authenticate()
+            // const res = await dripSdk.getDripTokenBalance(account2)
+            // const res = await dripSdk.getNextLoyaltyCard()
+            // const res = await dripSdk.getOwnedLoyaltyCards()
+            // const res = await dripSdk.getBeansBalance()
+            // const res = await dripSdk.recycleTokens()
+            // const res = await dripSdk.upgradeLoyaltyCard()
         }
         catch (error) {
             console.log(`Main error: ${error}`);

package/dist/types/Asset.d.ts

@@ -0,0 +1,5 @@
+type Asset = {
+    decimals: number;
+    symbol: string;
+};
+export default Asset;

package/dist/types/MyPerqData.d.ts

@@ -1,3 +1,4 @@
+import Asset from './Asset';
 import { CacheVaultRewards } from './CacheVaultRewards';
 import DepositToken from './DepositToken';
 import { NFTBoost } from './NFTBoost';
@@ -32,6 +33,12 @@ type MyPerqData = {
         pendingWithdraws: number;
         claimable: number;
         ethPrice: number;
+        tokenRewards: {
+            [token_address: string]: Asset & {
+                amount: number;
+                rewardsPerHour: number;
+            };
+        };
     };
 };
 export default MyPerqData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dripfi/drip-sdk",
-  "version": "1.1.22-dev.1",
+  "version": "1.1.23",
   "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": "2.0.14",
+    "@spool.fi/spool-v2-sdk": "1.0.14",
     "ethers": "^5.7.2",
     "js-cookie": "^3.0.5",
     "web3-token": "^1.0.6"

package/dist/types/DeployedMetaVault.d.ts

@@ -1,6 +0,0 @@
-export type DeployedMetaVault = {
-    address: string;
-    liveUntil: string;
-    liveFrom: string;
-    depositTokenId: string;
-};

package/dist/types/MetaVault.d.ts

@@ -1,15 +0,0 @@
-import { VaultDepositToken } from './VaultDepositToken';
-type VaultAllocation = {
-    vaultAddress: string;
-    vaultName: string;
-    allocation: number;
-};
-export type MetaVault = {
-    name: string;
-    address: string;
-    depositToken: VaultDepositToken;
-    liveUntil: string;
-    liveFrom: string;
-    allocations: VaultAllocation[];
-};
-export {};

package/dist/types/MetaVault.js

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

package/dist/types/UserMetaVaultBalance.d.ts

@@ -1,5 +0,0 @@
-export type UserMetaVaultBalance = {
-    userBalance: string;
-    pendingUserBalance: string;
-    pendingWithdrawalBalance: string;
-};

package/dist/types/UserMetaVaultBalance.js

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