@zofai/zo-sdk 0.2.10 → 0.2.12

package/src/implementations/SLPAPI.ts

@@ -5,7 +5,6 @@
 
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
 import { KioskTransaction } from '@mysten/kiosk'
-import type { SuiClient } from '@mysten/sui/client'
 import type { TransactionObjectArgument } from '@mysten/sui/transactions'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
@@ -18,6 +17,7 @@ import type {
   ISLPAPI,
   ISLPCredential,
 } from '../interfaces'
+import type { SuiClient } from '../suiClient'
 import { joinSymbol } from '../utils'
 import { SLPDataAPI } from './SLPDataAPI'
 
@@ -1166,8 +1166,8 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -1198,14 +1198,14 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({
@@ -2334,8 +2334,8 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -2377,14 +2377,14 @@ export class SLPAPI extends BaseAPI implements ISLPAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({

package/src/implementations/SLPDataAPI.ts

@@ -6,7 +6,6 @@
  * Implements SLP-specific data access methods for Sudo SDK
  */
 
-import type { DynamicFieldInfo, SuiClient } from '@mysten/sui/client'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
 
@@ -39,6 +38,7 @@ import type {
   ISLPVaultInfo,
   ISwapFeeBreakdown,
 } from '../interfaces'
+import type { DynamicFieldInfo, SuiClient } from '../suiClient'
 import { joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
 
 export interface GetCumulativeAprResponse {

package/src/implementations/USDZAPI.ts

@@ -5,7 +5,6 @@
 
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
 import { KioskTransaction } from '@mysten/kiosk'
-import type { SuiClient } from '@mysten/sui/client'
 import type { TransactionObjectArgument } from '@mysten/sui/transactions'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
@@ -18,6 +17,7 @@ import type {
   IUSDZAPI,
   IUSDZCredential,
 } from '../interfaces'
+import type { SuiClient } from '../suiClient'
 import { joinSymbol } from '../utils'
 import { USDZDataAPI } from './USDZDataAPI'
 
@@ -828,8 +828,8 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -871,14 +871,14 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({
@@ -2022,8 +2022,8 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -2054,14 +2054,14 @@ export class USDZAPI extends BaseAPI implements IUSDZAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({

package/src/implementations/USDZDataAPI.ts

@@ -4,7 +4,7 @@
  * Implements USDZ-specific data access methods
  */
 
-import type { DynamicFieldInfo, SuiClient } from '@mysten/sui/client'
+import type { DynamicFieldInfo, SuiClient } from '../suiClient'
 import type { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
 

package/src/implementations/ZBTCVCAPI.ts

@@ -5,7 +5,6 @@
 
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
 import { KioskTransaction } from '@mysten/kiosk'
-import type { SuiClient } from '@mysten/sui/client'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
 
@@ -17,6 +16,7 @@ import type {
   IZBTCVCAPI,
   IZBTCVCCredential,
 } from '../interfaces'
+import type { SuiClient } from '../suiClient'
 import { joinSymbol } from '../utils'
 import { ZBTCVCDataAPI } from './ZBTCVCDataAPI'
 

package/src/implementations/ZBTCVCDataAPI.ts

@@ -4,7 +4,6 @@
  * Implements ZBTCVC-specific data access methods
  */
 
-import type { DynamicFieldInfo, SuiClient } from '@mysten/sui/client'
 import type { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
 
@@ -31,6 +30,7 @@ import type {
   IZBTCVCSymbolInfo,
   IZBTCVCVaultInfo,
 } from '../interfaces'
+import type { DynamicFieldInfo, SuiClient } from '../suiClient'
 import { joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
 
 export class ZBTCVCDataAPI extends BaseDataAPI implements IZBTCVCDataAPI {

package/src/implementations/ZLPAPI.ts

@@ -5,7 +5,6 @@
 
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
 import { KioskTransaction } from '@mysten/kiosk'
-import type { SuiClient } from '@mysten/sui/client'
 import type { TransactionObjectArgument } from '@mysten/sui/transactions'
 import { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
@@ -18,6 +17,7 @@ import type {
   IZLPAPI,
   IZLPCredential,
 } from '../interfaces'
+import type { SuiClient } from '../suiClient'
 import { joinSymbol } from '../utils'
 import { ZLPDataAPI } from './ZLPDataAPI'
 
@@ -1147,8 +1147,8 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -1179,14 +1179,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({
@@ -1983,8 +1983,8 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
     sponsoredTx?: boolean,
     sender?: string,
   ): Promise<Transaction> {
-    if (!coinObjects) {
-      throw new Error(`${this.constructor.name}: coinObjects is required`)
+    if (!coinObjects?.length && !sender) {
+      throw new Error(`${this.constructor.name}: coinObjects or sender is required`)
     }
 
     let tx = new Transaction()
@@ -2026,14 +2026,14 @@ export class ZLPAPI extends BaseAPI implements IZLPAPI {
       tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx
     }
 
-    // Process coin splitting
-    const [feeObject] = this.processCoinSplitting(
+    const feeObject = await this.resolveRelayerFeeObject(
       tx,
       collateralToken,
-      coinObjects,
-      [tx.pure.u64(relayerFee)],
+      coinObjects ?? [],
+      relayerFee,
       sponsoredTx,
       suiCoinObject,
+      sender,
     )
 
     tx.moveCall({

package/src/implementations/ZLPDataAPI.ts

@@ -4,7 +4,6 @@
  * Implements ZLP-specific data access methods
  */
 
-import type { DynamicFieldInfo, SuiClient } from '@mysten/sui/client'
 import type { Transaction } from '@mysten/sui/transactions'
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils'
 
@@ -36,6 +35,7 @@ import type {
   IZLPSymbolInfo,
   IZLPVaultInfo,
 } from '../interfaces'
+import type { DynamicFieldInfo, SuiClient } from '../suiClient'
 import { joinSymbol, parseSymbolKey, parseValue, suiSymbolToSymbol } from '../utils'
 
 interface SwapImpactConfig {

package/src/index.ts

@@ -20,6 +20,7 @@ export * from './abstract'
 export * from './factory/SDKFactory'
 export * from './implementations'
 export * from './interfaces'
+export * from './suiClient'
 
 // Export legacy components for backward compatibility
 export * from './api'
@@ -31,7 +32,7 @@ export * from './oracle'
 export * from './utils'
 
 // Re-export commonly used types from Sui SDK
-export type { SuiClient } from '@mysten/sui/client'
+export type { SuiClient } from './suiClient'
 export type { Transaction } from '@mysten/sui/transactions'
 
 /**

package/src/interfaces/base.ts

@@ -4,12 +4,12 @@
  */
 
 import type { KioskClient, KioskOwnerCap } from '@mysten/kiosk'
-import type { SuiClient } from '@mysten/sui/client'
 import type { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions'
 import type { PriceFeed } from '@pythnetwork/pyth-sui-js'
 
 import type { IConsts, LPToken, Network } from '../consts'
 import type { IInitOracleTxbResult } from '../oracle'
+import type { SuiClient } from '../suiClient'
 
 // Common data interfaces
 export interface IBaseMarketValuationInfo {
@@ -757,6 +757,7 @@ export interface IBaseAPI {
     relayerFee?: bigint,
     coinObjects?: string[],
     sponsoredTx?: boolean,
+    sender?: string,
   ) => Promise<Transaction>
 
   decreaseMultiPositionsWithSCardV2?: (

package/src/oracle.ts

@@ -1,4 +1,3 @@
-import type { SuiClient } from '@mysten/sui/client'
 import type { TransactionObjectArgument } from '@mysten/sui/transactions'
 import { Transaction } from '@mysten/sui/transactions'
 import type { PriceFeed } from '@pythnetwork/pyth-sui-js'
@@ -7,6 +6,7 @@ import { SuiPriceServiceConnection, SuiPythClient } from '@pythnetwork/pyth-sui-
 import { resolveSpendableSuiCoin } from './coins'
 import type { IConsts, Network } from './consts'
 import { getConsts, getPriceIdToPythFeeder, getPythFeederToId, getPythFeederToPriceId, getSharedConfig, LPToken } from './consts'
+import type { SuiClient } from './suiClient'
 import { createJsonRpcProvider } from './utils'
 
 export interface IInitOracleSponsorOptions {
@@ -47,7 +47,11 @@ export class OracleAPI {
     this.PythFeederToPriceId = getPythFeederToPriceId(network)
     this.PythFeederToId = getPythFeederToId(network)
     this.provider = provider || createJsonRpcProvider(network)
-    this.client = new SuiPythClient(this.provider, this.consts.pythFeeder.state, this.consts.pythFeeder.wormhole.state)
+    this.client = new SuiPythClient(
+      this.provider as ConstructorParameters<typeof SuiPythClient>[0],
+      this.consts.pythFeeder.state,
+      this.consts.pythFeeder.wormhole.state,
+    )
   }
 
   validateCache() {

package/src/suiClient.ts

@@ -0,0 +1,11 @@
+/**
+ * Sui v2 client re-exports.
+ * SuiJsonRpcClient is the JSON-RPC replacement for the removed SuiClient.
+ */
+export type { ClientWithCoreApi } from '@mysten/sui/client'
+export type { DynamicFieldInfo, SuiJsonRpcClient as SuiClient } from '@mysten/sui/jsonRpc'
+export {
+  getJsonRpcFullnodeUrl,
+  JsonRpcHTTPTransport,
+  SuiJsonRpcClient,
+} from '@mysten/sui/jsonRpc'

package/src/utils.ts

@@ -1,8 +1,13 @@
-import { SuiClient, SuiHTTPTransport } from '@mysten/sui/client'
+import type { SuiClientTypes } from '@mysten/sui/client'
+import { JsonRpcHTTPTransport, SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
 
 import type { IConsts } from './consts'
 import { Network } from './consts'
 
+function toSuiNetwork(network: Network): SuiClientTypes.Network {
+  return network
+}
+
 export function createJsonRpcProvider(network: Network) {
   let url = ''
   switch (network) {
@@ -23,8 +28,9 @@ export function createJsonRpcProvider(network: Network) {
     }
   }
 
-  return new SuiClient({
-    transport: new SuiHTTPTransport({ url }),
+  return new SuiJsonRpcClient({
+    transport: new JsonRpcHTTPTransport({ url }),
+    network: toSuiNetwork(network),
   })
 }
 

package/tsconfig.json

@@ -2,7 +2,14 @@
   "compilerOptions": {
     "target": "ES2020",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
+    "baseUrl": ".",
+    "paths": {
+      "@mysten/sui/transactions": ["node_modules/@mysten/sui/dist/transactions/index.d.mts"],
+      "@mysten/sui/utils": ["node_modules/@mysten/sui/dist/utils/index.d.mts"],
+      "@mysten/sui/jsonRpc": ["node_modules/@mysten/sui/dist/jsonRpc/index.d.mts"],
+      "@mysten/sui/client": ["node_modules/@mysten/sui/dist/client/index.d.mts"]
+    },
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,