@strkfarm/sdk 2.0.0-staging.27 → 2.0.0-staging.29

package/dist/index.browser.global.js

@@ -20207,7 +20207,7 @@ ${r2}}` : "}", l2;
         toHexString: () => toHexString2,
         toStorageKey: () => toStorageKey2
       });
-      var import_utils147 = require_utils2();
+      var import_utils146 = require_utils2();
       function isHex3(hex) {
         return /^0x[0-9a-f]*$/i.test(hex);
       }
@@ -20280,7 +20280,7 @@ ${r2}}` : "}", l2;
         if (adaptedValue.length % 2 !== 0) {
           adaptedValue = `0${adaptedValue}`;
         }
-        return (0, import_utils147.hexToBytes)(adaptedValue);
+        return (0, import_utils146.hexToBytes)(adaptedValue);
       }
       function addPercent2(number22, percent) {
         const bigIntNum = BigInt(number22);
@@ -92121,6 +92121,12 @@ spurious results.`);
     async getPendingRewards() {
       return [];
     }
+    getStrategyTooltip() {
+      return {
+        holdings: "Your Holdings",
+        earnings: "Lifetime Earnings"
+      };
+    }
     async getUserRealizedAPY(blockIdentifier, sinceBlocks) {
       throw new Error("Not implemented");
     }
@@ -116631,12 +116637,8 @@ spurious results.`);
     resolveWithdrawRequest(amountInfo, redeemableBaseTokenAmount, redeemableSecondaryTokenAmount) {
       const baseTokenAmountToWithdraw = Number(amountInfo.token0.amount.toWei());
       const secondaryTokenAmountToWithdraw = Number(amountInfo.token1.amount.toWei());
-      logger2.info(`baseTokenAmountToWithdraw: ${baseTokenAmountToWithdraw}`);
-      logger2.info(`secondaryTokenAmountToWithdraw: ${secondaryTokenAmountToWithdraw}`);
-      logger2.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-      logger2.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
       if (baseTokenAmountToWithdraw > 0 && redeemableBaseTokenAmount.greaterThanOrEqualTo(baseTokenAmountToWithdraw)) {
-        const sharesUsedFactor = redeemableBaseTokenAmount.dividedBy(baseTokenAmountToWithdraw);
+        const sharesUsedFactor = new Web3Number(baseTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableBaseTokenAmount);
         return {
           sharesUsedFactor: sharesUsedFactor.toNumber(),
           baseTokenAmountToWithdraw,
@@ -116646,8 +116648,9 @@ spurious results.`);
       if (secondaryTokenAmountToWithdraw > 0 && redeemableSecondaryTokenAmount.greaterThanOrEqualTo(
         secondaryTokenAmountToWithdraw
       )) {
+        const sharesUsedFactor = new Web3Number(secondaryTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableSecondaryTokenAmount);
         return {
-          sharesUsedFactor: secondaryTokenAmountToWithdraw / Number(redeemableSecondaryTokenAmount),
+          sharesUsedFactor: sharesUsedFactor.toNumber(),
           baseTokenAmountToWithdraw,
           secondaryTokenAmountToWithdraw
         };
@@ -116746,10 +116749,10 @@ spurious results.`);
     }
     async depositCall(amountInfo) {
       try {
-        const primaryToken = amountInfo.token0.tokenInfo;
-        const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.token0.amount);
+        const primaryToken = amountInfo.tokenInfo;
+        const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.amount);
         const depositCall = this.contract.populate("deposit", [
-          uint256_exports.bnToUint256(amountInfo.token0.amount.toWei())
+          uint256_exports.bnToUint256(amountInfo.amount.toWei())
         ]);
         return [approvalCall, depositCall];
       } catch (err2) {
@@ -116762,9 +116765,9 @@ spurious results.`);
       return vaultStatus;
     }
     async matchInputAmounts(amountInfo, user) {
-      const { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
-      logger2.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-      logger2.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+      let { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
+      redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+      redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
       const withdrawRequest = this.resolveWithdrawRequest(
         amountInfo,
         redeemableBaseTokenAmount,
@@ -116779,7 +116782,7 @@ spurious results.`);
         secondaryTokenAmountToWithdraw
       } = withdrawRequest;
       if (baseTokenAmountToWithdraw > 0) {
-        const secondaryTokenAmount = redeemableSecondaryTokenAmount.multipliedBy(sharesUsedFactor);
+        const secondaryTokenAmount = redeemableSecondaryTokenAmount.dividedBy(10 ** this.secondaryToken.decimals).multipliedBy(sharesUsedFactor);
         return {
           token0: {
             tokenInfo: amountInfo.token0.tokenInfo,
@@ -116791,7 +116794,7 @@ spurious results.`);
           }
         };
       }
-      const baseTokenAmount = redeemableBaseTokenAmount.multipliedBy(sharesUsedFactor);
+      const baseTokenAmount = redeemableBaseTokenAmount.dividedBy(10 ** this.primaryToken.decimals).multipliedBy(sharesUsedFactor);
       return {
         token0: {
           tokenInfo: amountInfo.token0.tokenInfo,
@@ -116805,23 +116808,22 @@ spurious results.`);
     }
     async withdrawCall(amountInfo, receiver, owner) {
       try {
-        const {
+        let {
           shares: userShares,
           primaryTokenBalance: redeemableBaseTokenAmount,
           claimableSecondaryTokens: redeemableSecondaryTokenAmount
         } = await this.getNormalizedUserInfo(receiver);
-        logger2.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-        logger2.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+        redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+        redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
         const withdrawRequest = this.resolveWithdrawRequest(
           amountInfo,
           redeemableBaseTokenAmount,
           redeemableSecondaryTokenAmount
         );
         if (!withdrawRequest) {
-          return [];
+          throw new Error("Invalid amount info");
         }
-        const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor);
-        logger2.info(`requiredShares: ${requiredShares.toString()}`);
+        const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor).floor();
         const withdrawCall = this.contract.populate("redeem", [
           uint256_exports.bnToUint256(requiredShares.toString())
         ]);
@@ -116832,36 +116834,13 @@ spurious results.`);
       }
     }
     async netAPY() {
-      try {
-        const vaultStatus = await this.getVaultStatus();
-        const {
-          remaining_base: remainingBase,
-          total_second_tokens: totalSecondTokens
-        } = vaultStatus;
-        const primaryTokenPrice = await this.pricer.getPrice(this.primaryToken.symbol);
-        const secondaryTokenPrice = await this.pricer.getPrice(this.secondaryToken.symbol);
-        const primaryTokenAmount = Web3Number.fromWei(remainingBase.toString(), this.primaryToken.decimals);
-        const secondaryTokenAmount = Web3Number.fromWei(totalSecondTokens.toString(), this.secondaryToken.decimals);
-        const primaryTokenUsd = primaryTokenAmount.multipliedBy(primaryTokenPrice.price).toNumber();
-        const secondaryTokenUsd = secondaryTokenAmount.multipliedBy(secondaryTokenPrice.price).toNumber();
-        const netUsd = primaryTokenUsd + secondaryTokenUsd;
-        return {
-          net: netUsd,
-          splits: [
-            {
-              apy: primaryTokenAmount.toNumber(),
-              id: this.primaryToken.symbol
-            },
-            {
-              apy: secondaryTokenAmount.toNumber(),
-              id: this.secondaryToken.symbol
-            }
-          ]
-        };
-      } catch (err2) {
-        console.error("Error fetching net APY:", err2);
-        return 0;
-      }
+      return "YOLO";
+    }
+    getStrategyTooltip() {
+      return {
+        holdings: "USDC Left",
+        earnings: "WBTC Accumulated"
+      };
     }
   };
   var yoloVaultDescription = "Deposit USDC into YOLO Vault and gradually accumulate WBTC over fixed epochs, where a manager decides how much USDC to deploy each epoch.";

package/dist/index.browser.mjs

@@ -4890,6 +4890,12 @@ var BaseStrategy = class extends CacheClass {
   async getPendingRewards() {
     return [];
   }
+  getStrategyTooltip() {
+    return {
+      holdings: "Your Holdings",
+      earnings: "Lifetime Earnings"
+    };
+  }
   async getUserRealizedAPY(blockIdentifier, sinceBlocks) {
     throw new Error("Not implemented");
   }
@@ -29424,12 +29430,8 @@ var YoLoVault = class extends BaseStrategy {
   resolveWithdrawRequest(amountInfo, redeemableBaseTokenAmount, redeemableSecondaryTokenAmount) {
     const baseTokenAmountToWithdraw = Number(amountInfo.token0.amount.toWei());
     const secondaryTokenAmountToWithdraw = Number(amountInfo.token1.amount.toWei());
-    logger.info(`baseTokenAmountToWithdraw: ${baseTokenAmountToWithdraw}`);
-    logger.info(`secondaryTokenAmountToWithdraw: ${secondaryTokenAmountToWithdraw}`);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
     if (baseTokenAmountToWithdraw > 0 && redeemableBaseTokenAmount.greaterThanOrEqualTo(baseTokenAmountToWithdraw)) {
-      const sharesUsedFactor = redeemableBaseTokenAmount.dividedBy(baseTokenAmountToWithdraw);
+      const sharesUsedFactor = new Web3Number(baseTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableBaseTokenAmount);
       return {
         sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
@@ -29439,8 +29441,9 @@ var YoLoVault = class extends BaseStrategy {
     if (secondaryTokenAmountToWithdraw > 0 && redeemableSecondaryTokenAmount.greaterThanOrEqualTo(
       secondaryTokenAmountToWithdraw
     )) {
+      const sharesUsedFactor = new Web3Number(secondaryTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableSecondaryTokenAmount);
       return {
-        sharesUsedFactor: secondaryTokenAmountToWithdraw / Number(redeemableSecondaryTokenAmount),
+        sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
         secondaryTokenAmountToWithdraw
       };
@@ -29539,10 +29542,10 @@ var YoLoVault = class extends BaseStrategy {
   }
   async depositCall(amountInfo) {
     try {
-      const primaryToken = amountInfo.token0.tokenInfo;
-      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.token0.amount);
+      const primaryToken = amountInfo.tokenInfo;
+      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.amount);
       const depositCall = this.contract.populate("deposit", [
-        uint25610.bnToUint256(amountInfo.token0.amount.toWei())
+        uint25610.bnToUint256(amountInfo.amount.toWei())
       ]);
       return [approvalCall, depositCall];
     } catch (err) {
@@ -29555,9 +29558,9 @@ var YoLoVault = class extends BaseStrategy {
     return vaultStatus;
   }
   async matchInputAmounts(amountInfo, user) {
-    const { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+    let { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
+    redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+    redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
     const withdrawRequest = this.resolveWithdrawRequest(
       amountInfo,
       redeemableBaseTokenAmount,
@@ -29572,7 +29575,7 @@ var YoLoVault = class extends BaseStrategy {
       secondaryTokenAmountToWithdraw
     } = withdrawRequest;
     if (baseTokenAmountToWithdraw > 0) {
-      const secondaryTokenAmount = redeemableSecondaryTokenAmount.multipliedBy(sharesUsedFactor);
+      const secondaryTokenAmount = redeemableSecondaryTokenAmount.dividedBy(10 ** this.secondaryToken.decimals).multipliedBy(sharesUsedFactor);
       return {
         token0: {
           tokenInfo: amountInfo.token0.tokenInfo,
@@ -29584,7 +29587,7 @@ var YoLoVault = class extends BaseStrategy {
         }
       };
     }
-    const baseTokenAmount = redeemableBaseTokenAmount.multipliedBy(sharesUsedFactor);
+    const baseTokenAmount = redeemableBaseTokenAmount.dividedBy(10 ** this.primaryToken.decimals).multipliedBy(sharesUsedFactor);
     return {
       token0: {
         tokenInfo: amountInfo.token0.tokenInfo,
@@ -29598,23 +29601,22 @@ var YoLoVault = class extends BaseStrategy {
   }
   async withdrawCall(amountInfo, receiver, owner) {
     try {
-      const {
+      let {
         shares: userShares,
         primaryTokenBalance: redeemableBaseTokenAmount,
         claimableSecondaryTokens: redeemableSecondaryTokenAmount
       } = await this.getNormalizedUserInfo(receiver);
-      logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-      logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+      redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+      redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
       const withdrawRequest = this.resolveWithdrawRequest(
         amountInfo,
         redeemableBaseTokenAmount,
         redeemableSecondaryTokenAmount
       );
       if (!withdrawRequest) {
-        return [];
+        throw new Error("Invalid amount info");
       }
-      const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor);
-      logger.info(`requiredShares: ${requiredShares.toString()}`);
+      const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor).floor();
       const withdrawCall = this.contract.populate("redeem", [
         uint25610.bnToUint256(requiredShares.toString())
       ]);
@@ -29625,36 +29627,13 @@ var YoLoVault = class extends BaseStrategy {
     }
   }
   async netAPY() {
-    try {
-      const vaultStatus = await this.getVaultStatus();
-      const {
-        remaining_base: remainingBase,
-        total_second_tokens: totalSecondTokens
-      } = vaultStatus;
-      const primaryTokenPrice = await this.pricer.getPrice(this.primaryToken.symbol);
-      const secondaryTokenPrice = await this.pricer.getPrice(this.secondaryToken.symbol);
-      const primaryTokenAmount = Web3Number.fromWei(remainingBase.toString(), this.primaryToken.decimals);
-      const secondaryTokenAmount = Web3Number.fromWei(totalSecondTokens.toString(), this.secondaryToken.decimals);
-      const primaryTokenUsd = primaryTokenAmount.multipliedBy(primaryTokenPrice.price).toNumber();
-      const secondaryTokenUsd = secondaryTokenAmount.multipliedBy(secondaryTokenPrice.price).toNumber();
-      const netUsd = primaryTokenUsd + secondaryTokenUsd;
-      return {
-        net: netUsd,
-        splits: [
-          {
-            apy: primaryTokenAmount.toNumber(),
-            id: this.primaryToken.symbol
-          },
-          {
-            apy: secondaryTokenAmount.toNumber(),
-            id: this.secondaryToken.symbol
-          }
-        ]
-      };
-    } catch (err) {
-      console.error("Error fetching net APY:", err);
-      return 0;
-    }
+    return "YOLO";
+  }
+  getStrategyTooltip() {
+    return {
+      holdings: "USDC Left",
+      earnings: "WBTC Accumulated"
+    };
   }
 };
 var yoloVaultDescription = "Deposit USDC into YOLO Vault and gradually accumulate WBTC over fixed epochs, where a manager decides how much USDC to deploy each epoch.";

package/dist/index.d.ts

@@ -612,17 +612,21 @@ interface CacheData {
     ttl: number;
     data: any;
 }
-declare class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
+declare class BaseStrategy<TVLInfo, DepositActionInfo, WithdrawActionInfo = DepositActionInfo> extends CacheClass {
     readonly config: IConfig;
     readonly cache: Map<string, CacheData>;
     constructor(config: IConfig);
     getUserTVL(user: ContractAddr, blockIdentifier?: BlockIdentifier): Promise<TVLInfo>;
     getTVL(): Promise<TVLInfo>;
-    depositCall(amountInfo: ActionInfo, receiver: ContractAddr): Promise<Call[]>;
-    withdrawCall(amountInfo: ActionInfo, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]>;
+    depositCall(amountInfo: DepositActionInfo, receiver: ContractAddr): Promise<Call[]>;
+    withdrawCall(amountInfo: WithdrawActionInfo, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]>;
     getVaultPositions(): Promise<VaultPosition[]>;
-    netAPY(blockIdentifier?: BlockIdentifier, sinceBlocks?: number, timeperiod?: "24h" | "7d" | "30d" | "3m"): Promise<number | NetAPYDetails>;
+    netAPY(blockIdentifier?: BlockIdentifier, sinceBlocks?: number, timeperiod?: "24h" | "7d" | "30d" | "3m"): Promise<number | string | NetAPYDetails>;
     getPendingRewards(): Promise<HarvestInfo[]>;
+    getStrategyTooltip(): {
+        holdings: string;
+        earnings: string;
+    };
     getUserRealizedAPY(blockIdentifier?: BlockIdentifier, sinceBlocks?: number): Promise<number>;
     /**
      * Calculate lifetime earnings for a user based on provided data from client
@@ -1190,7 +1194,7 @@ interface YoloVaultStatus {
     total_shares: bigint;
     base_token_assets_per_share: bigint;
 }
-declare class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
+declare class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, DualActionAmount> {
     readonly address: ContractAddr;
     readonly metadata: IStrategyMetadata<YoloVaultSettings>;
     readonly pricer: PricerBase;
@@ -1202,12 +1206,16 @@ declare class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
     private resolveWithdrawRequest;
     getUserTVL(user: ContractAddr): Promise<DualTokenInfo>;
     getTVL(): Promise<DualTokenInfo>;
-    depositCall(amountInfo: DualActionAmount): Promise<Call[]>;
+    depositCall(amountInfo: SingleActionAmount): Promise<Call[]>;
     getVaultStatus(): Promise<YoloVaultStatus>;
     matchInputAmounts(amountInfo: DualActionAmount, user: ContractAddr): Promise<DualActionAmount>;
     withdrawCall(amountInfo: DualActionAmount, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]>;
-    netAPY(): Promise<number | NetAPYDetails>;
+    netAPY(): Promise<number | string | NetAPYDetails>;
     getSettings: () => Promise<starknet.CallResult>;
+    getStrategyTooltip(): {
+        holdings: string;
+        earnings: string;
+    };
 }
 declare const YoloVaultStrategies: IStrategyMetadata<YoloVaultSettings>[];
 

package/dist/index.js

@@ -4932,6 +4932,12 @@ var BaseStrategy = class extends CacheClass {
   async getPendingRewards() {
     return [];
   }
+  getStrategyTooltip() {
+    return {
+      holdings: "Your Holdings",
+      earnings: "Lifetime Earnings"
+    };
+  }
   async getUserRealizedAPY(blockIdentifier, sinceBlocks) {
     throw new Error("Not implemented");
   }
@@ -29563,12 +29569,8 @@ var YoLoVault = class extends BaseStrategy {
   resolveWithdrawRequest(amountInfo, redeemableBaseTokenAmount, redeemableSecondaryTokenAmount) {
     const baseTokenAmountToWithdraw = Number(amountInfo.token0.amount.toWei());
     const secondaryTokenAmountToWithdraw = Number(amountInfo.token1.amount.toWei());
-    logger.info(`baseTokenAmountToWithdraw: ${baseTokenAmountToWithdraw}`);
-    logger.info(`secondaryTokenAmountToWithdraw: ${secondaryTokenAmountToWithdraw}`);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
     if (baseTokenAmountToWithdraw > 0 && redeemableBaseTokenAmount.greaterThanOrEqualTo(baseTokenAmountToWithdraw)) {
-      const sharesUsedFactor = redeemableBaseTokenAmount.dividedBy(baseTokenAmountToWithdraw);
+      const sharesUsedFactor = new Web3Number(baseTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableBaseTokenAmount);
       return {
         sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
@@ -29578,8 +29580,9 @@ var YoLoVault = class extends BaseStrategy {
     if (secondaryTokenAmountToWithdraw > 0 && redeemableSecondaryTokenAmount.greaterThanOrEqualTo(
       secondaryTokenAmountToWithdraw
     )) {
+      const sharesUsedFactor = new Web3Number(secondaryTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableSecondaryTokenAmount);
       return {
-        sharesUsedFactor: secondaryTokenAmountToWithdraw / Number(redeemableSecondaryTokenAmount),
+        sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
         secondaryTokenAmountToWithdraw
       };
@@ -29678,10 +29681,10 @@ var YoLoVault = class extends BaseStrategy {
   }
   async depositCall(amountInfo) {
     try {
-      const primaryToken = amountInfo.token0.tokenInfo;
-      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.token0.amount);
+      const primaryToken = amountInfo.tokenInfo;
+      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.amount);
       const depositCall = this.contract.populate("deposit", [
-        import_starknet20.uint256.bnToUint256(amountInfo.token0.amount.toWei())
+        import_starknet20.uint256.bnToUint256(amountInfo.amount.toWei())
       ]);
       return [approvalCall, depositCall];
     } catch (err) {
@@ -29694,9 +29697,9 @@ var YoLoVault = class extends BaseStrategy {
     return vaultStatus;
   }
   async matchInputAmounts(amountInfo, user) {
-    const { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+    let { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
+    redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+    redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
     const withdrawRequest = this.resolveWithdrawRequest(
       amountInfo,
       redeemableBaseTokenAmount,
@@ -29711,7 +29714,7 @@ var YoLoVault = class extends BaseStrategy {
       secondaryTokenAmountToWithdraw
     } = withdrawRequest;
     if (baseTokenAmountToWithdraw > 0) {
-      const secondaryTokenAmount = redeemableSecondaryTokenAmount.multipliedBy(sharesUsedFactor);
+      const secondaryTokenAmount = redeemableSecondaryTokenAmount.dividedBy(10 ** this.secondaryToken.decimals).multipliedBy(sharesUsedFactor);
       return {
         token0: {
           tokenInfo: amountInfo.token0.tokenInfo,
@@ -29723,7 +29726,7 @@ var YoLoVault = class extends BaseStrategy {
         }
       };
     }
-    const baseTokenAmount = redeemableBaseTokenAmount.multipliedBy(sharesUsedFactor);
+    const baseTokenAmount = redeemableBaseTokenAmount.dividedBy(10 ** this.primaryToken.decimals).multipliedBy(sharesUsedFactor);
     return {
       token0: {
         tokenInfo: amountInfo.token0.tokenInfo,
@@ -29737,23 +29740,22 @@ var YoLoVault = class extends BaseStrategy {
   }
   async withdrawCall(amountInfo, receiver, owner) {
     try {
-      const {
+      let {
         shares: userShares,
         primaryTokenBalance: redeemableBaseTokenAmount,
         claimableSecondaryTokens: redeemableSecondaryTokenAmount
       } = await this.getNormalizedUserInfo(receiver);
-      logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-      logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+      redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+      redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
       const withdrawRequest = this.resolveWithdrawRequest(
         amountInfo,
         redeemableBaseTokenAmount,
         redeemableSecondaryTokenAmount
       );
       if (!withdrawRequest) {
-        return [];
+        throw new Error("Invalid amount info");
       }
-      const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor);
-      logger.info(`requiredShares: ${requiredShares.toString()}`);
+      const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor).floor();
       const withdrawCall = this.contract.populate("redeem", [
         import_starknet20.uint256.bnToUint256(requiredShares.toString())
       ]);
@@ -29764,36 +29766,13 @@ var YoLoVault = class extends BaseStrategy {
     }
   }
   async netAPY() {
-    try {
-      const vaultStatus = await this.getVaultStatus();
-      const {
-        remaining_base: remainingBase,
-        total_second_tokens: totalSecondTokens
-      } = vaultStatus;
-      const primaryTokenPrice = await this.pricer.getPrice(this.primaryToken.symbol);
-      const secondaryTokenPrice = await this.pricer.getPrice(this.secondaryToken.symbol);
-      const primaryTokenAmount = Web3Number.fromWei(remainingBase.toString(), this.primaryToken.decimals);
-      const secondaryTokenAmount = Web3Number.fromWei(totalSecondTokens.toString(), this.secondaryToken.decimals);
-      const primaryTokenUsd = primaryTokenAmount.multipliedBy(primaryTokenPrice.price).toNumber();
-      const secondaryTokenUsd = secondaryTokenAmount.multipliedBy(secondaryTokenPrice.price).toNumber();
-      const netUsd = primaryTokenUsd + secondaryTokenUsd;
-      return {
-        net: netUsd,
-        splits: [
-          {
-            apy: primaryTokenAmount.toNumber(),
-            id: this.primaryToken.symbol
-          },
-          {
-            apy: secondaryTokenAmount.toNumber(),
-            id: this.secondaryToken.symbol
-          }
-        ]
-      };
-    } catch (err) {
-      console.error("Error fetching net APY:", err);
-      return 0;
-    }
+    return "YOLO";
+  }
+  getStrategyTooltip() {
+    return {
+      holdings: "USDC Left",
+      earnings: "WBTC Accumulated"
+    };
   }
 };
 var yoloVaultDescription = "Deposit USDC into YOLO Vault and gradually accumulate WBTC over fixed epochs, where a manager decides how much USDC to deploy each epoch.";

package/dist/index.mjs

@@ -4794,6 +4794,12 @@ var BaseStrategy = class extends CacheClass {
   async getPendingRewards() {
     return [];
   }
+  getStrategyTooltip() {
+    return {
+      holdings: "Your Holdings",
+      earnings: "Lifetime Earnings"
+    };
+  }
   async getUserRealizedAPY(blockIdentifier, sinceBlocks) {
     throw new Error("Not implemented");
   }
@@ -29429,12 +29435,8 @@ var YoLoVault = class extends BaseStrategy {
   resolveWithdrawRequest(amountInfo, redeemableBaseTokenAmount, redeemableSecondaryTokenAmount) {
     const baseTokenAmountToWithdraw = Number(amountInfo.token0.amount.toWei());
     const secondaryTokenAmountToWithdraw = Number(amountInfo.token1.amount.toWei());
-    logger.info(`baseTokenAmountToWithdraw: ${baseTokenAmountToWithdraw}`);
-    logger.info(`secondaryTokenAmountToWithdraw: ${secondaryTokenAmountToWithdraw}`);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
     if (baseTokenAmountToWithdraw > 0 && redeemableBaseTokenAmount.greaterThanOrEqualTo(baseTokenAmountToWithdraw)) {
-      const sharesUsedFactor = redeemableBaseTokenAmount.dividedBy(baseTokenAmountToWithdraw);
+      const sharesUsedFactor = new Web3Number(baseTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableBaseTokenAmount);
       return {
         sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
@@ -29444,8 +29446,9 @@ var YoLoVault = class extends BaseStrategy {
     if (secondaryTokenAmountToWithdraw > 0 && redeemableSecondaryTokenAmount.greaterThanOrEqualTo(
       secondaryTokenAmountToWithdraw
     )) {
+      const sharesUsedFactor = new Web3Number(secondaryTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableSecondaryTokenAmount);
       return {
-        sharesUsedFactor: secondaryTokenAmountToWithdraw / Number(redeemableSecondaryTokenAmount),
+        sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
         secondaryTokenAmountToWithdraw
       };
@@ -29544,10 +29547,10 @@ var YoLoVault = class extends BaseStrategy {
   }
   async depositCall(amountInfo) {
     try {
-      const primaryToken = amountInfo.token0.tokenInfo;
-      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.token0.amount);
+      const primaryToken = amountInfo.tokenInfo;
+      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.amount);
       const depositCall = this.contract.populate("deposit", [
-        uint25611.bnToUint256(amountInfo.token0.amount.toWei())
+        uint25611.bnToUint256(amountInfo.amount.toWei())
       ]);
       return [approvalCall, depositCall];
     } catch (err) {
@@ -29560,9 +29563,9 @@ var YoLoVault = class extends BaseStrategy {
     return vaultStatus;
   }
   async matchInputAmounts(amountInfo, user) {
-    const { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+    let { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } = await this.getNormalizedUserInfo(user);
+    redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+    redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
     const withdrawRequest = this.resolveWithdrawRequest(
       amountInfo,
       redeemableBaseTokenAmount,
@@ -29577,7 +29580,7 @@ var YoLoVault = class extends BaseStrategy {
       secondaryTokenAmountToWithdraw
     } = withdrawRequest;
     if (baseTokenAmountToWithdraw > 0) {
-      const secondaryTokenAmount = redeemableSecondaryTokenAmount.multipliedBy(sharesUsedFactor);
+      const secondaryTokenAmount = redeemableSecondaryTokenAmount.dividedBy(10 ** this.secondaryToken.decimals).multipliedBy(sharesUsedFactor);
       return {
         token0: {
           tokenInfo: amountInfo.token0.tokenInfo,
@@ -29589,7 +29592,7 @@ var YoLoVault = class extends BaseStrategy {
         }
       };
     }
-    const baseTokenAmount = redeemableBaseTokenAmount.multipliedBy(sharesUsedFactor);
+    const baseTokenAmount = redeemableBaseTokenAmount.dividedBy(10 ** this.primaryToken.decimals).multipliedBy(sharesUsedFactor);
     return {
       token0: {
         tokenInfo: amountInfo.token0.tokenInfo,
@@ -29603,23 +29606,22 @@ var YoLoVault = class extends BaseStrategy {
   }
   async withdrawCall(amountInfo, receiver, owner) {
     try {
-      const {
+      let {
         shares: userShares,
         primaryTokenBalance: redeemableBaseTokenAmount,
         claimableSecondaryTokens: redeemableSecondaryTokenAmount
       } = await this.getNormalizedUserInfo(receiver);
-      logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-      logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+      redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+      redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
       const withdrawRequest = this.resolveWithdrawRequest(
         amountInfo,
         redeemableBaseTokenAmount,
         redeemableSecondaryTokenAmount
       );
       if (!withdrawRequest) {
-        return [];
+        throw new Error("Invalid amount info");
       }
-      const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor);
-      logger.info(`requiredShares: ${requiredShares.toString()}`);
+      const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor).floor();
       const withdrawCall = this.contract.populate("redeem", [
         uint25611.bnToUint256(requiredShares.toString())
       ]);
@@ -29630,36 +29632,13 @@ var YoLoVault = class extends BaseStrategy {
     }
   }
   async netAPY() {
-    try {
-      const vaultStatus = await this.getVaultStatus();
-      const {
-        remaining_base: remainingBase,
-        total_second_tokens: totalSecondTokens
-      } = vaultStatus;
-      const primaryTokenPrice = await this.pricer.getPrice(this.primaryToken.symbol);
-      const secondaryTokenPrice = await this.pricer.getPrice(this.secondaryToken.symbol);
-      const primaryTokenAmount = Web3Number.fromWei(remainingBase.toString(), this.primaryToken.decimals);
-      const secondaryTokenAmount = Web3Number.fromWei(totalSecondTokens.toString(), this.secondaryToken.decimals);
-      const primaryTokenUsd = primaryTokenAmount.multipliedBy(primaryTokenPrice.price).toNumber();
-      const secondaryTokenUsd = secondaryTokenAmount.multipliedBy(secondaryTokenPrice.price).toNumber();
-      const netUsd = primaryTokenUsd + secondaryTokenUsd;
-      return {
-        net: netUsd,
-        splits: [
-          {
-            apy: primaryTokenAmount.toNumber(),
-            id: this.primaryToken.symbol
-          },
-          {
-            apy: secondaryTokenAmount.toNumber(),
-            id: this.secondaryToken.symbol
-          }
-        ]
-      };
-    } catch (err) {
-      console.error("Error fetching net APY:", err);
-      return 0;
-    }
+    return "YOLO";
+  }
+  getStrategyTooltip() {
+    return {
+      holdings: "USDC Left",
+      earnings: "WBTC Accumulated"
+    };
   }
 };
 var yoloVaultDescription = "Deposit USDC into YOLO Vault and gradually accumulate WBTC over fixed epochs, where a manager decides how much USDC to deploy each epoch.";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@strkfarm/sdk",
-    "version": "2.0.0-staging.27",
+    "version": "2.0.0-staging.29",
     "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
     "typings": "dist/index.d.ts",
     "types": "dist/index.d.ts",

package/src/strategies/base-strategy.ts

@@ -38,9 +38,13 @@ interface CacheData {
   ttl: number;
   data: any;
 }
-export class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
-    readonly config: IConfig;
-    readonly cache: Map<string, CacheData> = new Map();
+export class BaseStrategy<
+  TVLInfo,
+  DepositActionInfo,
+  WithdrawActionInfo = DepositActionInfo,
+> extends CacheClass {
+  readonly config: IConfig;
+  readonly cache: Map<string, CacheData> = new Map();
 
     constructor(config: IConfig) {
         super();
@@ -55,11 +59,11 @@ export class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
         throw new Error("Not implemented");
     }   
 
-    async depositCall(amountInfo: ActionInfo, receiver: ContractAddr): Promise<Call[]> {
+    async depositCall(amountInfo: DepositActionInfo, receiver: ContractAddr): Promise<Call[]> {
         throw new Error("Not implemented");
     }
 
-    async withdrawCall(amountInfo: ActionInfo, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]> {
+    async withdrawCall(amountInfo: WithdrawActionInfo, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]> {
         throw new Error("Not implemented");
     }
 
@@ -71,7 +75,7 @@ export class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
         blockIdentifier?: BlockIdentifier,
         sinceBlocks?: number,
         timeperiod?: "24h" | "7d" | "30d" | "3m"
-    ): Promise<number | NetAPYDetails> {
+    ): Promise<number | string | NetAPYDetails> {
         throw new Error("Not implemented");
     }
 
@@ -79,6 +83,13 @@ export class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
         return [];
     }
 
+    getStrategyTooltip(): {holdings: string, earnings: string} {
+      return {
+          holdings:"Your Holdings",
+          earnings:"Lifetime Earnings",
+      };
+    }
+
     async getUserRealizedAPY(
         blockIdentifier?: BlockIdentifier,
         sinceBlocks?: number

package/src/strategies/yoloVault.ts

@@ -12,7 +12,7 @@ import {
   VaultType,
 } from "@/interfaces";
 import { logger } from "@/utils";
-import { NetAPYDetails } from "./base-strategy";
+import { NetAPYDetails, SingleActionAmount } from "./base-strategy";
 import {
   BaseStrategy,
   DualTokenInfo,
@@ -32,6 +32,7 @@ export interface YoloVaultSettings {
   secondaryToken: TokenInfo;
   maxUnitsSpendPerEpoch: number;
   feeBps: number; // in bps
+  //feeRecipient?: ContractAddr;
 }
 
 export interface UserYoloInfo {
@@ -52,7 +53,7 @@ export interface YoloVaultStatus {
   base_token_assets_per_share: bigint;
 }
 
-export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
+export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, DualActionAmount> {
   readonly address: ContractAddr;
   readonly metadata: IStrategyMetadata<YoloVaultSettings>;
   readonly pricer: PricerBase;
@@ -126,19 +127,14 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
     | null {
     const baseTokenAmountToWithdraw = Number(amountInfo.token0.amount.toWei());
     const secondaryTokenAmountToWithdraw = Number(amountInfo.token1.amount.toWei());
-    logger.info(`baseTokenAmountToWithdraw: ${baseTokenAmountToWithdraw}`);
-    logger.info(`secondaryTokenAmountToWithdraw: ${secondaryTokenAmountToWithdraw}`);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
     // if (baseTokenAmountToWithdraw > 0 && secondaryTokenAmountToWithdraw > 0) {
     //   throw new Error("Cannot pass amounts for both base and secondary tokens at once");
     // }
-
     if (
       baseTokenAmountToWithdraw > 0 &&
       redeemableBaseTokenAmount.greaterThanOrEqualTo(baseTokenAmountToWithdraw)
     ) {
-      const sharesUsedFactor = redeemableBaseTokenAmount.dividedBy(baseTokenAmountToWithdraw);
+      const sharesUsedFactor = new Web3Number(baseTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableBaseTokenAmount);
       return {
         sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
@@ -152,10 +148,9 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
         secondaryTokenAmountToWithdraw,
       )
     ) {
+      const sharesUsedFactor = new Web3Number(secondaryTokenAmountToWithdraw.toString(), 0).dividedBy(redeemableSecondaryTokenAmount);
       return {
-        sharesUsedFactor:
-          secondaryTokenAmountToWithdraw /
-          Number(redeemableSecondaryTokenAmount),
+        sharesUsedFactor: sharesUsedFactor.toNumber(),
         baseTokenAmountToWithdraw,
         secondaryTokenAmountToWithdraw,
       };
@@ -263,13 +258,13 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
   }
 
   async depositCall(
-    amountInfo: DualActionAmount,
+    amountInfo: SingleActionAmount,
   ): Promise<Call[]> {
     try{
-      const primaryToken = amountInfo.token0.tokenInfo;
-      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.token0.amount);
+      const primaryToken = amountInfo.tokenInfo;
+      const approvalCall = new ERC20(this.config).approve(primaryToken.address.address, this.address.address, amountInfo.amount);
       const depositCall = this.contract.populate("deposit", [
-        uint256.bnToUint256(amountInfo.token0.amount.toWei()),
+        uint256.bnToUint256(amountInfo.amount.toWei()),
       ]);
       return [approvalCall, depositCall];
     }catch(err){
@@ -287,10 +282,10 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
     amountInfo: DualActionAmount,
     user: ContractAddr,
   ): Promise<DualActionAmount> {
-    const { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } =
+    let { primaryTokenBalance: redeemableBaseTokenAmount, claimableSecondaryTokens: redeemableSecondaryTokenAmount } =
       await this.getNormalizedUserInfo(user);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+    redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+    redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
     const withdrawRequest = this.resolveWithdrawRequest(
       amountInfo,
       redeemableBaseTokenAmount,
@@ -308,8 +303,7 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
     } = withdrawRequest;
 
     if (baseTokenAmountToWithdraw > 0) {
-      const secondaryTokenAmount =
-        redeemableSecondaryTokenAmount.multipliedBy(sharesUsedFactor);
+      const secondaryTokenAmount = redeemableSecondaryTokenAmount.dividedBy(10 ** this.secondaryToken.decimals).multipliedBy(sharesUsedFactor);
       return {
         token0: {
           tokenInfo: amountInfo.token0.tokenInfo,
@@ -321,8 +315,8 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
         },
       };
     }
-
-    const baseTokenAmount = redeemableBaseTokenAmount.multipliedBy(sharesUsedFactor);
+    
+    const baseTokenAmount = redeemableBaseTokenAmount.dividedBy(10 ** this.primaryToken.decimals).multipliedBy(sharesUsedFactor);
     return {
       token0: {
         tokenInfo: amountInfo.token0.tokenInfo,
@@ -341,23 +335,23 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
     owner: ContractAddr,
   ): Promise<Call[]> {
     try{
-    const {
+    let {
       shares: userShares,
       primaryTokenBalance: redeemableBaseTokenAmount,
       claimableSecondaryTokens: redeemableSecondaryTokenAmount,
     } = await this.getNormalizedUserInfo(receiver);
-    logger.info(`redeemableBaseTokenAmount: ${redeemableBaseTokenAmount.toString()}`);
-    logger.info(`redeemableSecondaryTokenAmount: ${redeemableSecondaryTokenAmount.toString()}`);
+    redeemableBaseTokenAmount = new Web3Number(redeemableBaseTokenAmount.toWei().toString(), 0);
+    redeemableSecondaryTokenAmount = new Web3Number(redeemableSecondaryTokenAmount.toWei().toString(), 0);
     const withdrawRequest = this.resolveWithdrawRequest(
       amountInfo,
       redeemableBaseTokenAmount,
       redeemableSecondaryTokenAmount,
     );
+   
     if (!withdrawRequest) {
-      return [];
+      throw new Error("Invalid amount info");
     }
-    const requiredShares = userShares.multipliedBy(withdrawRequest.sharesUsedFactor);
-    logger.info(`requiredShares: ${requiredShares.toString()}`);
+    const requiredShares =  userShares.multipliedBy(withdrawRequest.sharesUsedFactor).floor();
     const withdrawCall = this.contract.populate("redeem", [
       uint256.bnToUint256(requiredShares.toString()),
     ]);
@@ -368,42 +362,20 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, DualActionAmount> {
     }
   }
 
-  async netAPY(): Promise<number | NetAPYDetails> {
-    try{
-    const vaultStatus = await this.getVaultStatus();
-    const {
-      remaining_base: remainingBase,
-      total_second_tokens: totalSecondTokens,
-    } = vaultStatus as YoloVaultStatus;
-    const primaryTokenPrice = await this.pricer.getPrice(this.primaryToken.symbol);
-    const secondaryTokenPrice = await this.pricer.getPrice(this.secondaryToken.symbol);
-    const primaryTokenAmount = Web3Number.fromWei(remainingBase.toString(), this.primaryToken.decimals);
-    const secondaryTokenAmount = Web3Number.fromWei(totalSecondTokens.toString(), this.secondaryToken.decimals);
-    const primaryTokenUsd = primaryTokenAmount.multipliedBy(primaryTokenPrice.price).toNumber();
-    const secondaryTokenUsd = secondaryTokenAmount.multipliedBy(secondaryTokenPrice.price).toNumber();
-    const netUsd = primaryTokenUsd + secondaryTokenUsd;
-    return {
-      net: netUsd,
-      splits: [
-        {
-          apy: primaryTokenAmount.toNumber(),
-          id: this.primaryToken.symbol,
-        },
-        {
-          apy: secondaryTokenAmount.toNumber(),
-          id: this.secondaryToken.symbol,
-        },
-      ],
-    }
-    }catch(err){
-      console.error("Error fetching net APY:", err);
-      return 0;
-    }
+  async netAPY(): Promise<number | string | NetAPYDetails> {
+    return "YOLO"
   }
 
   getSettings = async () => {
     return this.contract.call("get_settings", []);
   };
+
+  getStrategyTooltip(): {holdings: string, earnings: string} {
+    return {
+      holdings:"USDC Left",
+      earnings:"WBTC Accumulated",
+    };
+  }
 }
 
 const yoloVaultDescription =