@dripfi/drip-sdk 1.4.28-silo-sdk-2 → 1.4.28-silo-sdk-4

package/README.md

@@ -71,13 +71,13 @@ The SDK automatically determines the deposit type based on the provided paramete
 
 Access vault methods through `sdk.vault`:
 
-| Method | Description |
-| --- | --- |
-| `getAllowance(params: VaultOperationParams): Promise<boolean>` | Checks if the user's allowance is sufficient for the `depositAmount` |
-| `approveAllowance(params: VaultOperationParams): Promise<string>` | Approves the allowance for the `depositAmount` for the selected Vault |
-| `deposit(params: VaultOperationParams): Promise<string>` | Deposits the `depositAmount` into the selected `vault` |
-| `withdraw(params: VaultOperationParams): Promise<string>` | Withdraws the specified amount from the selected vault |
-| `getBalance(vaultAddress: string, tokenAddress?: string, onChainProjectId?: number): Promise<string>` | Gets the user's balance for the specified vault |
+| Method                                                                                                | Description                                                           |
+| ----------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| `getAllowance(params: VaultOperationParams): Promise<boolean>`                                        | Checks if the user's allowance is sufficient for the `depositAmount`  |
+| `approveAllowance(params: VaultOperationParams): Promise<string>`                                     | Approves the allowance for the `depositAmount` for the selected Vault |
+| `deposit(params: VaultOperationParams): Promise<string>`                                              | Deposits the `depositAmount` into the selected `vault`                |
+| `withdraw(params: VaultOperationParams): Promise<string>`                                             | Withdraws the specified amount from the selected vault                |
+| `getBalance(vaultAddress: string, tokenAddress?: string, onChainProjectId?: number): Promise<string>` | Gets the user's balance for the specified vault                       |
 
 ## Legacy Methods
 
@@ -426,11 +426,11 @@ enum ELoyaltyCardTier {
 	Black = 'Black',
 }
 
