@strkfarm/sdk 2.0.0-dev.50 → 2.0.0-dev.51

package/dist/index.js

@@ -914,7 +914,8 @@ var defaultTokens = [{
   priceCheckAmount: 5e3,
   displayDecimals: 2,
   priceMethod: "Avnu",
-  indexingType: "lstScript" /* LST_SCRIPT */
+  indexingType: "lstScript" /* LST_SCRIPT */,
+  intermediateQuoteTokenSymbol: "STRK"
 }, {
   name: "ETH",
   symbol: "ETH",
@@ -4311,6 +4312,42 @@ var PricerAvnuApi = class extends PricerBase {
   }
 };
 
+// src/modules/pricer-quote-utils.ts
+var PRICER_USDC_ADDRESS = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
+var PRICER_USDC_DECIMALS = 6;
+function resolveQuoteTokenConfig(token, tokens2) {
+  if (token.intermediateQuoteTokenSymbol) {
+    const intermediateToken = tokens2.find(
+      (t) => t.symbol === token.intermediateQuoteTokenSymbol
+    );
+    if (!intermediateToken) {
+      throw new Error(
+        `Intermediate quote token ${token.intermediateQuoteTokenSymbol} not found for ${token.symbol}`
+      );
+    }
+    return {
+      address: intermediateToken.address.toString(),
+      decimals: intermediateToken.decimals,
+      symbol: intermediateToken.symbol,
+      isUsdQuote: false
+    };
+  }
+  return {
+    address: PRICER_USDC_ADDRESS,
+    decimals: PRICER_USDC_DECIMALS,
+    symbol: "USDC",
+    isUsdQuote: true
+  };
+}
+async function convertQuoteAmountToUsd(tokenSymbol, quoteAmount, quoteConfig, resolveUsdPrice) {
+  if (quoteConfig.isUsdQuote) {
+    const usdcPrice = await resolveUsdPrice("USDC");
+    return quoteAmount * usdcPrice;
+  }
+  const intermediateUsdPrice = await resolveUsdPrice(quoteConfig.symbol);
+  return quoteAmount * intermediateUsdPrice;
+}
+
 // src/modules/pricer.ts
 var PRICE_METHOD_PRIORITY = [
   "AvnuApi",
@@ -4334,7 +4371,7 @@ var Pricer = class extends PricerBase {
      */
     // ! switch to USDC (new) later
     this.PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
-    this.EKUBO_API = "https://prod-api-quoter.ekubo.org/23448594291968334/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
+    this.EKUBO_API = `https://prod-api-quoter.ekubo.org/23448594291968334/{{AMOUNT}}/{{TOKEN_ADDRESS}}/${PRICER_USDC_ADDRESS}`;
     this.refreshInterval = refreshInterval;
     this.staleTime = staleTime;
     this.avnuApiPricer = new PricerAvnuApi(config, tokens2);
@@ -4507,37 +4544,67 @@ var Pricer = class extends PricerBase {
   async _getPriceCoinMarketCap(token) {
     throw new Error("Not implemented");
   }
+  async _resolveQuoteTokenUsdPrice(symbol) {
+    const cached = this.prices[symbol];
+    if (cached && !this.isStale(cached.timestamp, symbol)) {
+      return cached.price;
+    }
+    const quoteToken = this.tokens.find((t) => t.symbol === symbol);
+    if (!quoteToken) {
+      throw new FatalError(`Quote token ${symbol} not found in pricer tokens`);
+    }
+    return await this._getPrice(quoteToken);
+  }
+  async _convertDexQuoteToUsd(token, quoteAmount) {
+    const quoteConfig = resolveQuoteTokenConfig(token, this.tokens);
+    const usdPrice = await convertQuoteAmountToUsd(
+      token.symbol,
+      quoteAmount,
+      quoteConfig,
+      this._resolveQuoteTokenUsdPrice.bind(this)
+    );
+    logger.verbose(
+      `${token.symbol}: ${quoteAmount} ${quoteConfig.symbol} -> $${usdPrice}`
+    );
+    return usdPrice;
+  }
   async _getAvnuPrice(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
-    logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
+    const quoteConfig = resolveQuoteTokenConfig(token, this.tokens);
+    logger.verbose(`Getting price of ${token.symbol} using Avnu, amountIn: ${amountIn.toWei()}`);
     const avnuWrapper = new AvnuWrapper();
-    const usdcAddress = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
-    const quote = await avnuWrapper.getQuotes(token.address.toString(), usdcAddress, amountIn.toWei(), "0x1");
+    const quote = await avnuWrapper.getQuotes(
+      token.address.toString(),
+      quoteConfig.address,
+      amountIn.toWei(),
+      "0x1"
+    );
     const multiplier = 1 / amountIn.toNumber();
-    const outputUSDC = Number(Web3Number.fromWei(quote.buyAmount.toString(), 6).toFixed(6)) * multiplier;
-    logger.verbose(`Avnu: ${token.symbol} -> USDC: ${outputUSDC}, retry: ${retry}`);
-    if (outputUSDC === 0 && retry < 3) {
-      const amountIn2 = new Web3Number(100, token.decimals);
-      return await this._getAvnuPrice(token, amountIn2, retry + 1);
+    const outputQuote = Number(
+      Web3Number.fromWei(quote.buyAmount.toString(), quoteConfig.decimals).toFixed(6)
+    ) * multiplier;
+    logger.verbose(`Avnu: ${token.symbol} -> ${quoteConfig.symbol}: ${outputQuote}, retry: ${retry}`);
+    if (outputQuote === 0 && retry < 3) {
+      const retryAmountIn = new Web3Number(100, token.decimals);
+      return await this._getAvnuPrice(token, retryAmountIn, retry + 1);
     }
-    const usdcPrice = 1;
-    logger.verbose(`USDC Price: ${usdcPrice}`);
-    return outputUSDC * usdcPrice;
+    return await this._convertDexQuoteToUsd(token, outputQuote);
   }
   async _getPriceEkubo(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+    const quoteConfig = resolveQuoteTokenConfig(token, this.tokens);
     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 url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei()).replace(PRICER_USDC_ADDRESS, quoteConfig.address);
     const result = await import_axios4.default.get(url);
     const data = result.data;
     const multiplier = 1 / amountIn.toNumber();
-    const outputUSDC = Number(Web3Number.fromWei(data.total_calculated, 6).toFixed(6)) * multiplier;
-    logger.verbose(`Ekubo: ${token.symbol} -> USDC: ${outputUSDC}, retry: ${retry}`);
-    if (outputUSDC === 0 && retry < 3) {
-      const amountIn2 = new Web3Number(100, token.decimals);
-      return await this._getPriceEkubo(token, amountIn2, retry + 1);
+    const outputQuote = Number(
+      Web3Number.fromWei(data.total_calculated, quoteConfig.decimals).toFixed(6)
+    ) * multiplier;
+    logger.verbose(`Ekubo: ${token.symbol} -> ${quoteConfig.symbol}: ${outputQuote}, retry: ${retry}`);
+    if (outputQuote === 0 && retry < 3) {
+      const retryAmountIn = new Web3Number(100, token.decimals);
+      return await this._getPriceEkubo(token, retryAmountIn, retry + 1);
     }
-    const usdcPrice = 1;
-    logger.verbose(`USDC Price: ${usdcPrice}`);
-    return outputUSDC * usdcPrice;
+    return await this._convertDexQuoteToUsd(token, outputQuote);
   }
 };
 
@@ -5119,12 +5186,10 @@ var ekubo_price_fethcer_abi_default = [
 
 // src/modules/ekubo-pricer.ts
 var EkuboPricer = class extends PricerBase {
-  constructor(config, tokens2) {
+  constructor(config, tokens2, resolveUsdPrice) {
     super(config, tokens2);
+    this.resolveUsdPrice = resolveUsdPrice;
     this.EKUBO_PRICE_FETCHER_ADDRESS = "0x04946fb4ad5237d97bbb1256eba2080c4fe1de156da6a7f83e3b4823bb6d7da1";
-    // Updating to new USDC_ADDRESS
-    this.USDC_ADDRESS = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
-    this.USDC_DECIMALS = 6;
     this.contract = new import_starknet13.Contract({
       abi: ekubo_price_fethcer_abi_default,
       address: this.EKUBO_PRICE_FETCHER_ADDRESS,
@@ -5138,9 +5203,16 @@ var EkuboPricer = class extends PricerBase {
     if (!tokenAddr) {
       throw new Error(`EkuboPricer:getPrice - no token`);
     }
+    const tokenInfo = this.tokens.find(
+      (t) => t.address.eqString(tokenAddr)
+    );
+    if (!tokenInfo) {
+      throw new Error(`Token ${tokenAddr} not found in global tokens`);
+    }
+    const quoteConfig = resolveQuoteTokenConfig(tokenInfo, this.tokens);
     const result = await this.contract.call(
       "get_prices",
-      [this.USDC_ADDRESS, [tokenAddr], 3600, 1e6],
+      [quoteConfig.address, [tokenAddr], 3600, 1e6],
       { blockIdentifier }
     );
     if (!result || result.length === 0) {
@@ -5152,17 +5224,23 @@ var EkuboPricer = class extends PricerBase {
       throw new Error(`EkuboPricer: Price fetch failed with variant: ${variant}`);
     }
     const rawPrice = typeof priceResult.variant.Price === "string" ? BigInt(priceResult.variant.Price) : priceResult.variant.Price;
-    const tokenInfo = this.tokens.find(
-      (t) => t.address.address.toLowerCase() === tokenAddr.toLowerCase()
-    );
-    if (!tokenInfo) {
-      throw new Error(`Token ${tokenAddr} not found in global tokens`);
-    }
     const priceAfterX128 = this.div2Power128(rawPrice);
-    const decimalAdjustment = 10 ** (tokenInfo.decimals - this.USDC_DECIMALS);
-    const price = priceAfterX128 * decimalAdjustment;
+    const decimalAdjustment = 10 ** (tokenInfo.decimals - quoteConfig.decimals);
+    const priceInQuote = priceAfterX128 * decimalAdjustment;
+    if (!quoteConfig.isUsdQuote) {
+      if (!this.resolveUsdPrice) {
+        throw new Error(
+          `EkuboPricer: USD price resolver required for ${tokenInfo.symbol} via ${quoteConfig.symbol}`
+        );
+      }
+      const quoteUsdPrice = await this.resolveUsdPrice(quoteConfig.symbol);
+      return {
+        price: priceInQuote * quoteUsdPrice,
+        timestamp: /* @__PURE__ */ new Date()
+      };
+    }
     return {
-      price,
+      price: priceInQuote,
       timestamp: /* @__PURE__ */ new Date()
     };
   }
@@ -5190,7 +5268,10 @@ var PricerFromApi = class extends PricerBase {
     ];
     this.apolloClient = createApolloClient(config);
     this.pragma = new Pragma(config, tokens2);
-    this.ekuboPricer = new EkuboPricer(config, tokens2);
+    this.ekuboPricer = new EkuboPricer(config, tokens2, async (symbol) => {
+      const priceInfo = await this.getPriceFromMyAPI(symbol);
+      return priceInfo.price;
+    });
   }
   async getPrice(tokenSymbol, blockNumber) {
     const tokenInfo = this.tokens.find((t) => t.symbol === tokenSymbol);

package/dist/index.mjs

@@ -744,7 +744,8 @@ var defaultTokens = [{
   priceCheckAmount: 5e3,
   displayDecimals: 2,
   priceMethod: "Avnu",
-  indexingType: "lstScript" /* LST_SCRIPT */
+  indexingType: "lstScript" /* LST_SCRIPT */,
+  intermediateQuoteTokenSymbol: "STRK"
 }, {
   name: "ETH",
   symbol: "ETH",
@@ -4141,6 +4142,42 @@ var PricerAvnuApi = class extends PricerBase {
   }
 };
 
+// src/modules/pricer-quote-utils.ts
+var PRICER_USDC_ADDRESS = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
+var PRICER_USDC_DECIMALS = 6;
+function resolveQuoteTokenConfig(token, tokens2) {
+  if (token.intermediateQuoteTokenSymbol) {
+    const intermediateToken = tokens2.find(
+      (t) => t.symbol === token.intermediateQuoteTokenSymbol
+    );
+    if (!intermediateToken) {
+      throw new Error(
+        `Intermediate quote token ${token.intermediateQuoteTokenSymbol} not found for ${token.symbol}`
+      );
+    }
+    return {
+      address: intermediateToken.address.toString(),
+      decimals: intermediateToken.decimals,
+      symbol: intermediateToken.symbol,
+      isUsdQuote: false
+    };
+  }
+  return {
+    address: PRICER_USDC_ADDRESS,
+    decimals: PRICER_USDC_DECIMALS,
+    symbol: "USDC",
+    isUsdQuote: true
+  };
+}
+async function convertQuoteAmountToUsd(tokenSymbol, quoteAmount, quoteConfig, resolveUsdPrice) {
+  if (quoteConfig.isUsdQuote) {
+    const usdcPrice = await resolveUsdPrice("USDC");
+    return quoteAmount * usdcPrice;
+  }
+  const intermediateUsdPrice = await resolveUsdPrice(quoteConfig.symbol);
+  return quoteAmount * intermediateUsdPrice;
+}
+
 // src/modules/pricer.ts
 var PRICE_METHOD_PRIORITY = [
   "AvnuApi",
@@ -4164,7 +4201,7 @@ var Pricer = class extends PricerBase {
      */
     // ! switch to USDC (new) later
     this.PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
-    this.EKUBO_API = "https://prod-api-quoter.ekubo.org/23448594291968334/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
+    this.EKUBO_API = `https://prod-api-quoter.ekubo.org/23448594291968334/{{AMOUNT}}/{{TOKEN_ADDRESS}}/${PRICER_USDC_ADDRESS}`;
     this.refreshInterval = refreshInterval;
     this.staleTime = staleTime;
     this.avnuApiPricer = new PricerAvnuApi(config, tokens2);
@@ -4337,37 +4374,67 @@ var Pricer = class extends PricerBase {
   async _getPriceCoinMarketCap(token) {
     throw new Error("Not implemented");
   }
+  async _resolveQuoteTokenUsdPrice(symbol) {
+    const cached = this.prices[symbol];
+    if (cached && !this.isStale(cached.timestamp, symbol)) {
+      return cached.price;
+    }
+    const quoteToken = this.tokens.find((t) => t.symbol === symbol);
+    if (!quoteToken) {
+      throw new FatalError(`Quote token ${symbol} not found in pricer tokens`);
+    }
+    return await this._getPrice(quoteToken);
+  }
+  async _convertDexQuoteToUsd(token, quoteAmount) {
+    const quoteConfig = resolveQuoteTokenConfig(token, this.tokens);
+    const usdPrice = await convertQuoteAmountToUsd(
+      token.symbol,
+      quoteAmount,
+      quoteConfig,
+      this._resolveQuoteTokenUsdPrice.bind(this)
+    );
+    logger.verbose(
+      `${token.symbol}: ${quoteAmount} ${quoteConfig.symbol} -> $${usdPrice}`
+    );
+    return usdPrice;
+  }
   async _getAvnuPrice(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
-    logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
+    const quoteConfig = resolveQuoteTokenConfig(token, this.tokens);
+    logger.verbose(`Getting price of ${token.symbol} using Avnu, amountIn: ${amountIn.toWei()}`);
     const avnuWrapper = new AvnuWrapper();
-    const usdcAddress = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
-    const quote = await avnuWrapper.getQuotes(token.address.toString(), usdcAddress, amountIn.toWei(), "0x1");
+    const quote = await avnuWrapper.getQuotes(
+      token.address.toString(),
+      quoteConfig.address,
+      amountIn.toWei(),
+      "0x1"
+    );
     const multiplier = 1 / amountIn.toNumber();
-    const outputUSDC = Number(Web3Number.fromWei(quote.buyAmount.toString(), 6).toFixed(6)) * multiplier;
-    logger.verbose(`Avnu: ${token.symbol} -> USDC: ${outputUSDC}, retry: ${retry}`);
-    if (outputUSDC === 0 && retry < 3) {
-      const amountIn2 = new Web3Number(100, token.decimals);
-      return await this._getAvnuPrice(token, amountIn2, retry + 1);
+    const outputQuote = Number(
+      Web3Number.fromWei(quote.buyAmount.toString(), quoteConfig.decimals).toFixed(6)
+    ) * multiplier;
+    logger.verbose(`Avnu: ${token.symbol} -> ${quoteConfig.symbol}: ${outputQuote}, retry: ${retry}`);
+    if (outputQuote === 0 && retry < 3) {
+      const retryAmountIn = new Web3Number(100, token.decimals);
+      return await this._getAvnuPrice(token, retryAmountIn, retry + 1);
     }
-    const usdcPrice = 1;
-    logger.verbose(`USDC Price: ${usdcPrice}`);
-    return outputUSDC * usdcPrice;
+    return await this._convertDexQuoteToUsd(token, outputQuote);
   }
   async _getPriceEkubo(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+    const quoteConfig = resolveQuoteTokenConfig(token, this.tokens);
     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 url = this.EKUBO_API.replace("{{TOKEN_ADDRESS}}", token.address.toString()).replace("{{AMOUNT}}", amountIn.toWei()).replace(PRICER_USDC_ADDRESS, quoteConfig.address);
     const result = await axios4.get(url);
     const data = result.data;
     const multiplier = 1 / amountIn.toNumber();
-    const outputUSDC = Number(Web3Number.fromWei(data.total_calculated, 6).toFixed(6)) * multiplier;
-    logger.verbose(`Ekubo: ${token.symbol} -> USDC: ${outputUSDC}, retry: ${retry}`);
-    if (outputUSDC === 0 && retry < 3) {
-      const amountIn2 = new Web3Number(100, token.decimals);
-      return await this._getPriceEkubo(token, amountIn2, retry + 1);
+    const outputQuote = Number(
+      Web3Number.fromWei(data.total_calculated, quoteConfig.decimals).toFixed(6)
+    ) * multiplier;
+    logger.verbose(`Ekubo: ${token.symbol} -> ${quoteConfig.symbol}: ${outputQuote}, retry: ${retry}`);
+    if (outputQuote === 0 && retry < 3) {
+      const retryAmountIn = new Web3Number(100, token.decimals);
+      return await this._getPriceEkubo(token, retryAmountIn, retry + 1);
     }
-    const usdcPrice = 1;
-    logger.verbose(`USDC Price: ${usdcPrice}`);
-    return outputUSDC * usdcPrice;
+    return await this._convertDexQuoteToUsd(token, outputQuote);
   }
 };
 
@@ -4949,12 +5016,10 @@ var ekubo_price_fethcer_abi_default = [
 
 // src/modules/ekubo-pricer.ts
 var EkuboPricer = class extends PricerBase {
-  constructor(config, tokens2) {
+  constructor(config, tokens2, resolveUsdPrice) {
     super(config, tokens2);
+    this.resolveUsdPrice = resolveUsdPrice;
     this.EKUBO_PRICE_FETCHER_ADDRESS = "0x04946fb4ad5237d97bbb1256eba2080c4fe1de156da6a7f83e3b4823bb6d7da1";
-    // Updating to new USDC_ADDRESS
-    this.USDC_ADDRESS = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
-    this.USDC_DECIMALS = 6;
     this.contract = new Contract3({
       abi: ekubo_price_fethcer_abi_default,
       address: this.EKUBO_PRICE_FETCHER_ADDRESS,
@@ -4968,9 +5033,16 @@ var EkuboPricer = class extends PricerBase {
     if (!tokenAddr) {
       throw new Error(`EkuboPricer:getPrice - no token`);
     }
+    const tokenInfo = this.tokens.find(
+      (t) => t.address.eqString(tokenAddr)
+    );
+    if (!tokenInfo) {
+      throw new Error(`Token ${tokenAddr} not found in global tokens`);
+    }
+    const quoteConfig = resolveQuoteTokenConfig(tokenInfo, this.tokens);
     const result = await this.contract.call(
       "get_prices",
-      [this.USDC_ADDRESS, [tokenAddr], 3600, 1e6],
+      [quoteConfig.address, [tokenAddr], 3600, 1e6],
       { blockIdentifier }
     );
     if (!result || result.length === 0) {
@@ -4982,17 +5054,23 @@ var EkuboPricer = class extends PricerBase {
       throw new Error(`EkuboPricer: Price fetch failed with variant: ${variant}`);
     }
     const rawPrice = typeof priceResult.variant.Price === "string" ? BigInt(priceResult.variant.Price) : priceResult.variant.Price;
-    const tokenInfo = this.tokens.find(
-      (t) => t.address.address.toLowerCase() === tokenAddr.toLowerCase()
-    );
-    if (!tokenInfo) {
-      throw new Error(`Token ${tokenAddr} not found in global tokens`);
-    }
     const priceAfterX128 = this.div2Power128(rawPrice);
-    const decimalAdjustment = 10 ** (tokenInfo.decimals - this.USDC_DECIMALS);
-    const price = priceAfterX128 * decimalAdjustment;
+    const decimalAdjustment = 10 ** (tokenInfo.decimals - quoteConfig.decimals);
+    const priceInQuote = priceAfterX128 * decimalAdjustment;
+    if (!quoteConfig.isUsdQuote) {
+      if (!this.resolveUsdPrice) {
+        throw new Error(
+          `EkuboPricer: USD price resolver required for ${tokenInfo.symbol} via ${quoteConfig.symbol}`
+        );
+      }
+      const quoteUsdPrice = await this.resolveUsdPrice(quoteConfig.symbol);
+      return {
+        price: priceInQuote * quoteUsdPrice,
+        timestamp: /* @__PURE__ */ new Date()
+      };
+    }
     return {
-      price,
+      price: priceInQuote,
       timestamp: /* @__PURE__ */ new Date()
     };
   }
@@ -5020,7 +5098,10 @@ var PricerFromApi = class extends PricerBase {
     ];
     this.apolloClient = createApolloClient(config);
     this.pragma = new Pragma(config, tokens2);
-    this.ekuboPricer = new EkuboPricer(config, tokens2);
+    this.ekuboPricer = new EkuboPricer(config, tokens2, async (symbol) => {
+      const priceInfo = await this.getPriceFromMyAPI(symbol);
+      return priceInfo.price;
+    });
   }
   async getPrice(tokenSymbol, blockNumber) {
     const tokenInfo = this.tokens.find((t) => t.symbol === tokenSymbol);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.50",
+  "version": "2.0.0-dev.51",
   "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

@@ -36,6 +36,7 @@ const defaultTokens: TokenInfo[] = [{
     displayDecimals: 2,
     priceMethod: 'Avnu',
     indexingType: TokenIndexingType.LST_SCRIPT,
+    intermediateQuoteTokenSymbol: 'STRK',
 }, {
     name: 'ETH',
     symbol: 'ETH',
@@ -249,7 +250,7 @@ const tokens: TokenInfo[] = defaultTokens;
  * - fatalError: Things to do when a fatal error occurs
  */
 export class Global {
-    static cache: Record<string, {value: any, ttl: number, timestamp: number}> = {};
+    static cache: Record<string, { value: any, ttl: number, timestamp: number }> = {};
 
     static fatalError(message: string, err?: Error) {
         logger.error(message);

package/src/interfaces/common.tsx

@@ -46,6 +46,7 @@ export interface TokenInfo {
   priceMethod?: PriceMethod; // preferred price source; tried first, then falls back to other methods
   dontPrice?: boolean; // a flag that skips pricer to check these tokens.
   indexingType: TokenIndexingType;
+  intermediateQuoteTokenSymbol?: string; // for tokens like xSTRK, directly quoting in USDC can lead to higher slippages on avnu, instead can quote in STRK and then convert STRK to USDC
 }
 
 export enum Network {

package/src/modules/ekubo-pricer.ts

@@ -3,19 +3,25 @@ import EkuboPricerAbi from '@/data/ekubo-price-fethcer.abi.json';
 import { PricerBase } from "./pricerBase";
 import { IConfig, TokenInfo } from "@/interfaces";
 import { PriceInfo } from "./pricer";
+import {
+    resolveQuoteTokenConfig,
+} from "./pricer-quote-utils";
+
+export type UsdPriceResolver = (symbol: string) => Promise<number>;
 
 export class EkuboPricer extends PricerBase {
     EKUBO_PRICE_FETCHER_ADDRESS = '0x04946fb4ad5237d97bbb1256eba2080c4fe1de156da6a7f83e3b4823bb6d7da1';
     readonly contract: Contract;
-    // Updating to new USDC_ADDRESS
-    private readonly USDC_ADDRESS = '0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb';
-    private readonly USDC_DECIMALS = 6;
 
-    constructor(config: IConfig, tokens: TokenInfo[]) {
+    constructor(
+        config: IConfig,
+        tokens: TokenInfo[],
+        private readonly resolveUsdPrice?: UsdPriceResolver,
+    ) {
         super(config, tokens);
         this.contract = new Contract({
-            abi: EkuboPricerAbi, 
-            address: this.EKUBO_PRICE_FETCHER_ADDRESS, 
+            abi: EkuboPricerAbi,
+            address: this.EKUBO_PRICE_FETCHER_ADDRESS,
             providerOrAccount: config.provider as RpcProvider
         });
     }
@@ -29,14 +35,24 @@ export class EkuboPricer extends PricerBase {
             throw new Error(`EkuboPricer:getPrice - no token`);
         }
 
+        const tokenInfo = this.tokens.find(t =>
+            t.address.eqString(tokenAddr)
+        );
+
+        if (!tokenInfo) {
+            throw new Error(`Token ${tokenAddr} not found in global tokens`);
+        }
+
+        const quoteConfig = resolveQuoteTokenConfig(tokenInfo, this.tokens);
+
         // get_prices arguments in order:
-        // - quote_token: USDC address (quote token for price calculation)
+        // - quote_token: quote token address for price calculation
         // - base_tokens: array containing the base token address/addresses
         // - period: time period in seconds for TWAP (3600 = 1 hour)
         // - min_token: minimum token amount threshold (min liquidity) in 6 Decimals = 1000000)
         const result: any = await this.contract.call(
             'get_prices',
-            [this.USDC_ADDRESS, [tokenAddr], 3600, 1000000],
+            [quoteConfig.address, [tokenAddr], 3600, 1000000],
             { blockIdentifier }
         );
 
@@ -45,36 +61,39 @@ export class EkuboPricer extends PricerBase {
         }
 
         const priceResult = result[0];
-        
+
         if (!priceResult?.variant?.Price) {
             const variant = priceResult?.variant ? Object.keys(priceResult.variant)[0] : 'Unknown';
             throw new Error(`EkuboPricer: Price fetch failed with variant: ${variant}`);
         }
 
-        const rawPrice = typeof priceResult.variant.Price === 'string' 
-            ? BigInt(priceResult.variant.Price) 
+        const rawPrice = typeof priceResult.variant.Price === 'string'
+            ? BigInt(priceResult.variant.Price)
             : priceResult.variant.Price;
 
-        // Get token info to determine decimals from configured tokens
-        const tokenInfo = this.tokens.find(t => 
-            t.address.address.toLowerCase() === tokenAddr.toLowerCase()
-        );
-        
-        if (!tokenInfo) {
-            throw new Error(`Token ${tokenAddr} not found in global tokens`);
-        }
-
         // Convert from x128 format
         const priceAfterX128 = this.div2Power128(rawPrice);
-        
-        // Adjust for token decimals
-        const decimalAdjustment = 10 ** (tokenInfo.decimals - this.USDC_DECIMALS);
-        const price = priceAfterX128 * decimalAdjustment;
+
+        // Adjust for token decimals relative to quote token decimals
+        const decimalAdjustment = 10 ** (tokenInfo.decimals - quoteConfig.decimals);
+        const priceInQuote = priceAfterX128 * decimalAdjustment;
+
+        if (!quoteConfig.isUsdQuote) {
+            if (!this.resolveUsdPrice) {
+                throw new Error(
+                    `EkuboPricer: USD price resolver required for ${tokenInfo.symbol} via ${quoteConfig.symbol}`,
+                );
+            }
+            const quoteUsdPrice = await this.resolveUsdPrice(quoteConfig.symbol);
+            return {
+                price: priceInQuote * quoteUsdPrice,
+                timestamp: new Date(),
+            };
+        }
 
         return {
-            price,
+            price: priceInQuote,
             timestamp: new Date()
         };
     }
 }
-

package/src/modules/pricer-from-api.ts

@@ -31,7 +31,10 @@ export class PricerFromApi extends PricerBase {
         super(config, tokens);
         this.apolloClient = createApolloClient(config);
         this.pragma = new Pragma(config, tokens);
-        this.ekuboPricer = new EkuboPricer(config, tokens);
+        this.ekuboPricer = new EkuboPricer(config, tokens, async (symbol) => {
+            const priceInfo = await this.getPriceFromMyAPI(symbol);
+            return priceInfo.price;
+        });
     }
 
     async getPrice(tokenSymbol: string, blockNumber?: BlockIdentifier): Promise<PriceInfo> {

package/src/modules/pricer-quote-utils.ts

@@ -0,0 +1,54 @@
+import { TokenInfo } from "@/interfaces/common";
+
+export const PRICER_USDC_ADDRESS =
+    "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
+export const PRICER_USDC_DECIMALS = 6;
+
+export interface QuoteTokenConfig {
+    address: string;
+    decimals: number;
+    symbol: string;
+    isUsdQuote: boolean;
+}
+
+export function resolveQuoteTokenConfig(token: TokenInfo, tokens: TokenInfo[]): QuoteTokenConfig {
+    if (token.intermediateQuoteTokenSymbol) {
+        const intermediateToken = tokens.find(
+            (t) => t.symbol === token.intermediateQuoteTokenSymbol,
+        );
+        if (!intermediateToken) {
+            throw new Error(
+                `Intermediate quote token ${token.intermediateQuoteTokenSymbol} not found for ${token.symbol}`,
+            );
+        }
+
+        return {
+            address: intermediateToken.address.toString(),
+            decimals: intermediateToken.decimals,
+            symbol: intermediateToken.symbol,
+            isUsdQuote: false,
+        };
+    }
+
+    return {
+        address: PRICER_USDC_ADDRESS,
+        decimals: PRICER_USDC_DECIMALS,
+        symbol: "USDC",
+        isUsdQuote: true,
+    };
+}
+
+export async function convertQuoteAmountToUsd(
+    tokenSymbol: string,
+    quoteAmount: number,
+    quoteConfig: QuoteTokenConfig,
+    resolveUsdPrice: (symbol: string) => Promise<number>,
+): Promise<number> {
+    if (quoteConfig.isUsdQuote) {
+        const usdcPrice = await resolveUsdPrice("USDC");
+        return quoteAmount * usdcPrice;
+    }
+
+    const intermediateUsdPrice = await resolveUsdPrice(quoteConfig.symbol);
+    return quoteAmount * intermediateUsdPrice;
+}