@strkfarm/sdk 1.1.58 → 1.1.60

package/dist/index.browser.global.js

@@ -49159,6 +49159,7 @@ ${JSON.stringify(data, null, 2)}`;
     decimals: 8,
     coingeckId: void 0,
     displayDecimals: 6,
+    priceProxySymbol: "WBTC",
     priceCheckAmount: 1e-3
     // 112000 * 0.0001 = $110.2
   }, {
@@ -49181,8 +49182,9 @@ ${JSON.stringify(data, null, 2)}`;
     decimals: 18,
     coingeckId: void 0,
     displayDecimals: 6,
-    priceCheckAmount: 1e-3
+    priceCheckAmount: 1e-3,
     // 112000 * 0.0001 = $110.2
+    priceProxySymbol: "WBTC"
   }, {
     name: "xLBTC",
     symbol: "xLBTC",
@@ -49462,6 +49464,7 @@ ${JSON.stringify(data, null, 2)}`;
       throw new Error("Not implemented");
     }
     async _getPriceEkubo(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+      logger2.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
       const url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei());
       const result2 = await axios_default.get(url);
       const data = result2.data;
@@ -80217,7 +80220,7 @@ spurious results.`);
         }
       };
     }
-    async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4) {
+    async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
       const poolKey = await this.getPoolKey();
       const unusedBalances = await this.unusedBalances(poolKey);
       const { amount: token0Bal1, usdValue: token0PriceUsd } = unusedBalances.token0;
@@ -80257,7 +80260,8 @@ spurious results.`);
         token1Bal,
         ekuboBounds,
         maxIterations,
-        priceRatioPrecision
+        priceRatioPrecision,
+        getQuoteCallback
       );
     }
     assertValidBounds(bounds) {
@@ -80302,7 +80306,7 @@ spurious results.`);
      * @returns {Promise<SwapInfo>}
      * 
      */
