@scallop-io/sui-scallop-sdk 0.47.2 → 1.3.0-alpha.1

package/dist/models/scallop.d.ts

@@ -4,7 +4,7 @@ import { ScallopClient } from './scallopClient';
 import { ScallopBuilder } from './scallopBuilder';
 import { ScallopQuery } from './scallopQuery';
 import { ScallopUtils } from './scallopUtils';
-import type { ScallopParams } from '../types/';
+import type { ScallopBuilderParams, ScallopClientParams, ScallopParams, ScallopQueryParams, ScallopUtilsParams } from '../types/';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
 import { QueryClientConfig } from '@tanstack/query-core';
@@ -44,20 +44,20 @@ export declare class Scallop {
      *
      * @return Scallop Builder.
      */
-    createScallopBuilder(): Promise<ScallopBuilder>;
+    createScallopBuilder(params?: ScallopBuilderParams): Promise<ScallopBuilder>;
     /**
      * Create a scallop client instance that already has initial data.
      *
      * @param walletAddress - When user cannot provide a secret key or mnemonic, the scallop client cannot directly derive the address of the transaction the user wants to sign. This argument specifies the wallet address for signing the transaction.
      * @return Scallop Client.
      */
-    createScallopClient(walletAddress?: string): Promise<ScallopClient>;
+    createScallopClient(params?: ScallopClientParams): Promise<ScallopClient>;
     /**
      * Create a scallop query instance.
      *
      * @return Scallop Query.
      */
-    createScallopQuery(): Promise<ScallopQuery>;
+    createScallopQuery(params?: ScallopQueryParams): Promise<ScallopQuery>;
     /**
      * Create a scallop indexer instance.
      *
@@ -69,5 +69,5 @@ export declare class Scallop {
      *
      * @return Scallop Utils.
      */
-    createScallopUtils(): Promise<ScallopUtils>;
+    createScallopUtils(params?: ScallopUtilsParams): Promise<ScallopUtils>;
 }

package/dist/models/scallopBuilder.d.ts

@@ -2,11 +2,12 @@ import { SuiKit } from '@scallop-io/sui-kit';
 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, ScallopTxBlock, SupportMarketCoins, SupportAssetCoins, SupportSCoin, ScallopBuilderInstanceParams, SelectCoinReturnType } from '../types';
 import { ScallopCache } from './scallopCache';
+import { SuiClient as SuiClientV0 } from '@mysten/sui.js/client';
 /**
  * @description
  * It provides methods for operating the transaction block, making it more convenient to organize transaction combinations.
@@ -27,6 +28,7 @@ export declare class ScallopBuilder {
     utils: ScallopUtils;
     walletAddress: string;
     cache: ScallopCache;
+    oldSuiClient: SuiClientV0;
     constructor(params: ScallopBuilderParams, instance?: ScallopBuilderInstanceParams);
     /**
      * Request the scallop API to initialize data.
@@ -41,7 +43,7 @@ export declare class ScallopBuilder {
      * @param txBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
      * @return Scallop txBlock.
      */
-    createTxBlock(txBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock): ScallopTxBlock;
+    createTxBlock(txBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction): ScallopTxBlock;
     /**
      * Specifying the sender's amount of coins to get coins args from transaction result.
      *
@@ -62,8 +64,8 @@ export declare class ScallopBuilder {
      * @return Take coin and left coin.
      */
     selectMarketCoin(txBlock: ScallopTxBlock | SuiKitTxBlock, marketCoinName: SupportMarketCoins, amount: number, sender?: string): Promise<{
-        takeCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
-        leftCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
+        takeCoin: any;
+        leftCoin: any;
         totalAmount: number;
     }>;
     /**
@@ -76,8 +78,8 @@ export declare class ScallopBuilder {
      * @return Take coin and left coin.
      */
     selectSCoin(txBlock: ScallopTxBlock | SuiKitTxBlock, sCoinName: SupportSCoin, amount: number, sender?: string): Promise<{
-        takeCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
-        leftCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
+        takeCoin: any;
+        leftCoin: any;
         totalAmount: number;
     }>;
     /**
@@ -85,5 +87,5 @@ export declare class ScallopBuilder {
      *
      * @param txBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
      */
-    signAndSendTxBlock(txBlock: ScallopTxBlock | SuiKitTxBlock | TransactionBlock): Promise<SuiTransactionBlockResponse>;
+    signAndSendTxBlock(txBlock: ScallopTxBlock | SuiKitTxBlock | Transaction): Promise<SuiTransactionBlockResponse>;
 }

