@mysten/sui 2.5.0 → 2.6.0

package/src/grpc/core.ts

@@ -6,7 +6,6 @@ import { CoreClient, formatMoveAbortMessage, SimulationError } from '../client/i
 import type { SuiGrpcClient } from './client.js';
 import type { Owner } from './proto/sui/rpc/v2/owner.js';
 import { Owner_OwnerKind } from './proto/sui/rpc/v2/owner.js';
-import { DynamicField_DynamicFieldKind } from './proto/sui/rpc/v2/state_service.js';
 import { chunk, fromBase64, toBase64 } from '@mysten/utils';
 import type { ExecutedTransaction } from './proto/sui/rpc/v2/executed_transaction.js';
 import type { TransactionEffects } from './proto/sui/rpc/v2/effects.js';
@@ -56,7 +55,7 @@ export class GrpcCoreClient extends CoreClient {
 		this.#client = client;
 	}
 
-	async getObjects<Include extends SuiClientTypes.ObjectInclude = object>(
+	async getObjects<Include extends SuiClientTypes.ObjectInclude = {}>(
 		options: SuiClientTypes.GetObjectsOptions<Include>,
 	): Promise<SuiClientTypes.GetObjectsResponse<Include>> {
 		const batches = chunk(options.objectIds, 50);
@@ -131,7 +130,7 @@ export class GrpcCoreClient extends CoreClient {
 			objects: results,
 		};
 	}
-	async listOwnedObjects<Include extends SuiClientTypes.ObjectInclude = object>(
+	async listOwnedObjects<Include extends SuiClientTypes.ObjectInclude = {}>(
 		options: SuiClientTypes.ListOwnedObjectsOptions<Include>,
 	): Promise<SuiClientTypes.ListOwnedObjectsResponse<Include>> {
 		const paths = ['owner', 'object_type', 'digest', 'version', 'object_id'];
@@ -285,7 +284,7 @@ export class GrpcCoreClient extends CoreClient {
 			})),
 		};
 	}
-	async getTransaction<Include extends SuiClientTypes.TransactionInclude = object>(
+	async getTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 		options: SuiClientTypes.GetTransactionOptions<Include>,
 	): Promise<SuiClientTypes.TransactionResult<Include>> {
 		const paths = ['digest', 'transaction.digest', 'signatures', 'effects.status'];
@@ -327,7 +326,7 @@ export class GrpcCoreClient extends CoreClient {
 
 		return parseTransaction(response.transaction, options.include);
 	}
-	async executeTransaction<Include extends SuiClientTypes.TransactionInclude = object>(
+	async executeTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 		options: SuiClientTypes.ExecuteTransactionOptions<Include>,
 	): Promise<SuiClientTypes.TransactionResult<Include>> {
 		const paths = ['digest', 'transaction.digest', 'signatures', 'effects.status'];
@@ -377,7 +376,7 @@ export class GrpcCoreClient extends CoreClient {
 
 		return parseTransaction(response.transaction!, options.include);
 	}
-	async simulateTransaction<Include extends SuiClientTypes.SimulateTransactionInclude = object>(
+	async simulateTransaction<Include extends SuiClientTypes.SimulateTransactionInclude = {}>(
 		options: SuiClientTypes.SimulateTransactionOptions<Include>,
 	): Promise<SuiClientTypes.SimulateTransactionResult<Include>> {
 		const paths = [
@@ -561,38 +560,7 @@ export class GrpcCoreClient extends CoreClient {
 	async listDynamicFields(
 		options: SuiClientTypes.ListDynamicFieldsOptions,
 	): Promise<SuiClientTypes.ListDynamicFieldsResponse> {
-		const response = await this.#client.stateService.listDynamicFields({
-			parent: options.parentId,
-			pageToken: options.cursor ? fromBase64(options.cursor) : undefined,
-			pageSize: options.limit,
-			readMask: {
-				paths: ['field_id', 'name', 'value_type', 'kind', 'child_id'],
-			},
-		});
-
-		return {
-			dynamicFields: response.response.dynamicFields.map(
-				(field): SuiClientTypes.DynamicFieldEntry => {
-					const isDynamicObject = field.kind === DynamicField_DynamicFieldKind.OBJECT;
-					const fieldType = isDynamicObject
-						? `0x2::dynamic_field::Field<0x2::dynamic_object_field::Wrapper<${field.name?.name!}>,0x2::object::ID>`
-						: `0x2::dynamic_field::Field<${field.name?.name!},${field.valueType!}>`;
-					return {
-						$kind: isDynamicObject ? 'DynamicObject' : 'DynamicField',
-						fieldId: field.fieldId!,
-						name: {
-							type: field.name?.name!,
-							bcs: field.name?.value!,
-						},
-						valueType: field.valueType!,
-						type: normalizeStructTag(fieldType),
-						childId: field.childId,
-					} as SuiClientTypes.DynamicFieldEntry;
-				},
-			),
-			cursor: response.response.nextPageToken ? toBase64(response.response.nextPageToken) : null,
-			hasNextPage: response.response.nextPageToken !== undefined,
-		};
+		return this.#client.listDynamicFields(options);
 	}
 
 	async verifyZkLoginSignature(
@@ -1170,7 +1138,7 @@ export function parseTransactionEffects({
 	};
 }
 
-function parseTransaction<Include extends SuiClientTypes.TransactionInclude = object>(
+function parseTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 	transaction: ExecutedTransaction,
 	include?: Include,
 ): SuiClientTypes.TransactionResult<Include> {
@@ -1248,6 +1216,7 @@ function parseTransaction<Include extends SuiClientTypes.TransactionInclude = ob
 					sender: normalizeSuiAddress(event.sender!),
 					eventType: event.eventType!,
 					bcs: event.contents?.value ?? new Uint8Array(),
+					json: event.json ? (Value.toJson(event.json) as Record<string, unknown>) : null,
 				})) ?? [])
 			: undefined) as SuiClientTypes.Transaction<Include>['events'],
 	};

