@dripfi/drip-sdk 1.4.2-yelay-lite → 1.4.3

package/CHANGELOG.md

@@ -72,3 +72,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Export the `PerqConfig` from index.ts like recommended
+
+## [1.4.3] - 2025-02-02
+
+### Fixed
+
+- Instantiation of the `SpoolSDK`

package/dist/PerqApi.d.ts

@@ -1,11 +1,9 @@
 import { BigNumber } from 'ethers';
-import { Vault, SwapInfo, QLFastRedeem, UserRewards, VaultStats, MyPerqData, LoyaltyCard, BeansBalance, PerqToBeansSwapInfo, BeanEntry, NonceEnrichedSignedPayload, NonceEnrichedPayload, UpgradeLoyaltyCardPayload, YelayLiteVault } from './types';
+import { Vault, SwapInfo, QLFastRedeem, UserRewards, VaultStats, MyPerqData, LoyaltyCard, BeansBalance, PerqToBeansSwapInfo, BeanEntry, NonceEnrichedSignedPayload, NonceEnrichedPayload, UpgradeLoyaltyCardPayload } from './types';
 export default class PerqApi {
     route: string;
     constructor(route: string);
     fetchAllVaults(): Promise<Vault[]>;
-    fetchAllYelayLiteVaults(): Promise<YelayLiteVault[]>;
-    fetchYelayLiteVaultDetails(vaultAddress: string, yliteProjectId: number): Promise<YelayLiteVault>;
     fetchTokenPrice(tokenName: string): Promise<number>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
     getUserBoostedNfts(walletAddress: string, vaultAddress: string): Promise<string[]>;

package/dist/PerqApi.js

@@ -18,26 +18,6 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
-    async fetchAllYelayLiteVaults() {
-        const res = await fetch(`${this.route}/api-be/api/vault/yelay-lite`);
-        if (res.ok) {
-            const vaults = await res.json();
-            return vaults;
-        }
-        else {
-            throw Error(`${await res.text()}`);
-        }
-    }
-    async fetchYelayLiteVaultDetails(vaultAddress, yliteProjectId) {
-        const res = await fetch(`${this.route}/api-be/api/vault/yelay-lite/${vaultAddress}/${yliteProjectId}`);
-        if (res.ok) {
-            const data = (await res.json());
-            return data;
-        }
-        else {
-            throw Error(`${await res.text()}`);
-        }
-    }
     async fetchTokenPrice(tokenName) {
         const res = await fetch(`${this.route}/api-be/api/tokenPrice?tokenName=${tokenName}`);
         if (res.ok) {

package/dist/PerqSdk.d.ts

@@ -1,5 +1,6 @@
-import { BigNumber, Signer, ethers } from 'ethers';
-import { Vault, UserRewards, VaultStats, UserVaultBalance, LoyaltyCard, NonceEnrichedSignedPayload, MyPerqData, BeansBalance, BeanEntry, PerqToBeansSwapInfo, VestingInfo, YelayLiteVault, PerqConfig } from './types';
+import { BigNumber, Signer } from 'ethers';
+import { Vault, UserRewards, VaultStats, UserVaultBalance, LoyaltyCard, NonceEnrichedSignedPayload, MyPerqData, BeansBalance, BeanEntry, PerqToBeansSwapInfo, VestingInfo } from './types';
+import { PerqConfig } from './types/index';
 export default class PerqSdk {
     private perqApi;
     private perqConfig;
@@ -9,16 +10,12 @@ export default class PerqSdk {
     private perqVestingContract;
     private spoolSdk?;
     private signer?;
-    private yelayLiteSdk?;
-    constructor(perqConfig: PerqConfig, provider?: ethers.providers.JsonRpcProvider);
-    getAllYelayLiteVaults(): Promise<YelayLiteVault[]>;
+    constructor(perqConfig: PerqConfig, signer?: Signer);
     getAllVaults(): Promise<Vault[]>;
     getVaultDetails(vaultAddress: string): Promise<Vault>;
-    getYelayLiteVaultDetails(vaultAddress: string, yliteProjectId: number): Promise<YelayLiteVault>;
     getVaultStats(): Promise<VaultStats>;
     getTokenPrice(tokenName: string): Promise<number>;
     updateSigner(newSigner: Signer): Promise<void>;
-    yelayLiteDeposit(tokenAddress: string, vaultAddress: string, yliteProjectId: number, amount: string): Promise<string>;
     newDeposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
     deposit(tokenAddress: string, vaultAddress: string, amount: string): Promise<string>;
     private doDeposit;
@@ -30,14 +27,12 @@ export default class PerqSdk {
     getRewardsPerHour(vaultAddress: string): Promise<number>;
     getRewards(): Promise<UserRewards>;
     getMyPerqBalance(): Promise<MyPerqData[]>;
-    getYelayLiteUserVaultBalance(vaultAddress: string, yliteProjectId: number): Promise<BigNumber>;
     getUserVaultBalance(vaultAddress: string): Promise<UserVaultBalance>;
     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>;
-    yelayLiteWithdraw(tokenAddress: string, vaultAddress: string, yliteProjectId: number, amount: string): Promise<string>;
     claimWithdraws(vaultAddress: string): Promise<string>;
     getBeansBalance(): Promise<BeansBalance>;
     getBeansHistory(): Promise<BeanEntry[]>;
@@ -53,8 +48,6 @@ export default class PerqSdk {
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     getPerqTokenContractAddress(): string;
     getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
-    getAllowance(tokenAddress: string, spender: string): Promise<BigNumber>;
-    approveAllowance(tokenAddress: string, amount: string, spenderAddress: string): Promise<string>;
     transferErc20Token(tokenAddress: string, amount: string, receiver: string): Promise<string>;
     wrapEther(amount: string, tokenAddress: string): Promise<string>;
     getVestingStart(): Promise<string>;

package/dist/PerqSdk.js

@@ -9,7 +9,6 @@ const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
 const PerqApi_1 = __importDefault(require("./PerqApi"));
 const contracts_1 = require("./contracts");
 const WethTokenAbi_json_1 = __importDefault(require("./abi/WethTokenAbi.json"));
-const sdk_1 = require("@yelay-lite/sdk");
 class PerqSdk {
     perqApi;
     perqConfig;
@@ -19,26 +18,17 @@ class PerqSdk {
     perqVestingContract;
     spoolSdk;
     signer;
-    yelayLiteSdk;
-    constructor(perqConfig, provider) {
-        const newSigner = provider?.getSigner();
-        if (provider && newSigner) {
-            this.signer = newSigner;
-            this.yelayLiteSdk = new sdk_1.YelayLiteSdk({
-                backendUrl: perqConfig.yelayLiteBackendUrl,
-                provider: provider,
-            });
-            this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(perqConfig.spoolSdkConfig, newSigner);
+    constructor(perqConfig, signer) {
+        this.signer = signer;
+        if (this.signer) {
+            this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(perqConfig.spoolSdkConfig, this.signer);
         }
         this.perqConfig = perqConfig;
         this.perqApi = new PerqApi_1.default(perqConfig.route);
-        this.perqTokenContract = new contracts_1.PerqTokenContract(perqConfig.perqTokenAddress, newSigner);
-        this.perqTokenRecyclerContract = new contracts_1.PerqTokenRecyclerContract(perqConfig.perqTokenRecyclerAddress, newSigner);
-        this.perqSwapAndRecyclerContract = new contracts_1.PerqSwapAndRecyclerContract(perqConfig.perqSwapAndRecyclerAddress, newSigner);
-        this.perqVestingContract = new contracts_1.PerqVestingContract(perqConfig.perqVestingAddress, newSigner);
-    }
-    async getAllYelayLiteVaults() {
-        return this.perqApi.fetchAllYelayLiteVaults();
+        this.perqTokenContract = new contracts_1.PerqTokenContract(perqConfig.perqTokenAddress, signer);
+        this.perqTokenRecyclerContract = new contracts_1.PerqTokenRecyclerContract(perqConfig.perqTokenRecyclerAddress, signer);
+        this.perqSwapAndRecyclerContract = new contracts_1.PerqSwapAndRecyclerContract(perqConfig.perqSwapAndRecyclerAddress, signer);
+        this.perqVestingContract = new contracts_1.PerqVestingContract(perqConfig.perqVestingAddress, signer);
     }
     async getAllVaults() {
         return this.perqApi.fetchAllVaults();
@@ -46,9 +36,6 @@ class PerqSdk {
     async getVaultDetails(vaultAddress) {
         return this.perqApi.fetchVaultDetails(vaultAddress);
     }
-    async getYelayLiteVaultDetails(vaultAddress, yliteProjectId) {
-        return this.perqApi.fetchYelayLiteVaultDetails(vaultAddress, yliteProjectId);
-    }
     async getVaultStats() {
         return this.perqApi.fetchVaultStats();
     }
@@ -63,23 +50,6 @@ class PerqSdk {
         this.perqSwapAndRecyclerContract.updateSigner(newSigner);
         this.perqVestingContract.updateSigner(newSigner);
     }
-    async yelayLiteDeposit(tokenAddress, vaultAddress, yliteProjectId, amount) {
-        if (!this.signer) {
-            throw Error('No signer provided');
-        }
-        const decimals = await this.getERC20Precission(tokenAddress);
-        const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
-        const currentTokenAllowance = parseFloat(ethers_1.ethers.utils.formatUnits(await this.getAllowance(tokenAddress, vaultAddress), decimals));
-        if (amountWithDecimals > currentTokenAllowance) {
-            await this.approveToken(tokenAddress, amountWithDecimals.toString(), vaultAddress);
-        }
-        const amountToDeposit = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-        const res = await this.yelayLiteSdk.deposit(this.signer, vaultAddress, yliteProjectId, BigInt(amountToDeposit.toString()));
-        if (!res.success || !res.hash) {
-            throw Error('Error depositing into vault');
-        }
-        return res.hash;
-    }
     async newDeposit(tokenAddress, vaultAddress, amount) {
         return this.doDeposit(tokenAddress, vaultAddress, amount, false);
     }
@@ -156,14 +126,6 @@ class PerqSdk {
         const myPerqBalance = this.perqApi.fetchMyPerqData(userAddress);
         return myPerqBalance;
     }
-    async getYelayLiteUserVaultBalance(vaultAddress, yliteProjectId) {
-        if (!this.signer) {
-            throw Error('No signer provided');
-        }
-        const userAddress = await this.signer.getAddress();
-        const balance = await this.yelayLiteSdk.balanceOf(vaultAddress, yliteProjectId, userAddress);
-        return balance;
-    }
     async getUserVaultBalance(vaultAddress) {
         if (!this.signer) {
             throw Error('No signer provided');
@@ -270,18 +232,6 @@ class PerqSdk {
         const redeemTxReceipt = await redeemTx.wait();
         return redeemTxReceipt.transactionHash;
     }
-    async yelayLiteWithdraw(tokenAddress, vaultAddress, yliteProjectId, amount) {
-        if (!this.signer) {
-            throw Error('No signer provided');
-        }
-        const decimals = await this.getERC20Precission(tokenAddress);
-        const amountToWithdraw = ethers_1.ethers.utils.parseUnits(amount, decimals);
-        const res = await this.yelayLiteSdk.redeem(this.signer, vaultAddress, yliteProjectId, BigInt(amountToWithdraw.toString()));
-        if (!res.success || !res.hash) {
-            throw Error('Error withdrawing from vault');
-        }
-        return res.hash;
-    }
     async claimWithdraws(vaultAddress) {
         const userAddress = await this.signer.getAddress();
         if (!this.signer) {
@@ -329,6 +279,15 @@ class PerqSdk {
         if (this.perqConfig.perqSwapAndRecyclerAddress === ethers_1.ethers.constants.AddressZero) {
             throw Error('Recycler contract address not defined');
         }
+        console.log('swap and recycle ERC-20 with this: ', {
+            beneficiary,
+            path,
+            amountInWithDecimals,
+            minAmountOutWithDecimals,
+            price,
+            deadline,
+            signature,
+        });
         const swapAndRecycleTx = await this.perqSwapAndRecyclerContract.swapAndRecycle(beneficiary, path, amountInWithDecimals, minAmountOutWithDecimals, price, deadline, signature);
         const receipt = await swapAndRecycleTx.wait();
         return receipt.transactionHash;
@@ -377,15 +336,6 @@ class PerqSdk {
     async getSwapPerqForBeansInfo() {
         return this.perqApi.getSwapPerqForBeansInfo();
     }
-    async getAllowance(tokenAddress, spender) {
-        const allowance = await this.getERC20TokenAllowance(spender, tokenAddress);
-        return allowance;
-    }
-    async approveAllowance(tokenAddress, amount, spenderAddress) {
-        const decimals = await this.getERC20Precission(tokenAddress);
-        const amountWithDecimals = parseFloat(parseFloat(amount).toFixed(decimals));
-        return await this.approveToken(tokenAddress, amountWithDecimals.toString(), spenderAddress);
-    }
     async transferErc20Token(tokenAddress, amount, receiver) {
         if (!this.signer) {
             throw Error('No signer provided');

package/dist/types/PerqConfig.d.ts

@@ -8,7 +8,6 @@ type PerqConfig = {
     perqVestingAddress: string;
     swapAndDepositContractAddress: string;
     smartVaultManagerContractAddress: string;
-    yelayLiteBackendUrl: string;
 };
 export default PerqConfig;
 export declare const PRODUCTION: PerqConfig;

package/dist/types/PerqConfig.js

@@ -11,7 +11,6 @@ exports.PRODUCTION = {
     perqVestingAddress: '0x5e19C155C30bDEB83FCFE20a3b6f6Eda34B746c5',
     swapAndDepositContractAddress: '0xd8534197bd587f8226d12e0c864ef2cae6f82f5c',
     smartVaultManagerContractAddress: '0x23daf34e2b9af02a74dc19cb52af727b19403874',
-    yelayLiteBackendUrl: '',
 };
 exports.DEVELOPMENT = {
     route: 'https://dev.perq.finance',
@@ -22,5 +21,4 @@ exports.DEVELOPMENT = {
     perqVestingAddress: '0x1d3B9E32a7139718f94BE32c797682fFf2D1bE60',
     swapAndDepositContractAddress: '0x5fb08e00de169f041711206a0995410884080177',
     smartVaultManagerContractAddress: '0x2638d6c0b4ef6dee04050fa0b07ca62500435747',
-    yelayLiteBackendUrl: 'https://lite.dev.yelay.io',
 };

package/dist/types/index.d.ts

@@ -24,5 +24,4 @@ import VaultStats from './VaultStats';
 import VaultType from './VaultType';
 import VestingInfo from './VestingInfo';
 import YelayVersion from './YelayVersion';
-import YelayLiteVault from './YelayLiteVault';
-export { Asset, BasePayload, BeanEntry, BeansBalance, DeployedProject, DeployedVault, DepositToken, ELoyaltyCardTier, LoyaltyCard, MyPerqData, NFTBoost, NonceEnrichedPayload, NonceEnrichedSignedPayload, PerqConfig, PerqToBeansSwapInfo, ProjectBacker, QLFastRedeem, RewardType, Strategy, StretchGoal, SwapInfo, UpgradeLoyaltyCardPayload, UserRewards, UserVaultBalance, Vault, VaultReward, VaultStats, VaultType, VestingInfo, YelayVersion, YelayLiteVault, };
+export { Asset, BasePayload, BeanEntry, BeansBalance, DeployedProject, DeployedVault, DepositToken, ELoyaltyCardTier, LoyaltyCard, MyPerqData, NFTBoost, NonceEnrichedPayload, NonceEnrichedSignedPayload, PerqConfig, PerqToBeansSwapInfo, ProjectBacker, QLFastRedeem, RewardType, Strategy, StretchGoal, SwapInfo, UpgradeLoyaltyCardPayload, UserRewards, UserVaultBalance, Vault, VaultReward, VaultStats, VaultType, VestingInfo, YelayVersion, };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dripfi/drip-sdk",
-	"version": "1.4.2-yelay-lite",
+	"version": "1.4.3",
 	"description": "Drip SDK",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@spool.fi/spool-v2-sdk": "2.0.44",
-		"@yelay-lite/sdk": "0.0.15",
+		"@yelay-lite/sdk": "0.0.11",
 		"ethers": "^5.7.2"
 	},
 	"author": "",

package/dist/types/YelayLiteVault.d.ts

@@ -1,11 +0,0 @@
-type YelayLiteVault = {
-    id: number;
-    depositTokenAddress: string;
-    depositTokenSymbol: string;
-    decimals: number;
-    projectName: string;
-    projectLogo: string;
-    address: string;
-    apy: string;
-};
-export default YelayLiteVault;

package/dist/types/YelayLiteVault.js

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