package/dist/models/scallopCache.d.ts

@@ -1,11 +1,11 @@
 import { QueryClient, QueryClientConfig } from '@tanstack/query-core';
-import { SuiTxArg } from '@scallop-io/sui-kit';
+import { SuiObjectArg, SuiTxBlock } from '@scallop-io/sui-kit';
 import { SuiKit } from '@scallop-io/sui-kit';
-import type { SuiObjectResponse, SuiObjectDataOptions, SuiObjectData, GetOwnedObjectsParams, DevInspectResults, GetDynamicFieldsParams, DynamicFieldPage, GetDynamicFieldObjectParams, GetBalanceParams } from '@mysten/sui.js/client';
+import type { SuiObjectResponse, SuiObjectDataOptions, SuiObjectData, GetOwnedObjectsParams, DevInspectResults, GetDynamicFieldsParams, DynamicFieldPage, GetDynamicFieldObjectParams, GetBalanceParams } from '@mysten/sui/client';
 import { TokenBucket } from 'src/utils';
 type QueryInspectTxnParams = {
     queryTarget: string;
-    args: SuiTxArg[];
+    args: SuiObjectArg[];
     typeArgs?: any[];
 };
 /**
@@ -38,11 +38,7 @@ export declare class ScallopCache {
      * - `none`: No queries will be refetched. Queries that match the refetch predicate will only be marked as invalid.
      */
     invalidateAndRefetchAllCache(refetchType: 'all' | 'active' | 'inactive' | 'none'): Promise<void>;
-    /**
-     * @description Cache protocol config call for 60 seconds.
-     * @returns Promise<ProtocolConfig>
-     */
-    getProtocolConfig(): Promise<import("@mysten/sui.js/client").ProtocolConfig | null>;
+    resolveArgs(txb: SuiTxBlock, args: SuiObjectArg[]): Promise<SuiObjectArg[]>;
     /**
      * @description Provides cache for inspectTxn of the SuiKit.
      * @param QueryInspectTxnParams
@@ -68,7 +64,7 @@ export declare class ScallopCache {
      * @param input
      * @returns Promise<PaginatedObjectsResponse>
      */
-    queryGetOwnedObjects(input: GetOwnedObjectsParams): Promise<import("@mysten/sui.js/client").PaginatedObjectsResponse | null>;
+    queryGetOwnedObjects(input: GetOwnedObjectsParams): Promise<import("@mysten/sui/client").PaginatedObjectsResponse | null>;
     queryGetDynamicFields(input: GetDynamicFieldsParams): Promise<DynamicFieldPage | null>;
     queryGetDynamicFieldObject(input: GetDynamicFieldObjectParams): Promise<SuiObjectResponse | null>;
     queryGetAllCoinBalances(owner: string): Promise<{

package/dist/models/scallopClient.d.ts

@@ -3,9 +3,9 @@ import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopBuilder } from './scallopBuilder';
 import { ScallopQuery } from './scallopQuery';
+import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
+import type { TransactionObjectArgument } from '@mysten/sui/transactions';
 import { ScallopCache } from './scallopCache';
-import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
-import type { TransactionObjectArgument } from '@mysten/sui.js/transactions';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopClientFnReturnType, ScallopClientParams, SupportPoolCoins, SupportCollateralCoins, SupportAssetCoins, SupportStakeCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, ScallopTxBlock, ScallopClientVeScaReturnType, ScallopClientInstanceParams } from '../types';
 /**

package/dist/models/scallopQuery.d.ts

@@ -4,7 +4,7 @@ import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
-import { SuiObjectData } from '@mysten/sui.js/client';
+import { SuiObjectData } from '@mysten/sui/src/client';
 /**
  * @description
  * It provides methods for getting on-chain data from the Scallop contract.

package/dist/models/scallopUtils.d.ts

@@ -2,7 +2,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 } from '../types';
-import type { SuiAddressArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
+import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
 /**
  * @description
  * Integrates some helper functions frequently used in interactions with the Scallop contract.
@@ -168,7 +168,7 @@ export declare class ScallopUtils {
      * @param obligationId - The obligation id.
      * @return Asset coin Names.
      */
