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

package/dist/models/scallopQuery.d.ts

@@ -1,5 +1,5 @@
 import { SuiKit } from '@scallop-io/sui-kit';
-import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams, MarketPool, CoinPrices, MarketPools } from '../types';
+import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams } from '../types';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
@@ -38,9 +38,7 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market data.
      */
-    queryMarket(indexer?: boolean, args?: {
-        coinPrices: CoinPrices;
-    }): Promise<import("../types").Market>;
+    queryMarket(indexer?: boolean): Promise<import("../types").Market>;
     /**
      * Get market pools.
      *
@@ -52,23 +50,21 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market pools data.
      */
-    getMarketPools(poolCoinNames?: SupportPoolCoins[], indexer?: boolean, args?: {
-        coinPrices?: CoinPrices;
-    }): Promise<{
-        usdc?: MarketPool | undefined;
-        sbeth?: MarketPool | undefined;
-        weth?: MarketPool | undefined;
-        wbtc?: MarketPool | undefined;
-        wusdc?: MarketPool | undefined;
-        wusdt?: MarketPool | undefined;
-        sui?: MarketPool | undefined;
-        wapt?: MarketPool | undefined;
-        wsol?: MarketPool | undefined;
-        cetus?: MarketPool | undefined;
-        afsui?: MarketPool | undefined;
-        hasui?: MarketPool | undefined;
-        vsui?: MarketPool | undefined;
-        sca?: MarketPool | undefined;
+    getMarketPools(poolCoinNames?: SupportPoolCoins[], indexer?: boolean): Promise<{
+        usdc?: import("../types").MarketPool | undefined;
+        sbeth?: import("../types").MarketPool | undefined;
+        weth?: import("../types").MarketPool | undefined;
+        wbtc?: import("../types").MarketPool | undefined;
+        wusdc?: import("../types").MarketPool | undefined;
+        wusdt?: import("../types").MarketPool | undefined;
+        sui?: import("../types").MarketPool | undefined;
+        wapt?: import("../types").MarketPool | undefined;
+        wsol?: import("../types").MarketPool | undefined;
+        cetus?: import("../types").MarketPool | undefined;
+        afsui?: import("../types").MarketPool | undefined;
+        hasui?: import("../types").MarketPool | undefined;
+        vsui?: import("../types").MarketPool | undefined;
+        sca?: import("../types").MarketPool | undefined;
     }>;
     /**
      * Get  market pool
@@ -77,10 +73,7 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market pool data.
      */
-    getMarketPool(poolCoinName: SupportPoolCoins, indexer?: boolean, args?: {
-        marketObject?: SuiObjectData | null;
-        coinPrice?: number;
-    }): Promise<MarketPool | undefined>;
+    getMarketPool(poolCoinName: SupportPoolCoins, indexer?: boolean): Promise<import("../types").MarketPool | undefined>;
     /**
      * Get market collaterals.
      *
@@ -183,15 +176,12 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Spools data.
      */
-    getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean, args?: {
-        marketPools?: MarketPools;
-        coinPrices?: CoinPrices;
-    }): Promise<{
+    getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean): Promise<{
         susdc?: import("../types").Spool | undefined;
         sweth?: import("../types").Spool | undefined;
+        ssui?: import("../types").Spool | undefined;
         swusdc?: import("../types").Spool | undefined;
         swusdt?: import("../types").Spool | undefined;
-        ssui?: import("../types").Spool | undefined;
         scetus?: import("../types").Spool | undefined;
         safsui?: import("../types").Spool | undefined;
         shasui?: import("../types").Spool | undefined;
@@ -204,10 +194,7 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Spool data.
      */
-    getSpool(stakeMarketCoinName: SupportStakeMarketCoins, indexer?: boolean, args?: {
-        marketPool?: MarketPool;
-        coinPrices?: CoinPrices;
-    }): Promise<import("../types").Spool | undefined>;
+    getSpool(stakeMarketCoinName: SupportStakeMarketCoins, indexer?: boolean): Promise<import("../types").Spool | undefined>;
     /**
      * Get stake accounts data for all stake pools (spools).
      *
@@ -236,9 +223,9 @@ export declare class ScallopQuery {
     getStakePools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
         susdc?: import("../types").StakePool | undefined;
         sweth?: import("../types").StakePool | undefined;
+        ssui?: import("../types").StakePool | undefined;
         swusdc?: import("../types").StakePool | undefined;
         swusdt?: import("../types").StakePool | undefined;
-        ssui?: import("../types").StakePool | undefined;
         scetus?: import("../types").StakePool | undefined;
         safsui?: import("../types").StakePool | undefined;
         shasui?: import("../types").StakePool | undefined;
@@ -268,9 +255,9 @@ export declare class ScallopQuery {
     getStakeRewardPools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
         susdc?: import("../types").StakeRewardPool | undefined;
         sweth?: import("../types").StakeRewardPool | undefined;
+        ssui?: import("../types").StakeRewardPool | undefined;
         swusdc?: import("../types").StakeRewardPool | undefined;
         swusdt?: import("../types").StakeRewardPool | undefined;
-        ssui?: import("../types").StakeRewardPool | undefined;
         scetus?: import("../types").StakeRewardPool | undefined;
         safsui?: import("../types").StakeRewardPool | undefined;
         shasui?: import("../types").StakeRewardPool | undefined;
@@ -294,9 +281,7 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Borrow incentive pools data.
      */
-    getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, args?: {
-        coinPrices: CoinPrices;
-    }): Promise<{
+    getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean): Promise<{
         usdc?: import("../types").BorrowIncentivePool | undefined;
         sbeth?: import("../types").BorrowIncentivePool | undefined;
         weth?: import("../types").BorrowIncentivePool | undefined;
@@ -452,7 +437,7 @@ export declare class ScallopQuery {
      * @param ownerAddress - The owner address.
      * @return All market sCoin amounts.
      */
-    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca", number>>>;
+    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssbeth" | "ssca" | "swsol" | "swbtc", number>>>;
     /**
      * Get sCoin amount.
      *

package/dist/models/scallopUtils.d.ts

@@ -1,7 +1,7 @@
 import { SuiKit } from '@scallop-io/sui-kit';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopCache } from './scallopCache';
-import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins, PoolAddressInfo } from '../types';
+import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
 /**
  * @description
@@ -22,6 +22,7 @@ export declare class ScallopUtils {
     address: ScallopAddress;
     cache: ScallopCache;
     walletAddress: string;
+    private _priceMap;
     constructor(params: ScallopUtilsParams, instance?: ScallopUtilsInstanceParams);
     isSuiBridgeAsset(coinName: any): coinName is SupportSuiBridgeCoins;
     isWormholeAsset(coinName: any): coinName is SupportWormholeCoins;
@@ -64,12 +65,6 @@ export declare class ScallopUtils {
      * @returns sCoin type
      */
     parseSCoinType(sCoinName: SupportSCoin): string;
-    /**
-     * Convert sCoinType into sCoin name
-     * @param sCoinType
-     * @returns sCoin name
-     */
-    parseSCoinNameFromType(sCoinType: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca";
     /**
      * Convert sCoin name into its underlying coin type
      * @param sCoinName
@@ -188,7 +183,7 @@ export declare class ScallopUtils {
      * @param assetCoinNames - Specific an array of support asset coin name.
      * @return  Asset coin price.
      */
-    getCoinPrices(_?: SupportAssetCoins[]): Promise<import("../types").OptionalKeys<Record<SupportAssetCoins, number>>>;
+    getCoinPrices(assetCoinNames?: SupportAssetCoins[]): Promise<import("../types").OptionalKeys<Record<SupportAssetCoins, number>>>;
     /**
      * Convert apr to apy.
      *
@@ -219,9 +214,4 @@ export declare class ScallopUtils {
      * @return New unlock at in seconds timestamp.
      */
     getUnlockAt(extendLockPeriodInDay?: number, unlockAtInMillisTimestamp?: number): number;
-    /**
-     * Get detailed contract address and price id information for supported pool in Scallop
-     * @returns Supported pool informations
-     */
-    getSupportedPoolAddresses(): PoolAddressInfo[];
 }

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -1,5 +1,5 @@
 import type { ScallopAddress, ScallopQuery, ScallopUtils } from '../models';
-import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool, CoinPrices } from '../types';
+import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool } from '../types';
 /**
  * Query borrow incentive pools data using moveCall
  * @param address
@@ -14,7 +14,7 @@ export declare const queryBorrowIncentivePools: (address: ScallopAddress) => Pro
  * @param indexer - Whether to use indexer.
  * @return Borrow incentive pools data.
  */