-    async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4) {
+    async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
       logger2.verbose(
         `${_EkuboCLVault.name}: getSwapInfoGivenAmounts::pre => token0Bal: ${token0Bal.toString()}, token1Bal: ${token1Bal.toString()}`
       );
@@ -80337,12 +80341,7 @@ spurious results.`);
         if (amountToSell.eq(0)) {
           return AvnuWrapper.buildZeroSwap(tokenToSell, this.address.address);
         }
-        const quote = await this.avnu.getQuotes(
-          tokenToSell.address,
-          tokenToBuy.address,
-          amountToSell.toWei(),
-          this.address.address
-        );
+        const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
         if (remainingSellAmount.eq(0)) {
           const minAmountOut = Web3Number.fromWei(
             quote.buyAmount.toString(),

package/dist/index.browser.mjs

@@ -239,6 +239,7 @@ var defaultTokens = [{
   decimals: 8,
   coingeckId: void 0,
   displayDecimals: 6,
+  priceProxySymbol: "WBTC",
   priceCheckAmount: 1e-3
   // 112000 * 0.0001 = $110.2
 }, {
@@ -261,8 +262,9 @@ var defaultTokens = [{
   decimals: 18,
   coingeckId: void 0,
   displayDecimals: 6,
-  priceCheckAmount: 1e-3
+  priceCheckAmount: 1e-3,
   // 112000 * 0.0001 = $110.2
+  priceProxySymbol: "WBTC"
 }, {
   name: "xLBTC",
   symbol: "xLBTC",
@@ -542,6 +544,7 @@ var Pricer = class extends PricerBase {
     throw new Error("Not implemented");
   }
   async _getPriceEkubo(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+    logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
     const url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei());
     const result = await axios2.get(url);
     const data = result.data;
@@ -16294,7 +16297,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       }
     };
   }
-  async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4) {
+  async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
     const poolKey = await this.getPoolKey();
     const unusedBalances = await this.unusedBalances(poolKey);
     const { amount: token0Bal1, usdValue: token0PriceUsd } = unusedBalances.token0;
@@ -16334,7 +16337,8 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       token1Bal,
       ekuboBounds,
       maxIterations,
-      priceRatioPrecision
+      priceRatioPrecision,
+      getQuoteCallback
     );
   }
   assertValidBounds(bounds) {
@@ -16379,7 +16383,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<SwapInfo>}
    * 
    */
-  async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4) {
+  async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
     logger.verbose(
       `${_EkuboCLVault.name}: getSwapInfoGivenAmounts::pre => token0Bal: ${token0Bal.toString()}, token1Bal: ${token1Bal.toString()}`
     );
@@ -16414,12 +16418,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       if (amountToSell.eq(0)) {
         return AvnuWrapper.buildZeroSwap(tokenToSell, this.address.address);
       }
-      const quote = await this.avnu.getQuotes(
-        tokenToSell.address,
-        tokenToBuy.address,
-        amountToSell.toWei(),
-        this.address.address
-      );
+      const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
       if (remainingSellAmount.eq(0)) {
         const minAmountOut = Web3Number.fromWei(
           quote.buyAmount.toString(),

package/dist/index.d.ts

@@ -782,7 +782,7 @@ declare class EkuboCLVault extends BaseStrategy<DualTokenInfo, DualActionAmount>
             usdValue: number;
         };
     }>;
-    getSwapInfoToHandleUnused(considerRebalance?: boolean, newBounds?: EkuboBounds | null, maxIterations?: number, priceRatioPrecision?: number): Promise<SwapInfo>;
+    getSwapInfoToHandleUnused(considerRebalance?: boolean, newBounds?: EkuboBounds | null, maxIterations?: number, priceRatioPrecision?: number, getQuoteCallback?: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote>): Promise<SwapInfo>;
     assertValidBounds(bounds: EkuboBounds): void;
     assertValidAmounts(expectedAmounts: any, token0Bal: Web3Number, token1Bal: Web3Number): void;
     getSwapParams(expectedAmounts: any, poolKey: EkuboPoolKey, token0Bal: Web3Number, token1Bal: Web3Number): {
@@ -802,7 +802,7 @@ declare class EkuboCLVault extends BaseStrategy<DualTokenInfo, DualActionAmount>
      * @returns {Promise<SwapInfo>}
      *
      */
-    getSwapInfoGivenAmounts(poolKey: EkuboPoolKey, token0Bal: Web3Number, token1Bal: Web3Number, bounds: EkuboBounds, maxIterations?: number, priceRatioPrecision?: number): Promise<SwapInfo>;
+    getSwapInfoGivenAmounts(poolKey: EkuboPoolKey, token0Bal: Web3Number, token1Bal: Web3Number, bounds: EkuboBounds, maxIterations?: number, priceRatioPrecision?: number, getQuoteCallback?: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote>): Promise<SwapInfo>;
     /**
      * Attempts to rebalance the vault by iteratively adjusting swap amounts if initial attempt fails.
      * Uses binary search approach to find optimal swap amount.

package/dist/index.js

@@ -386,6 +386,7 @@ var defaultTokens = [{
   decimals: 8,
   coingeckId: void 0,
   displayDecimals: 6,
+  priceProxySymbol: "WBTC",
   priceCheckAmount: 1e-3
   // 112000 * 0.0001 = $110.2
 }, {
@@ -408,8 +409,9 @@ var defaultTokens = [{
   decimals: 18,
   coingeckId: void 0,
   displayDecimals: 6,
-  priceCheckAmount: 1e-3
+  priceCheckAmount: 1e-3,
   // 112000 * 0.0001 = $110.2
+  priceProxySymbol: "WBTC"
 }, {
   name: "xLBTC",
   symbol: "xLBTC",
@@ -689,6 +691,7 @@ var Pricer = class extends PricerBase {
     throw new Error("Not implemented");
   }
   async _getPriceEkubo(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+    logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
     const url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei());
     const result = await import_axios2.default.get(url);
     const data = result.data;
@@ -16294,7 +16297,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       }
     };
   }
-  async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4) {
+  async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
     const poolKey = await this.getPoolKey();
     const unusedBalances = await this.unusedBalances(poolKey);
     const { amount: token0Bal1, usdValue: token0PriceUsd } = unusedBalances.token0;
@@ -16334,7 +16337,8 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       token1Bal,
       ekuboBounds,
       maxIterations,
-      priceRatioPrecision
+      priceRatioPrecision,
+      getQuoteCallback
     );
   }
   assertValidBounds(bounds) {
@@ -16379,7 +16383,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<SwapInfo>}
    * 
    */
-  async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4) {
+  async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
     logger.verbose(
       `${_EkuboCLVault.name}: getSwapInfoGivenAmounts::pre => token0Bal: ${token0Bal.toString()}, token1Bal: ${token1Bal.toString()}`
     );
@@ -16414,12 +16418,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       if (amountToSell.eq(0)) {
         return AvnuWrapper.buildZeroSwap(tokenToSell, this.address.address);
       }
-      const quote = await this.avnu.getQuotes(
-        tokenToSell.address,
-        tokenToBuy.address,
-        amountToSell.toWei(),
-        this.address.address
-      );
+      const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
       if (remainingSellAmount.eq(0)) {
         const minAmountOut = Web3Number.fromWei(
           quote.buyAmount.toString(),

package/dist/index.mjs

@@ -280,6 +280,7 @@ var defaultTokens = [{
   decimals: 8,
   coingeckId: void 0,
   displayDecimals: 6,
+  priceProxySymbol: "WBTC",
   priceCheckAmount: 1e-3
   // 112000 * 0.0001 = $110.2
 }, {
@@ -302,8 +303,9 @@ var defaultTokens = [{
   decimals: 18,
   coingeckId: void 0,
   displayDecimals: 6,
-  priceCheckAmount: 1e-3
+  priceCheckAmount: 1e-3,
   // 112000 * 0.0001 = $110.2
+  priceProxySymbol: "WBTC"
 }, {
   name: "xLBTC",
   symbol: "xLBTC",
@@ -583,6 +585,7 @@ var Pricer = class extends PricerBase {
     throw new Error("Not implemented");
   }
   async _getPriceEkubo(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+    logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
     const url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei());
     const result = await axios2.get(url);
     const data = result.data;
@@ -16192,7 +16195,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       }
     };
   }
-  async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4) {
+  async getSwapInfoToHandleUnused(considerRebalance = true, newBounds = null, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
     const poolKey = await this.getPoolKey();
     const unusedBalances = await this.unusedBalances(poolKey);
     const { amount: token0Bal1, usdValue: token0PriceUsd } = unusedBalances.token0;
@@ -16232,7 +16235,8 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       token1Bal,
       ekuboBounds,
       maxIterations,
-      priceRatioPrecision
+      priceRatioPrecision,
+      getQuoteCallback
     );
   }
   assertValidBounds(bounds) {
@@ -16277,7 +16281,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<SwapInfo>}
    * 
    */
-  async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4) {
+  async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds, maxIterations = 20, priceRatioPrecision = 4, getQuoteCallback = this.avnu.getQuotes) {
     logger.verbose(
       `${_EkuboCLVault.name}: getSwapInfoGivenAmounts::pre => token0Bal: ${token0Bal.toString()}, token1Bal: ${token1Bal.toString()}`
     );
@@ -16312,12 +16316,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       if (amountToSell.eq(0)) {
         return AvnuWrapper.buildZeroSwap(tokenToSell, this.address.address);
       }
-      const quote = await this.avnu.getQuotes(
-        tokenToSell.address,
-        tokenToBuy.address,
-        amountToSell.toWei(),
-        this.address.address
-      );
+      const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
       if (remainingSellAmount.eq(0)) {
         const minAmountOut = Web3Number.fromWei(
           quote.buyAmount.toString(),

package/package.json

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

@@ -105,6 +105,7 @@ const defaultTokens: TokenInfo[] = [{
     decimals: 8,
     coingeckId: undefined,
     displayDecimals: 6,
+    priceProxySymbol: 'WBTC',
     priceCheckAmount: 0.001, // 112000 * 0.0001 = $110.2
 }, {
     name: 'xsBTC',
@@ -126,6 +127,7 @@ const defaultTokens: TokenInfo[] = [{
     coingeckId: undefined,
     displayDecimals: 6,
     priceCheckAmount: 0.001, // 112000 * 0.0001 = $110.2
+    priceProxySymbol: 'WBTC',
 }, {
     name: 'xLBTC',
     symbol: 'xLBTC',

package/src/modules/pricer.ts

@@ -201,6 +201,7 @@ export class Pricer extends PricerBase {
     }
 
     async _getPriceEkubo(token: TokenInfo, amountIn = new Web3Number(1, token.decimals), retry = 0): Promise<number> {
+        logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
         const url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei());
         const result = await axios.get(url);
         const data: any = result.data;

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

@@ -40,6 +40,7 @@ import { DepegRiskLevel, ImpermanentLossLevel, MarketRiskLevel, SmartContractRis
 import { gql } from "@apollo/client";
 import apolloClient from "@/modules/apollo-client";
 import { binarySearch } from "@/utils/math-utils";
+import { Quote } from "@avnu/avnu-sdk";
 
 export interface EkuboPoolKey {
   token0: ContractAddr;
@@ -1080,7 +1081,12 @@ export class EkuboCLVault extends BaseStrategy<
     };
   }
 
-  async getSwapInfoToHandleUnused(considerRebalance: boolean = true, newBounds: EkuboBounds | null = null, maxIterations = 20, priceRatioPrecision = 4): Promise<SwapInfo> {
+  async getSwapInfoToHandleUnused(
+    considerRebalance: boolean = true, 
+    newBounds: EkuboBounds | null = null, 
+    maxIterations = 20, priceRatioPrecision = 4, 
+    getQuoteCallback: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote> = this.avnu.getQuotes
+  ): Promise<SwapInfo> {
     const poolKey = await this.getPoolKey();
 
     // fetch current unused balances of vault
@@ -1145,7 +1151,8 @@ export class EkuboCLVault extends BaseStrategy<
       token1Bal,
       ekuboBounds,
       maxIterations,
-      priceRatioPrecision
+      priceRatioPrecision,
+      getQuoteCallback
     );
   }
 
@@ -1229,7 +1236,8 @@ export class EkuboCLVault extends BaseStrategy<
     token1Bal: Web3Number,
     bounds: EkuboBounds,
     maxIterations: number = 20,
-    priceRatioPrecision: number = 4
+    priceRatioPrecision: number = 4,
+    getQuoteCallback: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote> = this.avnu.getQuotes
   ): Promise<SwapInfo> {
     logger.verbose(
       `${
@@ -1284,12 +1292,7 @@ export class EkuboCLVault extends BaseStrategy<
       }
 
       // Get a quote for swapping the calculated amount
-      const quote = await this.avnu.getQuotes(
-        tokenToSell.address,
-        tokenToBuy.address,
-        amountToSell.toWei(),
-        this.address.address
-      );
+      const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
 
       // If all of the token is to be swapped, return the swap info directly
       if (remainingSellAmount.eq(0)) {