package/src/jsonRpc/core.ts

@@ -115,7 +115,7 @@ export class JSONRpcCoreClient extends CoreClient {
 		this.#jsonRpcClient = jsonRpcClient;
 	}
 
-	async getObjects<Include extends SuiClientTypes.ObjectInclude = object>(
+	async getObjects<Include extends SuiClientTypes.ObjectInclude = {}>(
 		options: SuiClientTypes.GetObjectsOptions<Include>,
 	) {
 		const batches = chunk(options.objectIds, 50);
@@ -148,7 +148,7 @@ export class JSONRpcCoreClient extends CoreClient {
 			objects: results,
 		};
 	}
-	async listOwnedObjects<Include extends SuiClientTypes.ObjectInclude = object>(
+	async listOwnedObjects<Include extends SuiClientTypes.ObjectInclude = {}>(
 		options: SuiClientTypes.ListOwnedObjectsOptions<Include>,
 	) {
 		let filter: SuiObjectDataFilter | null = null;
@@ -287,7 +287,7 @@ export class JSONRpcCoreClient extends CoreClient {
 			cursor: null,
 		};
 	}
-	async getTransaction<Include extends SuiClientTypes.TransactionInclude = object>(
+	async getTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 		options: SuiClientTypes.GetTransactionOptions<Include>,
 	): Promise<SuiClientTypes.TransactionResult<Include>> {
 		const transaction = await this.#jsonRpcClient.getTransactionBlock({
@@ -307,7 +307,7 @@ export class JSONRpcCoreClient extends CoreClient {
 
 		return parseTransaction(transaction, options.include);
 	}
-	async executeTransaction<Include extends SuiClientTypes.TransactionInclude = object>(
+	async executeTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 		options: SuiClientTypes.ExecuteTransactionOptions<Include>,
 	): Promise<SuiClientTypes.TransactionResult<Include>> {
 		const transaction = await this.#jsonRpcClient.executeTransactionBlock({
@@ -328,7 +328,7 @@ export class JSONRpcCoreClient extends CoreClient {
 
 		return parseTransaction(transaction, options.include);
 	}
-	async simulateTransaction<Include extends SuiClientTypes.SimulateTransactionInclude = object>(
+	async simulateTransaction<Include extends SuiClientTypes.SimulateTransactionInclude = {}>(
 		options: SuiClientTypes.SimulateTransactionOptions<Include>,
 	): Promise<SuiClientTypes.SimulateTransactionResult<Include>> {
 		if (!(options.transaction instanceof Uint8Array)) {
@@ -403,6 +403,7 @@ export class JSONRpcCoreClient extends CoreClient {
 						sender: event.sender,
 						eventType: event.type,
 						bcs: 'bcs' in event ? fromBase64(event.bcs) : new Uint8Array(),
+						json: (event.parsedJson as Record<string, unknown>) ?? null,
 					})) ?? [])
 				: undefined) as SuiClientTypes.Transaction<Include>['events'],
 		};
@@ -664,7 +665,7 @@ function serializeObjectToBcs(object: SuiObjectData): Uint8Array | undefined {
 	}
 }
 
-function parseObject<Include extends SuiClientTypes.ObjectInclude = object>(
+function parseObject<Include extends SuiClientTypes.ObjectInclude = {}>(
 	object: SuiObjectData,
 	include?: Include,
 ): SuiClientTypes.Object<Include> {
@@ -802,7 +803,7 @@ function parseOwnerAddress(owner: ObjectOwner): string | null {
 	throw new Error(`Unknown owner type: ${JSON.stringify(owner)}`);
 }
 
-function parseTransaction<Include extends SuiClientTypes.TransactionInclude = object>(
+function parseTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 	transaction: SuiTransactionBlockResponse,
 	include?: Include,
 ): SuiClientTypes.TransactionResult<Include> {
@@ -886,6 +887,7 @@ function parseTransaction<Include extends SuiClientTypes.TransactionInclude = ob
 					sender: event.sender,
 					eventType: event.type,
 					bcs: 'bcs' in event ? fromBase64(event.bcs) : new Uint8Array(),
+					json: (event.parsedJson as Record<string, unknown>) ?? null,
 				})) ?? [])
 			: undefined) as SuiClientTypes.Transaction<Include>['events'],
 	};