-    getObligationCoinNames(obligationId: SuiAddressArg): Promise<SupportAssetCoins[] | undefined>;
+    getObligationCoinNames(obligationId: SuiObjectArg): Promise<SupportAssetCoins[] | undefined>;
     /**
      * Get asset coin price.
      *

package/dist/queries/coreQuery.d.ts

@@ -1,5 +1,5 @@
-import type { SuiObjectData } from '@mysten/sui.js/client';
-import type { SuiAddressArg } from '@scallop-io/sui-kit';
+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 } from '../types';
 /**
@@ -119,7 +119,7 @@ export declare const getObligationLocked: (cache: ScallopCache, obligation: stri
  */
 export declare const queryObligation: ({ address, }: {
     address: ScallopAddress;
-}, obligationId: SuiAddressArg) => Promise<ObligationQueryInterface | undefined>;
+}, obligationId: SuiObjectArg) => Promise<ObligationQueryInterface | undefined>;
 /**
  * Query all owned coin amount.
  *

package/dist/queries/loyaltyProgramQuery.d.ts

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

package/dist/queries/priceQuery.d.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/dist/queries/vescaQuery.d.ts

@@ -1,5 +1,5 @@
 import { VeScaTreasuryInfo, Vesca } from '../types';
-import { type SuiObjectData } from '@mysten/sui.js/client';
+import { type SuiObjectData } from '@mysten/sui/client';
 import type { ScallopUtils } from '../models';
 /**
  * Query all owned veSca key.

package/dist/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/builder/borrowIncentive.d.ts

@@ -1,5 +1,5 @@
 import type { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } 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 { SupportBorrowIncentiveCoins, SupportBorrowIncentiveRewardCoins } from '../constant';
 export type BorrowIncentiveIds = {

package/dist/types/builder/core.d.ts

@@ -1,5 +1,5 @@
-import type { SuiTxBlock as SuiKitTxBlock, SuiAddressArg, SuiObjectArg, SuiTxArg } from '@scallop-io/sui-kit';
-import type { TransactionArgument, TransactionResult } from '@mysten/sui.js/transactions';
+import type { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
+import type { TransactionArgument, TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportCollateralCoins, SupportPoolCoins, SupportAssetCoins } from '../constant';
 import { SuiTxBlockWithSpool } from '.';
@@ -18,29 +18,29 @@ type ObligationKey = NestedResult;
 type ObligationHotPotato = NestedResult;
 export type CoreNormalMethods = {
     openObligation: () => [Obligation, ObligationKey, ObligationHotPotato];
-    returnObligation: (obligation: SuiAddressArg, obligationHotPotato: SuiObjectArg) => void;
+    returnObligation: (obligation: SuiObjectArg, obligationHotPotato: SuiObjectArg) => void;
     openObligationEntry: () => void;
-    addCollateral: (obligation: SuiAddressArg, coin: SuiObjectArg, collateralCoinName: SupportCollateralCoins) => void;
-    takeCollateral: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, amount: SuiTxArg, collateralCoinName: SupportCollateralCoins) => TransactionResult;
+    addCollateral: (obligation: SuiObjectArg, coin: SuiObjectArg, collateralCoinName: SupportCollateralCoins) => void;
+    takeCollateral: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, collateralCoinName: SupportCollateralCoins) => TransactionResult;
     deposit: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     depositEntry: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
     withdraw: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     withdrawEntry: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
-    borrow: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, amount: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    borrowWithReferral: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, borrowReferral: SuiObjectArg, amount: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    borrowEntry: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, amount: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
-    repay: (obligation: SuiAddressArg, coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
-    borrowFlashLoan: (amount: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    repayFlashLoan: (coin: SuiObjectArg, loan: SuiAddressArg, poolCoinName: SupportPoolCoins) => void;
+    borrow: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
+    borrowWithReferral: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, borrowReferral: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
+    borrowEntry: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => void;
+    repay: (obligation: SuiObjectArg, coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
+    borrowFlashLoan: (amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
+    repayFlashLoan: (coin: SuiObjectArg, loan: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
 };
 export type CoreQuickMethods = {
-    addCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiAddressArg) => Promise<void>;
-    takeCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiAddressArg, obligationKey?: SuiAddressArg) => Promise<TransactionResult>;
-    borrowQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiAddressArg, obligationKey?: SuiAddressArg) => Promise<TransactionResult>;
-    borrowWithReferralQuick: (amount: number, poolCoinName: SupportPoolCoins, borrowReferral: SuiObjectArg, obligationId?: SuiAddressArg, obligationKey?: SuiAddressArg) => Promise<TransactionResult>;
+    addCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiObjectArg) => Promise<void>;
+    takeCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiObjectArg, obligationKey?: SuiObjectArg) => Promise<TransactionResult>;
+    borrowQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiObjectArg, obligationKey?: SuiObjectArg) => Promise<TransactionResult>;
+    borrowWithReferralQuick: (amount: number, poolCoinName: SupportPoolCoins, borrowReferral: SuiObjectArg, obligationId?: SuiObjectArg, obligationKey?: SuiObjectArg) => Promise<TransactionResult>;
     depositQuick: (amount: number, poolCoinName: SupportPoolCoins, returnSCoin?: boolean) => Promise<TransactionResult>;
     withdrawQuick: (amount: number, poolCoinName: SupportPoolCoins) => Promise<TransactionResult>;
-    repayQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiAddressArg) => Promise<void>;
+    repayQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiObjectArg) => Promise<void>;
     updateAssetPricesQuick: (assetCoinNames?: SupportAssetCoins[]) => Promise<void>;
 };
 export type SuiTxBlockWithCoreNormalMethods = SuiKitTxBlock & SuiTxBlockWithSpool & CoreNormalMethods;

package/dist/types/builder/spool.d.ts

@@ -1,5 +1,5 @@
-import type { SuiTxBlock as SuiKitTxBlock, SuiAddressArg, SuiObjectArg, SuiTxArg } from '@scallop-io/sui-kit';
-import type { TransactionResult } from '@mysten/sui.js/transactions';
+import type { SuiTxBlock as SuiKitTxBlock, SuiAddressArg, SuiObjectArg } from '@scallop-io/sui-kit';
+import type { TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportStakeMarketCoins } from '../constant';
 import { SuiTxBlockWithSCoin } from '.';
@@ -9,7 +9,7 @@ export type SpoolIds = {
 export type SpoolNormalMethods = {
     createStakeAccount: (stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
     stake: (stakeAccount: SuiAddressArg, coin: SuiObjectArg, stakeMarketCoinName: SupportStakeMarketCoins) => void;
-    unstake: (stakeAccount: SuiAddressArg, amount: SuiTxArg, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
+    unstake: (stakeAccount: SuiAddressArg, amount: number, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
     claim: (stakeAccount: SuiAddressArg, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
 };
 export type SpoolQuickMethods = {

package/dist/types/builder/vesca.d.ts

@@ -1,5 +1,5 @@
-import { SuiTxBlock as SuiKitTxBlock, SuiObjectArg, SuiTxArg } from '@scallop-io/sui-kit';
-import type { TransactionResult } from '@mysten/sui.js/transactions';
+import { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
+import type { TransactionResult } from '@mysten/sui/transactions';
 import { ScallopBuilder } from 'src/models';
 export type VescaIds = {
     pkgId: string;
@@ -8,10 +8,10 @@ export type VescaIds = {
     config: string;
 };
 export type VeScaNormalMethods = {
-    lockSca: (scaCoin: SuiObjectArg, unlockAtInSecondTimestamp: SuiTxArg) => TransactionResult;
-    extendLockPeriod: (veScaKey: SuiObjectArg, newUnlockAtInSecondTimestamp: SuiTxArg) => void;
+    lockSca: (scaCoin: SuiObjectArg, unlockAtInSecondTimestamp: number) => TransactionResult;
+    extendLockPeriod: (veScaKey: SuiObjectArg, newUnlockAtInSecondTimestamp: number) => void;
     extendLockAmount: (veScaKey: SuiObjectArg, scaCoin: SuiObjectArg) => void;
-    renewExpiredVeSca: (veScaKey: SuiObjectArg, scaCoin: SuiObjectArg, newUnlockAtInSecondTimestamp: SuiTxArg) => void;
+    renewExpiredVeSca: (veScaKey: SuiObjectArg, scaCoin: SuiObjectArg, newUnlockAtInSecondTimestamp: number) => void;
     redeemSca: (veScaKey: SuiObjectArg) => TransactionResult;
     mintEmptyVeSca: () => TransactionResult;
 };

package/dist/types/model.d.ts

@@ -1,11 +1,11 @@
-import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
-import type { TransactionBlock, TransactionResult } from '@mysten/sui.js/transactions';
+import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
+import type { Transaction, TransactionResult } from '@mysten/sui/transactions';
 import type { SuiKit, SuiKitParams, NetworkType } from '@scallop-io/sui-kit';
 import type { ScallopAddress, ScallopQuery, ScallopUtils, ScallopBuilder, ScallopIndexer } from '../models';
 import { ScallopCache } from 'src/models/scallopCache';
-export type ScallopClientFnReturnType<T extends boolean> = T extends true ? SuiTransactionBlockResponse : TransactionBlock;
+export type ScallopClientFnReturnType<T extends boolean> = T extends true ? SuiTransactionBlockResponse : Transaction;
 export type ScallopClientVeScaReturnType<T extends boolean> = T extends true ? SuiTransactionBlockResponse : {
-    tx: TransactionBlock;
+    tx: Transaction;
     scaCoin: TransactionResult;
 };
 export type ScallopBaseInstanceParams = {
@@ -40,11 +40,12 @@ export type ScallopParams = {
     addressesId?: string;
     walletAddress?: string;
 } & SuiKitParams;
-export type ScallopClientParams = ScallopParams;
+export type ScallopClientParams = ScallopParams & ScallopBuilderParams & ScallopQueryParams & ScallopUtilsParams;
 export type ScallopBuilderParams = ScallopParams & {
     pythEndpoints?: string[];
-};
-export type ScallopQueryParams = ScallopParams;
+    usePythPullModel?: boolean;
+} & ScallopQueryParams;
+export type ScallopQueryParams = ScallopParams & ScallopUtilsParams;
 export type ScallopUtilsParams = ScallopParams & {
     pythEndpoints?: string[];
 };

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

@@ -1,4 +1,4 @@
-import type { SuiObjectRef } from '@mysten/sui.js/client';
+import type { SuiObjectRef } from '@mysten/sui/client';
 export type Vesca = {
     id: string;
     keyId: string;

package/dist/utils/query.d.ts

@@ -59,4 +59,4 @@ export declare const maxBigNumber: (...args: BigNumber.Value[]) => BigNumber;
  * @param type - The type of the calculation.
  * @return The estimated factor
  * */