-export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, coinPrices?: CoinPrices) => Promise<{
+export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean) => Promise<{
     usdc?: BorrowIncentivePool | undefined;
     sbeth?: BorrowIncentivePool | undefined;
     weth?: BorrowIncentivePool | undefined;

package/dist/queries/coreQuery.d.ts

@@ -1,7 +1,7 @@
 import type { SuiObjectData } from '@mysten/sui/client';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopAddress, ScallopCache, ScallopQuery } from '../models';
-import { Market, MarketPool, MarketCollateral, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, ObligationQueryInterface, Obligation, SupportMarketCoins, OptionalKeys, CoinPrices } from '../types';
+import { Market, MarketPool, MarketCollateral, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, ObligationQueryInterface, Obligation, SupportMarketCoins, OptionalKeys } from '../types';
 /**
  * Query market data.
  *
@@ -12,7 +12,7 @@ import { Market, MarketPool, MarketCollateral, SupportAssetCoins, SupportPoolCoi
  * @param indexer - Whether to use indexer.
  * @return Market data.
  */
-export declare const queryMarket: (query: ScallopQuery, indexer?: boolean, coinPrices?: CoinPrices) => Promise<Market>;
+export declare const queryMarket: (query: ScallopQuery, indexer?: boolean) => Promise<Market>;
 /**
  * Get coin market pools data.
  *
@@ -25,7 +25,7 @@ export declare const queryMarket: (query: ScallopQuery, indexer?: boolean, coinP
  * @param indexer - Whether to use indexer.
  * @return Market pools data.
  */
