@strkfarm/sdk 1.1.68 → 1.1.69

package/dist/index.mjs

@@ -429,6 +429,150 @@ var PricerBase = class {
   }
 };
 
+// src/modules/avnu.ts
+import { uint256 } from "starknet";
+import { fetchBuildExecuteTransaction, fetchQuotes } from "@avnu/avnu-sdk";
+
+// src/utils/oz-merkle.ts
+import { toHex } from "@ericnordelo/strk-merkle-tree/dist/bytes";
+import { processMultiProof, processProof } from "@ericnordelo/strk-merkle-tree/dist/core";
+import { standardLeafHash } from "@ericnordelo/strk-merkle-tree/dist/hashes";
+import { MerkleTreeImpl } from "@ericnordelo/strk-merkle-tree/dist/merkletree";
+import { num as num2 } from "starknet";
+import { pedersen } from "@scure/starknet";
+function hash_leaf(leaf) {
+  if (leaf.data.length < 1) {
+    throw new Error("Invalid leaf data");
+  }
+  let firstElement = leaf.data[0];
+  let value = firstElement;
+  for (let i = 1; i < leaf.data.length; i++) {
+    value = pedersen_hash(value, leaf.data[i]);
+  }
+  return `0x${num2.toHexString(value).replace(/^0x/, "").padStart(64, "0")}`;
+}
+function pedersen_hash(a, b) {
+  return BigInt(pedersen(a, b).toString());
+}
+var StandardMerkleTree = class _StandardMerkleTree extends MerkleTreeImpl {
+  constructor(tree, values, leafEncoding) {
+    super(tree, values, (leaf) => {
+      return hash_leaf(leaf);
+    });
+    this.tree = tree;
+    this.values = values;
+    this.leafEncoding = leafEncoding;
+  }
+  static of(values, leafEncoding = [], options = {}) {
+    const [tree, indexedValues] = MerkleTreeImpl.prepare(values, options, (leaf) => {
+      return hash_leaf(leaf);
+    });
+    return new _StandardMerkleTree(tree, indexedValues, leafEncoding);
+  }
+  static verify(root, leafEncoding, leaf, proof) {
+    return toHex(root) === processProof(standardLeafHash(leafEncoding, leaf), proof);
+  }
+  static verifyMultiProof(root, leafEncoding, multiproof) {
+    return toHex(root) === processMultiProof({
+      leaves: multiproof.leaves.map((leaf) => standardLeafHash(leafEncoding, leaf)),
+      proof: multiproof.proof,
+      proofFlags: multiproof.proofFlags
+    });
+  }
+  dump() {
+    return {
+      format: "standard-v1",
+      leafEncoding: this.leafEncoding,
+      tree: this.tree,
+      values: this.values
+    };
+  }
+};
+
+// src/utils/index.ts
+function assert(condition, message) {
+  if (!condition) {
+    throw new Error(message);
+  }
+}
+function getTrovesEndpoint() {
+  return process.env.TROVES_ENDPOINT || "https://app.troves.fi";
+}
+
+// src/modules/avnu.ts
+var AvnuWrapper = class {
+  async getQuotes(fromToken, toToken, amountWei, taker, retry = 0, excludeSources = ["Haiko(Solvers)"]) {
+    const MAX_RETRY = 5;
+    const params = {
+      sellTokenAddress: fromToken,
+      buyTokenAddress: toToken,
+      sellAmount: amountWei,
+      takerAddress: taker,
+      // excludeSources: ['Nostra', 'Haiko(Solvers)']
+      excludeSources
+      // excludeSources: ['Haiko(Solvers)'] // to resolve InvalidOraclePrice error
+    };
+    assert(fromToken != toToken, "From and to tokens are the same");
+    const quotes = await fetchQuotes(params);
+    const filteredQuotes = quotes.filter((q) => q.sellAmount.toString() == amountWei);
+    if (filteredQuotes.length == 0) {
+      if (retry < MAX_RETRY) {
+        await new Promise((res) => setTimeout(res, 3e3));
+        return await this.getQuotes(fromToken, toToken, amountWei, taker, retry + 1);
+      }
+      throw new Error("no quotes found");
+    }
+    return filteredQuotes[0];
+  }
+  async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount, options) {
+    const calldata = await fetchBuildExecuteTransaction(quote.quoteId, taker, void 0, void 0, options);
+    const call = calldata.calls[1];
+    const callData = call.calldata;
+    const routesLen = Number(callData[11]);
+    assert(routesLen > 0, "No routes found");
+    let startIndex = 12;
+    const routes = [];
+    for (let i = 0; i < routesLen; ++i) {
+      const swap_params_len = Number(callData[startIndex + 4]);
+      const route = {
+        token_from: callData[startIndex],
+        token_to: callData[startIndex + 1],
+        exchange_address: callData[startIndex + 2],
+        percent: Number(callData[startIndex + 3]),
+        additional_swap_params: swap_params_len > 0 ? callData.slice(startIndex + 5, startIndex + 5 + swap_params_len) : []
+      };
+      routes.push(route);
+      startIndex += 5 + swap_params_len;
+    }
+    const _minAmount = minAmount || (quote.buyAmount * 95n / 100n).toString();
+    const swapInfo = {
+      token_from_address: quote.sellTokenAddress,
+      token_from_amount: uint256.bnToUint256(quote.sellAmount),
+      token_to_address: quote.buyTokenAddress,
+      token_to_amount: uint256.bnToUint256(_minAmount),
+      token_to_min_amount: uint256.bnToUint256(_minAmount),
+      beneficiary: taker,
+      integrator_fee_amount_bps: integratorFeeBps,
+      integrator_fee_recipient: integratorFeeRecipient,
+      routes
+    };
+    return swapInfo;
+  }
+  static buildZeroSwap(tokenToSell, beneficiary, tokenToBuy = tokenToSell) {
+    return {
+      token_from_address: tokenToSell.address,
+      token_from_amount: uint256.bnToUint256(0),
+      token_to_address: tokenToBuy.address,
+      token_to_amount: uint256.bnToUint256(0),
+      token_to_min_amount: uint256.bnToUint256(0),
+      beneficiary,
+      integrator_fee_amount_bps: 0,
+      integrator_fee_recipient: beneficiary,
+      routes: []
+    };
+  }
+};
+
 // src/modules/pricer.ts
 var Pricer = class extends PricerBase {
   // e.g. ETH/USDC
@@ -445,7 +589,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://quoter-mainnet-api.ekubo.org/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8";
+    this.EKUBO_API = "https://prod-api-quoter.ekubo.org/23448594291968334/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
     this.refreshInterval = refreshInterval;
     this.staleTime = staleTime;
   }
