@strkfarm/sdk 2.0.0-staging.69 → 2.0.0-staging.70

package/src/modules/pricer.ts

@@ -7,12 +7,23 @@ import { PricerBase } from "./pricerBase";
 import { logger } from "@/utils/logger";
 import { AvnuWrapper } from "./avnu";
 import { BlockIdentifier } from "starknet";
+import { PricerAvnuApi } from "./pricer-avnu-api";
 
 export interface PriceInfo {
     price: number,
     timestamp: Date
 }
 
+type PriceMethod = 'AvnuApi' | 'Coinbase' | 'Coinmarketcap' | 'Ekubo' | 'Avnu';
+
+const PRICE_METHOD_PRIORITY: PriceMethod[] = [
+    'AvnuApi',
+    'Coinbase',
+    'Coinmarketcap',
+    'Ekubo',
+    'Avnu',
+];
+
 export class Pricer extends PricerBase {
     protected prices: {
         [key: string]: PriceInfo
@@ -21,9 +32,11 @@ export class Pricer extends PricerBase {
     refreshInterval = 30000;
     staleTime = 60000;
 
+    protected readonly avnuApiPricer: PricerAvnuApi;
+
     // 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' | 'Avnu'} = {};
+    protected methodToUse: {[tokenSymbol: string]: PriceMethod} = {};
 
     /**
      * TOKENA and TOKENB are the two token names to get price of TokenA in terms of TokenB
@@ -36,6 +49,7 @@ export class Pricer extends PricerBase {
         super(config, tokens);
         this.refreshInterval = refreshInterval;
         this.staleTime = staleTime;
+        this.avnuApiPricer = new PricerAvnuApi(config, tokens);
     }
 
     isReady() {
@@ -69,6 +83,7 @@ export class Pricer extends PricerBase {
     }
 
     start() {
+        this.avnuApiPricer.start();
         this._loadPrices();
         setInterval(() => {
             this._loadPrices();
@@ -96,6 +111,9 @@ export class Pricer extends PricerBase {
             let retry = 0;
             while (retry < MAX_RETRIES) {
                 try {
+                    if (token.dontPrice) {
+                        return;
+                    }
                     if (token.symbol === 'USDT' || token.symbol === 'USDC') {
                         this.prices[token.symbol] = {
                             price: 1,
@@ -145,56 +163,56 @@ export class Pricer extends PricerBase {
         }
     }
 
-    async _getPrice(token: TokenInfo, defaultMethod = 'all'): Promise<number> {
-        const methodToUse: string = this.methodToUse[token.symbol] || defaultMethod; // default start with coinbase
-        logger.verbose(`Fetching price of ${token.symbol} using ${methodToUse}`);
-        switch (methodToUse) {
+    async _getPrice(token: TokenInfo): Promise<number> {
+        const pinned = this.methodToUse[token.symbol];
+        if (pinned) {
+            logger.verbose(`Fetching price of ${token.symbol} using pinned ${pinned}`);
+            try {
+                return await this._tryPriceMethod(token, pinned);
+            } catch (error: any) {
+                console.warn(`${pinned}: pinned price failed [${token.symbol}]: `, error.message);
+                delete this.methodToUse[token.symbol];
+            }
+        }
+
+        for (const method of PRICE_METHOD_PRIORITY) {
+            logger.verbose(`Fetching price of ${token.symbol} using ${method}`);
+            try {
+                const result = await this._tryPriceMethod(token, method);
+                this.methodToUse[token.symbol] = method;
+                return result;
+            } catch (error: any) {
+                console.warn(`${method}: price err [${token.symbol}]: `, error.message);
+            }
+        }
+
+        throw new FatalError(`Price not found for ${token.symbol}`);
+    }
+
+    protected async _tryPriceMethod(token: TokenInfo, method: PriceMethod): Promise<number> {
+        switch (method) {
+            case 'AvnuApi':
+                return await this._getPriceAvnuApi(token);
             case 'Coinbase':
-                // try {
-                //     const result = await this._getPriceCoinbase(token);
-                //     this.methodToUse[token.symbol] = 'Coinbase';
-                //     return result;
-                // } catch (error: any) {
-                //     console.warn(`Coinbase: price err: message [${token.symbol}]: `, error.message);
-                //     // do nothing, try next
-                // }
+                return await this._getPriceCoinbase(token);
             case 'Coinmarketcap':
-                try {
-                    const result = await this._getPriceCoinMarketCap(token);
-                    this.methodToUse[token.symbol] = 'Coinmarketcap';
-                    return result;
-                } catch (error: any) {
-                    console.warn(`CoinMarketCap: price err [${token.symbol}]: `, Object.keys(error));
-                    console.warn(`CoinMarketCap: price err [${token.symbol}]: `, error.message);
-                }
+                return await this._getPriceCoinMarketCap(token);
             case 'Ekubo':
-                try {
-                    const result = await this._getPriceEkubo(token, new Web3Number(token.priceCheckAmount ? token.priceCheckAmount : 1, token.decimals));
-                    this.methodToUse[token.symbol] = 'Ekubo';
-                    return result;
-                } catch (error: any) {
-                    console.warn(`Ekubo: price err [${token.symbol}]: `, error.message);
-                    console.warn(`Ekubo: price err [${token.symbol}]: `, Object.keys(error));
-                    // do nothing, try next
-                }
+                return await this._getPriceEkubo(
+                    token,
+                    new Web3Number(token.priceCheckAmount ? token.priceCheckAmount : 1, token.decimals),
+                );
             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
-        if (defaultMethod == 'all') {
-            // try again with coinbase
-            return await this._getPrice(token, 'Coinbase');
+                return await this._getAvnuPrice(
+                    token,
+                    new Web3Number(token.priceCheckAmount ? token.priceCheckAmount : 1, token.decimals),
+                );
         }
+    }
 
-        throw new FatalError(`Price not found for ${token.symbol}`);
+    async _getPriceAvnuApi(token: TokenInfo): Promise<number> {
+        const priceInfo = await this.avnuApiPricer.getPrice(token.symbol);
+        return priceInfo.price;
     }
 
     async _getPriceCoinbase(token: TokenInfo) {

package/src/node/pricer-redis.ts

@@ -18,6 +18,7 @@ export class PricerRedis extends Pricer {
         await this.initRedis(redisUrl);
 
         logger.info(`Starting Pricer with Redis`);
+        this.avnuApiPricer.start();
         this._loadPrices(this._setRedisPrices.bind(this));
         setInterval(() => {
             this._loadPrices(this._setRedisPrices.bind(this));

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

@@ -874,7 +874,10 @@ export class EkuboCLVault extends BaseStrategy<
     const token1Usd = Number(amount1.toFixed(13)) * P1.price;
     const totalUsdValue = token0Usd + token1Usd;
 
-    if (totalUsdValue === 0 || token0Usd === 0 || token1Usd === 0 || amount0.eq(0) || amount1.eq(0)) {
+    if (
+      (totalUsdValue === 0 || token0Usd === 0 || token1Usd === 0 || amount0.eq(0) || amount1.eq(0)) &&
+      this.metadata.settings?.liveStatus === StrategyLiveStatus.ACTIVE
+    ) {
       logger.warn(
         `${this.metadata.name}:getTVL - Zero value detected: ` +
         `usdValue=${totalUsdValue}, ` +

package/src/strategies/universal-strategy.tsx

@@ -469,7 +469,10 @@ export class UniversalStrategy<
     );
     const usdValue = Number(amount.toFixed(6)) * price.price;
 
-    if (usdValue === 0 || amount.eq(0)) {
+    if (
+      (usdValue === 0 || amount.eq(0)) &&
+      this.metadata.settings?.liveStatus === StrategyLiveStatus.ACTIVE
+    ) {
       logger.warn(
         `${this.metadata.name}:getTVL - Zero value detected: ` +
         `usdValue=${usdValue}, ` +

package/src/strategies/yoloVault.ts

@@ -463,7 +463,10 @@ export class YoLoVault extends BaseStrategy<DualTokenInfo, SingleActionAmount, D
 
       const totalUsdValue = primaryTokenUsd.plus(secondaryTokenUsd).toNumber();
 
-      if (totalUsdValue === 0 || primaryTokenAmount.eq(0) || secondaryTokenAmount.eq(0)) {
+      if (
+        (totalUsdValue === 0 || primaryTokenAmount.eq(0) || secondaryTokenAmount.eq(0)) &&
+        this.metadata.settings?.liveStatus === StrategyLiveStatus.ACTIVE
+      ) {
         logger.warn(
           `${this.metadata.name}:getTVL - Zero value detected: ` +
           `usdValue=${totalUsdValue}, ` +