@scallop-io/sui-scallop-sdk 1.3.4-alpha.7 → 1.3.4-hotfix

package/src/models/scallopClient.ts

@@ -34,7 +34,6 @@ import type {
   ScallopClientVeScaReturnType,
   ScallopClientInstanceParams,
 } from '../types';
-import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -65,9 +64,9 @@ export class ScallopClient {
   ) {
     this.params = params;
     this.suiKit =
-      instance?.suiKit ?? instance?.builder?.suiKit ?? newSuiKit(params);
+      instance?.suiKit ?? instance?.builder?.suiKit ?? new SuiKit(params);
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress ?? this.suiKit.currentAddress()
+      params?.walletAddress || this.suiKit.currentAddress()
     );
 
     if (instance?.builder) {
@@ -84,7 +83,7 @@ export class ScallopClient {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId ?? ADDRESSES_ID,
+          id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },
@@ -143,7 +142,7 @@ export class ScallopClient {
    * @return Obligations data.
    */
   public async getObligations(ownerAddress?: string) {
-    const owner = ownerAddress ?? this.walletAddress;
+    const owner = ownerAddress || this.walletAddress;
     return await this.query.getObligations(owner);
   }
 
@@ -170,7 +169,7 @@ export class ScallopClient {
    * @return All stake accounts data.
    */
   async getAllStakeAccounts(ownerAddress?: string) {
-    const owner = ownerAddress ?? this.walletAddress;
+    const owner = ownerAddress || this.walletAddress;
     return await this.query.getAllStakeAccounts(owner);
   }
 
@@ -188,7 +187,7 @@ export class ScallopClient {
     stakeMarketCoinName: SupportStakeMarketCoins,
     ownerAddress?: string
   ) {
-    const owner = ownerAddress ?? this.walletAddress;
+    const owner = ownerAddress || this.walletAddress;
     return await this.query.getStakeAccounts(stakeMarketCoinName, owner);
   }
 
@@ -273,11 +272,11 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const obligations = await this.query.getObligations(sender);
-    const specificObligationId = obligationId ?? obligations[0]?.id;
+    const specificObligationId = obligationId || obligations[0]?.id;
     if (specificObligationId) {
       await txBlock.addCollateralQuick(
         amount,
@@ -320,7 +319,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const collateralCoin = await txBlock.takeCollateralQuick(
@@ -366,7 +365,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const sCoin = await txBlock.depositQuick(amount, poolCoinName);
@@ -410,14 +409,14 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeMarketCoinName =
       this.utils.parseMarketCoinName<SupportStakeMarketCoins>(stakeCoinName);
     const stakeAccounts =
       await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId ?? stakeAccounts[0]?.id;
+    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
 
     const marketCoin = await txBlock.depositQuick(amount, stakeCoinName, false);
     if (targetStakeAccount) {
@@ -467,7 +466,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const coin = await txBlock.withdrawQuick(amount, poolCoinName);
@@ -502,7 +501,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const availableStake = (
@@ -550,7 +549,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const availableStake = (
@@ -611,7 +610,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
     const [coin, loan] = txBlock.borrowFlashLoan(amount, poolCoinName);
     txBlock.repayFlashLoan(await callback(txBlock, coin), loan, poolCoinName);
@@ -648,7 +647,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeAccount = txBlock.createStakeAccount(marketCoinName);
@@ -692,12 +691,12 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeAccounts =
       await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId ?? stakeAccounts[0]?.id;
+    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
     if (targetStakeAccount) {
       await txBlock.stakeQuick(amount, stakeMarketCoinName, targetStakeAccount);
     } else {
@@ -744,7 +743,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const sCoin = await txBlock.unstakeQuick(
@@ -803,7 +802,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeMarketCoin = await txBlock.unstakeQuick(
@@ -864,7 +863,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const rewardCoins = await txBlock.claimQuick(
@@ -900,7 +899,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKeyId);
@@ -930,7 +929,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     await txBlock.unstakeObligationQuick(obligationId, obligationKeyId);
@@ -962,7 +961,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const rewardCoins = [];
@@ -1187,7 +1186,7 @@ export class ScallopClient {
     }
 
     const txBlock = this.builder.createTxBlock();
-    const recipient = receiveAddress ?? this.walletAddress;
+    const recipient = receiveAddress || this.walletAddress;
     const packageId = this.address.get('core.packages.testCoin.id');
     const treasuryId = this.address.get(`core.coins.${assetCoinName}.treasury`);
     const target = `${packageId}::${assetCoinName}::mint`;

package/src/models/scallopQuery.ts

@@ -47,9 +47,6 @@ import {
   SupportBorrowIncentiveCoins,
   SupportSCoin,
   ScallopQueryInstanceParams,
-  MarketPool,
-  CoinPrices,
-  MarketPools,
 } from '../types';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
@@ -64,13 +61,9 @@ import {
   getSCoinTotalSupply,
 } from 'src/queries/sCoinQuery';
 import { normalizeSuiAddress } from '@mysten/sui/utils';
-import {
-  getSupplyLimit,
-  getIsolatedAssets,
-  isIsolatedAsset,
-} from 'src/queries';
+import { getSupplyLimit } from 'src/queries/supplyLimit';
 import { withIndexerFallback } from 'src/utils/indexer';
-import { newSuiKit } from './suiKit';
+import { getIsolatedAssets, isIsolatedAsset } from 'src/queries/isolatedAsset';
 
 /**
  * @description
@@ -100,10 +93,10 @@ export class ScallopQuery {
   ) {
     this.params = params;
     this.suiKit =
-      instance?.suiKit ?? instance?.utils?.suiKit ?? newSuiKit(params);
+      instance?.suiKit ?? instance?.utils?.suiKit ?? new SuiKit(params);
 
     this.walletAddress = normalizeSuiAddress(
-      params.walletAddress ?? this.suiKit.currentAddress()
+      params.walletAddress || this.suiKit.currentAddress()
     );
 
     if (instance?.utils) {
@@ -118,7 +111,7 @@ export class ScallopQuery {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId ?? ADDRESSES_ID,
+          id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },
@@ -190,11 +183,8 @@ export class ScallopQuery {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  public async queryMarket(
-    indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
-  ) {
-    return await queryMarket(this, indexer, args?.coinPrices);
+  public async queryMarket(indexer: boolean = false) {
+    return await queryMarket(this, indexer);
   }
 
   /**
@@ -210,12 +200,9 @@ export class ScallopQuery {
    */
   public async getMarketPools(
     poolCoinNames?: SupportPoolCoins[],
-    indexer: boolean = false,
-    args?: {
-      coinPrices?: CoinPrices;
-    }
+    indexer: boolean = false
   ) {
-    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
+    return await getMarketPools(this, poolCoinNames, indexer);
   }
 
   /**
@@ -227,19 +214,9 @@ export class ScallopQuery {
    */
   public async getMarketPool(
     poolCoinName: SupportPoolCoins,
-    indexer: boolean = false,
-    args?: {
-      marketObject?: SuiObjectData | null;
-      coinPrice?: number;
-    }
+    indexer: boolean = false
   ) {
-    return await getMarketPool(
-      this,
-      poolCoinName,
-      indexer,
-      args?.marketObject,
-      args?.coinPrice
-    );
+    return await getMarketPool(this, poolCoinName, indexer);
   }
 
   /**
@@ -381,19 +358,9 @@ export class ScallopQuery {
    */
   public async getSpools(
     stakeMarketCoinNames?: SupportStakeMarketCoins[],
-    indexer: boolean = false,
-    args?: {
-      marketPools?: MarketPools;
-      coinPrices?: CoinPrices;
-    }
+    indexer: boolean = false
   ) {
-    return await getSpools(
-      this,
-      stakeMarketCoinNames,
-      indexer,
-      args?.marketPools,
-      args?.coinPrices
-    );
+    return await getSpools(this, stakeMarketCoinNames, indexer);
   }
 
   /**
@@ -405,16 +372,9 @@ export class ScallopQuery {
    */
   public async getSpool(
     stakeMarketCoinName: SupportStakeMarketCoins,
-    indexer: boolean = false,
-    args?: { marketPool?: MarketPool; coinPrices?: CoinPrices }
+    indexer: boolean = false
   ) {
-    return await getSpool(
-      this,
-      stakeMarketCoinName,
-      indexer,
-      args?.marketPool,
-      args?.coinPrices
-    );
+    return await getSpool(this, stakeMarketCoinName, indexer);
   }
 
   /**
@@ -535,15 +495,9 @@ export class ScallopQuery {
    */
   public async getBorrowIncentivePools(
     coinNames?: SupportBorrowIncentiveCoins[],
-    indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
+    indexer: boolean = false
   ) {
-    return await getBorrowIncentivePools(
-      this,
-      coinNames,
-      indexer,
-      args?.coinPrices
-    );
+    return await getBorrowIncentivePools(this, coinNames, indexer);
   }
 
   /**

package/src/models/scallopUtils.ts

@@ -18,11 +18,8 @@ import {
   SUPPORT_SCOIN,
   sCoinIds,
   suiBridgeCoins,
-  COIN_GECKGO_IDS,
-  POOL_ADDRESSES,
-  sCoinTypeToName,
 } from '../constants';
-import { getPythPrices, queryObligation } from '../queries';
+import { getPythPrice, queryObligation } from '../queries';
 import {
   parseDataFromPythPriceFeed,
   isMarketCoin,
@@ -31,7 +28,7 @@ import {
   isSuiBridgeAsset,
   isWormholeAsset,
 } from '../utils';
-import { PYTH_ENDPOINTS, PYTH_FEED_IDS } from 'src/constants/pyth';
+import { PYTH_ENDPOINTS } from 'src/constants/pyth';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import type {
@@ -42,16 +39,15 @@ import type {
   SupportStakeMarketCoins,
   SupportBorrowIncentiveCoins,
   CoinPrices,
+  PriceMap,
   CoinWrappedType,
   SupportSCoin,
   ScallopUtilsInstanceParams,
   SupportSuiBridgeCoins,
   SupportWormholeCoins,
-  PoolAddressInfo,
 } from '../types';
 import { queryKeys } from 'src/constants';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
-import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -73,6 +69,7 @@ export class ScallopUtils {
   public address: ScallopAddress;
   public cache: ScallopCache;
   public walletAddress: string;
+  private _priceMap: PriceMap = new Map();
 
   public constructor(
     params: ScallopUtilsParams,
@@ -83,7 +80,9 @@ export class ScallopUtils {
       ...params,
     };
     this.suiKit =
-      instance?.suiKit ?? instance?.address?.cache._suiKit ?? newSuiKit(params);
+      instance?.suiKit ??
+      instance?.address?.cache._suiKit ??
+      new SuiKit(params);
 
     this.walletAddress = params.walletAddress ?? this.suiKit.currentAddress();
 
@@ -101,7 +100,7 @@ export class ScallopUtils {
         instance?.address ??
         new ScallopAddress(
           {
-            id: params?.addressesId ?? ADDRESSES_ID,
+            id: params?.addressesId || ADDRESSES_ID,
             network: params?.networkType,
             forceInterface: params?.forceAddressesInterface,
           },
@@ -225,7 +224,6 @@ export class ScallopUtils {
       return undefined;
     }
   }
-
   /**
    * Convert sCoin name into sCoin type
    * @param sCoinName
@@ -235,15 +233,6 @@ export class ScallopUtils {
     return sCoinIds[sCoinName];
   }
 
-  /**
-   * Convert sCoinType into sCoin name
-   * @param sCoinType
-   * @returns sCoin name
-   */
-  public parseSCoinNameFromType(sCoinType: string) {
-    return sCoinTypeToName[sCoinType];
-  }
-
   /**
    * Convert sCoin name into its underlying coin type
    * @param sCoinName
@@ -272,7 +261,7 @@ export class ScallopUtils {
    */
   public parseMarketCoinType(coinName: SupportCoins) {
     const protocolObjectId =
-      this.address.get('core.object') ?? PROTOCOL_OBJECT_ID;
+      this.address.get('core.object') || PROTOCOL_OBJECT_ID;
     const coinType = this.parseCoinType(coinName);
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
@@ -301,7 +290,7 @@ export class ScallopUtils {
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes('reserve::MarketCoin');
-    coinType = coinTypeMatch?.[1] ?? coinType;
+    coinType = coinTypeMatch?.[1] || coinType;
 
     const wormHoleCoinTypeMap: Record<string, SupportAssetCoins> = {
       [`${
@@ -439,7 +428,7 @@ export class ScallopUtils {
     coinType: string = SUI_TYPE_ARG,
     ownerAddress?: string
   ) {
-    ownerAddress = ownerAddress ?? this.suiKit.currentAddress();
+    ownerAddress = ownerAddress || this.suiKit.currentAddress();
     const coins = await this.suiKit.suiInteractor.selectCoins(
       ownerAddress,
       amount,
@@ -519,68 +508,100 @@ export class ScallopUtils {
    * @return  Asset coin price.
    */
   public async getCoinPrices(
-    _: SupportAssetCoins[] = [
+    assetCoinNames: SupportAssetCoins[] = [
       ...new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS]),
     ] as SupportAssetCoins[]
   ) {
-    let coinPrices: CoinPrices = {};
-
-    const endpoints =
-      this.params.pythEndpoints ??
-      PYTH_ENDPOINTS[this.isTestnet ? 'testnet' : 'mainnet'];
-
-    const failedRequests: Set<SupportAssetCoins> = new Set([
-      ...SUPPORT_POOLS,
-      ...SUPPORT_COLLATERALS,
-    ]);
-
-    for (const endpoint of endpoints) {
-      const priceIdPairs = Array.from(failedRequests.values()).reduce(
-        (acc, coinName) => {
-          const priceId = this.address.get(
-            `core.coins.${coinName}.oracle.pyth.feed`
-          );
-          acc.push([coinName, priceId]);
-          return acc;
-        },
-        [] as [string, string][]
-      );
+    const coinPrices: CoinPrices = {};
+    const existPricesCoinNames: SupportAssetCoins[] = [];
+    const lackPricesCoinNames: SupportAssetCoins[] = [];
+
+    assetCoinNames.forEach((assetCoinName) => {
+      if (
+        this._priceMap.has(assetCoinName) &&
+        Date.now() - this._priceMap.get(assetCoinName)!.publishTime < 1000 * 60
+      ) {
+        existPricesCoinNames.push(assetCoinName);
+      } else {
+        lackPricesCoinNames.push(assetCoinName);
+        this.cache.queryClient.invalidateQueries({
+          queryKey: queryKeys.oracle.getPythLatestPriceFeed(
+            this.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
+          ),
+        });
+      }
+    });
 
-      const priceIds = priceIdPairs.map(([_, priceId]) => priceId);
+    if (existPricesCoinNames.length > 0) {
+      for (const coinName of existPricesCoinNames) {
+        coinPrices[coinName] = this._priceMap.get(coinName)!.price;
+      }
+    }
 
-      const pythConnection = new SuiPriceServiceConnection(endpoint, {
-        timeout: 2000,
-      });
+    if (lackPricesCoinNames.length > 0) {
+      const endpoints =
+        this.params.pythEndpoints ??
+        PYTH_ENDPOINTS[this.isTestnet ? 'testnet' : 'mainnet'];
 
-      try {
-        const feeds = await this.cache.queryClient.fetchQuery({
-          queryKey: queryKeys.oracle.getPythLatestPriceFeeds(),
-          queryFn: async () => {
-            return await pythConnection.getLatestPriceFeeds(priceIds);
+      const failedRequests: Set<SupportAssetCoins> = new Set(
+        lackPricesCoinNames
+      );
+
+      for (const endpoint of endpoints) {
+        const priceIds = Array.from(failedRequests.values()).reduce(
+          (acc, coinName) => {
+            const priceId = this.address.get(
+              `core.coins.${coinName}.oracle.pyth.feed`
+            );
+            acc[coinName] = priceId;
+            return acc;
           },
-          staleTime: 30000,
-          gcTime: 30000,
-        });
-        if (feeds) {
-          feeds.forEach((feed, idx) => {
-            const coinName = priceIdPairs[idx][0] as SupportAssetCoins;
-            const data = parseDataFromPythPriceFeed(feed, this.address);
-            coinPrices[coinName as SupportAssetCoins] = data.price;
-            failedRequests.delete(coinName as SupportAssetCoins); // remove success price feed to prevent duplicate request on the next endpoint
-          });
-        }
-      } catch (e: any) {
-        console.error(e.message);
+          {} as Record<SupportAssetCoins, string>
+        );
+
+        await Promise.allSettled(
+          Object.entries(priceIds).map(async ([coinName, priceId]) => {
+            const pythConnection = new SuiPriceServiceConnection(endpoint);
+            try {
+              const feed = await this.cache.queryClient.fetchQuery({
+                queryKey: queryKeys.oracle.getPythLatestPriceFeed(priceId),
+                queryFn: async () => {
+                  return (
+                    (await pythConnection.getLatestPriceFeeds([priceId])) ?? []
+                  );
+                },
+              });
+              if (feed[0]) {
+                const data = parseDataFromPythPriceFeed(feed[0], this.address);
+                this._priceMap.set(coinName as SupportAssetCoins, {
+                  price: data.price,
+                  publishTime: data.publishTime,
+                });
+                coinPrices[coinName as SupportAssetCoins] = data.price;
+              }
+              failedRequests.delete(coinName as SupportAssetCoins); // remove success price feed to prevent duplicate request on the next endpoint
+            } catch (e) {
+              console.warn(
+                `Failed to get price ${coinName} feeds with endpoint ${endpoint}: ${e}`
+              );
+            }
+          })
+        );
+        if (failedRequests.size === 0) break;
       }
-      if (failedRequests.size === 0) break;
-    }
 
-    if (failedRequests.size > 0) {
-      coinPrices = {
-        ...coinPrices,
-        ...(await getPythPrices(this, Array.from(failedRequests.values()))),
-      };
-      failedRequests.clear();
+      if (failedRequests.size > 0) {
+        await Promise.allSettled(
+          Array.from(failedRequests.values()).map(async (coinName) => {
+            const price = await getPythPrice(this, coinName);
+            this._priceMap.set(coinName, {
+              price: price,
+              publishTime: Date.now(),
+            });
+            coinPrices[coinName] = price;
+          })
+        );
+      }
     }
 
     return coinPrices;
@@ -649,25 +670,4 @@ export class ScallopUtils {
     }
     return findClosestUnlockRound(newUnlockAtInSecondTimestamp);
   }
-
-  /**
-   * Get detailed contract address and price id information for supported pool in Scallop
-   * @returns Supported pool informations
-   */
-  public getSupportedPoolAddresses(): PoolAddressInfo[] {
-    return SUPPORT_POOLS.map((poolName) => {
-      const sCoinName = this.parseSCoinName(poolName)!;
-      return {
-        name: this.parseSymbol(poolName),
-        coingeckoId: COIN_GECKGO_IDS[poolName],
-        decimal: coinDecimals[poolName],
-        pythFeedId: PYTH_FEED_IDS[poolName],
-        ...POOL_ADDRESSES[poolName],
-        sCoinAddress: sCoinIds[sCoinName],
-        marketCoinAddress: this.parseMarketCoinType(poolName),
-        coinAddress: this.parseCoinType(poolName),
-        sCoinName: sCoinName ? this.parseSymbol(sCoinName) : undefined,
-      };
-    });
-  }
 }