-export declare const estimatedFactor: (amount: number, scaleStep: number, type: 'increase' | 'decrease') => number;
+export declare const estimatedFactor: (amount: number, scaleStep: number, type: "increase" | "decrease") => number;

package/dist/utils/util.d.ts

@@ -1,3 +1,4 @@
+import type { PriceFeed } from '@pythnetwork/pyth-sui-js';
 import type { ScallopAddress } from '../models';
 import type { SupportAssetCoins, SupportCoins, SupportMarketCoins } from '../types';
 export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.47.2",
+  "version": "1.3.0-alpha.1",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -38,14 +38,15 @@
     "src"
   ],
   "dependencies": {
-    "@graphql-typed-document-node/core": "^3.2.0",
-    "@mysten/bcs": "^0.8.1",
-    "@mysten/sui.js": "^0.54.1",
+    "@graphql-typed-document-node/core": "3.2.0",
+    "@mysten/bcs": "^1.0.3",
+    "@mysten/sui": "^1.3.0",
+    "@mysten/sui.js": "0.54.1",
     "@noble/curves": "^1.2.0",
     "@noble/hashes": "^1.3.2",
     "@pythnetwork/price-service-client": "^1.8.2",
     "@pythnetwork/pyth-sui-js": "2.0.0",
-    "@scallop-io/sui-kit": "0.52.0",
+    "@scallop-io/sui-kit": "1.3.0",
     "@scure/bip39": "^1.2.1",
     "@tanstack/query-core": "^5.28.0",
     "axios": "^1.6.0",
@@ -55,32 +56,35 @@
     "graphql": "^16.9.0",
     "superstruct": "^1.0.3",
     "tweetnacl": "^1.0.3",
+    "valibot": "^0.36.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.2.0",
     "@commitlint/config-conventional": "^18.1.0",
     "@commitlint/prompt-cli": "^18.2.0",
-    "@types/node": "^20.8.10",
+    "@types/node": "^20.4.2",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",
     "dotenv": "^16.3.1",
     "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.1",
+    "graphql-config": "^5.0.3",
     "husky": "^8.0.3",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "standard-version": "^9.5.0",
     "tsconfig-paths": "^4.2.0",
     "tsup": "^7.2.0",
-    "typedoc": "^0.25.3",
-    "typescript": "^5.2.2",
+    "typedoc": "^0.26.3",
+    "typescript": "^5.3.3",
     "vitest": "^0.34.6"
   },
   "peerDependencies": {
+    "@mysten/sui": "1.3.0",
     "@mysten/sui.js": "0.54.1",
-    "@scallop-io/sui-kit": "0.52.0",
+    "@scallop-io/sui-kit": "1.3.0",
     "bn.js": "^5.2.1"
   },
   "lint-staged": {

package/src/builders/borrowIncentiveBuilder.ts

@@ -1,5 +1,5 @@
-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 { getObligations, getObligationLocked } from '../queries';
 import { requireSender } from '../utils';
@@ -255,19 +255,14 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
           const bindedVeScaKey =
             await builder.query.getBindedVeScaKey(obligationArg);
 
-          if (veScaKey && veScaKey !== bindedVeScaKey) {
-            throw new Error(
-              'Binded veScaKey is not equal to the provided veScaKey'
-            );
-          }
-          if (bindedVeScaKey) {
+          if ((veScaKey && veScaKey !== bindedVeScaKey) || !bindedVeScaKey) {
+            txBlock.stakeObligation(obligationArg, obligationKeyArg);
+          } else {
             txBlock.stakeObligationWithVesca(
               obligationArg,
               obligationKeyArg,
               bindedVeScaKey
             );
-          } else {
-            txBlock.stakeObligation(obligationArg, obligationKeyArg);
           }
         }
       },
