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

package/CHANGELOG.md

@@ -72,3 +72,40 @@ 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`
+
+## [1.4.3] - 2025-02-02
+
+### Fixed
+
+- Calculation of users vault balance in vaults with extracted strategies by using the `getUserBalanceBreakdown` method in the `SpoolSDK`
+
+## [1.4.6] - 2025-02-13
+
+### Changed
+
+- Upgraded version of `SpoolSDK` to `2.0.53` in order to fix potential issues with the generation of the redeem bag structure
+
+## [1.4.7] - 2025-02-13
+
+### Added
+
+- Added method `getSwapAndDepositTokenAllowanceForCurrency` to the `PerqSdk`
+
+## [1.4.8] - 2025-02-14
+
+### Changed
+
+- Updated `PerqApi` to use the new 1inch API endpoint
+
+## [1.4.9] - 2025-02-14
+
+### Added
+
+- Added method `linkSuiWalletWithEthWallet` to the `PerqSdk`
+- Added method `getLinkedSuiWallet` to the `PerqSdk`

package/dist/PerqApi.d.ts

@@ -1,18 +1,20 @@
 import { BigNumber } from 'ethers';
-import { Vault, SwapInfo, QLFastRedeem, UserRewards, VaultStats, MyPerqData, LoyaltyCard, BeansBalance, PerqToBeansSwapInfo, BeanEntry, NonceEnrichedSignedPayload, NonceEnrichedPayload, UpgradeLoyaltyCardPayload, YelayLiteVault } from './types';
+import { SwapInfo, QLFastRedeem, UserRewards, VaultStats, MyPerqData, LoyaltyCard, BeansBalance, PerqToBeansSwapInfo, BeanEntry, NonceEnrichedSignedPayload, NonceEnrichedPayload, UpgradeLoyaltyCardPayload, ReducedProjectData, DetailedProjectData, LinkWalletPayload } from './types';
+import CachedVaultData from './types/VaultData';
 export default class PerqApi {
     route: string;
     constructor(route: string);
-    fetchAllVaults(): Promise<Vault[]>;
-    fetchAllYelayLiteVaults(): Promise<YelayLiteVault[]>;
-    fetchYelayLiteVaultDetails(vaultAddress: string, yliteProjectId: number): Promise<YelayLiteVault>;
+    fetchAllVaults(): Promise<CachedVaultData[]>;
+    fetchVaultV2Details(vaultAddress: string): Promise<CachedVaultData>;
+    fetchVaultLiteDetails(vaultAddress: string, onChainProjectId: number): Promise<CachedVaultData>;
+    fetchAllProjects(): Promise<ReducedProjectData[]>;
+    fetchProjetctDetails(projectName: string): Promise<DetailedProjectData>;
     fetchTokenPrice(tokenName: string): Promise<number>;
-    getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
+    getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number, chainId: string): Promise<string>;
     getUserBoostedNfts(walletAddress: string, vaultAddress: string): Promise<string[]>;
     fetchVaultStats(): Promise<VaultStats>;
-    fetchVaultDetails(vaultAddress: string): Promise<Vault>;
     fetchRewardsPerHour(walletAddress: string, vaultAddress: string): Promise<number>;
-    getSwapInfo(fromTokenAddress: string, toTokenAddress: string, amount: BigNumber, fromAddress: string): Promise<SwapInfo[]>;
+    getSwapInfo(fromTokenAddress: string, toTokenAddress: string, amount: BigNumber, fromAddress: string, chainId: number): Promise<SwapInfo[]>;
     fetchUserSVTBalance(vaultAddress: string, walletAddress: string): Promise<BigNumber>;
     fetchUserBalance(vaultAddress: string, walletAddress: string): Promise<Record<string, string>>;
     fetchEnrichedUserWNFTForVault(vaultAddress: string, walletAddress: string): Promise<any[]>;
@@ -28,6 +30,8 @@ export default class PerqApi {
     fetchMyPerqData(userAddress: string): Promise<MyPerqData[]>;
     getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
     fetchBeansHistory(walletAddress: string): Promise<BeanEntry[]>;
+    linkSuiWalletWithEthWallet(signedPayload: NonceEnrichedSignedPayload<LinkWalletPayload>): Promise<boolean>;
+    getLinkedSuiWallet(walletAddress: string): Promise<string>;
     getNonceEnrichedPayload<T>(payload: T): Promise<NonceEnrichedPayload<T>>;
     fetchUserVaultDeposits(userAddress: string, vaultAddress: string): Promise<{
         pending: number;

package/dist/PerqApi.js

@@ -18,18 +18,18 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
-    async fetchAllYelayLiteVaults() {
-        const res = await fetch(`${this.route}/api-be/api/vault/yelay-lite`);
+    async fetchVaultV2Details(vaultAddress) {
+        const res = await fetch(`${this.route}/api-be/api/vault/${vaultAddress}`);
         if (res.ok) {
-            const vaults = await res.json();
-            return vaults;
+            const data = (await res.json());
+            return data;
         }
         else {
             throw Error(`${await res.text()}`);
         }
     }
-    async fetchYelayLiteVaultDetails(vaultAddress, yliteProjectId) {
-        const res = await fetch(`${this.route}/api-be/api/vault/yelay-lite/${vaultAddress}/${yliteProjectId}`);
+    async fetchVaultLiteDetails(vaultAddress, onChainProjectId) {
+        const res = await fetch(`${this.route}/api-be/api/vault/${vaultAddress}?onChainProjectId=${onChainProjectId}`);
         if (res.ok) {
             const data = (await res.json());
             return data;
@@ -38,6 +38,26 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
+    async fetchAllProjects() {
+        const res = await fetch(`${this.route}/api-be/api/projects`);
+        if (res.ok) {
+            const data = await res.json();
+            return data;
+        }
+        else {
+            throw Error(`${await res.text()}`);
+        }
+    }
+    async fetchProjetctDetails(projectName) {
+        const res = await fetch(`${this.route}/api-be/api/projects/${projectName}`);
+        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) {
@@ -48,12 +68,13 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
-    async getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
+    async getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, chainId) {
         const parsedAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
         const queryParams = new URLSearchParams({
             from: fromTokenAddress,
             to: toTokenAddress,
             amount: parsedAmount.toString(),
+            chainId: chainId,
         });
         const res = await fetch(`${this.route}/api-be/api/1inch/swap?${queryParams}`);
         if (res.ok) {
@@ -84,16 +105,6 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
-    async fetchVaultDetails(vaultAddress) {
-        const res = await fetch(`${this.route}/api-be/api/vault/${vaultAddress}`);
-        if (res.ok) {
-            const data = (await res.json());
-            return data;
-        }
-        else {
-            throw Error(`${await res.text()}`);
-        }
-    }
     async fetchRewardsPerHour(walletAddress, vaultAddress) {
         const res = await fetch(`${this.route}/api-be/api/user/${walletAddress}/rewardsPerHour/${vaultAddress}`);
         if (res.ok) {
@@ -104,18 +115,18 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
-    async getSwapInfo(fromTokenAddress, toTokenAddress, amount, fromAddress) {
+    async getSwapInfo(fromTokenAddress, toTokenAddress, amount, fromAddress, chainId) {
         if (fromTokenAddress === toTokenAddress && fromTokenAddress === WETH_TOKEN_ADDRESS) {
             return [];
         }
-        const url = `${this.route}/oneinch?getRequest=/swap/v5.2/1/swap?fromTokenAddress=${fromTokenAddress}%26toTokenAddress=${toTokenAddress}%26amount=${amount.toString()}%26fromAddress=${fromAddress}%26slippage=0.1%26disableEstimate=true%26allowPartialFill=false%26includeTokensInfo=true`;
+        const url = `${this.route}/oneinch?getRequest=/swap/v6.0/${chainId}/swap?fromTokenAddress=${fromTokenAddress}%26toTokenAddress=${toTokenAddress}%26amount=${amount.toString()}%26fromAddress=${fromAddress}%26slippage=0.1%26disableEstimate=true%26allowPartialFill=false%26includeTokensInfo=true`;
         const res = await fetch(url);
         if (res.ok) {
             const data = (await res.json());
             return [
                 {
                     swapTarget: data.tx.to,
-                    token: data.fromToken.address,
+                    token: data.srcToken.address,
                     swapCallData: data.tx.data,
                 },
             ];
@@ -320,6 +331,31 @@ class PerqApi {
             throw Error(`${await res.text()}`);
         }
     }
+    async linkSuiWalletWithEthWallet(signedPayload) {
+        const res = await fetch(`${this.route}/api-be/api/user/suiWallet`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(signedPayload),
+        });
+        if (res.ok) {
+            return true;
+        }
+        else {
+            throw Error(`${await res.text()}`);
+        }
+    }
+    async getLinkedSuiWallet(walletAddress) {
+        const res = await fetch(`${this.route}/api-be/api/user/suiWallet/${walletAddress}`);
+        if (res.ok) {
+            const data = await res.json();
+            return data.suiWalletAddr;
+        }
+        else {
+            throw Error(`${await res.text()}`);
+        }
+    }
     async getNonceEnrichedPayload(payload) {
         const res = await fetch(`${this.route}/api-be/api/nonce`, {
             method: 'POST',

package/dist/PerqSdk.d.ts

@@ -1,5 +1,7 @@
 import { BigNumber, Signer, ethers } from 'ethers';
-import { Vault, UserRewards, VaultStats, UserVaultBalance, LoyaltyCard, NonceEnrichedSignedPayload, MyPerqData, BeansBalance, BeanEntry, PerqToBeansSwapInfo, VestingInfo, YelayLiteVault, PerqConfig } from './types';
+import { UserRewards, VaultStats, UserVaultBalance, LoyaltyCard, NonceEnrichedSignedPayload, MyPerqData, BeansBalance, BeanEntry, PerqToBeansSwapInfo, VestingInfo, PerqConfig, ReducedProjectData } from './types';
+import DetailedProjectData from './types/DetailedProjectData';
+import VaultData from './types/VaultData';
 export default class PerqSdk {
     private perqApi;
     private perqConfig;
@@ -11,33 +13,39 @@ export default class PerqSdk {
     private signer?;
     private yelayLiteSdk?;
     constructor(perqConfig: PerqConfig, provider?: ethers.providers.JsonRpcProvider);
-    getAllYelayLiteVaults(): Promise<YelayLiteVault[]>;
-    getAllVaults(): Promise<Vault[]>;
-    getVaultDetails(vaultAddress: string): Promise<Vault>;
-    getYelayLiteVaultDetails(vaultAddress: string, yliteProjectId: number): Promise<YelayLiteVault>;
+    getAllProjects(): Promise<ReducedProjectData[]>;
+    getProjectDetails(projectName: string): Promise<DetailedProjectData>;
+    getAllVaults(): Promise<VaultData[]>;
+    getV2VaultDetails(vaultAddress: string): Promise<VaultData>;
+    getLiteVaultDetails(vaultAddress: string, onChainProjectId: number): Promise<VaultData>;
     getVaultStats(): Promise<VaultStats>;
     getTokenPrice(tokenName: string): Promise<number>;
     updateSigner(newSigner: Signer): Promise<void>;
-    yelayLiteDeposit(tokenAddress: string, vaultAddress: string, yliteProjectId: number, amount: string): Promise<string>;
+    yelayLiteDeposit(tokenAddress: string, vaultAddress: string, onChainProjectId: 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;
     getTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
+    getSwapAndDepositTokenAllowanceForCurrency(tokenAddress: string): Promise<string>;
     getTokenAllowanceForRecycler(tokenAddress: string): Promise<BigNumber>;
     getTokenAllowanceForSwapAndRecycler(tokenAddress: string): Promise<BigNumber>;
     getExpectedSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
+    getExpectedYelayLiteSwapResult(fromTokenAddress: string, toTokenAddress: string, amount: string, decimals: number): Promise<string>;
     getUserBoostedNfts(vaultAddress: string): Promise<string[]>;
     getRewardsPerHour(vaultAddress: string): Promise<number>;
     getRewards(): Promise<UserRewards>;
     getMyPerqBalance(): Promise<MyPerqData[]>;
-    getYelayLiteUserVaultBalance(vaultAddress: string, yliteProjectId: number): Promise<BigNumber>;
+    getYelayLiteUserVaultBalance(vaultAddress: string, onChainProjectId: number): Promise<UserVaultBalance>;
     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>;
+    getYelayLiteSwapAndDepositAllowance(tokenAddress: string): Promise<string>;
+    approveYelayLiteSwapAndDeposit(tokenAddress: string, amount: string): Promise<string>;
+    yelayLiteSwapAndDeposit(fromTokenAddress: string, toTokenAddress: string, amount: string, vaultAddress: string, projectId: number): Promise<string>;
+    yelayLiteWithdraw(tokenAddress: string, vaultAddress: string, onChainProjectId: number, amount: string): Promise<string>;
     claimWithdraws(vaultAddress: string): Promise<string>;
     getBeansBalance(): Promise<BeansBalance>;
     getBeansHistory(): Promise<BeanEntry[]>;
@@ -53,7 +61,7 @@ export default class PerqSdk {
     approveTokenForDeposit(tokenAddress: string, amount: string): Promise<string>;
     getPerqTokenContractAddress(): string;
     getSwapPerqForBeansInfo(): Promise<PerqToBeansSwapInfo>;
-    getAllowance(tokenAddress: string, spender: string): Promise<BigNumber>;
+    getAllowance(tokenAddress: string, spender: string): Promise<string>;
     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>;
@@ -65,12 +73,15 @@ export default class PerqSdk {
     getAllVestingInfo(beneficiaryAddress: string): Promise<VestingInfo>;
     claimVestedPerq(amount: string): Promise<string>;
     burnVestedPerq(amount: string, price: string, deadline: string, signature: string): Promise<string>;
+    linkSuiWalletWithEthWallet(suiWalletAddress: string): Promise<boolean>;
+    getLinkedSuiWallet(): Promise<string>;
     signPayload<T>(payload: T): Promise<NonceEnrichedSignedPayload<T>>;
     private getEnrichedPayload;
     private generateRedeemBagStruct;
     private getERC20Precission;
     private getTokenAllowanceForDeposit;
     private getTokenAllowanceForSwapAndDeposit;
-    private getERC20TokenAllowance;
-    private approveToken;
+    getERC20TokenAllowance(spender: string, tokenAddress: string): Promise<BigNumber>;
+    approveToken(tokenAddress: string, amount: string, spender: string): Promise<string>;
+    yelayLiteWrapAndDepositEth(vaultAddress: string, onChainProjectId: number, amount: string): Promise<any>;
 }

package/dist/PerqSdk.js

@@ -10,6 +10,8 @@ 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");
+const chains_1 = require("./utils/chains");
+const WETH_DECIMAL_PRECISION = 18;
 class PerqSdk {
     perqApi;
     perqConfig;
@@ -24,10 +26,7 @@ class PerqSdk {
         const newSigner = provider?.getSigner();
         if (provider && newSigner) {
             this.signer = newSigner;
-            this.yelayLiteSdk = new sdk_1.YelayLiteSdk({
-                backendUrl: perqConfig.yelayLiteBackendUrl,
-                provider: provider,
-            });
+            this.yelayLiteSdk = new sdk_1.YelayLiteSdk(newSigner, perqConfig.yelayLiteSdkConfig);
             this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(perqConfig.spoolSdkConfig, newSigner);
         }
         this.perqConfig = perqConfig;
@@ -37,17 +36,20 @@ class PerqSdk {
         this.perqSwapAndRecyclerContract = new contracts_1.PerqSwapAndRecyclerContract(perqConfig.perqSwapAndRecyclerAddress, newSigner);
         this.perqVestingContract = new contracts_1.PerqVestingContract(perqConfig.perqVestingAddress, newSigner);
     }
-    async getAllYelayLiteVaults() {
-        return this.perqApi.fetchAllYelayLiteVaults();
+    async getAllProjects() {
+        return this.perqApi.fetchAllProjects();
+    }
+    async getProjectDetails(projectName) {
+        return this.perqApi.fetchProjetctDetails(projectName);
     }
     async getAllVaults() {
         return this.perqApi.fetchAllVaults();
     }
-    async getVaultDetails(vaultAddress) {
-        return this.perqApi.fetchVaultDetails(vaultAddress);
+    async getV2VaultDetails(vaultAddress) {
+        return this.perqApi.fetchVaultV2Details(vaultAddress);
     }
-    async getYelayLiteVaultDetails(vaultAddress, yliteProjectId) {
-        return this.perqApi.fetchYelayLiteVaultDetails(vaultAddress, yliteProjectId);
+    async getLiteVaultDetails(vaultAddress, onChainProjectId) {
+        return this.perqApi.fetchVaultLiteDetails(vaultAddress, onChainProjectId);
     }
     async getVaultStats() {
         return this.perqApi.fetchVaultStats();
@@ -58,26 +60,19 @@ class PerqSdk {
     async updateSigner(newSigner) {
         this.signer = newSigner;
         this.spoolSdk = new spool_v2_sdk_1.SpoolSdk(this.perqConfig.spoolSdkConfig, newSigner);
+        this.yelayLiteSdk = new sdk_1.YelayLiteSdk(newSigner, this.perqConfig.yelayLiteSdkConfig);
         this.perqTokenContract.updateSigner(newSigner);
         this.perqTokenRecyclerContract.updateSigner(newSigner);
         this.perqSwapAndRecyclerContract.updateSigner(newSigner);
         this.perqVestingContract.updateSigner(newSigner);
     }
-    async yelayLiteDeposit(tokenAddress, vaultAddress, yliteProjectId, amount) {
+    async yelayLiteDeposit(tokenAddress, vaultAddress, onChainProjectId, 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');
-        }
+        const parsedAmountToDeposit = ethers_1.ethers.utils.parseUnits(amount, decimals);
+        const res = await this.yelayLiteSdk.vaults.deposit(vaultAddress, onChainProjectId, BigInt(parsedAmountToDeposit.toString()));
         return res.hash;
     }
     async newDeposit(tokenAddress, vaultAddress, amount) {
@@ -121,6 +116,13 @@ class PerqSdk {
         const currentTokenAllowance = await this.getTokenAllowanceForDeposit(tokenAddress);
         return currentTokenAllowance.toString();
     }
+    async getSwapAndDepositTokenAllowanceForCurrency(tokenAddress) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const currentTokenAllowance = await this.getTokenAllowanceForSwapAndDeposit(tokenAddress);
+        return currentTokenAllowance.toString();
+    }
     async getTokenAllowanceForRecycler(tokenAddress) {
         if (!this.signer) {
             throw Error('No signer provided');
@@ -136,7 +138,10 @@ class PerqSdk {
         return allowance;
     }
     async getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
-        return this.perqApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals);
+        return this.perqApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, chains_1.ETHEREUM_CHAIN_ID.toString());
+    }
+    async getExpectedYelayLiteSwapResult(fromTokenAddress, toTokenAddress, amount, decimals) {
+        return this.perqApi.getExpectedSwapResult(fromTokenAddress, toTokenAddress, amount, decimals, chains_1.BASE_CHAIN_ID.toString());
     }
     async getUserBoostedNfts(vaultAddress) {
         const userAddress = await this.signer.getAddress();
@@ -156,49 +161,70 @@ class PerqSdk {
         const myPerqBalance = this.perqApi.fetchMyPerqData(userAddress);
         return myPerqBalance;
     }
-    async getYelayLiteUserVaultBalance(vaultAddress, yliteProjectId) {
+    async getYelayLiteUserVaultBalance(vaultAddress, onChainProjectId) {
         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;
+        if (!this.yelayLiteSdk) {
+            throw Error('YelayLiteSdk not initialized');
+        }
+        try {
+            const [userAddress, vault] = await Promise.all([
+                this.signer.getAddress(),
+                this.getLiteVaultDetails(vaultAddress, onChainProjectId),
+            ]);
+            const [balance, decimals] = await Promise.all([
+                this.yelayLiteSdk.vaults.balanceOf(vaultAddress, onChainProjectId, userAddress),
+                this.getERC20Precission(vault.depositToken.tokenAddress),
+            ]);
+            return {
+                userBalance: ethers_1.ethers.utils.formatUnits(balance.toString(), decimals),
+                pendingUserBalance: '0',
+                pendingWithdrawalBalance: '0',
+                claimableBalance: '0',
+                hasWithdrawsToClaim: false,
+            };
+        }
+        catch (error) {
+            throw new Error(`Failed to get YelayLite user vault balance: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
     }
     async getUserVaultBalance(vaultAddress) {
         if (!this.signer) {
             throw Error('No signer provided');
         }
-        const userAddress = await this.signer.getAddress();
-        // Parallel fetch of vault, deposits and wnfts
-        const [vault, userVaultBalance, userWnftsForVault] = await Promise.all([
-            this.getVaultDetails(vaultAddress),
-            this.perqApi.fetchUserVaultDeposits(userAddress, vaultAddress),
-            this.perqApi.fetchAllUserWNFTForVault(vaultAddress, userAddress),
+        const [userAddress, vault] = await Promise.all([this.signer.getAddress(), this.getV2VaultDetails(vaultAddress)]);
+        const [decimals, userBalanceBreakdown] = await Promise.all([
+            this.getERC20Precission(vault.depositToken.tokenAddress),
+            this.spoolSdk?.getUserBalanceBreakdown({ userAddress, vaultAddress }),
         ]);
-        const decimals = await this.getERC20Precission(vault.depositToken.tokenAddress);
-        // Calculate withdrawals
-        let pendingWithdraws = ethers_1.BigNumber.from(0);
-        let claimable = ethers_1.BigNumber.from(0);
-        for (const wnft of userWnftsForVault) {
-            if (!wnft.isBurned && wnft.svtWithdrawn) {
-                const currentBlockNumber = wnft.blockNumber - 1;
-                const assetsPerSvtAtBlock = await this.perqApi.fetchAssetPerSvtAtBlock(vaultAddress, currentBlockNumber);
-                const estimatedValueOfNFT = ethers_1.BigNumber.from(ethers_1.ethers.utils.formatUnits(ethers_1.BigNumber.from(wnft.svtWithdrawn).mul(assetsPerSvtAtBlock), 36).split('.')[0]);
-                if (wnft.isDHWFinished) {
-                    // Processed and claimable
-                    claimable = claimable.add(estimatedValueOfNFT);
-                }
-                else {
-                    // Not processed, pending withdrawal
-                    pendingWithdraws = pendingWithdraws.add(estimatedValueOfNFT);
-                }
-            }
+        if (!userBalanceBreakdown) {
+            return {
+                hasWithdrawsToClaim: false,
+                userBalance: '0',
+                pendingUserBalance: '0',
+                pendingWithdrawalBalance: '0',
+                claimableBalance: '0',
+            };
         }
+        let claimable = ethers_1.BigNumber.from(0);
+        for (const wnft of userBalanceBreakdown.claimableWNFTs) {
+            const currentBlockNumber = wnft.blockNumber - 1;
+            const assetsPerSvtAtBlock = await this.perqApi.fetchAssetPerSvtAtBlock(vaultAddress, currentBlockNumber);
+            const estimatedValueOfNFT = ethers_1.BigNumber.from(ethers_1.ethers.utils.formatUnits(ethers_1.BigNumber.from(wnft.svtWithdrawn).mul(assetsPerSvtAtBlock), 36).split('.')[0]);
+            claimable = claimable.add(estimatedValueOfNFT);
+        }
+        const currentBalance = Object.values(userBalanceBreakdown.withdrawableAssets)
+            .reduce((acc, curr) => acc + curr, 0)
+            .toString();
+        const pendingDepositBalance = Object.values(userBalanceBreakdown.pendingAssets)
+            .reduce((acc, curr) => acc + curr, 0)
+            .toString();
         return {
             hasWithdrawsToClaim: claimable.gt(0),
-            userBalance: userVaultBalance.deposited?.toString() || '0',
-            pendingUserBalance: userVaultBalance.pending?.toString() || '0',
-            pendingWithdrawalBalance: ethers_1.ethers.utils.formatUnits(pendingWithdraws, decimals) || '0',
+            userBalance: currentBalance,
+            pendingUserBalance: pendingDepositBalance,
+            pendingWithdrawalBalance: userBalanceBreakdown.pendingWithdrawal || '0',
             claimableBalance: ethers_1.ethers.utils.formatUnits(claimable, decimals) || '0',
         };
     }
@@ -210,7 +236,7 @@ class PerqSdk {
         if (!this.signer) {
             throw Error('No signer provided');
         }
-        const vault = await this.getVaultDetails(vaultAddress);
+        const vault = await this.getV2VaultDetails(vaultAddress);
         const redeemBagStruct = await this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
         const currentBlockNumber = await this.signer.provider?.getBlockNumber();
         if (!currentBlockNumber) {
@@ -240,7 +266,7 @@ class PerqSdk {
             }
         }
         const fromToken = ethers_1.ethers.utils.parseUnits(amountWithDecimals.toString(), decimals);
-        const swapInfo = await this.perqApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, userAddress);
+        const swapInfo = await this.perqApi.getSwapInfo(fromTokenAddress, toTokenAddress, fromToken, this.perqConfig.ethereumSwapperAddress, chains_1.ETHEREUM_CHAIN_ID);
         const swapDepositBagStruct = {
             inTokens: [fromTokenAddress],
             inAmounts: [fromToken],
@@ -264,22 +290,41 @@ class PerqSdk {
         if (!this.signer) {
             throw Error('No signer provided');
         }
-        const vault = await this.getVaultDetails(vaultAddress);
+        const vault = await this.getV2VaultDetails(vaultAddress);
         const redeemBagStruct = await this.generateRedeemBagStruct(vault, userAddress, amountToWithdraw);
         const redeemTx = await this.spoolSdk.redeem(redeemBagStruct, userAddress, false);
         const redeemTxReceipt = await redeemTx.wait();
         return redeemTxReceipt.transactionHash;
     }
-    async yelayLiteWithdraw(tokenAddress, vaultAddress, yliteProjectId, amount) {
+    async getYelayLiteSwapAndDepositAllowance(tokenAddress) {
+        const res = await this.yelayLiteSdk.vaults.vaultWrapperAllowance(tokenAddress);
+        return res.toString();
+    }
+    async approveYelayLiteSwapAndDeposit(tokenAddress, amount) {
+        const decimals = await this.getERC20Precission(tokenAddress);
+        const parsedAmountToApprove = ethers_1.ethers.utils.parseUnits(amount, decimals);
+        const res = await this.yelayLiteSdk.vaults.approveVaultWrapper(tokenAddress, parsedAmountToApprove.toBigInt());
+        return res.hash;
+    }
+    async yelayLiteSwapAndDeposit(fromTokenAddress, toTokenAddress, amount, vaultAddress, projectId) {
+        const decimals = await this.getERC20Precission(fromTokenAddress);
+        const parsedAmountToSwapAndDeposit = ethers_1.ethers.utils.parseUnits(amount, decimals);
+        const swapInfo = await this.perqApi.getSwapInfo(fromTokenAddress, toTokenAddress, parsedAmountToSwapAndDeposit, this.perqConfig.baseSwapperAddress, chains_1.BASE_CHAIN_ID);
+        const swapArgsStruct = {
+            tokenIn: swapInfo[0].token,
+            swapTarget: swapInfo[0].swapTarget,
+            swapCallData: swapInfo[0].swapCallData,
+        };
+        const res = await this.yelayLiteSdk.vaults.swapAndDeposit(vaultAddress.toLowerCase(), projectId, parsedAmountToSwapAndDeposit.toBigInt(), swapArgsStruct);
+        return res.hash;
+    }
+    async yelayLiteWithdraw(tokenAddress, vaultAddress, onChainProjectId, 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');
-        }
+        const parsedAmountToWithdraw = ethers_1.ethers.utils.parseUnits(amount, decimals);
+        const res = await this.yelayLiteSdk.vaults.redeem(vaultAddress, onChainProjectId, BigInt(parsedAmountToWithdraw.toString()));
         return res.hash;
     }
     async claimWithdraws(vaultAddress) {
@@ -379,7 +424,7 @@ class PerqSdk {
     }
     async getAllowance(tokenAddress, spender) {
         const allowance = await this.getERC20TokenAllowance(spender, tokenAddress);
-        return allowance;
+        return allowance.toString();
     }
     async approveAllowance(tokenAddress, amount, spenderAddress) {
         const decimals = await this.getERC20Precission(tokenAddress);
@@ -509,6 +554,20 @@ class PerqSdk {
             throw new Error('Failed to get total releasable amount: Unknown error');
         }
     }
+    async linkSuiWalletWithEthWallet(suiWalletAddress) {
+        const payload = {
+            suiWalletAddr: suiWalletAddress,
+        };
+        const signedPayload = await this.signPayload(payload);
+        return this.perqApi.linkSuiWalletWithEthWallet(signedPayload);
+    }
+    async getLinkedSuiWallet() {
+        if (!this.signer) {
+            throw new Error('No signer provided');
+        }
+        const walletAddr = await this.signer.getAddress();
+        return this.perqApi.getLinkedSuiWallet(walletAddr);
+    }
     async signPayload(payload) {
         if (!this.signer) {
             throw new Error('No signer provided');
@@ -585,5 +644,13 @@ class PerqSdk {
         const receipt = await approveTx.wait();
         return receipt.transactionHash;
     }
+    async yelayLiteWrapAndDepositEth(vaultAddress, onChainProjectId, amount) {
+        if (!this.signer) {
+            throw Error('No signer provided');
+        }
+        const parsedAmount = ethers_1.ethers.utils.parseUnits(amount, WETH_DECIMAL_PRECISION);
+        const res = await this.yelayLiteSdk.vaults.depositEth(vaultAddress, onChainProjectId, BigInt(parsedAmount.toString()));
+        return res.hash;
+    }
 }
 exports.default = PerqSdk;

package/dist/types/DeployedProject.d.ts

@@ -41,6 +41,7 @@ type DeployedProject = {
     rewardTooltipName?: string;
     liveUntil: string;
     liveFrom: string;
+    distributionType: string;
 };
 export default DeployedProject;
 export type ProjectBacker = {

package/dist/types/DetailedProjectData.d.ts

@@ -0,0 +1,33 @@
+import { ProjectBacker } from './DeployedProject';
+import { ReducedProjectData } from './ReducedProjectData';
+import StretchGoal from './StretchGoal';
+import VaultData from './VaultData';
+type DetailedProjectData = ReducedProjectData & {
+    content: string;
+    telegramLink: string;
+    twitterLink: string;
+    mediumLink: string;
+    deckLink: string;
+    roadmapLink: string;
+    economicsLink: string;
+    discordLink: string;
+    docsLink: string;
+    whitepaperLink: string;
+    litepaperLink: string;
+    websiteLink: string;
+    networks: string[];
+    supplyAtLaunch: number;
+    fdv: number;
+    totalSupply: number;
+    projectType: string;
+    yelayVersion: string;
+    wikiLink: string;
+    youTubeLink: string;
+    tikTokLink: string;
+    stretchGoals: StretchGoal[];
+    projectRewardText: string;
+    backers: ProjectBacker[];
+    protocols: string[];
+    vaults: VaultData[];
+};
+export default DetailedProjectData;

package/dist/types/DetailedProjectData.js

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

package/dist/types/LinkWalletPayload.d.ts

@@ -0,0 +1,4 @@
+type LinkWalletPayload = {
+    suiWalletAddr: string;
+};
+export default LinkWalletPayload;

package/dist/types/LinkWalletPayload.js

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

package/dist/types/MyPerqData.d.ts

@@ -1,10 +1,10 @@
-import { Asset, Vault } from './index';
-type MyPerqData = Vault & {
-    claimable: number;
+import VaultData from './VaultData';
+import { Asset } from './index';
+type MyPerqBalance = {
     pendingDeposits: number;
-    pendingWithdraws: number;
     currentlyDeposited: number;
-    ethPrice: number;
+    pendingWithdraws: number;
+    claimable: number;
     tokenRewards: {
         [token_address: string]: Asset & {
             amount: number;
@@ -12,4 +12,9 @@ type MyPerqData = Vault & {
         };
     };
 };
+type MyPerqData = VaultData & MyPerqBalance & {
+    ethPrice: number;
+    btcPrice: number;
+    combinedTvl: number;
+};
 export default MyPerqData;

package/dist/types/PerqConfig.d.ts

@@ -1,14 +1,17 @@
-import { SDKConfig } from '@spool.fi/spool-v2-sdk';
+import { SDKConfig as SpoolSdkConfig } from '@spool.fi/spool-v2-sdk';
+import { SDKConfig as YelayLikeSdkConfig } from '@yelay-lite/sdk';
 type PerqConfig = {
     route: string;
-    spoolSdkConfig: SDKConfig;
+    spoolSdkConfig: SpoolSdkConfig;
     perqTokenAddress: string;
     perqTokenRecyclerAddress: string;
     perqSwapAndRecyclerAddress: string;
     perqVestingAddress: string;
     swapAndDepositContractAddress: string;
+    ethereumSwapperAddress: string;
+    baseSwapperAddress: string;
     smartVaultManagerContractAddress: string;
-    yelayLiteBackendUrl: string;
+    yelayLiteSdkConfig: YelayLikeSdkConfig;
 };
 export default PerqConfig;
 export declare const PRODUCTION: PerqConfig;

package/dist/types/PerqConfig.js

@@ -2,25 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEVELOPMENT = exports.PRODUCTION = void 0;
 const spool_v2_sdk_1 = require("@spool.fi/spool-v2-sdk");
+const sdk_1 = require("@yelay-lite/sdk");
+const chains_1 = require("../utils/chains");
 exports.PRODUCTION = {
     route: 'https://perq.finance',
     spoolSdkConfig: (0, spool_v2_sdk_1.getMainnetConfig)('https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2/api'),
     perqTokenAddress: '0x2a414884a549ef5716bc1a4e648d3dc03f08b2cf',
-    perqTokenRecyclerAddress: '0x2FdcdB17799557Dce6f26921f12B7FA1DbcD79FA',
-    perqSwapAndRecyclerAddress: '0x15ED53964E6a5EcbEBAb80A0Fc68c2297b0eaA8D',
-    perqVestingAddress: '0x5e19C155C30bDEB83FCFE20a3b6f6Eda34B746c5',
+    perqTokenRecyclerAddress: '0x2fdcdb17799557dce6f26921f12b7fa1dbcd79fa',
+    perqSwapAndRecyclerAddress: '0x15ed53964e6a5ecbebab80a0fc68c2297b0eaa8d',
+    perqVestingAddress: '0x5e19c155c30bdeb83fcfe20a3b6f6eda34b746c5',
     swapAndDepositContractAddress: '0xd8534197bd587f8226d12e0c864ef2cae6f82f5c',
+    ethereumSwapperAddress: '0x33e52c206d584550193e642c8982f2fff6339994',
+    baseSwapperAddress: '0xf9a42821bc7b13c47a6c934704645111ead836a9',
     smartVaultManagerContractAddress: '0x23daf34e2b9af02a74dc19cb52af727b19403874',
-    yelayLiteBackendUrl: '',
+    yelayLiteSdkConfig: sdk_1.sdkConfig[chains_1.BASE_CHAIN_ID],
 };
 exports.DEVELOPMENT = {
     route: 'https://dev.perq.finance',
     spoolSdkConfig: (0, spool_v2_sdk_1.getSepoliaConfig)('https://subgraph.satsuma-prod.com/49eb322da234/solidant/spool-v2-sepolia/api'),
-    perqTokenAddress: '0x707B4Cc05645713d8Ea04FBC7192A0f2c1503d6E',
-    perqTokenRecyclerAddress: '0x07F2264E199D62afe07E8288eC9D36d155fc3f24',
-    perqSwapAndRecyclerAddress: '0xA4ed357FF233731860Ec8D0446FD95756d564014',
-    perqVestingAddress: '0x1d3B9E32a7139718f94BE32c797682fFf2D1bE60',
+    perqTokenAddress: '0x707b4cc05645713d8ea04fbc7192a0f2c1503d6e',
+    perqTokenRecyclerAddress: '0x07f2264e199d62afe07e8288ec9d36d155fc3f24',
+    perqSwapAndRecyclerAddress: '0xa4ed357ff233731860ec8d0446fd95756d564014',
+    perqVestingAddress: '0x1d3b9e32a7139718f94be32c797682fff2d1be60',
     swapAndDepositContractAddress: '0x5fb08e00de169f041711206a0995410884080177',
+    ethereumSwapperAddress: '0xe411921ee9eedfefd7b9ae15bf232bd36949fcbbc',
+    baseSwapperAddress: '0xf9a42821bc7b13c47a6c934704645111ead836a9',
     smartVaultManagerContractAddress: '0x2638d6c0b4ef6dee04050fa0b07ca62500435747',
-    yelayLiteBackendUrl: 'https://lite.dev.yelay.io',
+    yelayLiteSdkConfig: sdk_1.devSdkConfig[chains_1.BASE_CHAIN_ID],
 };

package/dist/types/ReducedProjectData.d.ts

@@ -0,0 +1,20 @@
+import DepositToken from './DepositToken';
+import VaultType from './VaultType';
+export type ReducedProjectData = {
+    projectName: string;
+    logo: string;
+    bannerImage: string;
+    rewardImage: string;
+    rewardTooltipName: string;
+    projectInfoText: string;
+    projectType: string;
+    poolType: VaultType;
+    liveUntil: string;
+    liveFrom: string;
+    tvlUsd: number;
+    tvl: number;
+    vAPY: number;
+    peakTVL: number;
+    isFeatured: boolean;
+    currencies: DepositToken[];
+};

package/dist/types/ReducedProjectData.js

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

package/dist/types/VaultData.d.ts

@@ -0,0 +1,31 @@
+import DepositToken from './DepositToken';
+import Strategy from './Strategy';
+import StretchGoal from './StretchGoal';
+import VaultReward from './VaultReward';
+import VaultType from './VaultType';
+type VaultData = {
+    depositToken: DepositToken;
+    vaultAddress: string;
+    projectName: string;
+    projectLogo: string;
+    projectType: string;
+    liveFrom: string;
+    liveUntil: string;
+    tvlUsd: number;
+    avgTvl: number;
+    tokenPrice: number;
+    change24h: number;
+    volume24h: number;
+    peakTvl: number;
+    onChainProjectId: number;
+    combinedTvl: number;
+    isActive: boolean;
+    owners: string[];
+    coingeckoId?: string;
+    expectedTge?: string;
+    poolType: VaultType;
+    strategies: Strategy[];
+    rewards: VaultReward[];
+    stretchGoals: StretchGoal[];
+};
+export default VaultData;

package/dist/types/VaultData.js

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

package/dist/types/index.d.ts

@@ -1,10 +1,12 @@
 import Asset from './Asset';
 import BeanEntry from './BeanEntry';
 import BeansBalance from './BeansBalance';
+import DetailedProjectData from './DetailedProjectData';
 import DeployedProject, { ProjectBacker } from './DeployedProject';
 import DeployedVault from './DeployedVault';
 import DepositToken from './DepositToken';
 import ELoyaltyCardTier from './ELoyaltyCardTier';
+import LinkWalletPayload from './LinkWalletPayload';
 import LoyaltyCard from './LoyaltyCard';
 import MyPerqData from './MyPerqData';
 import NFTBoost from './NFTBoost';
@@ -12,6 +14,7 @@ import PerqConfig from './PerqConfig';
 import PerqToBeansSwapInfo from './PerqToBeansSwapInfo';
 import QLFastRedeem from './QLFastRedeem';
 import { BasePayload, NonceEnrichedPayload, NonceEnrichedSignedPayload } from './SignedPayload';
+import { ReducedProjectData } from './ReducedProjectData';
 import Strategy from './Strategy';
 import StretchGoal from './StretchGoal';
 import SwapInfo from './SwapInfo';
@@ -19,10 +22,11 @@ import UpgradeLoyaltyCardPayload from './UpgradeLoyaltyCardPayload';
 import UserRewards from './UserRewards';
 import UserVaultBalance from './UserVaultBalance';
 import Vault from './Vault';
+import VaultData from './VaultData';
 import VaultReward, { RewardType } from './VaultReward';
 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, DetailedProjectData, ELoyaltyCardTier, LinkWalletPayload, LoyaltyCard, MyPerqData, NFTBoost, NonceEnrichedPayload, NonceEnrichedSignedPayload, PerqConfig, PerqToBeansSwapInfo, ProjectBacker, QLFastRedeem, ReducedProjectData, RewardType, Strategy, StretchGoal, SwapInfo, UpgradeLoyaltyCardPayload, UserRewards, UserVaultBalance, Vault, VaultData, VaultReward, VaultStats, VaultType, VestingInfo, YelayVersion, YelayLiteVault, };

package/dist/utils/chains.d.ts

@@ -0,0 +1,2 @@
+export declare const BASE_CHAIN_ID = 8453;
+export declare const ETHEREUM_CHAIN_ID = 1;

package/dist/utils/chains.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ETHEREUM_CHAIN_ID = exports.BASE_CHAIN_ID = void 0;
+exports.BASE_CHAIN_ID = 8453;
+exports.ETHEREUM_CHAIN_ID = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dripfi/drip-sdk",
-	"version": "1.4.3-yelay-lite",
+	"version": "1.4.3-yelay-lite-1",
 	"description": "Drip SDK",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -13,8 +13,8 @@
 		"pretty": "prettier --write \"./**/*.{js,jsx,mjs,cjs,ts,tsx,json}\""
 	},
 	"dependencies": {
-		"@spool.fi/spool-v2-sdk": "2.0.44",
-		"@yelay-lite/sdk": "0.0.15",
+		"@yelay-lite/sdk": "0.0.25",
+		"@spool.fi/spool-v2-sdk": "2.0.53",
 		"ethers": "^5.7.2"
 	},
 	"author": "",