@strkfarm/sdk 1.0.53 → 1.0.54

package/dist/index.browser.global.js

@@ -19770,6 +19770,19 @@ var strkfarm_risk_engine = (() => {
       }
       return value.toFixed(this.maxToFixedDecimals());
     }
+    minimum(value) {
+      const _value = new import_bignumber.default(value);
+      const _valueMe = new import_bignumber.default(this.toString());
+      const answer = _value.lessThanOrEqualTo(_valueMe) ? _value : _valueMe;
+      return this.construct(answer.toString(), this.decimals);
+    }
+    maximum(value) {
+      const _value = new import_bignumber.default(value);
+      const _valueMe = new import_bignumber.default(this.toString());
+      console.warn(`maximum: _value: ${_value.toString()}, _valueMe: ${_valueMe.toString()}`);
+      const answer = _value.greaterThanOrEqualTo(_valueMe) ? _value : _valueMe;
+      return this.construct(answer.toString(), this.decimals);
+    }
   };
   import_bignumber.default.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: import_bignumber.default.ROUND_DOWN });
   _Web3Number.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: import_bignumber.default.ROUND_DOWN });
@@ -38132,7 +38145,6 @@ var strkfarm_risk_engine = (() => {
         }
         throw new Error("no quotes found");
       }
-      logger.verbose(`${_AvnuWrapper.name}: getQuotes => Found ${JSON.stringify(filteredQuotes[0])}`);
       return filteredQuotes[0];
     }
     async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount) {
@@ -52150,11 +52162,19 @@ var strkfarm_risk_engine = (() => {
             uint256_exports.uint256ToBN(swapInfo1.token_from_amount).toString(),
             18
             // cause its always STRK?
+          ).minimum(
+            postFeeAmount.toFixed(18)
+            // cause always strk
+          );
+          swapInfo.token_from_amount = uint256_exports.bnToUint256(swap1Amount.toWei());
+          swapInfo.token_to_min_amount = uint256_exports.bnToUint256(
+            swap1Amount.multipliedBy(0).toWei()
+            // placeholder
           );
           logger.verbose(
             `${_EkuboCLVault.name}: harvest => swap1Amount: ${swap1Amount}`
           );
-          const remainingAmount = postFeeAmount.minus(swap1Amount);
+          const remainingAmount = postFeeAmount.minus(swap1Amount).maximum(0);
           logger.verbose(
             `${_EkuboCLVault.name}: harvest => remainingAmount: ${remainingAmount}`
           );
@@ -52194,7 +52214,12 @@ var strkfarm_risk_engine = (() => {
         const _callsFinal = await this.rebalanceIter(
           swapInfo,
           acc,
-          harvestEstimateCall
+          harvestEstimateCall,
+          claim.token.eq(poolKey.token0),
+          0,
+          0n,
+          BigInt(postFeeAmount.toWei())
+          // upper limit is the post fee amount
         );
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => _callsFinal: ${JSON.stringify(

package/dist/index.browser.mjs

@@ -51,6 +51,19 @@ var _Web3Number = class extends BigNumber {
     }
     return value.toFixed(this.maxToFixedDecimals());
   }
+  minimum(value) {
+    const _value = new BigNumber(value);
+    const _valueMe = new BigNumber(this.toString());
+    const answer = _value.lessThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
+  maximum(value) {
+    const _value = new BigNumber(value);
+    const _valueMe = new BigNumber(this.toString());
+    console.warn(`maximum: _value: ${_value.toString()}, _valueMe: ${_valueMe.toString()}`);
+    const answer = _value.greaterThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
 };
 BigNumber.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: BigNumber.ROUND_DOWN });
 _Web3Number.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: BigNumber.ROUND_DOWN });
@@ -1911,7 +1924,6 @@ var AvnuWrapper = class _AvnuWrapper {
       }
       throw new Error("no quotes found");
     }
-    logger.verbose(`${_AvnuWrapper.name}: getQuotes => Found ${JSON.stringify(filteredQuotes[0])}`);
     return filteredQuotes[0];
   }
   async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount) {
@@ -15943,11 +15955,19 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
           uint2564.uint256ToBN(swapInfo1.token_from_amount).toString(),
           18
           // cause its always STRK?
+        ).minimum(
+          postFeeAmount.toFixed(18)
+          // cause always strk
+        );
+        swapInfo.token_from_amount = uint2564.bnToUint256(swap1Amount.toWei());
+        swapInfo.token_to_min_amount = uint2564.bnToUint256(
+          swap1Amount.multipliedBy(0).toWei()
+          // placeholder
         );
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => swap1Amount: ${swap1Amount}`
         );
-        const remainingAmount = postFeeAmount.minus(swap1Amount);
+        const remainingAmount = postFeeAmount.minus(swap1Amount).maximum(0);
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => remainingAmount: ${remainingAmount}`
         );