-interface IVaultOperations {
+interface VaultOperations {
 	getAllowance(params: VaultOperationParams): Promise<boolean>;
 	approveAllowance(params: VaultOperationParams): Promise<string>;
 	deposit(params: VaultOperationParams): Promise<string>;
-	withdraw(params: VaultOperationParams): Promise<string>;
+	withdraw(params: WithdrawParams): Promise<string>;
 	getBalance(vaultAddress: string, tokenAddress?: string, onChainProjectId?: number): Promise<string>;
 }
 
@@ -649,6 +649,15 @@ type VaultStats = {
 
 type VaultType = 'launch' | 'earn' | 'airdrop';
 
+interface WithdrawParams {
+	amount: string;
+	sdkType: SdkType;
+	tokenAddress: string;
+	vaultAddress: string;
+	// Optional parameters that may be needed for specific SDK implementations
+	onChainProjectId?: number; // needed for yelay SDK
+}
+
 interface VaultOperationParams {
 	sourceTokenAddress: string;
 	vaultTokenAddress: string;
@@ -760,6 +769,7 @@ type OverallStats = {
 	totalUsers: number;
 };
 
+
 ```
 
 ## Abis

package/dist/subpackages/SiloVaultOperations.d.ts

@@ -1,16 +1,16 @@
 import PerqSdk from '../PerqSdk';
 import { VaultOperationParams } from '../types/VaultOperationParams';
-import { IVaultOperations } from './VaultHandlerPackage';
+import { VaultOperations, WithdrawParams } from './VaultHandlerPackage';
 /**
  * Silo SDK vault operations implementation
  */
-export declare class SiloVaultOperations implements IVaultOperations {
+export declare class SiloVaultOperations implements VaultOperations {
     private perqSdk;
     constructor(perqSdk: PerqSdk);
     getAllowance(params: VaultOperationParams): Promise<boolean>;
     approveAllowance(params: VaultOperationParams): Promise<string>;
     deposit(params: VaultOperationParams): Promise<string>;
-    withdraw(params: VaultOperationParams): Promise<string>;
+    withdraw(params: WithdrawParams): Promise<string>;
     getBalance(vaultAddress: string, tokenAddress: string): Promise<string>;
     /**
      * Handles Silo withdraw with automatic full/partial withdraw detection

package/dist/subpackages/SiloVaultOperations.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SiloVaultOperations = void 0;
 const ethers_1 = require("ethers");
-const ERC20TokenContract_1 = __importDefault(require("../contracts/ERC20TokenContract"));
 /**
  * Silo SDK vault operations implementation
  */
@@ -24,11 +20,9 @@ class SiloVaultOperations {
             // For Silo, we use the standard ERC20 allowance
             const allowance = await this.perqSdk.tokenUtils.getERC20TokenAllowance(vaultAddress, sourceTokenAddress);
             console.log('🚀 ~ allowance:', allowance);
-            // Get token decimals for proper amount comparison
-            const tokenContract = new ERC20TokenContract_1.default(sourceTokenAddress, this.perqSdk.signer);
-            const decimals = await tokenContract.getPrecission();
-            const requiredAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
-            console.log('🚀 ~ requiredAmount:', requiredAmount);
+            // Get required amount with correct decimals
+            const requiredAmount = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, sourceTokenAddress);
+            console.log('🚀 ~ requiredAmount:', requiredAmount.toString());
             return allowance.gte(requiredAmount);
         }
         catch (error) {
@@ -42,35 +36,40 @@ class SiloVaultOperations {
         if (!this.perqSdk.siloPackage) {
             throw new Error('Silo package not initialized. Please provide a signer.');
         }
+        const amountToApprove = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, sourceTokenAddress);
+        console.log('🚀 ~ amountToApprove:', amountToApprove.toString());
         // For Silo, we use the standard ERC20 approval
-        return await this.perqSdk.tokenUtils.approveAllowance(sourceTokenAddress, amount, vaultAddress);
+        return await this.perqSdk.tokenUtils.approveAllowance(sourceTokenAddress, amountToApprove.toString(), vaultAddress);
     }
     async deposit(params) {
-        const { amount, vaultAddress } = params;
+        const { amount, vaultAddress, sourceTokenAddress } = params;
         console.log(`🚀 ~ silo deposit called with these params:`, { amount, vaultAddress });
         if (!this.perqSdk.siloPackage) {
             throw new Error('Silo package not initialized. Please provide a signer.');
         }
-        const tx = await this.perqSdk.siloPackage.deposit(amount, vaultAddress);
+        const parsedAmount = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, sourceTokenAddress);
+        console.log('🚀 ~ parsedAmount:', parsedAmount.toString());
+        const tx = await this.perqSdk.siloPackage.deposit(parsedAmount.toString(), vaultAddress);
         return this.extractTransactionHash(tx);
     }
     async withdraw(params) {
-        const { sourceTokenAddress, vaultAddress, amount } = params;
-        console.log(`🚀 ~ silo withdraw called with these params:`, { sourceTokenAddress, vaultAddress, amount });
+        const { amount, vaultAddress, tokenAddress } = params;
+        console.log(`🚀 ~ silo withdraw called with these params:`, { amount, vaultAddress, tokenAddress });
         if (!this.perqSdk.siloPackage) {
             throw new Error('Silo package not initialized. Please provide a signer.');
         }
-        return await this.handleSiloWithdraw(sourceTokenAddress, vaultAddress, amount);
+        const parsedAmount = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, tokenAddress);
+        console.log('🚀 ~ parsedAmount:', parsedAmount.toString());
+        return await this.handleSiloWithdraw(tokenAddress, vaultAddress, parsedAmount.toString());
     }
     async getBalance(vaultAddress, tokenAddress) {
         if (!this.perqSdk.signer) {
             throw new Error('Signer not initialized');
         }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
         const balance = await this.perqSdk.siloPackage.getBalanceInAssets(vaultAddress);
-        const formattedBalance = ethers_1.ethers.utils.formatUnits(balance, decimals);
-        return formattedBalance;
+        const formattedBalance = await this.perqSdk.tokenUtils.parseAmountWithDecimals(balance.toString(), tokenAddress);
+        console.log('🚀 ~ formattedBalance:', formattedBalance.toString());
+        return formattedBalance.toString();
     }
     /**
      * Handles Silo withdraw with automatic full/partial withdraw detection
@@ -80,13 +79,14 @@ class SiloVaultOperations {
         let userBalance = ethers_1.BigNumber.from(0);
         try {
             userBalance = await this.perqSdk.siloPackage.getBalanceInAssets(vaultAddress);
+            console.log('🚀 ~ userBalance:', userBalance.toString());
         }
         catch (error) {
             console.error('Error getting user balance for silo withdraw: ', error);
         }
-        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const parsedWithdrawAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
+        // Parse withdraw amount with correct decimals
+        const parsedWithdrawAmount = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, tokenAddress);
+        console.log('🚀 ~ parsedWithdrawAmount:', parsedWithdrawAmount.toString());
         try {
             if (parsedWithdrawAmount.gte(userBalance)) {
                 return await this.handleSiloFullWithdraw(vaultAddress);

package/dist/subpackages/TokenUtilsPackage.d.ts

@@ -3,6 +3,13 @@ import PerqSdk from '../PerqSdk';
 export default class TokenUtilsPackage {
     private perqSdk;
     constructor(perqSdk: PerqSdk);
+    /**
+     * Helper method to parse amount with correct token decimals
+     * @param amount - The amount as a string
+     * @param tokenAddress - The token contract address
+     * @returns Promise<BigNumber> - The parsed amount with correct decimals
+     */
+    parseAmountWithDecimals(amount: string, tokenAddress: string): Promise<BigNumber>;
     getTokenPrice(tokenName: string): Promise<number>;
     getAllowance(tokenAddress: string, spender: string): Promise<string>;
     approveAllowance(tokenAddress: string, amount: string, spenderAddress: string): Promise<string>;

package/dist/subpackages/TokenUtilsPackage.js

@@ -11,6 +11,20 @@ class TokenUtilsPackage {
     constructor(perqSdk) {
         this.perqSdk = perqSdk;
     }
+    /**
+     * Helper method to parse amount with correct token decimals
+     * @param amount - The amount as a string
+     * @param tokenAddress - The token contract address
+     * @returns Promise<BigNumber> - The parsed amount with correct decimals
+     */
+    async parseAmountWithDecimals(amount, tokenAddress) {
+        if (!this.perqSdk.signer) {
+            throw new Error('No signer provided');
+        }
+        const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
+        const decimals = await tokenContract.getPrecission();
+        return ethers_1.ethers.utils.parseUnits(amount, decimals);
+    }
     async getTokenPrice(tokenName) {
         return this.perqSdk.perqApi.fetchTokenPrice(tokenName);
     }
@@ -27,8 +41,7 @@ class TokenUtilsPackage {
             throw Error('No signer provided');
         }
         const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const parsedAmount = ethers_1.ethers.utils.parseUnits(parseFloat(amount).toFixed(decimals), decimals);
+        const parsedAmount = await this.parseAmountWithDecimals(amount, tokenAddress);
         return await tokenContract.approveToken(spenderAddress, parsedAmount.toString());
     }
     async transferErc20Token(tokenAddress, amount, receiver) {
@@ -36,8 +49,8 @@ class TokenUtilsPackage {
             throw Error('No signer provided');
         }
         const tokenContract = new ERC20TokenContract_1.default(tokenAddress, this.perqSdk.signer);
-        const decimals = await tokenContract.getPrecission();
-        const txHash = await tokenContract.transfer(receiver, ethers_1.ethers.utils.parseUnits(amount, decimals).toString());
+        const parsedAmount = await this.parseAmountWithDecimals(amount, tokenAddress);
+        const txHash = await tokenContract.transfer(receiver, parsedAmount.toString());
         return txHash;
     }
     async wrapEther(amount, tokenAddress) {

package/dist/subpackages/VaultHandlerPackage.d.ts

@@ -1,10 +1,18 @@
 import PerqSdk from '../PerqSdk';
+import SdkType from '../types/SdkType';
 import { VaultOperationParams } from '../types/VaultOperationParams';
-export interface IVaultOperations {
+export interface WithdrawParams {
+    amount: string;
+    sdkType: SdkType;
+    tokenAddress: string;
+    vaultAddress: string;
+    onChainProjectId?: number;
+}
+export interface VaultOperations {
     getAllowance(params: VaultOperationParams): Promise<boolean>;
     approveAllowance(params: VaultOperationParams): Promise<string>;
     deposit(params: VaultOperationParams): Promise<string>;
-    withdraw(params: VaultOperationParams): Promise<string>;
+    withdraw(params: WithdrawParams): Promise<string>;
     getBalance(vaultAddress: string, tokenAddress?: string, onChainProjectId?: number): Promise<string>;
 }
 export default class VaultHandler {
@@ -28,7 +36,7 @@ export default class VaultHandler {
     /**
      * Withdraw from vault
      */
-    withdraw(params: VaultOperationParams): Promise<string>;
+    withdraw(params: WithdrawParams): Promise<string>;
     /**
      * Get the balance of the vault
      */

package/dist/subpackages/YelayVaultOperations.d.ts

@@ -1,13 +1,13 @@
 import PerqSdk from '../PerqSdk';
 import { VaultOperationParams } from '../types/VaultOperationParams';
-import { IVaultOperations } from './VaultHandlerPackage';
-export declare class YelayVaultOperations implements IVaultOperations {
+import { VaultOperations, WithdrawParams } from './VaultHandlerPackage';
+export declare class YelayVaultOperations implements VaultOperations {
     private perqSdk;
     constructor(perqSdk: PerqSdk);
     getAllowance(params: VaultOperationParams): Promise<boolean>;
     approveAllowance(params: VaultOperationParams): Promise<string>;
     deposit(params: VaultOperationParams): Promise<string>;
-    withdraw(params: VaultOperationParams): Promise<string>;
-    getBalance(vaultAddress: string, tokenAddress: string, onChainProjectId: number): Promise<string>;
+    withdraw(params: WithdrawParams): Promise<string>;
+    getBalance(vaultAddress: string, _: string, onChainProjectId: number): Promise<string>;
     private determineDepositType;
 }

package/dist/subpackages/YelayVaultOperations.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YelayVaultOperations = void 0;
 const ethers_1 = require("ethers");
-const ERC20TokenContract_1 = __importDefault(require("../contracts/ERC20TokenContract"));
 class YelayVaultOperations {
     perqSdk;
     constructor(perqSdk) {
@@ -44,10 +40,8 @@ class YelayVaultOperations {
                 default:
                     throw new Error(`Unsupported deposit type: ${depositType}`);
             }
-            // Get token decimals for proper amount comparison
-            const tokenContract = new ERC20TokenContract_1.default(sourceTokenAddress, this.perqSdk.signer);
-            const decimals = await tokenContract.getPrecission();
-            const requiredAmount = ethers_1.ethers.utils.parseUnits(amount, decimals);
+            // Get required amount with correct decimals
+            const requiredAmount = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, sourceTokenAddress);
             return allowance.gte(requiredAmount);
         }
         catch (error) {
@@ -67,13 +61,15 @@ class YelayVaultOperations {
             throw new Error('OnChainProjectId is required for Yelay vaults');
         }
         const depositType = this.determineDepositType(params);
+        const parsedAmount = await this.perqSdk.tokenUtils.parseAmountWithDecimals(amount, sourceTokenAddress);
+        console.log('🚀 ~ parsedAmount:', parsedAmount.toString());
         switch (depositType) {
             case 'direct':
-                return await this.perqSdk.tokenUtils.approveAllowance(sourceTokenAddress, amount, vaultAddress);
+                return await this.perqSdk.tokenUtils.approveAllowance(sourceTokenAddress, parsedAmount.toString(), vaultAddress);
             case 'wrap':
                 throw new Error("Can't approve a native token");
             case 'swap':
-                return await this.perqSdk.lite.approveSwapAndDeposit(sourceTokenAddress, amount);
+                return await this.perqSdk.lite.approveSwapAndDeposit(sourceTokenAddress, parsedAmount.toString());
             default:
                 throw new Error(`Unsupported deposit type: ${depositType}`);
         }
@@ -121,26 +117,32 @@ class YelayVaultOperations {
         }
     }
     async withdraw(params) {
-        const { sourceTokenAddress, vaultAddress, amount, onChainProjectId } = params;
-        console.log(`🚀 ~ yelay withdraw called with these params: `, {
-            sourceTokenAddress,
-            vaultAddress,
+        const { amount, tokenAddress, vaultAddress, onChainProjectId } = params;
+        console.log(`🚀 ~ yelay withdraw called with these params:`, {
             amount,
+            tokenAddress,
+            vaultAddress,
             onChainProjectId,
         });
         if (!onChainProjectId || onChainProjectId === -1) {
             throw new Error('OnChainProjectId is required for Yelay vaults');
         }
         console.log('🚀 ~ this.perqSdk.lite.withdraw called', {
-            sourceTokenAddress,
+            tokenAddress,
             vaultAddress,
             onChainProjectId,
             amount,
         });
-        return await this.perqSdk.lite.withdraw(sourceTokenAddress, vaultAddress, onChainProjectId, amount);
+        return await this.perqSdk.lite.withdraw(tokenAddress, vaultAddress, onChainProjectId, amount);
     }
-    async getBalance(vaultAddress, tokenAddress, onChainProjectId) {
-        return await this.perqSdk.pools.getUserPoolBalance(vaultAddress, onChainProjectId);
+    async getBalance(vaultAddress, _, onChainProjectId) {
+        console.log('🚀 ~ this.perqSdk.pools.getUserPoolBalance called with: ', {
+            vaultAddress,
+            onChainProjectId,
+        });
+        const balance = await this.perqSdk.pools.getUserPoolBalance(vaultAddress, onChainProjectId);
+        console.log('🚀 ~ balance: ', balance);
+        return balance;
     }
     determineDepositType(params) {
         const { sourceTokenSymbol, vaultTokenSymbol } = params;

package/package.json

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