@scallop-io/sui-scallop-sdk 1.3.4-alpha.1 → 1.3.4-alpha.2

package/src/models/scallopClient.ts

@@ -34,6 +34,7 @@ import type {
   ScallopClientVeScaReturnType,
   ScallopClientInstanceParams,
 } from '../types';
+import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -64,9 +65,9 @@ export class ScallopClient {
   ) {
     this.params = params;
     this.suiKit =
-      instance?.suiKit ?? instance?.builder?.suiKit ?? new SuiKit(params);
+      instance?.suiKit ?? instance?.builder?.suiKit ?? newSuiKit(params);
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress || this.suiKit.currentAddress()
+      params?.walletAddress ?? this.suiKit.currentAddress()
     );
 
     if (instance?.builder) {
@@ -83,7 +84,7 @@ export class ScallopClient {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },
@@ -142,7 +143,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);
   }
 
@@ -169,7 +170,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);
   }
 
@@ -187,7 +188,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);
   }
 
@@ -272,11 +273,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,
@@ -319,7 +320,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(
@@ -365,7 +366,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);
@@ -409,14 +410,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) {
@@ -466,7 +467,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);
@@ -501,7 +502,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 = (
@@ -549,7 +550,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 = (
@@ -610,7 +611,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);
@@ -647,7 +648,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);
@@ -691,12 +692,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 {
@@ -743,7 +744,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(
@@ -802,7 +803,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(
@@ -863,7 +864,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(
@@ -899,7 +900,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);
@@ -929,7 +930,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);
@@ -961,7 +962,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 = [];
@@ -1186,7 +1187,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,6 +47,9 @@ import {
   SupportBorrowIncentiveCoins,
   SupportSCoin,
   ScallopQueryInstanceParams,
+  MarketPool,
+  CoinPrices,
+  MarketPools,
 } from '../types';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
@@ -64,6 +67,7 @@ import { normalizeSuiAddress } from '@mysten/sui/utils';
 import { getSupplyLimit } from 'src/queries/supplyLimit';
 import { withIndexerFallback } from 'src/utils/indexer';
 import { getIsolatedAssets, isIsolatedAsset } from 'src/queries/isolatedAsset';
+import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -93,10 +97,10 @@ export class ScallopQuery {
   ) {
     this.params = params;
     this.suiKit =
-      instance?.suiKit ?? instance?.utils?.suiKit ?? new SuiKit(params);
+      instance?.suiKit ?? instance?.utils?.suiKit ?? newSuiKit(params);
 
     this.walletAddress = normalizeSuiAddress(
-      params.walletAddress || this.suiKit.currentAddress()
+      params.walletAddress ?? this.suiKit.currentAddress()
     );
 
     if (instance?.utils) {
@@ -111,7 +115,7 @@ export class ScallopQuery {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },
@@ -167,11 +171,10 @@ export class ScallopQuery {
    * @param address - ScallopAddress instance.
    */
   public async init(force: boolean = false, address?: ScallopAddress) {
-    if (address && !this.address) {
-      this.address = address;
-    }
-    if (force || !this.address.getAddresses()) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
 
     await this.utils.init(force, this.address);
@@ -184,8 +187,11 @@ export class ScallopQuery {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  public async queryMarket(indexer: boolean = false) {
-    return await queryMarket(this, indexer);
+  public async queryMarket(
+    indexer: boolean = false,
+    args?: { coinPrices: CoinPrices }
+  ) {
+    return await queryMarket(this, indexer, args?.coinPrices);
   }
 
   /**
@@ -201,9 +207,12 @@ export class ScallopQuery {
    */
   public async getMarketPools(
     poolCoinNames?: SupportPoolCoins[],
-    indexer: boolean = false
+    indexer: boolean = false,
+    args?: {
+      coinPrices?: CoinPrices;
+    }
   ) {
-    return await getMarketPools(this, poolCoinNames, indexer);
+    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
   }
 
   /**
@@ -215,9 +224,19 @@ export class ScallopQuery {
    */
   public async getMarketPool(
     poolCoinName: SupportPoolCoins,
-    indexer: boolean = false
+    indexer: boolean = false,
+    args?: {
+      marketObject?: SuiObjectData | null;
+      coinPrice?: number;
+    }
   ) {
-    return await getMarketPool(this, poolCoinName, indexer);
+    return await getMarketPool(
+      this,
+      poolCoinName,
+      indexer,
+      args?.marketObject,
+      args?.coinPrice
+    );
   }
 
   /**
@@ -359,9 +378,19 @@ export class ScallopQuery {
    */
   public async getSpools(
     stakeMarketCoinNames?: SupportStakeMarketCoins[],
-    indexer: boolean = false
+    indexer: boolean = false,
+    args?: {
+      marketPools?: MarketPools;
+      coinPrices?: CoinPrices;
+    }
   ) {
-    return await getSpools(this, stakeMarketCoinNames, indexer);
+    return await getSpools(
+      this,
+      stakeMarketCoinNames,
+      indexer,
+      args?.marketPools,
+      args?.coinPrices
+    );
   }
 
   /**
@@ -373,9 +402,16 @@ export class ScallopQuery {
    */
   public async getSpool(
     stakeMarketCoinName: SupportStakeMarketCoins,
-    indexer: boolean = false
+    indexer: boolean = false,
+    args?: { marketPool?: MarketPool; coinPrices?: CoinPrices }
   ) {
-    return await getSpool(this, stakeMarketCoinName, indexer);
+    return await getSpool(
+      this,
+      stakeMarketCoinName,
+      indexer,
+      args?.marketPool,
+      args?.coinPrices
+    );
   }
 
   /**
@@ -496,9 +532,15 @@ export class ScallopQuery {
    */
   public async getBorrowIncentivePools(
     coinNames?: SupportBorrowIncentiveCoins[],
-    indexer: boolean = false
+    indexer: boolean = false,
+    args?: { coinPrices: CoinPrices }
   ) {
-    return await getBorrowIncentivePools(this, coinNames, indexer);
+    return await getBorrowIncentivePools(
+      this,
+      coinNames,
+      indexer,
+      args?.coinPrices
+    );
   }
 
   /**

package/src/models/scallopUtils.ts

@@ -20,8 +20,9 @@ import {
   suiBridgeCoins,
   COIN_GECKGO_IDS,
   POOL_ADDRESSES,
+  sCoinTypeToName,
 } from '../constants';
-import { getPythPrice, queryObligation } from '../queries';
+import { getPythPrices, queryObligation } from '../queries';
 import {
   parseDataFromPythPriceFeed,
   isMarketCoin,
@@ -41,7 +42,6 @@ import type {
   SupportStakeMarketCoins,
   SupportBorrowIncentiveCoins,
   CoinPrices,
-  PriceMap,
   CoinWrappedType,
   SupportSCoin,
   ScallopUtilsInstanceParams,
@@ -51,6 +51,7 @@ import type {
 } from '../types';
 import { queryKeys } from 'src/constants';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
+import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -72,7 +73,6 @@ export class ScallopUtils {
   public address: ScallopAddress;
   public cache: ScallopCache;
   public walletAddress: string;
-  private _priceMap: PriceMap = new Map();
 
   public constructor(
     params: ScallopUtilsParams,
@@ -83,9 +83,7 @@ export class ScallopUtils {
       ...params,
     };
     this.suiKit =
-      instance?.suiKit ??
-      instance?.address?.cache._suiKit ??
-      new SuiKit(params);
+      instance?.suiKit ?? instance?.address?.cache._suiKit ?? newSuiKit(params);
 
     this.walletAddress = params.walletAddress ?? this.suiKit.currentAddress();
 
@@ -103,7 +101,7 @@ export class ScallopUtils {
         instance?.address ??
         new ScallopAddress(
           {
-            id: params?.addressesId || ADDRESSES_ID,
+            id: params?.addressesId ?? ADDRESSES_ID,
             network: params?.networkType,
             forceInterface: params?.forceAddressesInterface,
           },
@@ -132,9 +130,10 @@ export class ScallopUtils {
    * @param address - ScallopAddress instance.
    */
   public async init(force: boolean = false, address?: ScallopAddress) {
-    if (address && !this.address) this.address = address;
-    if (force || !this.address.getAddresses()) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
   }
 
@@ -226,6 +225,7 @@ export class ScallopUtils {
       return undefined;
     }
   }
+
   /**
    * Convert sCoin name into sCoin type
    * @param sCoinName
@@ -235,6 +235,15 @@ 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
@@ -263,7 +272,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}>`;
   }
@@ -292,7 +301,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> = {
       [`${
@@ -430,7 +439,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,
@@ -510,112 +519,68 @@ export class ScallopUtils {
    * @return  Asset coin price.
    */
   public async getCoinPrices(
-    assetCoinNames: SupportAssetCoins[] = [
+    _: SupportAssetCoins[] = [
       ...new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS]),
     ] as SupportAssetCoins[]
   ) {
-    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`)
-          ),
-        });
-      }
-    });
-
-    if (existPricesCoinNames.length > 0) {
-      for (const coinName of existPricesCoinNames) {
-        coinPrices[coinName] = this._priceMap.get(coinName)!.price;
-      }
-    }
+    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][]
+      );
 
-    if (lackPricesCoinNames.length > 0) {
-      const endpoints =
-        this.params.pythEndpoints ??
-        PYTH_ENDPOINTS[this.isTestnet ? 'testnet' : 'mainnet'];
+      const priceIds = priceIdPairs.map(([_, priceId]) => priceId);
 
-      const failedRequests: Set<SupportAssetCoins> = new Set(
-        lackPricesCoinNames
-      );
+      const pythConnection = new SuiPriceServiceConnection(endpoint, {
+        timeout: 2000,
+      });
 
-      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`
-            );
-            if (priceId) {
-              acc[coinName] = priceId;
-            }
-            return acc;
+      try {
+        const feeds = await this.cache.queryClient.fetchQuery({
+          queryKey: queryKeys.oracle.getPythLatestPriceFeeds(),
+          queryFn: async () => {
+            return await pythConnection.getLatestPriceFeeds(priceIds);
           },
-          {} as Record<SupportAssetCoins, string>
-        );
-
-        await Promise.allSettled(
-          Object.entries(priceIds)
-            .filter(([_, priceId]) => !!priceId)
-            .map(async ([coinName, priceId]) => {
-              // console.log({ coinName, priceId, endpoint });
-              const pythConnection = new SuiPriceServiceConnection(endpoint);
-              try {
-                const feed = await this.cache.queryClient.fetchQuery({
-                  queryKey: queryKeys.oracle.getPythLatestPriceFeed(
-                    priceId,
-                    endpoint
-                  ),
-                  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;
+          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);
       }
+      if (failedRequests.size === 0) break;
+    }
 
-      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;
-          })
-        );
-      }
+    if (failedRequests.size > 0) {
+      coinPrices = {
+        ...coinPrices,
+        ...(await getPythPrices(this, Array.from(failedRequests.values()))),
+      };
+      failedRequests.clear();
     }
 
     return coinPrices;

package/src/models/suiKit.ts

@@ -0,0 +1,11 @@
+import { SuiKit, SuiKitParams } from '@scallop-io/sui-kit';
+import { RPC_PROVIDERS } from 'src/constants/rpc';
+
+export const newSuiKit = (params: SuiKitParams) => {
+  return new SuiKit({
+    ...params,
+    fullnodeUrls: Array.from(
+      new Set([...(params.fullnodeUrls ?? []), ...RPC_PROVIDERS])
+    ),
+  });
+};