@scallop-io/sui-scallop-sdk 0.47.6 → 1.3.0-alpha.2

package/src/builders/oracle.ts

@@ -1,14 +1,15 @@
-import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui.js/utils';
+import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
 import {
   SuiPythClient,
   SuiPriceServiceConnection,
 } from '@pythnetwork/pyth-sui-js';
 import { SUPPORT_COLLATERALS, SUPPORT_POOLS } from '../constants';
-import type { TransactionArgument } from '@mysten/sui.js/transactions';
+import type { TransactionArgument } from '@mysten/sui/transactions';
 import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { SupportAssetCoins, SupportOracleType } from '../types';
 import { PYTH_ENDPOINTS } from 'src/constants/pyth';
+import { TransactionBlock } from '@mysten/sui.js/transactions';
 
 /**
  * Update the price of the oracle for multiple coin.
@@ -34,7 +35,7 @@ export const updateOracles = async (
   const rules: SupportOracleType[] = builder.isTestnet ? ['pyth'] : ['pyth'];
   if (usePythPullModel && rules.includes('pyth')) {
     const pythClient = new SuiPythClient(
-      builder.suiKit.client(),
+      builder.oldSuiClient,
       builder.address.get('core.oracles.pyth.state'),
       builder.address.get('core.oracles.pyth.wormholeState')
     );
@@ -52,7 +53,7 @@ export const updateOracles = async (
         const priceUpdateData =
           await pythConnection.getPriceFeedsUpdateData(priceIds);
         await pythClient.updatePriceFeeds(
-          txBlock.txBlock,
+          TransactionBlock.from(txBlock.serialize()), // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
           priceUpdateData,
           priceIds
         );

package/src/builders/referralBuilder.ts

@@ -4,7 +4,7 @@ import {
   SUI_CLOCK_OBJECT_ID,
   SuiTxBlock as SuiKitTxBlock,
   SuiObjectArg,
-  TransactionBlock,
+  Transaction,
 } from '@scallop-io/sui-kit';
 import {
   GenerateReferralNormalMethod,
@@ -39,7 +39,7 @@ const generateReferralNormalMethod: GenerateReferralNormalMethod = ({
         `${referralIds.referralPgkId}::referral_bindings::bind_ve_sca_referrer`,
         [
           referralIds.referralBindings,
-          txBlock.pure(veScaKeyId),
+          txBlock.pure.id(veScaKeyId),
           veScaTable,
           SUI_CLOCK_OBJECT_ID,
         ],
@@ -118,7 +118,7 @@ const generateReferralQuickMethod: GenerateReferralQuickMethod = ({
               builder.utils.parseCoinType(coinName)
             );
             txBlock.mergeCoins(rewardCoin, coins.slice(0, 500));
-          } catch (e) {
+          } catch (_e) {
             // ignore
           } finally {
             objToTransfer.push(rewardCoin);
@@ -141,14 +141,14 @@ const generateReferralQuickMethod: GenerateReferralQuickMethod = ({
  */
 export const newReferralTxBlock = (
   builder: ScallopBuilder,
-  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction
 ) => {
   const txBlock =
-    initTxBlock instanceof TransactionBlock
+    initTxBlock instanceof Transaction
       ? new SuiKitTxBlock(initTxBlock)
       : initTxBlock
-      ? initTxBlock
-      : new SuiKitTxBlock();
+        ? initTxBlock
+        : new SuiKitTxBlock();
 
   const normalMethod = generateReferralNormalMethod({
     builder,

package/src/builders/sCoinBuilder.ts

@@ -1,7 +1,4 @@
-import {
-  TransactionBlock,
-  SuiTxBlock as SuiKitTxBlock,
-} from '@scallop-io/sui-kit';
+import { Transaction, SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
 import {
   BaseScallopTxBlock,
@@ -83,15 +80,15 @@ export const newSCoinTxBlock = (
   initTxBlock?:
     | ScallopTxBlock
     | SuiKitTxBlock
-    | TransactionBlock
+    | Transaction
     | BaseScallopTxBlock
 ) => {
   const txBlock =
-    initTxBlock instanceof TransactionBlock
+    initTxBlock instanceof Transaction
       ? new SuiKitTxBlock(initTxBlock)
       : initTxBlock
-      ? initTxBlock
-      : new SuiKitTxBlock();
+        ? initTxBlock
+        : new SuiKitTxBlock();
 
   const normalMethod = generateSCoinNormalMethod({
     builder,

package/src/builders/spoolBuilder.ts

@@ -1,11 +1,11 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
-import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui.js/utils';
+import { Transaction } from '@mysten/sui/transactions';
+import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { spoolRewardCoins } from '../constants/enum';
 import { getStakeAccounts } from '../queries/spoolQuery';
 import { requireSender } from '../utils';
 import type { SuiAddressArg } from '@scallop-io/sui-kit';
-import type { TransactionResult } from '@mysten/sui.js/transactions';
+import type { TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../models';
 import type {
   SpoolIds,
@@ -107,7 +107,7 @@ const stakeHelper = async (
     }
     txBlock.transferObjects([leftCoin], sender);
     return totalAmount;
-  } catch (e) {
+  } catch (_e) {
     return 0;
   }
 };
@@ -166,10 +166,10 @@ const generateSpoolNormalMethod: GenerateSpoolNormalMethod = ({
     claim: (stakeAccount, stakeMarketCoinName) => {
       const stakePoolId = builder.address.get(
         `spool.pools.${stakeMarketCoinName}.id`
-      );
+      ) as string;
       const rewardPoolId = builder.address.get(
         `spool.pools.${stakeMarketCoinName}.rewardPoolId`
-      );
+      ) as string;
       const marketCoinType =
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
       const rewardCoinName = spoolRewardCoins[stakeMarketCoinName];
@@ -317,15 +317,15 @@ export const newSpoolTxBlock = (
   initTxBlock?:
     | ScallopTxBlock
     | SuiKitTxBlock
-    | TransactionBlock
+    | Transaction
     | SuiTxBlockWithSCoin
 ) => {
   const txBlock =
-    initTxBlock instanceof TransactionBlock
+    initTxBlock instanceof Transaction
       ? new SuiKitTxBlock(initTxBlock)
       : initTxBlock
-      ? initTxBlock
-      : new SuiKitTxBlock();
+        ? initTxBlock
+        : new SuiKitTxBlock();
 
   const normalMethod = generateSpoolNormalMethod({
     builder,

package/src/builders/vescaBuilder.ts

@@ -1,7 +1,7 @@
 import {
   SUI_CLOCK_OBJECT_ID,
   SuiTxBlock,
-  TransactionBlock,
+  Transaction,
   SuiTxBlock as SuiKitTxBlock,
 } from '@scallop-io/sui-kit';
 import { SCA_COIN_TYPE } from 'src/constants';
@@ -366,14 +366,14 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
  */
 export const newVeScaTxBlock = (
   builder: ScallopBuilder,
-  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction
 ) => {
   const txBlock =
-    initTxBlock instanceof TransactionBlock
+    initTxBlock instanceof Transaction
       ? new SuiKitTxBlock(initTxBlock)
       : initTxBlock
-      ? initTxBlock
-      : new SuiKitTxBlock();
+        ? initTxBlock
+        : new SuiKitTxBlock();
 
   const normalMethod = generateNormalVeScaMethod({
     builder,

package/src/constants/common.ts

@@ -1,9 +1,9 @@
 // export const API_BASE_URL = 'https://sui.api.scallop.io';
-export const API_BASE_URL = 'https://sui.apis.scallop.io';
-export const SDK_API_BASE_URL = 'https://sdk.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;
 
-export const IS_VE_SCA_TEST = false;
-export const USE_TEST_ADDRESS = false;
+export const IS_VE_SCA_TEST: boolean = false;
+export const USE_TEST_ADDRESS: boolean = false;
 
 export const ADDRESSES_ID =
   IS_VE_SCA_TEST || USE_TEST_ADDRESS

package/src/constants/index.ts

@@ -1,4 +1,4 @@
 export * from './common';
 export * from './enum';
-export * from './vesca';
 export * from './flashloan';
+export * from './vesca';

package/src/constants/vesca.ts

@@ -1,7 +1,6 @@
-export const UNLOCK_ROUND_DURATION = 60 * 60 * 24; // 1 days in seconds
-export const MAX_LOCK_ROUNDS: number = 1460; // 4 years in days (or 9 days for testing)
-export const MAX_LOCK_DURATION: number =
-  MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION; // 4 years in seconds
+export const UNLOCK_ROUND_DURATION = 60 * 60 * 24; // 1 day in seconds
+export const MAX_LOCK_ROUNDS = 1460 as const; // 4 years in days (or 9 days for testing)
+export const MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION; // 4 years in seconds
 
-export const MIN_INITIAL_LOCK_AMOUNT: number = 10_000_000_000 as const;
-export const MIN_TOP_UP_AMOUNT: number = 1_000_000_000 as const;
+export const MIN_INITIAL_LOCK_AMOUNT = 10_000_000_000 as const;
+export const MIN_TOP_UP_AMOUNT = 1_000_000_000 as const;

package/src/models/scallopBuilder.ts

@@ -1,12 +1,12 @@
-import { normalizeSuiAddress } from '@mysten/sui.js/utils';
+import { normalizeSuiAddress } from '@mysten/sui/utils';
 import { SuiKit } from '@scallop-io/sui-kit';
 import { ADDRESSES_ID } from '../constants';
 import { newScallopTxBlock } from '../builders';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopQuery } from './scallopQuery';
 import { ScallopUtils } from './scallopUtils';
-import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
-import type { TransactionBlock } from '@mysten/sui.js/transactions';
+import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
+import type { Transaction } from '@mysten/sui/transactions';
 import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type {
   ScallopBuilderParams,
@@ -19,6 +19,7 @@ import type {
 } from '../types';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
+import { SuiClient as SuiClientV0 } from '@mysten/sui.js/client';
 
 /**
  * @description
@@ -42,6 +43,9 @@ export class ScallopBuilder {
   public walletAddress: string;
   public cache: ScallopCache;
 
+  // For compatibility with pyth sdk
+  public oldSuiClient: SuiClientV0;
+
   public constructor(
     params: ScallopBuilderParams,
     instance?: ScallopBuilderInstanceParams
@@ -68,6 +72,7 @@ export class ScallopBuilder {
         {
           id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface,
         },
         {
           cache: this.cache,
@@ -88,6 +93,11 @@ export class ScallopBuilder {
     this.isTestnet = params.networkType
       ? params.networkType === 'testnet'
       : false;
+
+    // intitialize old Sui Client version
+    this.oldSuiClient = new SuiClientV0({
+      url: this.suiKit.suiInteractor.currentFullNode,
+    });
   }
 
   /**
@@ -112,9 +122,7 @@ export class ScallopBuilder {
    * @param txBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
    * @return Scallop txBlock.
    */
-  public createTxBlock(
-    txBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
-  ) {
+  public createTxBlock(txBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction) {
     return newScallopTxBlock(this, txBlock);
   }
 
@@ -210,7 +218,7 @@ export class ScallopBuilder {
    * @param txBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
    */
   public async signAndSendTxBlock(
-    txBlock: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+    txBlock: ScallopTxBlock | SuiKitTxBlock | Transaction
   ) {
     return (await this.suiKit.signAndSendTxn(
       txBlock

package/src/models/scallopCache.ts

@@ -1,6 +1,6 @@
 import { QueryClient, QueryClientConfig } from '@tanstack/query-core';
 import {
-  SuiTxArg,
+  SuiObjectArg,
   SuiTxBlock,
   normalizeStructTag,
   normalizeSuiAddress,
@@ -17,7 +17,7 @@ import type {
   GetDynamicFieldObjectParams,
   GetBalanceParams,
   SuiClient,
-} from '@mysten/sui.js/client';
+} from '@mysten/sui/client';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import { callWithRateLimit, TokenBucket } from 'src/utils';
 import {
@@ -27,7 +27,7 @@ import {
 
 type QueryInspectTxnParams = {
   queryTarget: string;
-  args: SuiTxArg[];
+  args: SuiObjectArg[];
   typeArgs?: any[];
 };
 
@@ -92,20 +92,43 @@ export class ScallopCache {
     });
   }
 
-  /**
-   * @description Cache protocol config call for 60 seconds.
-   * @returns Promise<ProtocolConfig>
-   */
-  public async getProtocolConfig() {
-    return await this.queryClient.fetchQuery({
-      queryKey: ['getProtocolConfig'],
-      queryFn: async () => {
-        return await callWithRateLimit(this.tokenBucket, () =>
-          this.client.getProtocolConfig()
-        );
-      },
-      staleTime: 30000,
-    });
+  public async resolveArgs(
+    txb: SuiTxBlock,
+    args: SuiObjectArg[]
+  ): Promise<SuiObjectArg[]> {
+    return await Promise.all(
+      args.map(async (arg) => {
+        if (typeof arg === 'string') {
+          const objData = (await this.queryGetObject(arg, { showOwner: true }))
+            ?.data;
+          if (!objData) return arg;
+          const owner = objData?.owner as any;
+          if (!owner) return arg;
+
+          if ('Shared' in owner) {
+            return txb.sharedObjectRef({
+              objectId: objData.objectId,
+              initialSharedVersion: owner.Shared.initial_shared_version,
+              mutable: true,
+            });
+          } else {
+            return txb.objectRef({
+              objectId: objData.objectId,
+              version: objData.version,
+              digest: objData.digest,
+            });
+          }
+        } else if ('objectId' in arg && 'version' in arg && 'digest' in arg) {
+          return txb.objectRef({
+            objectId: arg.objectId,
+            version: arg.version as string,
+            digest: arg.digest,
+          });
+        } else {
+          return arg;
+        }
+      })
+    );
   }
 
   /**
@@ -121,23 +144,9 @@ export class ScallopCache {
   }: QueryInspectTxnParams): Promise<DevInspectResults | null> {
     const txBlock = new SuiTxBlock();
 
-    // resolve all the object args to prevent duplicate getNormalizedMoveFunction calls
-    const resolvedArgs = await Promise.all(
-      args.map(async (arg) => {
-        if (typeof arg === 'string') {
-          return (await this.queryGetObject(arg, { showContent: true }))?.data;
-        }
-        return arg;
-      })
-    );
-    txBlock.moveCall(queryTarget, resolvedArgs, typeArgs);
+    const resolvedArgs = await this.resolveArgs(txBlock, args);
 
-    // build the txBlock to prevent duplicate getProtocolConfig calls
-    const txBytes = await txBlock.txBlock.build({
-      client: this.client,
-      onlyTransactionKind: true,
-      protocolConfig: (await this.getProtocolConfig()) ?? undefined,
-    });
+    txBlock.moveCall(queryTarget, resolvedArgs, typeArgs);
 
     const query = await this.queryClient.fetchQuery({
       queryKey: typeArgs
@@ -150,7 +159,7 @@ export class ScallopCache {
           ],
       queryFn: async () => {
         return await callWithRateLimit(this.tokenBucket, () =>
-          this.suiKit.inspectTxn(txBytes)
+          this.suiKit.inspectTxn(txBlock)
         );
       },
     });

package/src/models/scallopClient.ts

@@ -1,4 +1,4 @@
-import { normalizeSuiAddress } from '@mysten/sui.js/utils';
+import { normalizeSuiAddress } from '@mysten/sui/utils';
 import { SuiKit } from '@scallop-io/sui-kit';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import {
@@ -12,13 +12,13 @@ import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopBuilder } from './scallopBuilder';
 import { ScallopQuery } from './scallopQuery';
-import { ScallopCache } from './scallopCache';
-import { requireSender } from 'src/utils';
-import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
+import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
 import type {
   TransactionObjectArgument,
   TransactionResult,
-} from '@mysten/sui.js/transactions';
+} from '@mysten/sui/transactions';
+import { ScallopCache } from './scallopCache';
+import { requireSender } from 'src/utils';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type {
   ScallopClientFnReturnType,
@@ -84,8 +84,8 @@ export class ScallopClient {
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
-          forceInterface: params?.forceAddressesInterface,
           network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface,
         },
         {
           cache: this.cache,
@@ -605,7 +605,7 @@ export class ScallopClient {
     callback: (
       txBlock: ScallopTxBlock,
       coin: TransactionObjectArgument | string
-    ) => SuiObjectArg,
+    ) => SuiObjectArg | Promise<SuiObjectArg>,
     sign: S = true as S,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
@@ -813,6 +813,7 @@ export class ScallopClient {
     );
     const stakeCoinName =
       this.utils.parseCoinName<SupportStakeCoins>(stakeMarketCoinName);
+
     if (stakeMarketCoin) {
       const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
       await this.utils.mergeSimilarCoins(
@@ -1053,7 +1054,7 @@ export class ScallopClient {
               if (sCoin) {
                 sCoins.push(sCoin);
               }
-            } catch (e: any) {
+            } catch (_e: any) {
               // ignore
             }
           }
@@ -1114,7 +1115,7 @@ export class ScallopClient {
           const scaCoin = await tx.redeemScaQuick(key, false);
           if (!scaCoin) return;
           scaCoins.push(scaCoin);
-        } catch (e) {
+        } catch (_e) {
           // ignore
         }
       })

package/src/models/scallopQuery.ts

@@ -53,15 +53,16 @@ import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
-import { SuiObjectData } from '@mysten/sui.js/client';
+import { SuiObjectData } from '@mysten/sui/src/client';
 import {
   getSCoinAmount,
   getSCoinAmounts,
   getSCoinSwapRate,
   getSCoinTotalSupply,
 } from 'src/queries/sCoinQuery';
-import { normalizeSuiAddress } from '@mysten/sui.js/utils';
+import { normalizeSuiAddress } from '@mysten/sui/utils';
 import { getSupplyLimit } from 'src/queries/supplyLimit';
+import { withIndexerFallback } from 'src/utils/indexer';
 
 /**
  * @description
@@ -111,6 +112,7 @@ export class ScallopQuery {
         {
           id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface,
         },
         {
           cache: this.cache,
@@ -123,8 +125,40 @@ export class ScallopQuery {
     this.indexer =
       instance?.indexer ??
       new ScallopIndexer(this.params, { cache: this.cache });
+
+    // Wrap any method that has an indexer parameter as the last parameter
+    this.queryMarket = withIndexerFallback.call(this, this.queryMarket);
+    this.getMarketPools = withIndexerFallback.call(this, this.getMarketPools);
+    this.getMarketPool = withIndexerFallback.call(this, this.getMarketPool);
+    this.getMarketCollaterals = withIndexerFallback.call(
+      this,
+      this.getMarketCollaterals
+    );
+    this.getMarketCollateral = withIndexerFallback.call(
+      this,
+      this.getMarketCollateral
+    );
+    this.getSpools = withIndexerFallback.call(this, this.getSpools);
+    this.getSpool = withIndexerFallback.call(this, this.getSpool);
+    this.getBorrowIncentivePools = withIndexerFallback.call(
+      this,
+      this.getBorrowIncentivePools
+    );
+    this.getLendings = withIndexerFallback.call(this, this.getLendings);
+    this.getLending = withIndexerFallback.call(this, this.getLending);
+    this.getObligationAccounts = withIndexerFallback.call(
+      this,
+      this.getObligationAccounts
+    );
+    this.getObligationAccount = withIndexerFallback.call(
+      this,
+      this.getObligationAccount
+    );
+    this.getTvl = withIndexerFallback.call(this, this.getTvl);
   }
 
+  /* ========================================================== */
+
   /**
    * Request the scallop API to initialize data.
    *

package/src/models/scallopUtils.ts

@@ -1,4 +1,4 @@
-import { SUI_TYPE_ARG, normalizeStructTag } from '@mysten/sui.js/utils';
+import { SUI_TYPE_ARG, normalizeStructTag } from '@mysten/sui/utils';
 import { SuiKit } from '@scallop-io/sui-kit';
 import { SuiPriceServiceConnection } from '@pythnetwork/pyth-sui-js';
 import { ScallopAddress } from './scallopAddress';
@@ -46,7 +46,7 @@ import type {
   SupportSuiBridgeCoins,
   SupportWormholeCoins,
 } from '../types';
-import type { SuiAddressArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
+import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
 
 /**
  * @description
@@ -101,6 +101,7 @@ export class ScallopUtils {
           {
             id: params?.addressesId || ADDRESSES_ID,
             network: params?.networkType,
+            forceInterface: params?.forceAddressesInterface,
           },
           {
             cache: this.cache,
@@ -459,7 +460,7 @@ export class ScallopUtils {
       if (existingCoins.length > 0) {
         txBlock.mergeCoins(dest, existingCoins.slice(0, 500));
       }
-    } catch (e) {
+    } catch (_e) {
       // ignore
     }
   }
@@ -474,7 +475,7 @@ export class ScallopUtils {
    * @param obligationId - The obligation id.
    * @return Asset coin Names.
    */
-  public async getObligationCoinNames(obligationId: SuiAddressArg) {
+  public async getObligationCoinNames(obligationId: SuiObjectArg) {
     const obligation = await queryObligation(this, obligationId);
     if (!obligation) return undefined;
 

package/src/queries/borrowIncentiveQuery.ts

@@ -1,4 +1,4 @@
-import { normalizeStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag } from '@mysten/sui/utils';
 import {
   SUPPORT_BORROW_INCENTIVE_POOLS,
   SUPPORT_BORROW_INCENTIVE_REWARDS,

package/src/queries/coreQuery.ts

@@ -1,4 +1,4 @@
-import { normalizeStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag } from '@mysten/sui/utils';
 import {
   SUPPORT_POOLS,
   PROTOCOL_OBJECT_ID,
@@ -13,8 +13,8 @@ import {
   parseOriginMarketCollateralData,
   calculateMarketCollateralData,
 } from '../utils';
-import type { SuiObjectResponse, SuiObjectData } from '@mysten/sui.js/client';
-import type { SuiAddressArg } from '@scallop-io/sui-kit';
+import type { SuiObjectResponse, SuiObjectData } from '@mysten/sui/client';
+import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopAddress, ScallopCache, ScallopQuery } from '../models';
 import {
   Market,
@@ -818,7 +818,7 @@ export const queryObligation = async (
   }: {
     address: ScallopAddress;
   },
-  obligationId: SuiAddressArg
+  obligationId: SuiObjectArg
 ) => {
   const packageId = address.get('core.packages.query.id');
   const queryTarget = `${packageId}::obligation_query::obligation_data`;

package/src/queries/loyaltyProgramQuery.ts

@@ -1,4 +1,4 @@
-import { SuiObjectData } from '@mysten/sui.js/client';
+import { SuiObjectData } from '@mysten/sui/src/client';
 import BigNumber from 'bignumber.js';
 import { ScallopQuery } from 'src/models';
 import { LoyaltyProgramInfo } from 'src/types';

package/src/queries/priceQuery.ts

@@ -1,4 +1,4 @@
-import { SuiObjectData } from '@mysten/sui.js/client';
+import { SuiObjectData } from '@mysten/sui/client';
 import type { ScallopAddress } from '../models';
 import type { SupportAssetCoins } from '../types';
 

package/src/queries/sCoinQuery.ts

@@ -1,4 +1,4 @@
-import { bcs } from '@mysten/sui.js/bcs';
+import { bcs } from '@mysten/sui/bcs';
 import assert from 'assert';
 import BigNumber from 'bignumber.js';
 import { SUPPORT_SCOIN } from 'src/constants';
@@ -38,7 +38,7 @@ export const getSCoinTotalSupply = async (
     const type = results[0].returnValues[0][1]; // should be u64
     assert(type === 'u64', 'Result type is not u64');
 
-    return BigNumber(bcs.de(type, value))
+    return BigNumber(bcs.u64().parse(value))
       .shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName)))
       .toNumber();
   }