@@ -320,14 +315,14 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
  */
 export const newBorrowIncentiveTxBlock = (
   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 = generateBorrowIncentiveNormalMethod({
     builder,

package/src/builders/coreBuilder.ts

@@ -1,10 +1,10 @@
-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 { getObligations } from '../queries';
 import { updateOracles } from './oracle';
 import { requireSender } from '../utils';
-import type { SuiAddressArg, TransactionResult } from '@scallop-io/sui-kit';
+import type { SuiObjectArg, TransactionResult } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type {
   CoreIds,
@@ -35,8 +35,8 @@ const requireObligationInfo = async (
   ...params: [
     builder: ScallopBuilder,
     txBlock: SuiKitTxBlock,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg,
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg,
   ]
 ) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
@@ -116,7 +116,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID,
         ],
@@ -189,7 +189,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           coreIds.market,
           coreIds.coinDecimalsRegistry,
           borrowReferral,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID,
         ],
@@ -206,7 +206,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID,
         ],
@@ -303,7 +303,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.takeCollateral(
         obligationInfo.obligationId,
-        obligationInfo.obligationKey as SuiAddressArg,
+        obligationInfo.obligationKey as SuiObjectArg,
         amount,
         collateralCoinName
       );
@@ -396,7 +396,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrow(
         obligationInfo.obligationId,
-        obligationInfo.obligationKey as SuiAddressArg,
+        obligationInfo.obligationKey as SuiObjectArg,
         amount,
         poolCoinName
       );
@@ -422,7 +422,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrowWithReferral(
         obligationInfo.obligationId,
-        obligationInfo.obligationKey as SuiAddressArg,
+        obligationInfo.obligationKey as SuiObjectArg,
         borrowReferral,
         amount,
         poolCoinName
@@ -476,15 +476,15 @@ export const newCoreTxBlock = (
   initTxBlock?:
     | ScallopTxBlock
     | SuiKitTxBlock
-    | TransactionBlock
+    | Transaction
     | SuiTxBlockWithSpool
 ) => {
   const txBlock =
-    initTxBlock instanceof TransactionBlock
+    initTxBlock instanceof Transaction
       ? new SuiKitTxBlock(initTxBlock)
       : initTxBlock
-      ? initTxBlock
-      : new SuiKitTxBlock();
+        ? initTxBlock
+        : new SuiKitTxBlock();
 
   const normalMethod = generateCoreNormalMethod({
     builder,

package/src/builders/index.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { newCoreTxBlock } from './coreBuilder';
 import { newSpoolTxBlock } from './spoolBuilder';
@@ -19,7 +19,7 @@ import { newSCoinTxBlock } from './sCoinBuilder';
  */
 export const newScallopTxBlock = (
   builder: ScallopBuilder,
-  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | Transaction
 ): ScallopTxBlock => {
   const vescaTxBlock = newVeScaTxBlock(builder, initTxBlock);
   const loyaltyTxBlock = newLoyaltyProgramTxBlock(builder, vescaTxBlock);

package/src/builders/loyaltyProgramBuilder.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { coinIds } from 'src/constants';
 import { ScallopBuilder } from 'src/models';
@@ -66,14 +66,14 @@ const generateLoyaltyProgramQuickMethod: GenerateLoyaltyProgramQuickMethod = ({
  */
 export const newLoyaltyProgramTxBlock = (
   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 = generateLoyaltyProgramNormalMethod({
     builder,