@@ -579,6 +723,15 @@ var Pricer = class extends PricerBase {
           console.warn(`Ekubo: price err [${token.symbol}]: `, error.message);
           console.warn(`Ekubo: price err [${token.symbol}]: `, Object.keys(error));
         }
+      case "Avnu":
+        try {
+          const result = await this._getAvnuPrice(token, new Web3Number(token.priceCheckAmount ? token.priceCheckAmount : 1, token.decimals));
+          this.methodToUse[token.symbol] = "Avnu";
+          return result;
+        } catch (error) {
+          console.warn(`Avnu: price err [${token.symbol}]: `, error.message);
+          console.warn(`Avnu: price err [${token.symbol}]: `, Object.keys(error));
+        }
     }
     if (defaultMethod == "all") {
       return await this._getPrice(token, "Coinbase");
@@ -594,6 +747,22 @@ var Pricer = class extends PricerBase {
   async _getPriceCoinMarketCap(token) {
     throw new Error("Not implemented");
   }
+  async _getAvnuPrice(token, amountIn = new Web3Number(1, token.decimals), retry = 0) {
+    logger.verbose(`Getting price of ${token.symbol} using Ekubo, amountIn: ${amountIn.toWei()}`);
+    const avnuWrapper = new AvnuWrapper();
+    const usdcAddress = "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb";
+    const quote = await avnuWrapper.getQuotes(token.address.toString(), usdcAddress, 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 usdcPrice = 1;
+    logger.verbose(`USDC Price: ${usdcPrice}`);
+    return outputUSDC * usdcPrice;
+  }
   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());
@@ -2107,150 +2276,6 @@ var ERC20 = class {
   }
 };
 
-// src/modules/avnu.ts
-import { uint256 } from "starknet";
-import { fetchBuildExecuteTransaction, fetchQuotes } from "@avnu/avnu-sdk";
-
-// src/utils/oz-merkle.ts
-import { toHex } from "@ericnordelo/strk-merkle-tree/dist/bytes";
-import { processMultiProof, processProof } from "@ericnordelo/strk-merkle-tree/dist/core";
-import { standardLeafHash } from "@ericnordelo/strk-merkle-tree/dist/hashes";
-import { MerkleTreeImpl } from "@ericnordelo/strk-merkle-tree/dist/merkletree";
-import { num as num2 } from "starknet";
-import { pedersen } from "@scure/starknet";
-function hash_leaf(leaf) {
-  if (leaf.data.length < 1) {
-    throw new Error("Invalid leaf data");
-  }
-  let firstElement = leaf.data[0];
-  let value = firstElement;
-  for (let i = 1; i < leaf.data.length; i++) {
-    value = pedersen_hash(value, leaf.data[i]);
-  }
-  return `0x${num2.toHexString(value).replace(/^0x/, "").padStart(64, "0")}`;
-}
-function pedersen_hash(a, b) {
-  return BigInt(pedersen(a, b).toString());
-}
-var StandardMerkleTree = class _StandardMerkleTree extends MerkleTreeImpl {
-  constructor(tree, values, leafEncoding) {
-    super(tree, values, (leaf) => {
-      return hash_leaf(leaf);
-    });
-    this.tree = tree;
-    this.values = values;
-    this.leafEncoding = leafEncoding;
-  }
-  static of(values, leafEncoding = [], options = {}) {
-    const [tree, indexedValues] = MerkleTreeImpl.prepare(values, options, (leaf) => {
-      return hash_leaf(leaf);
-    });
-    return new _StandardMerkleTree(tree, indexedValues, leafEncoding);
-  }
-  static verify(root, leafEncoding, leaf, proof) {
-    return toHex(root) === processProof(standardLeafHash(leafEncoding, leaf), proof);
-  }
-  static verifyMultiProof(root, leafEncoding, multiproof) {
-    return toHex(root) === processMultiProof({
-      leaves: multiproof.leaves.map((leaf) => standardLeafHash(leafEncoding, leaf)),
-      proof: multiproof.proof,
-      proofFlags: multiproof.proofFlags
-    });
-  }
-  dump() {
-    return {
-      format: "standard-v1",
-      leafEncoding: this.leafEncoding,
-      tree: this.tree,
-      values: this.values
-    };
-  }
-};
-
-// src/utils/index.ts
-function assert(condition, message) {
-  if (!condition) {
-    throw new Error(message);
-  }
-}
-function getTrovesEndpoint() {
-  return process.env.TROVES_ENDPOINT || "https://app.troves.fi";
-}
-
-// src/modules/avnu.ts
-var AvnuWrapper = class {
-  async getQuotes(fromToken, toToken, amountWei, taker, retry = 0, excludeSources = ["Haiko(Solvers)"]) {
-    const MAX_RETRY = 5;
-    const params = {
-      sellTokenAddress: fromToken,
-      buyTokenAddress: toToken,
-      sellAmount: amountWei,
-      takerAddress: taker,
-      // excludeSources: ['Nostra', 'Haiko(Solvers)']
-      excludeSources
-      // excludeSources: ['Haiko(Solvers)'] // to resolve InvalidOraclePrice error
-    };
-    assert(fromToken != toToken, "From and to tokens are the same");
-    const quotes = await fetchQuotes(params);
-    const filteredQuotes = quotes.filter((q) => q.sellAmount.toString() == amountWei);
-    if (filteredQuotes.length == 0) {
-      if (retry < MAX_RETRY) {
-        await new Promise((res) => setTimeout(res, 3e3));
-        return await this.getQuotes(fromToken, toToken, amountWei, taker, retry + 1);
-      }
-      throw new Error("no quotes found");
-    }
-    return filteredQuotes[0];
-  }
-  async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount, options) {
-    const calldata = await fetchBuildExecuteTransaction(quote.quoteId, taker, void 0, void 0, options);
-    const call = calldata.calls[1];
-    const callData = call.calldata;
-    const routesLen = Number(callData[11]);
-    assert(routesLen > 0, "No routes found");
-    let startIndex = 12;
-    const routes = [];
-    for (let i = 0; i < routesLen; ++i) {
-      const swap_params_len = Number(callData[startIndex + 4]);
-      const route = {
-        token_from: callData[startIndex],
-        token_to: callData[startIndex + 1],
-        exchange_address: callData[startIndex + 2],
-        percent: Number(callData[startIndex + 3]),
-        additional_swap_params: swap_params_len > 0 ? callData.slice(startIndex + 5, startIndex + 5 + swap_params_len) : []
-      };
-      routes.push(route);
-      startIndex += 5 + swap_params_len;
-    }
-    const _minAmount = minAmount || (quote.buyAmount * 95n / 100n).toString();
-    const swapInfo = {
-      token_from_address: quote.sellTokenAddress,
-      token_from_amount: uint256.bnToUint256(quote.sellAmount),
-      token_to_address: quote.buyTokenAddress,
-      token_to_amount: uint256.bnToUint256(_minAmount),
-      token_to_min_amount: uint256.bnToUint256(_minAmount),
-      beneficiary: taker,
-      integrator_fee_amount_bps: integratorFeeBps,
-      integrator_fee_recipient: integratorFeeRecipient,
-      routes
-    };
-    return swapInfo;
-  }
-  static buildZeroSwap(tokenToSell, beneficiary, tokenToBuy = tokenToSell) {
-    return {
-      token_from_address: tokenToSell.address,
-      token_from_amount: uint256.bnToUint256(0),
-      token_to_address: tokenToBuy.address,
-      token_to_amount: uint256.bnToUint256(0),
-      token_to_min_amount: uint256.bnToUint256(0),
-      beneficiary,
-      integrator_fee_amount_bps: 0,
-      integrator_fee_recipient: beneficiary,
-      routes: []
-    };
-  }
-};
-
 // src/modules/ekubo-quoter.ts
 import axios5 from "axios";
 var EkuboQuoter = class {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@strkfarm/sdk",
-    "version": "1.1.68",
+    "version": "1.1.69",
     "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/pricer.ts

@@ -5,6 +5,7 @@ import { IConfig } from "@/interfaces/common";
 import { Web3Number } from "@/dataTypes";
 import { PricerBase } from "./pricerBase";
 import { logger } from "@/utils/logger";
+import { AvnuWrapper } from "./avnu";
 
 export interface PriceInfo {
     price: number,
@@ -21,14 +22,14 @@ export class Pricer extends PricerBase {
 
     // code populates this map during runtime to determine which method to use for a given token
     // The method set will be the first one to try after first attempt
-    protected methodToUse: {[tokenSymbol: string]: 'Ekubo' | 'Coinbase' | 'Coinmarketcap'} = {};
+    protected methodToUse: {[tokenSymbol: string]: 'Ekubo' | 'Coinbase' | 'Coinmarketcap' | 'Avnu'} = {};
 
     /**
      * TOKENA and TOKENB are the two token names to get price of TokenA in terms of TokenB
      */
     // ! switch to USDC (new) later
     protected PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
-    protected EKUBO_API = 'https://quoter-mainnet-api.ekubo.org/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8'; // e.g. ETH/USDC
+    protected EKUBO_API = 'https://prod-api-quoter.ekubo.org/23448594291968334/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb'; // e.g. ETH/USDC
 
     constructor(config: IConfig, tokens: TokenInfo[], refreshInterval = 30000, staleTime = 60000) {
         super(config, tokens);
@@ -175,6 +176,15 @@ export class Pricer extends PricerBase {
                     console.warn(`Ekubo: price err [${token.symbol}]: `, Object.keys(error));
                     // do nothing, try next
                 }
+            case 'Avnu':
+                try {
+                    const result = await this._getAvnuPrice(token, new Web3Number(token.priceCheckAmount ? token.priceCheckAmount : 1, token.decimals));
+                    this.methodToUse[token.symbol] = 'Avnu';
+                    return result;
+                } catch (error: any) {
+                    console.warn(`Avnu: price err [${token.symbol}]: `, error.message);
+                    console.warn(`Avnu: price err [${token.symbol}]: `, Object.keys(error));
+                }
         }
 
         // if methodToUse is the default one, pass Coinbase to try all from start
@@ -201,6 +211,29 @@ export class Pricer extends PricerBase {
         throw new Error("Not implemented");
     }
 
+    async _getAvnuPrice(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 avnuWrapper = new AvnuWrapper();
+        const usdcAddress = '0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb';
+        const quote = await avnuWrapper.getQuotes(token.address.toString(), usdcAddress, 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) {
+            // try again with a higher amount
+            const amountIn = new Web3Number(100, token.decimals); // 100 unit of token
+            return await this._getAvnuPrice(token, amountIn, retry + 1);
+        }
+
+        // if usdc depegs, it will not longer be 1 USD
+        // so we need to get the price of USDC in USD
+        // and then convert the outputUSDC to USD
+        const usdcPrice = 1; // (await this.getPrice('USDC')).price;
+        logger.verbose(`USDC Price: ${usdcPrice}`);
+        return outputUSDC * usdcPrice;
+    }
+
     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());