@strkfarm/sdk 1.1.52 → 1.1.55

package/dist/index.browser.global.js

@@ -55712,6 +55712,9 @@ ${JSON.stringify(data, null, 2)}`;
     async getVaultPositions() {
       throw new Error("Not implemented");
     }
+    async getPendingRewards() {
+      return [];
+    }
   };
 
   // src/node/headless.browser.ts
@@ -55795,6 +55798,10 @@ ${JSON.stringify(data, null, 2)}`;
       const claimed_amount = Web3Number.fromWei(_claimed_amount.toString(), 18);
       logger2.verbose(`${_VesuHarvests.name}: claimed_amount: ${claimed_amount.toString()}`);
       const data = _data.data["defiSpring"];
+      if (!data) {
+        logger2.verbose(`${_VesuHarvests.name}: no defiSpring data found`);
+        return [];
+      }
       const actualReward = Web3Number.fromWei(data.amount, 18).minus(claimed_amount);
       logger2.verbose(`${_VesuHarvests.name}: actualReward: ${actualReward.toString()}`);
       return [{
@@ -61810,10 +61817,16 @@ ${JSON.stringify(data, null, 2)}`;
       });
       return [baseFlow];
     }
+    async getPendingRewards() {
+      const vesuHarvests = new VesuHarvests(this.config);
+      return await vesuHarvests.getUnHarvestedRewards(this.address);
+    }
     async harvest(acc) {
-      const vesuHarvest = new VesuHarvests(this.config);
-      const harvests = await vesuHarvest.getUnHarvestedRewards(this.address);
-      const harvest = harvests[0];
+      const pendingRewards = await this.getPendingRewards();
+      if (pendingRewards.length == 0) {
+        throw new Error(`No pending rewards found`);
+      }
+      const harvest = pendingRewards[0];
       const avnu = new AvnuWrapper();
       let swapInfo = {
         token_from_address: harvest.token.address,
@@ -80565,13 +80578,14 @@ spurious results.`);
         amount1
       };
     }