package/src/keypairs/ed25519/keypair.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+import { toHex } from '@mysten/bcs';
 import { ed25519 } from '@noble/curves/ed25519.js';
 
 import {
@@ -166,14 +167,17 @@ export class Ed25519Keypair extends Keypair {
 	 *
 	 * If path is none, it will default to m/44'/784'/0'/0'/0', otherwise the path must
 	 * be compliant to SLIP-0010 in form m/44'/784'/{account_index}'/{change_index}'/{address_index}'.
+	 *
+	 * @param seed - The seed as a hex string or Uint8Array.
 	 */
-	static deriveKeypairFromSeed(seedHex: string, path?: string): Ed25519Keypair {
+	static deriveKeypairFromSeed(seed: string | Uint8Array, path?: string): Ed25519Keypair {
 		if (path == null) {
 			path = DEFAULT_ED25519_DERIVATION_PATH;
 		}
 		if (!isValidHardenedPath(path)) {
 			throw new Error('Invalid derivation path');
 		}
+		const seedHex = typeof seed === 'string' ? seed : toHex(seed);
 		const { key } = derivePath(path, seedHex);
 
 		return Ed25519Keypair.fromSecretKey(key);

package/src/transactions/executor/caching.ts

@@ -15,7 +15,7 @@ import { isTransaction } from '../Transaction.js';
 export interface ExecuteTransactionOptions<Include extends SuiClientTypes.TransactionInclude = {}> {
 	transaction: Transaction | Uint8Array;
 	signatures: string[];
-	include?: Include;
+	include?: Include & SuiClientTypes.TransactionInclude;
 }
 
 export class CachingTransactionExecutor {
@@ -93,7 +93,7 @@ export class CachingTransactionExecutor {
 	}: {
 		transaction: Transaction;
 		signer: Signer;
-		include?: Include;
+		include?: Include & SuiClientTypes.TransactionInclude;
 	}): Promise<SuiClientTypes.TransactionResult<Include & { effects: true }>> {
 		transaction.setSenderIfNotSet(signer.toSuiAddress());
 		const bytes = await this.buildTransaction({ transaction });

package/src/transactions/executor/parallel.ts

@@ -128,7 +128,7 @@ export class ParallelTransactionExecutor {
 
 	async executeTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 		transaction: Transaction,
-		include?: Include,
+		include?: Include & SuiClientTypes.TransactionInclude,
 		additionalSignatures: string[] = [],
 	): Promise<SuiClientTypes.TransactionResult<Include & { effects: true }>> {
 		const { promise, resolve, reject } =
@@ -262,7 +262,6 @@ export class ParallelTransactionExecutor {
 				if (gasOwner === this.#signer.toSuiAddress()) {
 					const totalUsed =
 						BigInt(gasUsed.computationCost) +
-						BigInt(gasUsed.storageCost) +
 						BigInt(gasUsed.storageCost) -
 						BigInt(gasUsed.storageRebate);
 					const remainingBalance = coin.balance - totalUsed;

package/src/transactions/executor/serial.ts

@@ -164,7 +164,7 @@ export class SerialTransactionExecutor {
 
 	executeTransaction<Include extends SuiClientTypes.TransactionInclude = {}>(
 		transaction: Transaction | Uint8Array,
-		include?: Include,
+		include?: Include & SuiClientTypes.TransactionInclude,
 		additionalSignatures: string[] = [],
 	): Promise<SuiClientTypes.TransactionResult<Include & { effects: true }>> {
 		return this.#queue.runTask(async () => {

package/src/version.ts

@@ -3,5 +3,5 @@
 
 // This file is generated by genversion.mjs. Do not edit it directly.
 
-export const PACKAGE_VERSION = '2.5.0';
-export const TARGETED_RPC_VERSION = '1.67.0';
+export const PACKAGE_VERSION = '2.6.0';
+export const TARGETED_RPC_VERSION = '1.68.0';