@@ -15987,7 +16007,12 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       const _callsFinal = await this.rebalanceIter(
         swapInfo,
         acc,
-        harvestEstimateCall
+        harvestEstimateCall,
+        claim.token.eq(poolKey.token0),
+        0,
+        0n,
+        BigInt(postFeeAmount.toWei())
+        // upper limit is the post fee amount
       );
       logger.verbose(
         `${_EkuboCLVault.name}: harvest => _callsFinal: ${JSON.stringify(

package/dist/index.d.ts

@@ -19,6 +19,8 @@ declare class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
     valueOf(): string;
     private maxToFixedDecimals;
     private getStandardString;
+    minimum(value: string | number | T): T;
+    maximum(value: string | number | T): T;
 }
 
 declare class Web3Number extends _Web3Number<Web3Number> {

package/dist/index.js

@@ -124,6 +124,19 @@ var _Web3Number = class extends import_bignumber.default {
     }
     return value.toFixed(this.maxToFixedDecimals());
   }
+  minimum(value) {
+    const _value = new import_bignumber.default(value);
+    const _valueMe = new import_bignumber.default(this.toString());
+    const answer = _value.lessThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
+  maximum(value) {
+    const _value = new import_bignumber.default(value);
+    const _valueMe = new import_bignumber.default(this.toString());
+    console.warn(`maximum: _value: ${_value.toString()}, _valueMe: ${_valueMe.toString()}`);
+    const answer = _value.greaterThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
 };
 import_bignumber.default.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: import_bignumber.default.ROUND_DOWN });
 _Web3Number.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: import_bignumber.default.ROUND_DOWN });
@@ -2030,7 +2043,6 @@ var AvnuWrapper = class _AvnuWrapper {
       }
       throw new Error("no quotes found");
     }
-    logger.verbose(`${_AvnuWrapper.name}: getQuotes => Found ${JSON.stringify(filteredQuotes[0])}`);
     return filteredQuotes[0];
   }
   async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount) {
@@ -16058,11 +16070,19 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
           import_starknet9.uint256.uint256ToBN(swapInfo1.token_from_amount).toString(),
           18
           // cause its always STRK?
+        ).minimum(
+          postFeeAmount.toFixed(18)
+          // cause always strk
+        );
+        swapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(swap1Amount.toWei());
+        swapInfo.token_to_min_amount = import_starknet9.uint256.bnToUint256(
+          swap1Amount.multipliedBy(0).toWei()
+          // placeholder
         );
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => swap1Amount: ${swap1Amount}`
         );
-        const remainingAmount = postFeeAmount.minus(swap1Amount);
+        const remainingAmount = postFeeAmount.minus(swap1Amount).maximum(0);
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => remainingAmount: ${remainingAmount}`
         );
@@ -16102,7 +16122,12 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       const _callsFinal = await this.rebalanceIter(
         swapInfo,
         acc,
-        harvestEstimateCall
+        harvestEstimateCall,
+        claim.token.eq(poolKey.token0),
+        0,
+        0n,
+        BigInt(postFeeAmount.toWei())
+        // upper limit is the post fee amount
       );
       logger.verbose(
         `${_EkuboCLVault.name}: harvest => _callsFinal: ${JSON.stringify(

package/dist/index.mjs

@@ -54,6 +54,19 @@ var _Web3Number = class extends BigNumber {
     }
     return value.toFixed(this.maxToFixedDecimals());
   }
+  minimum(value) {
+    const _value = new BigNumber(value);
+    const _valueMe = new BigNumber(this.toString());
+    const answer = _value.lessThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
+  maximum(value) {
+    const _value = new BigNumber(value);
+    const _valueMe = new BigNumber(this.toString());
+    console.warn(`maximum: _value: ${_value.toString()}, _valueMe: ${_valueMe.toString()}`);
+    const answer = _value.greaterThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
 };
 BigNumber.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: BigNumber.ROUND_DOWN });
 _Web3Number.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: BigNumber.ROUND_DOWN });
@@ -1960,7 +1973,6 @@ var AvnuWrapper = class _AvnuWrapper {
       }
       throw new Error("no quotes found");
     }
