@mysten/sui 1.28.1 → 1.29.0

package/src/transactions/TransactionData.ts

@@ -211,54 +211,69 @@ export class TransactionDataBuilder implements TransactionData {
 		});
 	}
 
-	mapArguments(fn: (arg: Argument, command: Command) => Argument) {
-		for (const command of this.commands) {
-			switch (command.$kind) {
-				case 'MoveCall':
-					command.MoveCall.arguments = command.MoveCall.arguments.map((arg) => fn(arg, command));
-					break;
-				case 'TransferObjects':
-					command.TransferObjects.objects = command.TransferObjects.objects.map((arg) =>
-						fn(arg, command),
-					);
-					command.TransferObjects.address = fn(command.TransferObjects.address, command);
-					break;
-				case 'SplitCoins':
-					command.SplitCoins.coin = fn(command.SplitCoins.coin, command);
-					command.SplitCoins.amounts = command.SplitCoins.amounts.map((arg) => fn(arg, command));
-					break;
-				case 'MergeCoins':
-					command.MergeCoins.destination = fn(command.MergeCoins.destination, command);
-					command.MergeCoins.sources = command.MergeCoins.sources.map((arg) => fn(arg, command));
-					break;
-				case 'MakeMoveVec':
-					command.MakeMoveVec.elements = command.MakeMoveVec.elements.map((arg) =>
-						fn(arg, command),
-					);
-					break;
-				case 'Upgrade':
-					command.Upgrade.ticket = fn(command.Upgrade.ticket, command);
-					break;
-				case '$Intent':
-					const inputs = command.$Intent.inputs;
-					command.$Intent.inputs = {};
-
-					for (const [key, value] of Object.entries(inputs)) {
-						command.$Intent.inputs[key] = Array.isArray(value)
-							? value.map((arg) => fn(arg, command))
-							: fn(value, command);
-					}
-
-					break;
-				case 'Publish':
-					break;
-				default:
-					throw new Error(`Unexpected transaction kind: ${(command as { $kind: unknown }).$kind}`);
-			}
+	mapCommandArguments(
+		index: number,
+		fn: (arg: Argument, command: Command, commandIndex: number) => Argument,
+	) {
+		const command = this.commands[index];
+
+		switch (command.$kind) {
+			case 'MoveCall':
+				command.MoveCall.arguments = command.MoveCall.arguments.map((arg) =>
+					fn(arg, command, index),
+				);
+				break;
+			case 'TransferObjects':
+				command.TransferObjects.objects = command.TransferObjects.objects.map((arg) =>
+					fn(arg, command, index),
+				);
+				command.TransferObjects.address = fn(command.TransferObjects.address, command, index);
+				break;
+			case 'SplitCoins':
+				command.SplitCoins.coin = fn(command.SplitCoins.coin, command, index);
+				command.SplitCoins.amounts = command.SplitCoins.amounts.map((arg) =>
+					fn(arg, command, index),
+				);
+				break;
+			case 'MergeCoins':
+				command.MergeCoins.destination = fn(command.MergeCoins.destination, command, index);
+				command.MergeCoins.sources = command.MergeCoins.sources.map((arg) =>
+					fn(arg, command, index),
+				);
+				break;
+			case 'MakeMoveVec':
+				command.MakeMoveVec.elements = command.MakeMoveVec.elements.map((arg) =>
+					fn(arg, command, index),
+				);
+				break;
+			case 'Upgrade':
+				command.Upgrade.ticket = fn(command.Upgrade.ticket, command, index);
+				break;
+			case '$Intent':
+				const inputs = command.$Intent.inputs;
+				command.$Intent.inputs = {};
+
+				for (const [key, value] of Object.entries(inputs)) {
+					command.$Intent.inputs[key] = Array.isArray(value)
+						? value.map((arg) => fn(arg, command, index))
+						: fn(value, command, index);
+				}
+
+				break;
+			case 'Publish':
+				break;
+			default:
+				throw new Error(`Unexpected transaction kind: ${(command as { $kind: unknown }).$kind}`);
 		}
 	}
 
-	replaceCommand(index: number, replacement: Command | Command[]) {
+	mapArguments(fn: (arg: Argument, command: Command, commandIndex: number) => Argument) {
+		for (const commandIndex of this.commands.keys()) {
+			this.mapCommandArguments(commandIndex, fn);
+		}
+	}
+
+	replaceCommand(index: number, replacement: Command | Command[], resultIndex = index) {
 		if (!Array.isArray(replacement)) {
 			this.commands[index] = replacement;
 			return;
@@ -268,15 +283,27 @@ export class TransactionDataBuilder implements TransactionData {
 		this.commands.splice(index, 1, ...replacement);
 
 		if (sizeDiff !== 0) {
-			this.mapArguments((arg) => {
+			this.mapArguments((arg, _command, commandIndex) => {
+				if (commandIndex < index + replacement.length) {
+					return arg;
+				}
+
 				switch (arg.$kind) {
 					case 'Result':
+						if (arg.Result === index) {
+							arg.Result = resultIndex;
+						}
+
 						if (arg.Result > index) {
 							arg.Result += sizeDiff;
 						}
 						break;
 
 					case 'NestedResult':
+						if (arg.NestedResult[0] === index) {
+							arg.NestedResult[0] = resultIndex;
+						}
+
 						if (arg.NestedResult[0] > index) {
 							arg.NestedResult[0] += sizeDiff;
 						}
@@ -295,4 +322,17 @@ export class TransactionDataBuilder implements TransactionData {
 	snapshot(): TransactionData {
 		return parse(TransactionData, this);
 	}
+
+	shallowClone() {
+		return new TransactionDataBuilder({
+			version: this.version,
+			sender: this.sender,
+			expiration: this.expiration,
+			gasData: {
+				...this.gasData,
+			},
+			inputs: [...this.inputs],
+			commands: [...this.commands],
+		});
+	}
 }

package/src/transactions/intents/CoinWithBalance.ts

@@ -37,7 +37,7 @@ export function coinWithBalance({
 		tx.addIntentResolver(COIN_WITH_BALANCE, resolveCoinBalance);
 		const coinType = type === 'gas' ? type : normalizeStructTag(type);
 
-		coinResult = tx.add<TransactionResult>(
+		coinResult = tx.add(
 			Commands.Intent({
 				name: COIN_WITH_BALANCE,
 				inputs: {},

package/src/verify/verify.ts

@@ -5,13 +5,13 @@ import { fromBase64 } from '@mysten/bcs';
 
 import type { PublicKey, SignatureFlag, SignatureScheme } from '../cryptography/index.js';
 import { parseSerializedSignature, SIGNATURE_FLAG_TO_SCHEME } from '../cryptography/index.js';
-import type { SuiGraphQLClient } from '../graphql/client.js';
 import { Ed25519PublicKey } from '../keypairs/ed25519/publickey.js';
 import { PasskeyPublicKey } from '../keypairs/passkey/publickey.js';
 import { Secp256k1PublicKey } from '../keypairs/secp256k1/publickey.js';
 import { Secp256r1PublicKey } from '../keypairs/secp256r1/publickey.js';
 // eslint-disable-next-line import/no-cycle
 import { MultiSigPublicKey } from '../multisig/publickey.js';
+import type { ZkLoginCompatibleClient } from '../zklogin/publickey.js';
 import { ZkLoginPublicIdentifier } from '../zklogin/publickey.js';
 
 export async function verifySignature(
@@ -37,7 +37,7 @@ export async function verifySignature(
 export async function verifyPersonalMessageSignature(
 	message: Uint8Array,
 	signature: string,
-	options: { client?: SuiGraphQLClient; address?: string } = {},
+	options: { client?: ZkLoginCompatibleClient; address?: string } = {},
 ): Promise<PublicKey> {
 	const parsedSignature = parseSignature(signature, options);
 
@@ -60,7 +60,7 @@ export async function verifyPersonalMessageSignature(
 export async function verifyTransactionSignature(
 	transaction: Uint8Array,
 	signature: string,
-	options: { client?: SuiGraphQLClient; address?: string } = {},
+	options: { client?: ZkLoginCompatibleClient; address?: string } = {},
 ): Promise<PublicKey> {
 	const parsedSignature = parseSignature(signature, options);
 
@@ -80,7 +80,7 @@ export async function verifyTransactionSignature(
 	return parsedSignature.publicKey;
 }
 
-function parseSignature(signature: string, options: { client?: SuiGraphQLClient } = {}) {
+function parseSignature(signature: string, options: { client?: ZkLoginCompatibleClient } = {}) {
 	const parsedSignature = parseSerializedSignature(signature);
 
 	if (parsedSignature.signatureScheme === 'MultiSig') {
@@ -104,7 +104,7 @@ function parseSignature(signature: string, options: { client?: SuiGraphQLClient
 export function publicKeyFromRawBytes(
 	signatureScheme: SignatureScheme,
 	bytes: Uint8Array,
-	options: { client?: SuiGraphQLClient } = {},
+	options: { client?: ZkLoginCompatibleClient } = {},
 ): PublicKey {
 	switch (signatureScheme) {
 		case 'ED25519':
@@ -126,7 +126,7 @@ export function publicKeyFromRawBytes(
 
 export function publicKeyFromSuiBytes(
 	publicKey: string | Uint8Array,
-	options: { client?: SuiGraphQLClient } = {},
+	options: { client?: ZkLoginCompatibleClient } = {},
 ) {
 	const bytes = typeof publicKey === 'string' ? fromBase64(publicKey) : publicKey;
 

package/src/version.ts

@@ -3,5 +3,5 @@
 
 // This file is generated by genversion.mjs. Do not edit it directly.
 
-export const PACKAGE_VERSION = '1.28.1';
-export const TARGETED_RPC_VERSION = '1.48.0';
+export const PACKAGE_VERSION = '1.29.0';
+export const TARGETED_RPC_VERSION = '1.49.0';

package/src/zklogin/publickey.ts

@@ -9,26 +9,35 @@ import { PublicKey } from '../cryptography/publickey.js';
 import type { PublicKeyInitData } from '../cryptography/publickey.js';
 import { SIGNATURE_SCHEME_TO_FLAG } from '../cryptography/signature-scheme.js';
 import { SuiGraphQLClient } from '../graphql/client.js';
-import { graphql } from '../graphql/schemas/latest/index.js';
 import { normalizeSuiAddress, SUI_ADDRESS_LENGTH } from '../utils/sui-types.js';
 import type { ZkLoginSignatureInputs } from './bcs.js';
 import { extractClaimValue } from './jwt-utils.js';
 import { parseZkLoginSignature } from './signature.js';
 import { normalizeZkLoginIssuer, toBigEndianBytes, toPaddedBigEndianBytes } from './utils.js';
+import type { ClientWithExtensions, Experimental_SuiClientTypes } from '../experimental/types.js';
+
+export interface ZkLoginCompatibleClient
+	extends ClientWithExtensions<{
+		core: {
+			verifyZkLoginSignature: NonNullable<
+				Experimental_SuiClientTypes.TransportMethods['verifyZkLoginSignature']
+			>;
+		};
+	}> {}
 
 /**
  * A zkLogin public identifier
  */
 export class ZkLoginPublicIdentifier extends PublicKey {
 	#data: Uint8Array;
-	#client?: SuiGraphQLClient;
+	#client?: ZkLoginCompatibleClient;
 	#legacyAddress: boolean;
 
 	/**
 	 * Create a new ZkLoginPublicIdentifier object
 	 * @param value zkLogin public identifier as buffer or base-64 encoded string
 	 */
-	constructor(value: PublicKeyInitData, { client }: { client?: SuiGraphQLClient } = {}) {
+	constructor(value: PublicKeyInitData, { client }: { client?: ZkLoginCompatibleClient } = {}) {
 		super();
 
 		this.#client = client;
@@ -127,7 +136,7 @@ export class ZkLoginPublicIdentifier extends PublicKey {
 			address: address,
 			bytes: toBase64(message),
 			signature: parsedSignature.serializedSignature,
-			intentScope: 'PERSONAL_MESSAGE',
+			intentScope: 'PersonalMessage',
 			client: this.#client,
 		});
 	}
@@ -142,7 +151,7 @@ export class ZkLoginPublicIdentifier extends PublicKey {
 			address: address,
 			bytes: toBase64(transaction),
 			signature: parsedSignature.serializedSignature,
-			intentScope: 'TRANSACTION_DATA',
+			intentScope: 'TransactionData',
 			client: this.#client,
 		});
 	}
@@ -159,7 +168,7 @@ export class ZkLoginPublicIdentifier extends PublicKey {
 export function toZkLoginPublicIdentifier(
 	addressSeed: bigint,
 	iss: string,
-	options?: { client?: SuiGraphQLClient; legacyAddress?: boolean },
+	options?: { client?: ZkLoginCompatibleClient; legacyAddress?: boolean },
 ): ZkLoginPublicIdentifier {
 	// Consists of iss_bytes_len || iss_bytes || padded_32_byte_address_seed.
 	const addressSeedBytesBigEndian = options?.legacyAddress
@@ -174,25 +183,6 @@ export function toZkLoginPublicIdentifier(
 	return new ZkLoginPublicIdentifier(tmp, options);
 }
 
-const VerifyZkLoginSignatureQuery = graphql(`
-	query Zklogin(
-		$bytes: Base64!
-		$signature: Base64!
-		$intentScope: ZkLoginIntentScope!
-		$author: SuiAddress!
-	) {
-		verifyZkloginSignature(
-			bytes: $bytes
-			signature: $signature
-			intentScope: $intentScope
-			author: $author
-		) {
-			success
-			errors
-		}
-	}
-`);
-
 function normalizeZkLoginPublicKeyBytes(bytes: Uint8Array, legacyAddress = false) {
 	const issByteLength = bytes[0] + 1;
 	const addressSeed = BigInt(`0x${toHex(bytes.slice(issByteLength))}`);
@@ -217,23 +207,17 @@ async function graphqlVerifyZkLoginSignature({
 	address: string;
 	bytes: string;
 	signature: string;
-	intentScope: 'PERSONAL_MESSAGE' | 'TRANSACTION_DATA';
-	client?: SuiGraphQLClient;
+	intentScope: 'PersonalMessage' | 'TransactionData';
+	client?: ZkLoginCompatibleClient;
 }) {
-	const resp = await client.query({
-		query: VerifyZkLoginSignatureQuery,
-		variables: {
-			bytes,
-			signature,
-			intentScope,
-			author: address,
-		},
+	const resp = await client.core.verifyZkLoginSignature({
+		bytes,
+		signature,
+		intentScope,
+		author: address,
 	});
 
-	return (
-		resp.data?.verifyZkloginSignature.success === true &&
-		resp.data?.verifyZkloginSignature.errors.length === 0
-	);
+	return resp.success === true && resp.errors.length === 0;
 }
 
 export function parseSerializedZkLoginSignature(signature: Uint8Array | string) {