-export declare const getMarketPools: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], indexer?: boolean, coinPrices?: CoinPrices) => Promise<{
+export declare const getMarketPools: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], indexer?: boolean) => Promise<{
     usdc?: MarketPool | undefined;
     sbeth?: MarketPool | undefined;
     weth?: MarketPool | undefined;

package/dist/queries/index.d.ts

@@ -1,11 +1,8 @@
-export * from './borrowIncentiveQuery';
 export * from './coreQuery';
-export * from './isolatedAssetQuery';
-export * from './loyaltyProgramQuery';
-export * from './portfolioQuery';
-export * from './priceQuery';
-export * from './referralQuery';
-export * from './sCoinQuery';
 export * from './spoolQuery';
-export * from './supplyLimitQuery';
+export * from './borrowIncentiveQuery';
+export * from './priceQuery';
+export * from './portfolioQuery';
 export * from './vescaQuery';
+export * from './referralQuery';
+export * from './loyaltyProgramQuery';

package/dist/queries/{isolatedAssetQuery.d.ts → isolatedAsset.d.ts}

@@ -1,5 +1,5 @@
-import { ScallopAddress, ScallopUtils } from '../models';
-import { SupportPoolCoins } from '../types';
+import { ScallopAddress, ScallopUtils } from 'src/models';
+import { SupportPoolCoins } from 'src/types';
 /**
  * Return list of isolated assets coin types
  * @param utils ScallopUtils

package/dist/queries/sCoinQuery.d.ts

@@ -19,7 +19,7 @@ export declare const getSCoinTotalSupply: ({ utils, }: {
  */
 export declare const getSCoinAmounts: ({ utils, }: {
     utils: ScallopUtils;
-}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssbeth" | "ssca" | "swsol" | "swbtc", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/dist/queries/spoolQuery.d.ts

@@ -1,5 +1,5 @@
 import type { ScallopQuery, ScallopUtils } from '../models';
-import type { MarketPool, Spool, StakePool, StakeRewardPool, StakeAccounts, SupportStakeMarketCoins, CoinPrices, MarketPools } from '../types';
+import type { MarketPool, Spool, StakePool, StakeRewardPool, StakeAccounts, SupportStakeMarketCoins, CoinPrices } from '../types';
 /**
  * Get spools data.
  *
@@ -8,12 +8,12 @@ import type { MarketPool, Spool, StakePool, StakeRewardPool, StakeAccounts, Supp
  * @param indexer - Whether to use indexer.
  * @return Spools data.
  */
-export declare const getSpools: (query: ScallopQuery, stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
+export declare const getSpools: (query: ScallopQuery, stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean) => Promise<{
     susdc?: Spool | undefined;
     sweth?: Spool | undefined;
+    ssui?: Spool | undefined;
     swusdc?: Spool | undefined;
     swusdt?: Spool | undefined;
-    ssui?: Spool | undefined;
     scetus?: Spool | undefined;
     safsui?: Spool | undefined;
     shasui?: Spool | undefined;

package/dist/queries/{supplyLimitQuery.d.ts → supplyLimit.d.ts}

@@ -1,5 +1,5 @@
-import { ScallopUtils } from '../models';
-import { SupportPoolCoins } from '../types';
+import { ScallopUtils } from 'src/models';
+import { SupportPoolCoins } from 'src/types';
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils

package/dist/types/query/index.d.ts

@@ -1,7 +1,7 @@
-export type * from './borrowIncentive';
 export type * from './core';
-export type * from './loyaltyProgram';
-export type * from './portfolio';
-export type * from './sCoin';
 export type * from './spool';
+export type * from './borrowIncentive';
+export type * from './portfolio';
 export type * from './vesca';
+export type * from './loyaltyProgram';
+export type * from './sCoin';

package/dist/types/utils.d.ts

@@ -7,15 +7,3 @@ export type PriceMap = Map<SupportAssetCoins, {
     price: number;
     publishTime: number;
 }>;
-export type PoolAddressInfo = {
-    name: string;
-    coingeckoId: string;
-    decimal: number;
-    pythFeedId: string;
-    lendingPoolAddress: string;
-    collateralPoolAddress: string;
-    sCoinAddress: string | undefined;
-    marketCoinAddress: string;
-    coinAddress: string;
-    sCoinName: string | undefined;
-};

package/dist/utils/util.d.ts

@@ -1,7 +1,7 @@
 import type { PriceFeed } from '@pythnetwork/pyth-sui-js';
 import type { ScallopAddress } from '../models';
-import type { SupportAssetCoins, SupportCoins, SupportMarketCoins, SupportSCoin, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
-export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins | SupportSCoin;
+import type { SupportAssetCoins, SupportCoins, SupportMarketCoins, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
+export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins;
 export declare const isSuiBridgeAsset: (coinName: any) => coinName is SupportSuiBridgeCoins;
 export declare const isWormholeAsset: (coinName: any) => coinName is SupportWormholeCoins;
 export declare const parseAssetSymbol: (coinName: SupportCoins) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.3.4-alpha.7",
+  "version": "1.3.4-hotfix",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/loyaltyProgramBuilder.ts

@@ -38,7 +38,7 @@ const generateLoyaltyProgramQuickMethod: GenerateLoyaltyProgramQuickMethod = ({
 }) => {
   return {
     claimLoyaltyRevenueQuick: async (veScaKey) => {
-      veScaKey = veScaKey ?? (await builder.query.getVeScas())[0]?.keyObject;
+      veScaKey = veScaKey || (await builder.query.getVeScas())[0]?.keyObject;
       const sender = requireSender(txBlock);
       if (!veScaKey) throw new Error(`No veScaKey found for user ${sender}`);
 

package/src/constants/common.ts

@@ -1,3 +1,4 @@
+// export const API_BASE_URL = 'https://sui.api.scallop.io';
 export const API_BASE_URL = 'https://sui.apis.scallop.io' as const;
 export const SDK_API_BASE_URL = 'https://sdk.api.scallop.io' as const;
 
@@ -7,7 +8,7 @@ export const USE_TEST_ADDRESS: boolean = false;
 export const ADDRESSES_ID =
   IS_VE_SCA_TEST || USE_TEST_ADDRESS
     ? ('65fb07c39c845425d71d7b18' as const)
-    : ('66f8e7ed9bb9e07fdfb86bbb' as const);
+    : ('675c65cd301dd817ea262e76' as const);
 // : ('664dfe22898c36c159e28bc8' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST

package/src/constants/enum.ts

@@ -183,14 +183,6 @@ export const sCoinIds: types.SCoinIds = {
     '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
 } as const;
 
-export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
-  (acc, [coinName, coinType]) => {
-    acc[coinType] = coinName as types.SupportSCoin;
-    return acc;
-  },
-  {} as Record<string, types.SupportSCoin>
-);
-
 // TEST VERSION
 // export const sCoinIds: types.SCoinIds = {
 //   ssui: '0xfac769100bccc0caebcf4f4e2d00ac2f8883f07f724be28940df90605f5e7e9a::scallop_sui::SCALLOP_SUI',

package/src/constants/index.ts

@@ -1,12 +1,5 @@
-export * from './cache';
-export * from './coinGecko';
 export * from './common';
 export * from './enum';
 export * from './flashloan';
-export * from './poolAddress';
-export * from './pyth';
 export * from './queryKeys';
-export * from './rpc';
-export * from './testAddress';
-export * from './tokenBucket';
 export * from './vesca';

package/src/constants/pyth.ts

@@ -1,25 +1,6 @@
-import { SupportPoolCoins } from 'src/types';
-
 export const PYTH_ENDPOINTS: {
   [k in 'mainnet' | 'testnet']: string[];
 } = {
   testnet: ['https://hermes-beta.pyth.network'],
   mainnet: ['https://hermes.pyth.network', 'https://scallop.rpc.p2p.world'],
 };
-
-export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
-  usdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-  sbeth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
-  weth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
-  wbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
-  wusdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-  wusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
-  sui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  wapt: '03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5',
-  wsol: 'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
-  cetus: 'e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef',
-  afsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
-};

package/src/constants/queryKeys.ts

@@ -99,6 +99,10 @@ export const queryKeys = {
     ],
   },
   oracle: {
-    getPythLatestPriceFeeds: () => ['oracle', 'getPythPriceIds'],
+    getPythLatestPriceFeed: (pythPriceId?: string) => [
+      'oracle',
+      'getPythPriceId',
+      { pythPriceId },
+    ],
   },
 };

package/src/constants/tokenBucket.ts

@@ -1,2 +1,2 @@
-export const DEFAULT_TOKENS_PER_INTERVAL = 10;
+export const DEFAULT_TOKENS_PER_INTERVAL = 50;
 export const DEFAULT_INTERVAL_IN_MS = 300;

package/src/models/scallop.ts

@@ -22,7 +22,6 @@ import {
   DEFAULT_TOKENS_PER_INTERVAL,
 } from 'src/constants/tokenBucket';
 import type { QueryClient } from '@tanstack/query-core';
-import { newSuiKit } from './suiKit';
 
 /**
  * @argument params - The parameters for the Scallop instance.
@@ -55,7 +54,7 @@ export class Scallop {
     queryClient?: QueryClient
   ) {
     this.params = params;
-    this.suiKit = newSuiKit(params);
+    this.suiKit = new SuiKit(params);
     this.cache = new ScallopCache(
       this.suiKit,
       params.walletAddress,
@@ -66,7 +65,7 @@ export class Scallop {
     );
     this.address = new ScallopAddress(
       {
-        id: params?.addressesId ?? ADDRESSES_ID,
+        id: params?.addressesId || ADDRESSES_ID,
         network: params?.networkType,
         forceInterface: params?.forceAddressesInterface,
       },

package/src/models/scallopAddress.ts

@@ -393,11 +393,11 @@ export class ScallopAddress {
         'Content-Type': 'application/json',
         Accept: 'application/json',
       },
-      timeout: 8000,
+      timeout: 30000,
     });
     if (auth) this._auth = auth;
     this._id = id;
-    this._network = network ?? 'mainnet';
+    this._network = network || 'mainnet';
     this._addressesMap = USE_TEST_ADDRESS
       ? new Map([['mainnet', TEST_ADDRESSES]])
       : new Map();

package/src/models/scallopBuilder.ts

@@ -19,7 +19,6 @@ import type {
 } from '../types';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
-import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -47,11 +46,11 @@ export class ScallopBuilder {
     params: ScallopBuilderParams,
     instance?: ScallopBuilderInstanceParams
   ) {
-    this.suiKit = instance?.suiKit ?? newSuiKit(params);
+    this.suiKit = instance?.suiKit ?? new SuiKit(params);
 
     this.params = params;
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress ?? this.suiKit.currentAddress()
+      params?.walletAddress || this.suiKit.currentAddress()
     );
 
     if (instance?.query) {
@@ -67,7 +66,7 @@ export class ScallopBuilder {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId ?? ADDRESSES_ID,
+          id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },

package/src/models/scallopCache.ts

@@ -255,7 +255,7 @@ export class ScallopCache {
     if (!input.coinType) return '0';
 
     return (
-      ((await this.queryGetAllCoinBalances(input.owner)) ?? {})[
+      ((await this.queryGetAllCoinBalances(input.owner)) || {})[
         normalizeStructTag(input.coinType)
       ] ?? '0'
     );