@mysten/kiosk 0.0.0-experimental-20231108214021 → 0.0.0-experimental-20231113213638

package/src/client/kiosk-transaction.ts

@@ -19,7 +19,7 @@ import {
 	Price,
 	PurchaseOptions,
 } from '../types';
-import { getNormalizedRuleType, objArg } from '../utils';
+import { getNormalizedRuleType } from '../utils';
 import { type KioskClient } from './kiosk-client';
 
 export type KioskTransactionParams = {
@@ -396,9 +396,9 @@ export class KioskTransaction {
 	 */
 	setCap(cap: KioskOwnerCap) {
 		this.#validateFinalizedStatus();
-		this.kiosk = objArg(this.transactionBlock, cap.kioskId);
+		this.kiosk = this.transactionBlock.object(cap.kioskId);
 		if (!cap.isPersonal) {
-			this.kioskCap = objArg(this.transactionBlock, cap.objectId);
+			this.kioskCap = this.transactionBlock.object(cap.objectId);
 			return;
 		}
 
@@ -433,7 +433,7 @@ export class KioskTransaction {
 				target: `${packageId}::personal_kiosk::return_val`,
 				arguments: [
 					this.#personalCap,
-					objArg(this.transactionBlock, this.kioskCap!),
+					this.transactionBlock.object(this.kioskCap!),
 					this.#promise!,
 				],
 			});
@@ -487,11 +487,11 @@ export class KioskTransaction {
 			target: `${this.kioskClient.getRulePackageId(
 				'personalKioskRulePackageId',
 			)}::personal_kiosk::borrow_val`,
-			arguments: [objArg(this.transactionBlock, personalCap)],
+			arguments: [this.transactionBlock.object(personalCap)],
 		});
 
 		this.kioskCap = kioskCap;
-		this.#personalCap = objArg(this.transactionBlock, personalCap);
+		this.#personalCap = this.transactionBlock.object(personalCap);
 		this.#promise = promise;
 
 		return this;

package/src/tx/kiosk.ts

@@ -9,7 +9,6 @@ import {
 } from '@mysten/sui.js/transactions';
 
 import { KIOSK_MODULE, KIOSK_TYPE, ObjectArgument } from '../types';
-import { objArg } from '../utils';
 
 /**
  * Create a new shared Kiosk and returns the [kiosk, kioskOwnerCap] tuple.
@@ -59,7 +58,7 @@ export function place(
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::place`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), objArg(tx, item)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.object(item)],
 	});
 }
 
@@ -82,7 +81,7 @@ export function lock(
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::lock`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), objArg(tx, policy), objArg(tx, item)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.object(policy), tx.object(item)],
 	});
 }
 
@@ -100,7 +99,7 @@ export function take(
 	const [item] = tx.moveCall({
 		target: `${KIOSK_MODULE}::take`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), tx.pure.id(itemId)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.pure.id(itemId)],
 	});
 
 	return item;
@@ -121,7 +120,7 @@ export function list(
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::list`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), tx.pure.id(itemId), tx.pure.u64(price)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.pure.id(itemId), tx.pure.u64(price)],
 	});
 }
 
@@ -139,7 +138,7 @@ export function delist(
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::delist`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), tx.pure.id(itemId)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.pure.id(itemId)],
 	});
 }
 
@@ -158,7 +157,7 @@ export function placeAndList(
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::place_and_list`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), objArg(tx, item), tx.pure.u64(price)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.object(item), tx.pure.u64(price)],
 	});
 }
 
@@ -176,7 +175,7 @@ export function purchase(
 	const [item, transferRequest] = tx.moveCall({
 		target: `${KIOSK_MODULE}::purchase`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), tx.pure.id(itemId), objArg(tx, payment)],
+		arguments: [tx.object(kiosk), tx.pure.id(itemId), tx.object(payment)],
 	});
 
 	return [item, transferRequest];
@@ -196,7 +195,7 @@ export function withdrawFromKiosk(
 
 	const [coin] = tx.moveCall({
 		target: `${KIOSK_MODULE}::withdraw`,
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), amountArg],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), amountArg],
 	});
 
 	return coin;
@@ -218,7 +217,7 @@ export function borrowValue(
 	const [item, promise] = tx.moveCall({
 		target: `${KIOSK_MODULE}::borrow_val`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskCap), tx.pure.id(itemId)],
+		arguments: [tx.object(kiosk), tx.object(kioskCap), tx.pure.id(itemId)],
 	});
 
 	return [item, promise];
@@ -238,6 +237,6 @@ export function returnValue(
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::return_val`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, kiosk), item, promise],
+		arguments: [tx.object(kiosk), item, promise],
 	});
 }

package/src/tx/personal-kiosk.ts

@@ -4,7 +4,6 @@
 import { TransactionBlock, TransactionObjectArgument } from '@mysten/sui.js/transactions';
 
 import { ObjectArgument } from '../types';
-import { objArg } from '../utils';
 
 export function convertToPersonalTx(
 	tx: TransactionBlock,
@@ -14,7 +13,7 @@ export function convertToPersonalTx(
 ): TransactionObjectArgument {
 	const personalKioskCap = tx.moveCall({
 		target: `${packageId}::personal_kiosk::new`,
-		arguments: [objArg(tx, kiosk), objArg(tx, kioskOwnerCap)],
+		arguments: [tx.object(kiosk), tx.object(kioskOwnerCap)],
 	});
 
 	return personalKioskCap;

package/src/tx/rules/attach.ts

@@ -4,7 +4,6 @@
 import { type TransactionBlock } from '@mysten/sui.js/transactions';
 
 import { type ObjectArgument } from '../../types';
-import { objArg } from '../../utils';
 
 export function attachKioskLockRuleTx(
 	tx: TransactionBlock,
@@ -16,7 +15,7 @@ export function attachKioskLockRuleTx(
 	tx.moveCall({
 		target: `${packageId}::kiosk_lock_rule::add`,
 		typeArguments: [type],
-		arguments: [objArg(tx, policy), objArg(tx, policyCap)],
+		arguments: [tx.object(policy), tx.object(policyCap)],
 	});
 }
 
@@ -36,8 +35,8 @@ export function attachRoyaltyRuleTx(
 		target: `${packageId}::royalty_rule::add`,
 		typeArguments: [type],
 		arguments: [
-			objArg(tx, policy),
-			objArg(tx, policyCap),
+			tx.object(policy),
+			tx.object(policyCap),
 			tx.pure.u16(Number(percentageBps)),
 			tx.pure.u64(minAmount),
 		],
@@ -54,7 +53,7 @@ export function attachPersonalKioskRuleTx(
 	tx.moveCall({
 		target: `${packageId}::personal_kiosk_rule::add`,
 		typeArguments: [type],
-		arguments: [objArg(tx, policy), objArg(tx, policyCap)],
+		arguments: [tx.object(policy), tx.object(policyCap)],
 	});
 }
 
@@ -69,6 +68,6 @@ export function attachFloorPriceRuleTx(
 	tx.moveCall({
 		target: `${packageId}::floor_price_rule::add`,
 		typeArguments: [type],
-		arguments: [objArg(tx, policy), objArg(tx, policyCap), tx.pure.u64(minPrice)],
+		arguments: [tx.object(policy), tx.object(policyCap), tx.pure.u64(minPrice)],
 	});
 }

package/src/tx/rules/resolve.ts

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { type RuleResolvingParams } from '../../types';
-import { objArg } from '../../utils';
 import { lock } from '../kiosk';
 
 /**
@@ -11,7 +10,7 @@ import { lock } from '../kiosk';
 export function resolveRoyaltyRule(params: RuleResolvingParams) {
 	const { transactionBlock: txb, itemType, price, packageId, transferRequest, policyId } = params;
 
-	const policyObj = objArg(txb, policyId);
+	const policyObj = txb.object(policyId);
 
 	// calculates the amount
 	const [amount] = txb.moveCall({
@@ -51,7 +50,7 @@ export function resolveKioskLockRule(params: RuleResolvingParams) {
 	txb.moveCall({
 		target: `${packageId}::kiosk_lock_rule::prove`,
 		typeArguments: [itemType],
-		arguments: [transferRequest, objArg(txb, kiosk)],
+		arguments: [transferRequest, txb.object(kiosk)],
 	});
 }
 
@@ -68,7 +67,7 @@ export function resolvePersonalKioskRule(params: RuleResolvingParams) {
 	txb.moveCall({
 		target: `${packageId}::personal_kiosk_rule::prove`,
 		typeArguments: [itemType],
-		arguments: [objArg(txb, kiosk), transferRequest],
+		arguments: [txb.object(kiosk), transferRequest],
 	});
 }
 
@@ -82,6 +81,6 @@ export function resolveFloorPriceRule(params: RuleResolvingParams) {
 	txb.moveCall({
 		target: `${packageId}::floor_price_rule::prove`,
 		typeArguments: [itemType],
-		arguments: [objArg(txb, policyId), transferRequest],
+		arguments: [txb.object(policyId), transferRequest],
 	});
 }

package/src/tx/transfer-policy.ts

@@ -9,7 +9,6 @@ import {
 } from '@mysten/sui.js/transactions';
 
 import { ObjectArgument, TRANSFER_POLICY_MODULE, TRANSFER_POLICY_TYPE } from '../types';
-import { objArg } from '../utils';
 
 /**
  * Call the `transfer_policy::new` function to create a new transfer policy.
@@ -43,7 +42,7 @@ export function createTransferPolicyWithoutSharing(
 	const [transferPolicy, transferPolicyCap] = tx.moveCall({
 		target: `${TRANSFER_POLICY_MODULE}::new`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, publisher)],
+		arguments: [tx.object(publisher)],
 	});
 
 	return [transferPolicy, transferPolicyCap];
@@ -78,7 +77,7 @@ export function withdrawFromPolicy(
 	const [profits] = tx.moveCall({
 		target: `${TRANSFER_POLICY_MODULE}::withdraw`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, policy), objArg(tx, policyCap), amountArg],
+		arguments: [tx.object(policy), tx.object(policyCap), amountArg],
 	});
 
 	return profits;
@@ -97,7 +96,7 @@ export function confirmRequest(
 	tx.moveCall({
 		target: `${TRANSFER_POLICY_MODULE}::confirm_request`,
 		typeArguments: [itemType],
-		arguments: [objArg(tx, policy), request],
+		arguments: [tx.object(policy), request],
 	});
 }
 
@@ -115,6 +114,6 @@ export function removeTransferPolicyRule(
 	tx.moveCall({
 		target: `${TRANSFER_POLICY_MODULE}::remove_rule`,
 		typeArguments: [itemType, ruleType, configType],
-		arguments: [objArg(tx, policy), objArg(tx, policyCap)],
+		arguments: [tx.object(policy), tx.object(policyCap)],
 	});
 }

package/src/types/index.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { type SharedObjectRef } from '@mysten/sui.js/bcs';
-import { type SuiClient, type SuiObjectRef } from '@mysten/sui.js/client';
+import { type SuiClient } from '@mysten/sui.js/client';
 import { TransactionObjectArgument } from '@mysten/sui.js/transactions';
 
 import { BaseRulePackageIds } from '../constants';
@@ -13,7 +12,7 @@ export * from './transfer-policy';
 /**
  * A valid argument for any of the Kiosk functions.
  */
-export type ObjectArgument = string | TransactionObjectArgument | SharedObjectRef | SuiObjectRef;
+export type ObjectArgument = string | TransactionObjectArgument;
 
 /**
  * A Network selector.

package/src/utils.ts

@@ -1,18 +1,15 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from '@mysten/sui.js/bcs';
 import {
 	PaginationArguments,
 	SuiClient,
 	SuiObjectData,
 	SuiObjectDataFilter,
 	SuiObjectDataOptions,
-	SuiObjectRef,
 	SuiObjectResponse,
 	type DynamicFieldInfo,
 } from '@mysten/sui.js/client';
-import { TransactionBlock, TransactionObjectArgument } from '@mysten/sui.js/transactions';
 import { normalizeStructTag, normalizeSuiAddress, parseStructTag } from '@mysten/sui.js/utils';
 
 import { bcs } from './bcs';
@@ -27,36 +24,6 @@ import {
 
 const DEFAULT_QUERY_LIMIT = 50;
 
-/**
- * Convert any valid input into a TransactionArgument.
- *
- * @param txb The Transaction Block
- * @param arg The argument to convert.
- * @returns The converted TransactionArgument.
- */
-export function objArg(
-	txb: TransactionBlock,
-	arg: string | SharedObjectRef | SuiObjectRef | TransactionObjectArgument,
-): TransactionObjectArgument {
-	if (typeof arg === 'string') {
-		return txb.object(arg);
-	}
-
-	if ('digest' in arg && 'version' in arg && 'objectId' in arg) {
-		return txb.objectRef(arg);
-	}
-
-	if ('objectId' in arg && 'initialSharedVersion' in arg && 'mutable' in arg) {
-		return txb.sharedObjectRef(arg);
-	}
-
-	if ('kind' in arg) {
-		return arg;
-	}
-
-	throw new Error('Invalid argument type');
-}
-
 export async function getKioskObject(client: SuiClient, id: string): Promise<Kiosk> {
 	const queryRes = await client.getObject({ id, options: { showBcs: true } });