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

package/src/types/builder/core.ts

@@ -1,13 +1,11 @@
 import type {
   SuiTxBlock as SuiKitTxBlock,
-  SuiAddressArg,
   SuiObjectArg,
-  SuiTxArg,
 } from '@scallop-io/sui-kit';
 import type {
   TransactionArgument,
   TransactionResult,
-} from '@mysten/sui.js/transactions';
+} from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type {
   SupportCollateralCoins,
@@ -35,19 +33,19 @@ type ObligationHotPotato = NestedResult;
 export type CoreNormalMethods = {
   openObligation: () => [Obligation, ObligationKey, ObligationHotPotato];
   returnObligation: (
-    obligation: SuiAddressArg,
+    obligation: SuiObjectArg,
     obligationHotPotato: SuiObjectArg
   ) => void;
   openObligationEntry: () => void;
   addCollateral: (
-    obligation: SuiAddressArg,
+    obligation: SuiObjectArg,
     coin: SuiObjectArg,
     collateralCoinName: SupportCollateralCoins
   ) => void;
   takeCollateral: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
-    amount: SuiTxArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
+    amount: number,
     collateralCoinName: SupportCollateralCoins
   ) => TransactionResult;
   deposit: (
@@ -64,36 +62,36 @@ export type CoreNormalMethods = {
     poolCoinName: SupportPoolCoins
   ) => void;
   borrow: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
-    amount: SuiTxArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   borrowWithReferral: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
     borrowReferral: SuiObjectArg,
-    amount: SuiTxArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   borrowEntry: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
-    amount: SuiTxArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => void;
   repay: (
-    obligation: SuiAddressArg,
+    obligation: SuiObjectArg,
     coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => void;
   borrowFlashLoan: (
-    amount: SuiTxArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   repayFlashLoan: (
     coin: SuiObjectArg,
-    loan: SuiAddressArg,
+    loan: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => void;
 };
@@ -102,26 +100,26 @@ export type CoreQuickMethods = {
   addCollateralQuick: (
     amount: number,
     collateralCoinName: SupportCollateralCoins,
-    obligationId?: SuiAddressArg
+    obligationId?: SuiObjectArg
   ) => Promise<void>;
   takeCollateralQuick: (
     amount: number,
     collateralCoinName: SupportCollateralCoins,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   borrowQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   borrowWithReferralQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
     borrowReferral: SuiObjectArg,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   depositQuick: (
     amount: number,
@@ -135,7 +133,7 @@ export type CoreQuickMethods = {
   repayQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
-    obligationId?: SuiAddressArg
+    obligationId?: SuiObjectArg
   ) => Promise<void>;
   updateAssetPricesQuick: (
     assetCoinNames?: SupportAssetCoins[]

package/src/types/builder/spool.ts

@@ -2,9 +2,8 @@ import type {
   SuiTxBlock as SuiKitTxBlock,
   SuiAddressArg,
   SuiObjectArg,
-  SuiTxArg,
 } 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 { SupportStakeMarketCoins } from '../constant';
 import { SuiTxBlockWithSCoin } from '.';
@@ -24,7 +23,7 @@ export type SpoolNormalMethods = {
   ) => void;
   unstake: (
     stakeAccount: SuiAddressArg,
-    amount: SuiTxArg,
+    amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins
   ) => TransactionResult;
   claim: (

package/src/types/builder/vesca.ts

@@ -1,9 +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 = {
@@ -16,17 +12,17 @@ export type VescaIds = {
 export type VeScaNormalMethods = {
   lockSca: (
     scaCoin: SuiObjectArg,
-    unlockAtInSecondTimestamp: SuiTxArg
+    unlockAtInSecondTimestamp: number
   ) => TransactionResult;
   extendLockPeriod: (
     veScaKey: SuiObjectArg,
-    newUnlockAtInSecondTimestamp: SuiTxArg
+    newUnlockAtInSecondTimestamp: number
   ) => void;
   extendLockAmount: (veScaKey: SuiObjectArg, scaCoin: SuiObjectArg) => void;
   renewExpiredVeSca: (
     veScaKey: SuiObjectArg,
     scaCoin: SuiObjectArg,
-    newUnlockAtInSecondTimestamp: SuiTxArg
+    newUnlockAtInSecondTimestamp: number
   ) => void;
   redeemSca: (veScaKey: SuiObjectArg) => TransactionResult;
   mintEmptyVeSca: () => TransactionResult;

package/src/types/model.ts

@@ -1,8 +1,5 @@
-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,
@@ -15,12 +12,12 @@ import { ScallopCache } from 'src/models/scallopCache';
 
 export type ScallopClientFnReturnType<T extends boolean> = T extends true
   ? SuiTransactionBlockResponse
-  : TransactionBlock;
+  : Transaction;
 
 export type ScallopClientVeScaReturnType<T extends boolean> = T extends true
   ? SuiTransactionBlockResponse
   : {
-      tx: TransactionBlock;
+      tx: Transaction;
       scaCoin: TransactionResult;
     };
 

package/src/types/query/vesca.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;

package/src/utils/query.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { normalizeStructTag, parseStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag, parseStructTag } from '@mysten/sui/utils';
 import type { ScallopUtils } from '../models';
 import type {
   OriginMarketPoolData,