@strkfarm/sdk 1.1.56 → 1.1.58

package/dist/index.browser.global.js

@@ -55733,6 +55733,7 @@ ${JSON.stringify(data, null, 2)}`;
     }
     async getUnHarvestedRewards(addr) {
       const rewards = await this.getHarvests(addr);
+      logger2.verbose(`${_Harvests.name}: getUnHarvestedRewards => rewards length: ${rewards.length}`);
       if (rewards.length == 0) return [];
       const unClaimed = [];
       const sortedRewards = rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());
@@ -55759,11 +55760,13 @@ ${JSON.stringify(data, null, 2)}`;
     }
   };
   var STRK = "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
-  var EkuboHarvests = class extends Harvests {
+  var EkuboHarvests = class _EkuboHarvests extends Harvests {
     async getHarvests(addr) {
+      logger2.verbose(`${_EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
       const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`;
       const resultEkubo = await fetch(EKUBO_API);
       const items = await resultEkubo.json();
+      logger2.verbose(`${_EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
       const rewards = [];
       for (let i = 0; i < items.length; ++i) {
         const info = items[i];
@@ -95005,9 +95008,12 @@ spurious results.`);
       const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
       logger2.verbose(`${this.getTag()}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
       logger2.debug(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
-      const debtAmount = x_debt_usd.dividedBy(debtPrice);
+      let debtAmount = x_debt_usd.dividedBy(debtPrice);
       const marginAmount = addedCollateral;
       logger2.verbose(`${this.getTag()}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
+      if (marginAmount.lt(0) && debtAmount.gt(0)) {
+        debtAmount = Web3Number.fromWei(0, this.asset().decimals);
+      }
       return this.getModifyLeverCall({
         marginAmount,
         debtAmount,

package/dist/index.browser.mjs

@@ -4133,6 +4133,7 @@ var Harvests = class _Harvests {
   }
   async getUnHarvestedRewards(addr) {
     const rewards = await this.getHarvests(addr);
+    logger.verbose(`${_Harvests.name}: getUnHarvestedRewards => rewards length: ${rewards.length}`);
     if (rewards.length == 0) return [];
     const unClaimed = [];
     const sortedRewards = rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());
@@ -4159,11 +4160,13 @@ var Harvests = class _Harvests {
   }
 };
 var STRK = "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
-var EkuboHarvests = class extends Harvests {
+var EkuboHarvests = class _EkuboHarvests extends Harvests {
   async getHarvests(addr) {
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
     const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`;
     const resultEkubo = await fetch(EKUBO_API);
     const items = await resultEkubo.json();
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
     const rewards = [];
     for (let i = 0; i < items.length; ++i) {
       const info = items[i];
@@ -31098,9 +31101,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
     logger.debug(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
-    const debtAmount = x_debt_usd.dividedBy(debtPrice);
+    let debtAmount = x_debt_usd.dividedBy(debtPrice);
     const marginAmount = addedCollateral;
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
+    if (marginAmount.lt(0) && debtAmount.gt(0)) {
+      debtAmount = Web3Number.fromWei(0, this.asset().decimals);
+    }
     return this.getModifyLeverCall({
       marginAmount,
       debtAmount,

package/dist/index.js

@@ -4137,6 +4137,7 @@ var Harvests = class _Harvests {
   }
   async getUnHarvestedRewards(addr) {
     const rewards = await this.getHarvests(addr);
+    logger.verbose(`${_Harvests.name}: getUnHarvestedRewards => rewards length: ${rewards.length}`);
     if (rewards.length == 0) return [];
     const unClaimed = [];
     const sortedRewards = rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());
@@ -4163,11 +4164,13 @@ var Harvests = class _Harvests {
   }
 };
 var STRK = "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
-var EkuboHarvests = class extends Harvests {
+var EkuboHarvests = class _EkuboHarvests extends Harvests {
   async getHarvests(addr) {
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
     const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`;
     const resultEkubo = await fetch(EKUBO_API);
     const items = await resultEkubo.json();
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
     const rewards = [];
     for (let i = 0; i < items.length; ++i) {
       const info = items[i];
@@ -31098,9 +31101,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
     logger.debug(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
-    const debtAmount = x_debt_usd.dividedBy(debtPrice);
+    let debtAmount = x_debt_usd.dividedBy(debtPrice);
     const marginAmount = addedCollateral;
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
+    if (marginAmount.lt(0) && debtAmount.gt(0)) {
+      debtAmount = Web3Number.fromWei(0, this.asset().decimals);
+    }
     return this.getModifyLeverCall({
       marginAmount,
       debtAmount,

package/dist/index.mjs

@@ -4031,6 +4031,7 @@ var Harvests = class _Harvests {
   }
   async getUnHarvestedRewards(addr) {
     const rewards = await this.getHarvests(addr);
+    logger.verbose(`${_Harvests.name}: getUnHarvestedRewards => rewards length: ${rewards.length}`);
     if (rewards.length == 0) return [];
     const unClaimed = [];
     const sortedRewards = rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());
@@ -4057,11 +4058,13 @@ var Harvests = class _Harvests {
   }
 };
 var STRK = "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
-var EkuboHarvests = class extends Harvests {
+var EkuboHarvests = class _EkuboHarvests extends Harvests {
   async getHarvests(addr) {
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
     const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`;
     const resultEkubo = await fetch(EKUBO_API);
     const items = await resultEkubo.json();
+    logger.verbose(`${_EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
     const rewards = [];
     for (let i = 0; i < items.length; ++i) {
       const info = items[i];
@@ -30996,9 +30999,12 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
     logger.debug(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
-    const debtAmount = x_debt_usd.dividedBy(debtPrice);
+    let debtAmount = x_debt_usd.dividedBy(debtPrice);
     const marginAmount = addedCollateral;
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
+    if (marginAmount.lt(0) && debtAmount.gt(0)) {
+      debtAmount = Web3Number.fromWei(0, this.asset().decimals);
+    }
     return this.getModifyLeverCall({
       marginAmount,
       debtAmount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.56",
+  "version": "1.1.58",
   "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

@@ -29,6 +29,7 @@ export class Harvests {
 
     async getUnHarvestedRewards(addr: ContractAddr) {
         const rewards = await this.getHarvests(addr);
+        logger.verbose(`${Harvests.name}: getUnHarvestedRewards => rewards length: ${rewards.length}`);
         if (rewards.length == 0) return [];
 
         const unClaimed: HarvestInfo[] = [];
@@ -66,10 +67,11 @@ const STRK = '0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d'
 
 export class EkuboHarvests extends Harvests {
     async getHarvests(addr: ContractAddr) {
+        logger.verbose(`${EkuboHarvests.name}: getHarvests => addr: ${addr.address}`);
         const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`
         const resultEkubo = await fetch(EKUBO_API);
         const items = (await resultEkubo.json());
-
+        logger.verbose(`${EkuboHarvests.name}: getHarvests => items length: ${items.length}`);
         const rewards: HarvestInfo[] = [];
         for (let i=0; i<items.length; ++i) {
             const info = items[i];

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

@@ -485,10 +485,17 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
     logger.debug(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
 
     // both in underlying
-    const debtAmount = x_debt_usd.dividedBy(debtPrice);
+    let debtAmount = x_debt_usd.dividedBy(debtPrice);
     const marginAmount = addedCollateral;
     logger.verbose(`${this.getTag()}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
 
+    if (marginAmount.lt(0) && debtAmount.gt(0)) {
+      // if we want to withdraw, but debt can go high, its conflicting between
+      // increasing and reducing lever. and in this case, the HF will go high, 
+      // which is ok. 
+      debtAmount = Web3Number.fromWei(0, this.asset().decimals);
+    }
+
     // Cases of lever increase (within the scopr of this function)
     // 1. debtAmount > 0 and marginAmount > 0
     // 2. debtAmount > 0 and marginAmount < 0