-    async harvest(acc, maxIterations = 20, priceRatioPrecision = 4, minRewardAmount = new Web3Number(0, 18)) {
+    async getPendingRewards() {
       const ekuboHarvests = new EkuboHarvests(this.config);
-      const unClaimedRewards = (await ekuboHarvests.getUnHarvestedRewards(
-        this.address
-      )).filter((claim) => claim.actualReward.greaterThanOrEqualTo(minRewardAmount));
-      if (unClaimedRewards.length == 0) {
-        logger2.verbose(`${_EkuboCLVault.name}: harvest => no unclaimed rewards found`);
+      return await ekuboHarvests.getUnHarvestedRewards(this.address);
+    }
+    async harvest(acc, maxIterations = 20, priceRatioPrecision = 4) {
+      const pendingRewards = await this.getPendingRewards();
+      if (pendingRewards.length == 0) {
+        logger2.verbose(`${_EkuboCLVault.name}: harvest => no pending rewards found`);
         return [];
       }
       const poolKey = await this.getPoolKey();
@@ -80579,10 +80593,10 @@ spurious results.`);
       const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
       const bounds = await this.getCurrentBounds();
       logger2.verbose(
-        `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${unClaimedRewards.length}`
+        `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${pendingRewards.length}`
       );
       const calls = [];
-      const chosenClaim = unClaimedRewards[0];
+      const chosenClaim = pendingRewards[0];
       logger2.info(`${_EkuboCLVault.name}: harvest => doing one at a time`);
       logger2.info(`${_EkuboCLVault.name}: harvest => chosenClaim -> Claim ID: ${chosenClaim.claim.id}, Amount: ${chosenClaim.claim.amount.toString()}, actualAmount: ${chosenClaim.actualReward.toString()}, addr: ${chosenClaim.claim.claimee.toString()}`);
       for (let claim of [chosenClaim]) {
@@ -94156,9 +94170,15 @@ spurious results.`);
       const manageCall = this.getManageCall(["approve_bring_liquidity" /* APPROVE_BRING_LIQUIDITY */, "bring_liquidity" /* BRING_LIQUIDITY */], [manageCall1, manageCall2]);
       return manageCall;
     }
-    async getHarvestCall() {
+    async getPendingRewards() {
       const vesuHarvest = new VesuHarvests(this.config);
-      const harvestInfo = await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+      return await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+    }
+    async getHarvestCall() {
+      const harvestInfo = await this.getPendingRewards();
+      if (harvestInfo.length == 0) {
+        throw new Error(`No pending rewards found`);
+      }
       if (harvestInfo.length != 1) {
         throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
       }
@@ -95174,16 +95194,12 @@ spurious results.`);
       logger2.verbose(`${this.getTag()}::getModifyLeverCall leverSwap: ${JSON.stringify(leverSwap)}`);
       let minLSTReceived = params.debtAmount.dividedBy(lstDexPriceInUnderlying).multipliedBy(1 - MAX_SLIPPAGE);
       const minLSTReceivedAsPerTruePrice = params.debtAmount.dividedBy(lstTrueExchangeRate);
-      if (minLSTReceived < minLSTReceivedAsPerTruePrice) {
-        minLSTReceived = minLSTReceivedAsPerTruePrice;
-      }
+      minLSTReceived = minLSTReceivedAsPerTruePrice;
       logger2.verbose(`${this.getTag()}::getModifyLeverCall minLSTReceivedAsPerTruePrice: ${minLSTReceivedAsPerTruePrice}, minLSTReceived: ${minLSTReceived}`);
       let maxUsedCollateral = params.debtAmount.abs().dividedBy(lstDexPriceInUnderlying).multipliedBy(1 + MAX_SLIPPAGE);
       const maxUsedCollateralInLST = params.debtAmount.abs().dividedBy(lstTrueExchangeRate).multipliedBy(1.005);
       logger2.verbose(`${this.getTag()}::getModifyLeverCall maxUsedCollateralInLST: ${maxUsedCollateralInLST}, maxUsedCollateral: ${maxUsedCollateral}`);
-      if (maxUsedCollateralInLST > maxUsedCollateral) {
-        maxUsedCollateral = maxUsedCollateralInLST;
-      }
+      maxUsedCollateral = maxUsedCollateralInLST;
       const STEP2_ID = "switch_delegation_on" /* SWITCH_DELEGATION_ON */;
       const manage2Info = this.getProofs(STEP2_ID);
       const manageCall2 = manage2Info.callConstructor({

package/dist/index.browser.mjs

@@ -4110,6 +4110,9 @@ var BaseStrategy = class extends CacheClass {
   async getVaultPositions() {
     throw new Error("Not implemented");
   }
+  async getPendingRewards() {
+    return [];
+  }
 };
 
 // src/node/headless.browser.ts
@@ -4195,6 +4198,10 @@ var VesuHarvests = class _VesuHarvests extends Harvests {
     const claimed_amount = Web3Number.fromWei(_claimed_amount.toString(), 18);
     logger.verbose(`${_VesuHarvests.name}: claimed_amount: ${claimed_amount.toString()}`);
     const data = _data.data["defiSpring"];
+    if (!data) {
+      logger.verbose(`${_VesuHarvests.name}: no defiSpring data found`);
+      return [];
+    }
     const actualReward = Web3Number.fromWei(data.amount, 18).minus(claimed_amount);
     logger.verbose(`${_VesuHarvests.name}: actualReward: ${actualReward.toString()}`);
     return [{
@@ -10210,10 +10217,16 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     });
     return [baseFlow];
   }
+  async getPendingRewards() {
+    const vesuHarvests = new VesuHarvests(this.config);
+    return await vesuHarvests.getUnHarvestedRewards(this.address);
+  }
   async harvest(acc) {
-    const vesuHarvest = new VesuHarvests(this.config);
-    const harvests = await vesuHarvest.getUnHarvestedRewards(this.address);
-    const harvest = harvests[0];
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
+    const harvest = pendingRewards[0];
     const avnu = new AvnuWrapper();
     let swapInfo = {
       token_from_address: harvest.token.address,
@@ -16642,13 +16655,14 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       amount1
     };
   }
-  async harvest(acc, maxIterations = 20, priceRatioPrecision = 4, minRewardAmount = new Web3Number(0, 18)) {
+  async getPendingRewards() {
     const ekuboHarvests = new EkuboHarvests(this.config);
-    const unClaimedRewards = (await ekuboHarvests.getUnHarvestedRewards(
-      this.address
-    )).filter((claim) => claim.actualReward.greaterThanOrEqualTo(minRewardAmount));
-    if (unClaimedRewards.length == 0) {
-      logger.verbose(`${_EkuboCLVault.name}: harvest => no unclaimed rewards found`);
+    return await ekuboHarvests.getUnHarvestedRewards(this.address);
+  }
+  async harvest(acc, maxIterations = 20, priceRatioPrecision = 4) {
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      logger.verbose(`${_EkuboCLVault.name}: harvest => no pending rewards found`);
       return [];
     }
     const poolKey = await this.getPoolKey();
@@ -16656,10 +16670,10 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
     const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
     const bounds = await this.getCurrentBounds();
     logger.verbose(
-      `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${unClaimedRewards.length}`
+      `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${pendingRewards.length}`
     );
     const calls = [];
-    const chosenClaim = unClaimedRewards[0];
+    const chosenClaim = pendingRewards[0];
     logger.info(`${_EkuboCLVault.name}: harvest => doing one at a time`);
     logger.info(`${_EkuboCLVault.name}: harvest => chosenClaim -> Claim ID: ${chosenClaim.claim.id}, Amount: ${chosenClaim.claim.amount.toString()}, actualAmount: ${chosenClaim.actualReward.toString()}, addr: ${chosenClaim.claim.claimee.toString()}`);
     for (let claim of [chosenClaim]) {
@@ -30246,9 +30260,15 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     const manageCall = this.getManageCall(["approve_bring_liquidity" /* APPROVE_BRING_LIQUIDITY */, "bring_liquidity" /* BRING_LIQUIDITY */], [manageCall1, manageCall2]);
     return manageCall;
   }
-  async getHarvestCall() {
+  async getPendingRewards() {
     const vesuHarvest = new VesuHarvests(this.config);
-    const harvestInfo = await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+    return await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+  }
+  async getHarvestCall() {
+    const harvestInfo = await this.getPendingRewards();
+    if (harvestInfo.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
     if (harvestInfo.length != 1) {
       throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
     }
@@ -31267,16 +31287,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     logger.verbose(`${this.getTag()}::getModifyLeverCall leverSwap: ${JSON.stringify(leverSwap)}`);
     let minLSTReceived = params.debtAmount.dividedBy(lstDexPriceInUnderlying).multipliedBy(1 - MAX_SLIPPAGE);
     const minLSTReceivedAsPerTruePrice = params.debtAmount.dividedBy(lstTrueExchangeRate);
-    if (minLSTReceived < minLSTReceivedAsPerTruePrice) {
-      minLSTReceived = minLSTReceivedAsPerTruePrice;
-    }
+    minLSTReceived = minLSTReceivedAsPerTruePrice;
     logger.verbose(`${this.getTag()}::getModifyLeverCall minLSTReceivedAsPerTruePrice: ${minLSTReceivedAsPerTruePrice}, minLSTReceived: ${minLSTReceived}`);
     let maxUsedCollateral = params.debtAmount.abs().dividedBy(lstDexPriceInUnderlying).multipliedBy(1 + MAX_SLIPPAGE);
     const maxUsedCollateralInLST = params.debtAmount.abs().dividedBy(lstTrueExchangeRate).multipliedBy(1.005);
     logger.verbose(`${this.getTag()}::getModifyLeverCall maxUsedCollateralInLST: ${maxUsedCollateralInLST}, maxUsedCollateral: ${maxUsedCollateral}`);
-    if (maxUsedCollateralInLST > maxUsedCollateral) {
-      maxUsedCollateral = maxUsedCollateralInLST;
-    }
+    maxUsedCollateral = maxUsedCollateralInLST;
     const STEP2_ID = "switch_delegation_on" /* SWITCH_DELEGATION_ON */;
     const manage2Info = this.getProofs(STEP2_ID);
     const manageCall2 = manage2Info.callConstructor({

package/dist/index.d.ts

@@ -375,6 +375,20 @@ declare class AutoCompounderSTRK {
     }>;
 }
 
+interface HarvestInfo {
+    rewardsContract: ContractAddr;
+    token: ContractAddr;
+    startDate: Date;
+    endDate: Date;
+    claim: {
+        id: number;
+        amount: Web3Number;
+        claimee: ContractAddr;
+    };
+    actualReward: Web3Number;
+    proof: string[];
+}
+
 interface CacheData$1 {
     timestamp: number;
     ttl: number;
@@ -417,6 +431,7 @@ declare class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
     depositCall(amountInfo: ActionInfo, receiver: ContractAddr): Promise<Call[]>;
     withdrawCall(amountInfo: ActionInfo, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]>;
     getVaultPositions(): Promise<VaultPosition[]>;
+    getPendingRewards(): Promise<HarvestInfo[]>;
 }
 
 interface PoolProps {
@@ -615,6 +630,7 @@ declare class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAm
      */
     getRebalanceCall(pools: Awaited<ReturnType<typeof this.getRebalancedPositions>>["changes"], isOverWeightAdjustment: boolean): Promise<starknet.Call | null>;
     getInvestmentFlows(pools: PoolInfoFull[]): Promise<IInvestmentFlow[]>;
+    getPendingRewards(): Promise<HarvestInfo[]>;
     harvest(acc: Account): Promise<starknet.Call[]>;
     /**
      * Calculates the fees deducted in different vTokens based on the current and previous state.
@@ -631,20 +647,6 @@ declare class VesuRebalance extends BaseStrategy<SingleTokenInfo, SingleActionAm
  */
 declare const VesuRebalanceStrategies: IStrategyMetadata<VesuRebalanceSettings>[];
 
-interface HarvestInfo {
-    rewardsContract: ContractAddr;
-    token: ContractAddr;
-    startDate: Date;
-    endDate: Date;
-    claim: {
-        id: number;
-        amount: Web3Number;
-        claimee: ContractAddr;
-    };
-    actualReward: Web3Number;
-    proof: string[];
-}
-
 interface EkuboPoolKey {
     token0: ContractAddr;
     token1: ContractAddr;
@@ -833,7 +835,8 @@ declare class EkuboCLVault extends BaseStrategy<DualTokenInfo, DualActionAmount>
         amount0: Web3Number;
         amount1: Web3Number;
     }>;
-    harvest(acc: Account, maxIterations?: number, priceRatioPrecision?: number, minRewardAmount?: Web3Number): Promise<Call[]>;
+    getPendingRewards(): Promise<HarvestInfo[]>;
+    harvest(acc: Account, maxIterations?: number, priceRatioPrecision?: number): Promise<Call[]>;
     /**
      * @description This funciton requires atleast one of the pool tokens to be reward token
      * i.e. STRK.
@@ -1378,6 +1381,7 @@ declare class UniversalStrategy<S extends UniversalStrategySettings> extends Bas
     getBringLiquidityCall(params: {
         amount: Web3Number;
     }): Promise<Call>;
+    getPendingRewards(): Promise<HarvestInfo[]>;
     getHarvestCall(): Promise<{
         call: Call;
         reward: Web3Number;

package/dist/index.js

@@ -4114,6 +4114,9 @@ var BaseStrategy = class extends CacheClass {
   async getVaultPositions() {
     throw new Error("Not implemented");
   }
+  async getPendingRewards() {
+    return [];
+  }
 };
 
 // src/node/headless.browser.ts
@@ -4199,6 +4202,10 @@ var VesuHarvests = class _VesuHarvests extends Harvests {
     const claimed_amount = Web3Number.fromWei(_claimed_amount.toString(), 18);
     logger.verbose(`${_VesuHarvests.name}: claimed_amount: ${claimed_amount.toString()}`);
     const data = _data.data["defiSpring"];
+    if (!data) {
+      logger.verbose(`${_VesuHarvests.name}: no defiSpring data found`);
+      return [];
+    }
     const actualReward = Web3Number.fromWei(data.amount, 18).minus(claimed_amount);
     logger.verbose(`${_VesuHarvests.name}: actualReward: ${actualReward.toString()}`);
     return [{
@@ -10214,10 +10221,16 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     });
     return [baseFlow];
   }
+  async getPendingRewards() {
+    const vesuHarvests = new VesuHarvests(this.config);
+    return await vesuHarvests.getUnHarvestedRewards(this.address);
+  }
   async harvest(acc) {
-    const vesuHarvest = new VesuHarvests(this.config);
-    const harvests = await vesuHarvest.getUnHarvestedRewards(this.address);
-    const harvest = harvests[0];
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
+    const harvest = pendingRewards[0];
     const avnu = new AvnuWrapper();
     let swapInfo = {
       token_from_address: harvest.token.address,
@@ -16642,13 +16655,14 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       amount1
     };
   }
-  async harvest(acc, maxIterations = 20, priceRatioPrecision = 4, minRewardAmount = new Web3Number(0, 18)) {
+  async getPendingRewards() {
     const ekuboHarvests = new EkuboHarvests(this.config);
-    const unClaimedRewards = (await ekuboHarvests.getUnHarvestedRewards(
-      this.address
-    )).filter((claim) => claim.actualReward.greaterThanOrEqualTo(minRewardAmount));
-    if (unClaimedRewards.length == 0) {
-      logger.verbose(`${_EkuboCLVault.name}: harvest => no unclaimed rewards found`);
+    return await ekuboHarvests.getUnHarvestedRewards(this.address);
+  }
+  async harvest(acc, maxIterations = 20, priceRatioPrecision = 4) {
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      logger.verbose(`${_EkuboCLVault.name}: harvest => no pending rewards found`);
       return [];
     }
     const poolKey = await this.getPoolKey();
@@ -16656,10 +16670,10 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
     const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
     const bounds = await this.getCurrentBounds();
     logger.verbose(
-      `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${unClaimedRewards.length}`
+      `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${pendingRewards.length}`
     );
     const calls = [];
-    const chosenClaim = unClaimedRewards[0];
+    const chosenClaim = pendingRewards[0];
     logger.info(`${_EkuboCLVault.name}: harvest => doing one at a time`);
     logger.info(`${_EkuboCLVault.name}: harvest => chosenClaim -> Claim ID: ${chosenClaim.claim.id}, Amount: ${chosenClaim.claim.amount.toString()}, actualAmount: ${chosenClaim.actualReward.toString()}, addr: ${chosenClaim.claim.claimee.toString()}`);
     for (let claim of [chosenClaim]) {
@@ -30246,9 +30260,15 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     const manageCall = this.getManageCall(["approve_bring_liquidity" /* APPROVE_BRING_LIQUIDITY */, "bring_liquidity" /* BRING_LIQUIDITY */], [manageCall1, manageCall2]);
     return manageCall;
   }
-  async getHarvestCall() {
+  async getPendingRewards() {
     const vesuHarvest = new VesuHarvests(this.config);
-    const harvestInfo = await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+    return await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+  }
+  async getHarvestCall() {
+    const harvestInfo = await this.getPendingRewards();
+    if (harvestInfo.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
     if (harvestInfo.length != 1) {
       throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
     }
@@ -31267,16 +31287,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     logger.verbose(`${this.getTag()}::getModifyLeverCall leverSwap: ${JSON.stringify(leverSwap)}`);
     let minLSTReceived = params.debtAmount.dividedBy(lstDexPriceInUnderlying).multipliedBy(1 - MAX_SLIPPAGE);
     const minLSTReceivedAsPerTruePrice = params.debtAmount.dividedBy(lstTrueExchangeRate);
-    if (minLSTReceived < minLSTReceivedAsPerTruePrice) {
-      minLSTReceived = minLSTReceivedAsPerTruePrice;
-    }
+    minLSTReceived = minLSTReceivedAsPerTruePrice;
     logger.verbose(`${this.getTag()}::getModifyLeverCall minLSTReceivedAsPerTruePrice: ${minLSTReceivedAsPerTruePrice}, minLSTReceived: ${minLSTReceived}`);
     let maxUsedCollateral = params.debtAmount.abs().dividedBy(lstDexPriceInUnderlying).multipliedBy(1 + MAX_SLIPPAGE);
     const maxUsedCollateralInLST = params.debtAmount.abs().dividedBy(lstTrueExchangeRate).multipliedBy(1.005);
     logger.verbose(`${this.getTag()}::getModifyLeverCall maxUsedCollateralInLST: ${maxUsedCollateralInLST}, maxUsedCollateral: ${maxUsedCollateral}`);
-    if (maxUsedCollateralInLST > maxUsedCollateral) {
-      maxUsedCollateral = maxUsedCollateralInLST;
-    }
+    maxUsedCollateral = maxUsedCollateralInLST;
     const STEP2_ID = "switch_delegation_on" /* SWITCH_DELEGATION_ON */;
     const manage2Info = this.getProofs(STEP2_ID);
     const manageCall2 = manage2Info.callConstructor({

package/dist/index.mjs

@@ -4008,6 +4008,9 @@ var BaseStrategy = class extends CacheClass {
   async getVaultPositions() {
     throw new Error("Not implemented");
   }
+  async getPendingRewards() {
+    return [];
+  }
 };
 
 // src/node/headless.browser.ts
@@ -4093,6 +4096,10 @@ var VesuHarvests = class _VesuHarvests extends Harvests {
     const claimed_amount = Web3Number.fromWei(_claimed_amount.toString(), 18);
     logger.verbose(`${_VesuHarvests.name}: claimed_amount: ${claimed_amount.toString()}`);
     const data = _data.data["defiSpring"];
+    if (!data) {
+      logger.verbose(`${_VesuHarvests.name}: no defiSpring data found`);
+      return [];
+    }
     const actualReward = Web3Number.fromWei(data.amount, 18).minus(claimed_amount);
     logger.verbose(`${_VesuHarvests.name}: actualReward: ${actualReward.toString()}`);
     return [{
@@ -10108,10 +10115,16 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
     });
     return [baseFlow];
   }
+  async getPendingRewards() {
+    const vesuHarvests = new VesuHarvests(this.config);
+    return await vesuHarvests.getUnHarvestedRewards(this.address);
+  }
   async harvest(acc) {
-    const vesuHarvest = new VesuHarvests(this.config);
-    const harvests = await vesuHarvest.getUnHarvestedRewards(this.address);
-    const harvest = harvests[0];
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
+    const harvest = pendingRewards[0];
     const avnu = new AvnuWrapper();
     let swapInfo = {
       token_from_address: harvest.token.address,
@@ -16540,13 +16553,14 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       amount1
     };
   }
-  async harvest(acc, maxIterations = 20, priceRatioPrecision = 4, minRewardAmount = new Web3Number(0, 18)) {
+  async getPendingRewards() {
     const ekuboHarvests = new EkuboHarvests(this.config);
-    const unClaimedRewards = (await ekuboHarvests.getUnHarvestedRewards(
-      this.address
-    )).filter((claim) => claim.actualReward.greaterThanOrEqualTo(minRewardAmount));
-    if (unClaimedRewards.length == 0) {
-      logger.verbose(`${_EkuboCLVault.name}: harvest => no unclaimed rewards found`);
+    return await ekuboHarvests.getUnHarvestedRewards(this.address);
+  }
+  async harvest(acc, maxIterations = 20, priceRatioPrecision = 4) {
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      logger.verbose(`${_EkuboCLVault.name}: harvest => no pending rewards found`);
       return [];
     }
     const poolKey = await this.getPoolKey();
@@ -16554,10 +16568,10 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
     const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
     const bounds = await this.getCurrentBounds();
     logger.verbose(
-      `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${unClaimedRewards.length}`
+      `${_EkuboCLVault.name}: harvest => unClaimedRewards: ${pendingRewards.length}`
     );
     const calls = [];
-    const chosenClaim = unClaimedRewards[0];
+    const chosenClaim = pendingRewards[0];
     logger.info(`${_EkuboCLVault.name}: harvest => doing one at a time`);
     logger.info(`${_EkuboCLVault.name}: harvest => chosenClaim -> Claim ID: ${chosenClaim.claim.id}, Amount: ${chosenClaim.claim.amount.toString()}, actualAmount: ${chosenClaim.actualReward.toString()}, addr: ${chosenClaim.claim.claimee.toString()}`);
     for (let claim of [chosenClaim]) {
@@ -30144,9 +30158,15 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     const manageCall = this.getManageCall(["approve_bring_liquidity" /* APPROVE_BRING_LIQUIDITY */, "bring_liquidity" /* BRING_LIQUIDITY */], [manageCall1, manageCall2]);
     return manageCall;
   }
-  async getHarvestCall() {
+  async getPendingRewards() {
     const vesuHarvest = new VesuHarvests(this.config);
-    const harvestInfo = await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+    return await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+  }
+  async getHarvestCall() {
+    const harvestInfo = await this.getPendingRewards();
+    if (harvestInfo.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
     if (harvestInfo.length != 1) {
       throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
     }
@@ -31165,16 +31185,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     logger.verbose(`${this.getTag()}::getModifyLeverCall leverSwap: ${JSON.stringify(leverSwap)}`);
     let minLSTReceived = params.debtAmount.dividedBy(lstDexPriceInUnderlying).multipliedBy(1 - MAX_SLIPPAGE);
     const minLSTReceivedAsPerTruePrice = params.debtAmount.dividedBy(lstTrueExchangeRate);
-    if (minLSTReceived < minLSTReceivedAsPerTruePrice) {
-      minLSTReceived = minLSTReceivedAsPerTruePrice;
-    }
+    minLSTReceived = minLSTReceivedAsPerTruePrice;
     logger.verbose(`${this.getTag()}::getModifyLeverCall minLSTReceivedAsPerTruePrice: ${minLSTReceivedAsPerTruePrice}, minLSTReceived: ${minLSTReceived}`);
     let maxUsedCollateral = params.debtAmount.abs().dividedBy(lstDexPriceInUnderlying).multipliedBy(1 + MAX_SLIPPAGE);
     const maxUsedCollateralInLST = params.debtAmount.abs().dividedBy(lstTrueExchangeRate).multipliedBy(1.005);
     logger.verbose(`${this.getTag()}::getModifyLeverCall maxUsedCollateralInLST: ${maxUsedCollateralInLST}, maxUsedCollateral: ${maxUsedCollateral}`);
-    if (maxUsedCollateralInLST > maxUsedCollateral) {
-      maxUsedCollateral = maxUsedCollateralInLST;
-    }
+    maxUsedCollateral = maxUsedCollateralInLST;
     const STEP2_ID = "switch_delegation_on" /* SWITCH_DELEGATION_ON */;
     const manage2Info = this.getProofs(STEP2_ID);
     const manageCall2 = manage2Info.callConstructor({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.52",
+  "version": "1.1.55",
   "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/modules/harvests.ts

@@ -108,6 +108,10 @@ export class VesuHarvests extends Harvests {
         logger.verbose(`${VesuHarvests.name}: claimed_amount: ${claimed_amount.toString()}`);
         
         const data = _data.data['defiSpring'];
+        if (!data) {
+            logger.verbose(`${VesuHarvests.name}: no defiSpring data found`);
+            return [];
+        }
 
         // get the actual reward
         const actualReward = Web3Number.fromWei(data.amount, 18).minus(claimed_amount);

package/src/strategies/base-strategy.ts

@@ -1,5 +1,6 @@
 import { ContractAddr, Web3Number } from "@/dataTypes";
 import { IConfig, TokenInfo, VaultPosition } from "@/interfaces";
+import { HarvestInfo } from "@/modules/harvests";
 import { CacheClass } from "@/utils/cacheClass";
 import { Call } from "starknet";
 
@@ -55,4 +56,8 @@ export class BaseStrategy<TVLInfo, ActionInfo> extends CacheClass {
     async getVaultPositions(): Promise<VaultPosition[]> {
         throw new Error("Not implemented");
     }
+
+    async getPendingRewards(): Promise<HarvestInfo[]> {
+        return [];
+    }
 }

package/src/strategies/ekubo-cl-vault.tsx

@@ -1597,32 +1597,30 @@ export class EkuboCLVault extends BaseStrategy<
     };
   }
 
-  async harvest(acc: Account, maxIterations = 20, priceRatioPrecision = 4, minRewardAmount: Web3Number = new Web3Number(0, 18)): Promise<Call[]> {
+  async getPendingRewards(): Promise<HarvestInfo[]> {
     const ekuboHarvests = new EkuboHarvests(this.config);
-    
-    // get unclaimed rewards and filter out those less than the minimum reward amount
-    const unClaimedRewards = (await ekuboHarvests.getUnHarvestedRewards(
-      this.address
-    )).filter(claim => claim.actualReward.greaterThanOrEqualTo(minRewardAmount));
-
-    if (unClaimedRewards.length == 0) {
-      logger.verbose(`${EkuboCLVault.name}: harvest => no unclaimed rewards found`);
+    return await ekuboHarvests.getUnHarvestedRewards(this.address);
+  }
+
+  async harvest(acc: Account, maxIterations = 20, priceRatioPrecision = 4): Promise<Call[]> {
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      logger.verbose(`${EkuboCLVault.name}: harvest => no pending rewards found`);
       return [];
     }
-
     // get necessary info for the harvest
     const poolKey = await this.getPoolKey();
     const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
     const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
     const bounds = await this.getCurrentBounds();
     logger.verbose(
-      `${EkuboCLVault.name}: harvest => unClaimedRewards: ${unClaimedRewards.length}`
+      `${EkuboCLVault.name}: harvest => unClaimedRewards: ${pendingRewards.length}`
     );
 
     // execute the harvest
     const calls: Call[] = [];
     // do one at a time. 
-    const chosenClaim = unClaimedRewards[0];
+    const chosenClaim = pendingRewards[0];
     logger.info(`${EkuboCLVault.name}: harvest => doing one at a time`);
     logger.info(`${EkuboCLVault.name}: harvest => chosenClaim -> Claim ID: ${chosenClaim.claim.id}, Amount: ${chosenClaim.claim.amount.toString()}, actualAmount: ${chosenClaim.actualReward.toString()}, addr: ${chosenClaim.claim.claimee.toString()}`);
     for (let claim of [chosenClaim]) {

package/src/strategies/universal-lst-muliplier-strategy.tsx

@@ -726,18 +726,20 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
     // is Deposit
     let minLSTReceived = params.debtAmount.dividedBy(lstDexPriceInUnderlying).multipliedBy(1 - MAX_SLIPPAGE); // used for increase
     const minLSTReceivedAsPerTruePrice = params.debtAmount.dividedBy(lstTrueExchangeRate); // execution output to be <= True LST price
-    if (minLSTReceived < minLSTReceivedAsPerTruePrice) {
-      minLSTReceived = minLSTReceivedAsPerTruePrice; // the execution shouldn't be bad than True price logi
-    }
+    // if (minLSTReceived < minLSTReceivedAsPerTruePrice) {
+    //   minLSTReceived = minLSTReceivedAsPerTruePrice; // the execution shouldn't be bad than True price logi
+    // }
+    minLSTReceived = minLSTReceivedAsPerTruePrice; // in any case, we are ok with this, bcz the BTC LST spread shouldnt be high
     logger.verbose(`${this.getTag()}::getModifyLeverCall minLSTReceivedAsPerTruePrice: ${minLSTReceivedAsPerTruePrice}, minLSTReceived: ${minLSTReceived}`);
 
     // is withdraw
     let maxUsedCollateral = params.debtAmount.abs().dividedBy(lstDexPriceInUnderlying).multipliedBy(1 + MAX_SLIPPAGE); // +ve for exact amount out, used for decrease
     const maxUsedCollateralInLST = params.debtAmount.abs().dividedBy(lstTrueExchangeRate).multipliedBy(1.005); // 0.5% slippage, worst case based on true price
     logger.verbose(`${this.getTag()}::getModifyLeverCall maxUsedCollateralInLST: ${maxUsedCollateralInLST}, maxUsedCollateral: ${maxUsedCollateral}`);
-    if (maxUsedCollateralInLST > maxUsedCollateral) {
-      maxUsedCollateral = maxUsedCollateralInLST;
-    }
+    // if (maxUsedCollateralInLST > maxUsedCollateral) {
+    //   maxUsedCollateral = maxUsedCollateralInLST;
+    // }
+    maxUsedCollateral = maxUsedCollateralInLST; // in any case, we are ok with this, bcz the BTC LST spread shouldnt be high
 
     const STEP2_ID = LST_MULTIPLIER_MANAGE_IDS.SWITCH_DELEGATION_ON;
     const manage2Info = this.getProofs<VesuModifyDelegationCallParams>(STEP2_ID);

package/src/strategies/universal-strategy.tsx

@@ -11,7 +11,7 @@ import { ApproveCallParams, AvnuSwapCallParams, BaseAdapter, CommonAdapter, Flas
 import { Global } from "@/global";
 import { AvnuWrapper, ERC20 } from "@/modules";
 import { AVNU_MIDDLEWARE, VESU_SINGLETON } from "./universal-adapters/adapter-utils";
-import { VesuHarvests } from "@/modules/harvests";
+import { HarvestInfo, VesuHarvests } from "@/modules/harvests";
 
 export interface UniversalManageCall {
   proofs: string[];
@@ -729,9 +729,16 @@ export class UniversalStrategy<
     return manageCall;
   }
 
-  async getHarvestCall() {
+  async getPendingRewards(): Promise<HarvestInfo[]> {
     const vesuHarvest = new VesuHarvests(this.config);
-    const harvestInfo = await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+    return await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+  }
+
+  async getHarvestCall() {
+    const harvestInfo = await this.getPendingRewards();
+    if (harvestInfo.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
     if (harvestInfo.length != 1) {
       throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
     }

package/src/strategies/vesu-rebalance.tsx

@@ -25,7 +25,7 @@ import {
   SingleTokenInfo
 } from "./base-strategy";
 import { getAPIUsingHeadlessBrowser } from "@/node/headless";
-import { VesuHarvests } from "@/modules/harvests";
+import { HarvestInfo, VesuHarvests } from "@/modules/harvests";
 import VesuPoolIDs from "@/data/vesu_pools.json";
 import { COMMON_CONTRACTS, ENDPOINTS } from "./constants";
 
@@ -763,10 +763,17 @@ export class VesuRebalance extends BaseStrategy<
     return [baseFlow];
   }
 
+  async getPendingRewards(): Promise<HarvestInfo[]> {
+    const vesuHarvests = new VesuHarvests(this.config);
+    return await vesuHarvests.getUnHarvestedRewards(this.address);
+  }
+
   async harvest(acc: Account) {
-    const vesuHarvest = new VesuHarvests(this.config);
-    const harvests = await vesuHarvest.getUnHarvestedRewards(this.address);
-    const harvest = harvests[0];
+    const pendingRewards = await this.getPendingRewards();
+    if (pendingRewards.length == 0) {
+      throw new Error(`No pending rewards found`);
+    }
+    const harvest = pendingRewards[0];
     const avnu = new AvnuWrapper();
     let swapInfo: SwapInfo = {
       token_from_address: harvest.token.address,