-    logger.verbose(`${_AvnuWrapper.name}: getQuotes => Found ${JSON.stringify(filteredQuotes[0])}`);
     return filteredQuotes[0];
   }
   async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount) {
@@ -15992,11 +16004,19 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
           uint2564.uint256ToBN(swapInfo1.token_from_amount).toString(),
           18
           // cause its always STRK?
+        ).minimum(
+          postFeeAmount.toFixed(18)
+          // cause always strk
+        );
+        swapInfo.token_from_amount = uint2564.bnToUint256(swap1Amount.toWei());
+        swapInfo.token_to_min_amount = uint2564.bnToUint256(
+          swap1Amount.multipliedBy(0).toWei()
+          // placeholder
         );
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => swap1Amount: ${swap1Amount}`
         );
-        const remainingAmount = postFeeAmount.minus(swap1Amount);
+        const remainingAmount = postFeeAmount.minus(swap1Amount).maximum(0);
         logger.verbose(
           `${_EkuboCLVault.name}: harvest => remainingAmount: ${remainingAmount}`
         );
@@ -16036,7 +16056,12 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       const _callsFinal = await this.rebalanceIter(
         swapInfo,
         acc,
-        harvestEstimateCall
+        harvestEstimateCall,
+        claim.token.eq(poolKey.token0),
+        0,
+        0n,
+        BigInt(postFeeAmount.toWei())
+        // upper limit is the post fee amount
       );
       logger.verbose(
         `${_EkuboCLVault.name}: harvest => _callsFinal: ${JSON.stringify(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "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/dataTypes/_bignumber.ts

@@ -61,6 +61,21 @@ export class _Web3Number<T extends _Web3Number<T>> extends BigNumber {
     }
     return value.toFixed(this.maxToFixedDecimals());
   }
+
+  minimum(value: string | number | T): T {
+    const _value = new BigNumber(value);
+    const _valueMe = new BigNumber(this.toString());
+    const answer = _value.lessThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
+
+  maximum(value: string | number | T): T {
+    const _value = new BigNumber(value);
+    const _valueMe = new BigNumber(this.toString());
+    console.warn(`maximum: _value: ${_value.toString()}, _valueMe: ${_valueMe.toString()}`);
+    const answer = _value.greaterThanOrEqualTo(_valueMe) ? _value : _valueMe;
+    return this.construct(answer.toString(), this.decimals);
+  }
 }
 
 BigNumber.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: BigNumber.ROUND_DOWN });

package/src/modules/avnu.ts

@@ -60,7 +60,6 @@ export class AvnuWrapper {
         throw new Error('no quotes found')
     }
     
-    logger.verbose(`${AvnuWrapper.name}: getQuotes => Found ${JSON.stringify(filteredQuotes[0])}`);
     return filteredQuotes[0];
   }
 

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

@@ -1456,11 +1456,19 @@ export class EkuboCLVault extends BaseStrategy<
         const swap1Amount = Web3Number.fromWei(
           uint256.uint256ToBN(swapInfo1.token_from_amount).toString(),
           18 // cause its always STRK?
-        );
+        ).minimum(
+          postFeeAmount.toFixed(18) // cause always strk
+        ); // ensure we don't swap more than we have
+        swapInfo.token_from_amount = uint256.bnToUint256(swap1Amount.toWei());
+        swapInfo.token_to_min_amount = uint256.bnToUint256(
+          swap1Amount.multipliedBy(0).toWei() // placeholder
+        ); // 0.01% slippage
+
         logger.verbose(
           `${EkuboCLVault.name}: harvest => swap1Amount: ${swap1Amount}`
         );
-        const remainingAmount = postFeeAmount.minus(swap1Amount);
+
+        const remainingAmount = postFeeAmount.minus(swap1Amount).maximum(0);
         logger.verbose(
           `${EkuboCLVault.name}: harvest => remainingAmount: ${remainingAmount}`
         );
@@ -1500,7 +1508,11 @@ export class EkuboCLVault extends BaseStrategy<
       const _callsFinal = await this.rebalanceIter(
         swapInfo,
         acc,
-        harvestEstimateCall
+        harvestEstimateCall,
+        claim.token.eq(poolKey.token0),
+        0,
+        0n,
+        BigInt(postFeeAmount.toWei()), // upper limit is the post fee amount
       );
       logger.verbose(
         `${EkuboCLVault.name}: harvest => _callsFinal: ${JSON.stringify(