@msafe/sui3-sdk 0.0.65 → 0.0.67

package/src/core/MSafeAccount.ts

@@ -1,4 +1,4 @@
-import { appHelpers } from '@msafe/iota-app-store';
+import { appHelpers } from '@msafe/sui-app-store';
 import {
   CoinTransferIntention,
   IGasOption,
@@ -14,11 +14,12 @@ import {
   TransactionType,
   buildRejectTxb,
   isSameAddress,
-} from '@msafe/iota-utils';
-import { IotaObjectData, IotaObjectResponse } from '@iota/iota-sdk/client';
-import { SerializedSignature } from '@iota/iota-sdk/cryptography';
-import { TransactionBlock } from '@iota/iota-sdk/transactions';
-import { fromHEX, normalizeStructTag, toHEX } from '@iota/iota-sdk/utils';
+} from '@msafe/sui3-utils';
+import { SuiObjectData, SuiObjectResponse } from '@mysten/sui.js/client';
+import { SerializedSignature } from '@mysten/sui.js/cryptography';
+import { TransactionBlock } from '@mysten/sui.js/transactions';
+import { fromHEX, normalizeStructTag, toHEX } from '@mysten/sui.js/utils';
+import { SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN } from '@mysten/wallet-standard';
 
 import { MSafeGlobals } from '@/globals/MSafeGlobals';
 import { Simulator } from '@/simulate/simulator';
@@ -44,7 +45,7 @@ export class MSafeAccount {
       ownersWithWeight: info.owners,
       creationNonce: info.creationNonce,
     });
-    this.coinHelper = new CoinHelper(this.client);
+    this.coinHelper = new CoinHelper(this.suiClient);
     this.simulator = new Simulator(globals);
   }
 
@@ -57,9 +58,9 @@ export class MSafeAccount {
   }
 
   async ownedCoins(): Promise<OwnedCoin[]> {
-    const balances = await this.client.getAllBalances({ owner: this.address });
+    const balances = await this.suiClient.getAllBalances({ owner: this.address });
     return Promise.all(
-      balances.map(async (balance: any): Promise<OwnedCoin> => {
+      balances.map(async (balance): Promise<OwnedCoin> => {
         const meta = await this.coinHelper.getCoinMeta(balance.coinType);
         const unlockedBalance = balance.lockedBalance.number
           ? BigInt(balance.totalBalance) - BigInt(balance.lockedBalance.number)
@@ -74,12 +75,12 @@ export class MSafeAccount {
     );
   }
 
-  async ownedObjects(options?: BatchObjectOptions): Promise<IotaObjectData[]> {
+  async ownedObjects(options?: BatchObjectOptions): Promise<SuiObjectData[]> {
     const filterCoinObjectOptions = {
-      filter: (objRes: IotaObjectResponse) => !objRes?.data?.type?.startsWith('0x2::coin::Coin'),
+      filter: (objRes: SuiObjectResponse) => !objRes?.data?.type?.startsWith('0x2::coin::Coin'),
       ...options,
     };
-    return getAllOwnedObjects(this.client, this.address, filterCoinObjectOptions);
+    return getAllOwnedObjects(this.suiClient, this.address, filterCoinObjectOptions);
   }
 
   async pendingTransaction(): Promise<PendingTx | undefined> {
@@ -135,16 +136,17 @@ export class MSafeAccount {
     if (!appHelper) {
       throw new Error(`Can't find app helper for application ${request.application}`);
     }
+    // const config = getMSafeConfig(env, options);
     const txb = await appHelper.build({
       network: this.globals.config.network,
       intentionData: request.intention,
       txType: request.txType,
       txSubType: request.txSubType,
-      client: this.globals.client,
+      clientUrl: this.globals.config.suiClient.url,
       account: {
         address: this.address,
         publicKey: fromHEX(this.address),
-        chains: [],
+        chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
         features: [],
       },
     });
@@ -182,19 +184,19 @@ export class MSafeAccount {
       intentionData: input.intention,
       txType: input.txType,
       txSubType: input.txSubType,
-      client: this.globals.client,
+      clientUrl: this.globals.config.suiClient.url,
       account: {
         address: this.address,
         publicKey: fromHEX(this.address),
-        chains: [],
+        chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
         features: [],
       },
     });
     txb.setGasPrice(input.gasPrice);
     txb.setGasBudget(input.gasBudget);
     txb.setSender(this.address);
-    const payload = await txb.build({ client: this.globals.client });
-    const digest = await txb.getDigest({ client: this.globals.client });
+    const payload = await txb.build({ client: this.globals.suiClient });
+    const digest = await txb.getDigest({ client: this.globals.suiClient });
 
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
 
@@ -310,8 +312,8 @@ export class MSafeAccount {
     }
 
     const rejectTxb = buildRejectTxb(this.address);
-    const digest = await rejectTxb.getDigest({ client: this.client });
-    const payload = await rejectTxb.build({ client: this.client });
+    const digest = await rejectTxb.getDigest({ client: this.suiClient });
+    const payload = await rejectTxb.build({ client: this.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
     return this.backend.rejectCurrentTx({
       msafeAddress: this.address,
@@ -332,11 +334,11 @@ export class MSafeAccount {
       intentionData: intention.intention,
       txType: intention.txType as TransactionType,
       txSubType: intention.txSubType,
-      client: this.globals.client,
+      clientUrl: this.globals.config.suiClient.url,
       account: {
         address: this.address,
         publicKey: fromHEX(this.address),
-        chains: [],
+        chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
         features: [],
       },
     });
@@ -375,7 +377,7 @@ export class MSafeAccount {
       }
     }
     const multiSignature = this.multiSig.combinePartialSignatures(sortedSigs);
-    return this.client.executeTransactionBlock({
+    return this.suiClient.executeTransactionBlock({
       transactionBlock: HexToUint8Array(payload),
       signature: multiSignature,
       options: { showEffects: true, showEvents: true },
@@ -420,7 +422,7 @@ export class MSafeAccount {
     return this.globals.wallet.address();
   }
 
-  private get client() {
-    return this.globals.client;
+  private get suiClient() {
+    return this.globals.suiClient;
   }
 }

package/src/core/MSafeClient.ts

@@ -5,7 +5,7 @@ import {
   JWTToken,
   SigningMessageHelper,
   UserMSafeStatus,
-} from '@msafe/iota-utils';
+} from '@msafe/sui3-utils';
 
 import { AddressBookSDK } from '@/core/AddressBookSDK';
 import { CreateHelper } from '@/core/CreateHelper';

package/src/core/PublicKeyHelper.ts

@@ -1,6 +1,6 @@
-import { isSameAddress } from '@msafe/iota-utils';
-import { PublicKey } from '@iota/iota-sdk/cryptography';
-import { normalizeIotaAddress } from '@iota/iota-sdk/utils';
+import { isSameAddress } from '@msafe/sui3-utils';
+import { PublicKey } from '@mysten/sui.js/cryptography';
+import { normalizeSuiAddress } from '@mysten/sui.js/utils';
 
 import { MSafeGlobals } from '@/globals/MSafeGlobals';
 import { getPublicKeyFromChain } from '@/utils/sui';
@@ -67,10 +67,10 @@ export class PublicKeyHelper {
   }
 
   addPublicKey(address: string, publicKey: PublicKey) {
-    if (!isSameAddress(address, publicKey.toIotaAddress())) {
+    if (!isSameAddress(address, publicKey.toSuiAddress())) {
       throw new Error('Invalid public key');
     }
-    this.knownPublicKeys.set(normalizeIotaAddress(address), publicKey);
+    this.knownPublicKeys.set(normalizeSuiAddress(address), publicKey);
   }
 
   private async _getPublicKey(address: string) {
@@ -95,6 +95,6 @@ export class PublicKeyHelper {
   }
 
   private async getPublicKeyFromChain(address: string): Promise<PublicKey | undefined> {
-    return getPublicKeyFromChain(this.globals.client, address);
+    return getPublicKeyFromChain(this.globals.suiClient, address);
   }
 }

package/src/core/ReportSDK.ts

@@ -1,4 +1,4 @@
-import { Report } from '@msafe/iota-utils';
+import { Report } from '@msafe/sui3-utils';
 
 import { MSafeGlobals } from '@/globals';
 

package/src/globals/MSafeGlobals.ts

@@ -1,4 +1,4 @@
-import { IotaClient } from '@iota/iota-sdk/client';
+import { SuiClient } from '@mysten/sui.js/client';
 
 import { BackendImpl } from '@/backend/BackendImpl';
 import { IBackend } from '@/backend/interface';
@@ -8,25 +8,25 @@ import { IWallet } from '@/types/wallet';
 export class MSafeGlobals {
   public readonly backend: IBackend;
 
-  public readonly client: IotaClient;
+  public readonly suiClient: SuiClient;
 
   public readonly config: MSafeConfig;
 
   _wallet: IWallet | undefined;
 
-  constructor(input: { backend: IBackend; client: IotaClient; config: MSafeConfig }) {
+  constructor(input: { backend: IBackend; suiClient: SuiClient; config: MSafeConfig }) {
     this.backend = input.backend;
-    this.client = input.client;
+    this.suiClient = input.suiClient;
     this.config = input.config;
   }
 
   static async New(env: MSafeEnv, options?: MSafeConfigOptions) {
     const config = getMSafeConfig(env, options);
-    const client = new IotaClient(config.client);
+    const suiClient = new SuiClient(config.suiClient);
     const backend = new BackendImpl(config.backend.url, options?.mockAddress);
     return new MSafeGlobals({
       backend,
-      client,
+      suiClient,
       config,
     });
   }

package/src/globals/const.ts

@@ -7,7 +7,7 @@ export enum MSafeEnv {
 }
 
 export interface MSafeConfig {
-  client: {
+  suiClient: {
     url: string;
   };
   backend: {
@@ -18,7 +18,7 @@ export interface MSafeConfig {
 }
 
 export interface MSafeConfigOptions {
-  client?: {
+  suiClient?: {
     url?: string;
   };
   backend?: {
@@ -44,7 +44,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
   [
     MSafeEnv.unit,
     {
-      client: {
+      suiClient: {
         url: TESTNET_RPC_URL,
       },
       backend: {
@@ -57,7 +57,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
   [
     MSafeEnv.local,
     {
-      client: {
+      suiClient: {
         url: TESTNET_RPC_URL,
       },
       backend: {
@@ -70,7 +70,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
   [
     MSafeEnv.dev,
     {
-      client: {
+      suiClient: {
         url: TESTNET_RPC_URL,
       },
       backend: {
@@ -83,7 +83,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
   [
     MSafeEnv.prev,
     {
-      client: {
+      suiClient: {
         url: MAINNET_RPC_URL,
       },
       backend: {
@@ -96,7 +96,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
   [
     MSafeEnv.prod,
     {
-      client: {
+      suiClient: {
         url: MAINNET_RPC_URL,
       },
       backend: {
@@ -113,8 +113,8 @@ export function getMSafeConfig(env: MSafeEnv, options?: MSafeConfigOptions) {
   if (!config) {
     throw new Error('Unknown environment');
   }
-  if (options?.client?.url) {
-    config.client.url = options.client.url;
+  if (options?.suiClient?.url) {
+    config.suiClient.url = options.suiClient.url;
   }
   if (options?.backend?.url) {
     config.backend.url = options.backend.url;

package/src/simulate/simulator.ts

@@ -1,5 +1,5 @@
-import { GasCostSummary } from '@iota/iota-sdk/client';
-import { TransactionBlock } from '@iota/iota-sdk/transactions';
+import { GasCostSummary } from '@mysten/sui.js/client';
+import { TransactionBlock } from '@mysten/sui.js/transactions';
 
 // Default to 120% o the reference gas price
 import { MSafeGlobals } from '@/globals/MSafeGlobals';
@@ -58,14 +58,14 @@ export class Simulator {
   ): Promise<SimulationResult> {
     const tx = this.copyTransactionBlock(input.txb);
 
-    const { client } = this.globals;
+    const { suiClient } = this.globals;
 
     const gasPrice = await this.getGasPrice(gasOption);
     tx.setGasPrice(gasPrice);
 
     try {
-      const inspectResult = await client.dryRunTransactionBlock({
-        transactionBlock: await tx.build({ client: client }),
+      const inspectResult = await suiClient.dryRunTransactionBlock({
+        transactionBlock: await tx.build({ client: suiClient }),
       });
       const { gasUsed } = inspectResult.effects;
       const gasBudget = this.toGasBudget(gasUsed, gasPrice);
@@ -110,7 +110,7 @@ export class Simulator {
       return option.fixedVal;
     }
 
-    const refGasPrice = await this.globals.client.getReferenceGasPrice();
+    const refGasPrice = await this.globals.suiClient.getReferenceGasPrice();
 
     return this.applyGasOption(refGasPrice, option);
   }

package/src/types/assets.ts

@@ -1,4 +1,4 @@
-import { CoinMetadata } from '@iota/iota-sdk/client';
+import { CoinMetadata } from '@mysten/sui.js/client';
 
 export interface OwnedCoin {
   type: string;

package/src/types/msafe.ts

@@ -1,6 +1,6 @@
-import { DryRunTransactionBlockResponse, GasCostSummary, IotaObjectRef } from '@iota/iota-sdk/client';
-import { SerializedSignature } from '@iota/iota-sdk/cryptography';
-import { IGasOption, TransactionType, TxIntention } from '@msafe/iota-utils';
+import { IGasOption, TransactionType, TxIntention } from '@msafe/sui3-utils';
+import { DryRunTransactionBlockResponse, GasCostSummary, SuiObjectRef } from '@mysten/sui.js/client';
+import { SerializedSignature } from '@mysten/sui.js/cryptography';
 
 export interface PendingTx {
   application: string;
@@ -85,7 +85,7 @@ export interface SimulationResult {
   gasPrice: bigint;
   gasUsed: GasCostSummary;
   gasBudget: bigint;
-  gasObject: IotaObjectRef;
+  gasObject: SuiObjectRef;
   simulationError?: string;
   response?: DryRunTransactionBlockResponse;
 }

package/src/types/wallet.ts

@@ -1,10 +1,10 @@
 import {
   ExecuteTransactionRequestType,
-  IotaTransactionBlockResponse,
-  IotaTransactionBlockResponseOptions,
-} from '@iota/iota-sdk/client';
-import { SignatureWithBytes } from '@iota/iota-sdk/cryptography';
-import { TransactionBlock } from '@iota/iota-sdk/transactions';
+  SuiTransactionBlockResponseOptions,
+  SuiTransactionBlockResponse,
+} from '@mysten/sui.js/client';
+import { SignatureWithBytes } from '@mysten/sui.js/cryptography';
+import { TransactionBlock } from '@mysten/sui.js/transactions';
 
 export interface IWallet {
   walletType: string;
@@ -18,6 +18,6 @@ export interface IWallet {
   signAndExecuteTransactionBlock(input: {
     transactionBlock: TransactionBlock;
     requestType?: ExecuteTransactionRequestType;
-    options?: IotaTransactionBlockResponseOptions;
-  }): Promise<IotaTransactionBlockResponse>;
+    options?: SuiTransactionBlockResponseOptions;
+  }): Promise<SuiTransactionBlockResponse>;
 }

package/src/utils/coin.ts

@@ -1,13 +1,13 @@
-import { CoinMetadata, IotaClient, IotaObjectData } from '@iota/iota-sdk/client';
-import { normalizeStructTag } from '@iota/iota-sdk/utils';
+import { CoinMetadata, SuiClient, SuiObjectData } from '@mysten/sui.js/client';
+import { normalizeStructTag } from '@mysten/sui.js/utils';
 
 // CoinHelper is the coin helper to query for coin metadata.
 export class CoinHelper {
-  private _client: IotaClient;
+  private _client: SuiClient;
 
   private _coinMetaReg: Map<string, CoinMetadata>;
 
-  constructor(client: IotaClient) {
+  constructor(client: SuiClient) {
     this._client = client;
     this._coinMetaReg = new Map();
   }
@@ -48,7 +48,7 @@ export class Coin {
     return res || null;
   }
 
-  static getBalance(data: IotaObjectData): bigint | undefined {
+  static getBalance(data: SuiObjectData): bigint | undefined {
     if (!Coin.isCoin(data.type)) {
       return undefined;
     }

package/src/utils/crypto.ts

@@ -1,5 +1,5 @@
-import { SerializedSignature } from '@iota/iota-sdk/cryptography';
-import { verifyPersonalMessage, verifyTransactionBlock } from '@iota/iota-sdk/verify';
+import { SerializedSignature } from '@mysten/sui.js/cryptography';
+import { verifyPersonalMessage, verifyTransactionBlock } from '@mysten/sui.js/verify';
 
 import { stringToBuffer } from '@/utils/buffer';
 import { Formatter } from '@/utils/format';
@@ -32,7 +32,7 @@ export class SignatureVerifier {
     targetAddress: string;
   }) {
     const publicKey = await SignatureVerifier.getPublicKeyFromSignature(input);
-    return Formatter.isSuiAddressEqual(publicKey.toIotaAddress(), input.targetAddress);
+    return Formatter.isSuiAddressEqual(publicKey.toSuiAddress(), input.targetAddress);
   }
 
   static async verifyPersonalSignature(input: {

package/src/utils/format.ts

@@ -1,10 +1,10 @@
-import { normalizeIotaAddress, normalizeStructTag } from '@iota/iota-sdk/utils';
+import { normalizeSuiAddress, normalizeStructTag } from '@mysten/sui.js/utils';
 
 import { Coin } from '@/utils/coin';
 
 export class Formatter {
-  static normalizeIotaAddress(addr: string) {
-    return normalizeIotaAddress(addr);
+  static normalizeSuiAddress(addr: string) {
+    return normalizeSuiAddress(addr);
   }
 
   static normalizeStructTag(struct: string) {
@@ -12,7 +12,7 @@ export class Formatter {
   }
 
   static isSuiAddressEqual(addr1: string, addr2: string) {
-    return normalizeIotaAddress(addr1) === normalizeIotaAddress(addr2);
+    return normalizeSuiAddress(addr1) === normalizeSuiAddress(addr2);
   }
 
   static isSuiStructEqual(struct1: string, struct2: string) {

package/src/utils/iter/object.ts

@@ -1,11 +1,11 @@
-import { IotaObjectResponse, IotaObjectDataOptions, IotaObjectData, IotaClient } from '@iota/iota-sdk/client';
+import { SuiObjectResponse, SuiObjectDataOptions, SuiObjectData, SuiClient } from '@mysten/sui.js/client';
 
 import { EntryIterator, getAllFromIterator, REQUEST_PAGE_SIZE, SuiIterator } from './iterator';
 import { PagedData, Requester } from './requester';
 
 // TODO: setup testnet faucet and test this file
 
-export type ObjectFilter = (objRes: IotaObjectResponse) => boolean;
+export type ObjectFilter = (objRes: SuiObjectResponse) => boolean;
 
 // OidIter is the iterator to give the list of object ids
 export type OidIter = SuiIterator<string>;
@@ -13,20 +13,20 @@ export type OidIter = SuiIterator<string>;
 export interface BatchObjectOptions {
   filter?: ObjectFilter;
   pageSize?: number;
-  objectOptions?: IotaObjectDataOptions;
+  objectOptions?: SuiObjectDataOptions;
 }
 
 // getObjectsById get the list of objects by id.
 // Compared with the multiGetObject method defined by SUI, this method will do the pagination
 // for get object requests.
 export async function getObjectsById(
-  provider: IotaClient,
+  provider: SuiClient,
   ids: string[],
   options?: BatchObjectOptions,
-): Promise<(IotaObjectData | undefined)[]> {
+): Promise<(SuiObjectData | undefined)[]> {
   const oidIter = new ListOidIterator(ids);
   const iter = new ObjectBatchIterator(provider, oidIter, options);
-  return (await getAllFromIterator(iter)) as (IotaObjectData | undefined)[];
+  return (await getAllFromIterator(iter)) as (SuiObjectData | undefined)[];
 }
 
 // ListOidIterator is the iterator that iterate through a list of ids.
@@ -53,9 +53,9 @@ export class ListOidIterator implements OidIter {
   }
 }
 
-export class ObjectBatchIterator extends EntryIterator<IotaObjectData> {
+export class ObjectBatchIterator extends EntryIterator<SuiObjectData> {
   constructor(
-    public readonly provider: IotaClient,
+    public readonly provider: SuiClient,
     public readonly idIter: OidIter,
     public readonly options?: BatchObjectOptions,
   ) {
@@ -64,15 +64,15 @@ export class ObjectBatchIterator extends EntryIterator<IotaObjectData> {
 }
 
 // TODO: Test with customize objects
-export class ObjectBatchRequester implements Requester<IotaObjectData> {
+export class ObjectBatchRequester implements Requester<SuiObjectData> {
   filter: ObjectFilter | undefined;
 
   pageSize: number;
 
-  objectOptions: IotaObjectDataOptions;
+  objectOptions: SuiObjectDataOptions;
 
   constructor(
-    public readonly provider: IotaClient,
+    public readonly provider: SuiClient,
     public readonly stringIter: OidIter,
     public options?: BatchObjectOptions,
   ) {
@@ -84,7 +84,7 @@ export class ObjectBatchRequester implements Requester<IotaObjectData> {
     };
   }
 
-  async doNextRequest(): Promise<PagedData<IotaObjectData>> {
+  async doNextRequest(): Promise<PagedData<SuiObjectData>> {
     const requestPage: string[] = [];
     while (requestPage.length < this.pageSize) {
       const hasNext = await this.stringIter.hasNext();
@@ -96,36 +96,36 @@ export class ObjectBatchRequester implements Requester<IotaObjectData> {
         requestPage.push(objId);
       }
     }
-    const res: IotaObjectResponse[] = await this.provider.multiGetObjects({
+    const res: SuiObjectResponse[] = await this.provider.multiGetObjects({
       ids: requestPage,
       options: this.objectOptions,
     });
-    let filtered: IotaObjectResponse[];
+    let filtered: SuiObjectResponse[];
     if (this.filter) {
       const { filter } = this;
-      filtered = res.filter((r: IotaObjectResponse) => filter?.(r));
+      filtered = res.filter((r: SuiObjectResponse) => filter?.(r));
     } else {
       filtered = res;
     }
     return {
-      data: filtered.map((objRes) => objRes.data).filter((data) => data) as IotaObjectData[],
+      data: filtered.map((objRes) => objRes.data).filter((data) => data) as SuiObjectData[],
       hasNext: await this.stringIter.hasNext(),
     };
   }
 }
 
 export async function getAllOwnedObjects(
-  provider: IotaClient,
+  provider: SuiClient,
   owner: string,
   options?: BatchObjectOptions,
-): Promise<IotaObjectData[]> {
+): Promise<SuiObjectData[]> {
   const iter = new OwnedObjectIterator(provider, owner, options);
-  return (await getAllFromIterator(iter)) as IotaObjectData[];
+  return (await getAllFromIterator(iter)) as SuiObjectData[];
 }
 
-export class OwnedObjectIterator extends EntryIterator<IotaObjectData> implements SuiIterator<IotaObjectData> {
+export class OwnedObjectIterator extends EntryIterator<SuiObjectData> implements SuiIterator<SuiObjectData> {
   constructor(
-    public readonly provider: IotaClient,
+    public readonly provider: SuiClient,
     public readonly owner: string,
     public readonly options?: BatchObjectOptions,
   ) {
@@ -133,17 +133,17 @@ export class OwnedObjectIterator extends EntryIterator<IotaObjectData> implement
   }
 }
 
-export class OwnedObjectRequester implements Requester<IotaObjectData> {
+export class OwnedObjectRequester implements Requester<SuiObjectData> {
   nextCursor: string | null;
 
   public filter: ObjectFilter | undefined;
 
   public pageSize: number;
 
-  public objectOptions: IotaObjectDataOptions;
+  public objectOptions: SuiObjectDataOptions;
 
   constructor(
-    public readonly provider: IotaClient,
+    public readonly provider: SuiClient,
     public readonly owner: string,
     public readonly options?: BatchObjectOptions,
   ) {
@@ -156,7 +156,7 @@ export class OwnedObjectRequester implements Requester<IotaObjectData> {
     };
   }
 
-  async doNextRequest(): Promise<PagedData<IotaObjectData>> {
+  async doNextRequest(): Promise<PagedData<SuiObjectData>> {
     const res = await this.provider.getOwnedObjects({
       owner: this.owner,
       options: this.objectOptions,
@@ -164,15 +164,15 @@ export class OwnedObjectRequester implements Requester<IotaObjectData> {
       limit: this.pageSize,
     });
     this.nextCursor = res.nextCursor as string;
-    let filtered: IotaObjectResponse[];
+    let filtered: SuiObjectResponse[];
     if (this.filter) {
       const { filter } = this;
-      filtered = res.data.filter((obj: IotaObjectResponse) => filter?.(obj));
+      filtered = res.data.filter((obj: SuiObjectResponse) => filter?.(obj));
     } else {
       filtered = res.data;
     }
     return {
-      data: filtered.map((r: IotaObjectResponse) => r.data).filter((data) => data) as IotaObjectData[],
+      data: filtered.map((r: SuiObjectResponse) => r.data).filter((data) => data) as SuiObjectData[],
       hasNext: res.hasNextPage,
     };
   }