@mysten/kiosk 0.3.3 → 0.4.1

package/src/tx/kiosk.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { SuiAddress, TransactionArgument, TransactionBlock } from '@mysten/sui.js';
+import { TransactionBlock, TransactionArgument } from '@mysten/sui.js/transactions';
 
 import { getTypeWithoutPackageAddress, objArg } from '../utils';
 import { confirmRequest, resolveKioskLockRule, resolveRoyaltyRule } from './transfer-policy';
@@ -96,7 +96,7 @@ export function take(
 	itemType: string,
 	kiosk: ObjectArgument,
 	kioskCap: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 ): TransactionArgument {
 	let [item] = tx.moveCall({
 		target: `${KIOSK_MODULE}::take`,
@@ -116,7 +116,7 @@ export function list(
 	itemType: string,
 	kiosk: ObjectArgument,
 	kioskCap: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 	price: string | bigint,
 ): void {
 	tx.moveCall({
@@ -140,7 +140,7 @@ export function delist(
 	itemType: string,
 	kiosk: ObjectArgument,
 	kioskCap: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 ): void {
 	tx.moveCall({
 		target: `${KIOSK_MODULE}::delist`,
@@ -176,7 +176,7 @@ export function purchase(
 	tx: TransactionBlock,
 	itemType: string,
 	kiosk: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 	payment: ObjectArgument,
 ): [TransactionArgument, TransactionArgument] {
 	let [item, transferRequest] = tx.moveCall({
@@ -225,7 +225,7 @@ export function borrow(
 	itemType: string,
 	kiosk: ObjectArgument,
 	kioskCap: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 ): TransactionArgument {
 	let [item] = tx.moveCall({
 		target: `${KIOSK_MODULE}::borrow`,
@@ -245,7 +245,7 @@ export function borrowMut(
 	itemType: string,
 	kiosk: ObjectArgument,
 	kioskCap: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 ): TransactionArgument {
 	let [item] = tx.moveCall({
 		target: `${KIOSK_MODULE}::borrow_mut`,
@@ -267,7 +267,7 @@ export function borrowValue(
 	itemType: string,
 	kiosk: ObjectArgument,
 	kioskCap: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 ): [TransactionArgument, TransactionArgument] {
 	let [item, promise] = tx.moveCall({
 		target: `${KIOSK_MODULE}::borrow_val`,
@@ -310,7 +310,7 @@ export function purchaseAndResolvePolicies(
 	itemType: string,
 	price: string,
 	kiosk: ObjectArgument,
-	itemId: SuiAddress,
+	itemId: string,
 	policy: TransferPolicy,
 	environment: RulesEnvironmentParam,
 	extraParams?: PurchaseOptionalParams,

package/src/tx/transfer-policy.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionArgument, TransactionBlock } from '@mysten/sui.js';
+import { TransactionBlock, TransactionArgument } from '@mysten/sui.js/transactions';
 import { getRulePackageAddress, objArg } from '../utils';
 import { lock } from './kiosk';
 import {

package/src/types/env.ts

@@ -1,13 +1,11 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { SuiAddress } from '@mysten/sui.js';
-
 /* A list of environments. */
 export type Environment = 'mainnet' | 'testnet' | 'devnet' | 'custom';
 
-/** A Parameter to support enivronments for rules.  */
-export type RulesEnvironmentParam = { env: Environment; address?: SuiAddress };
+/** A Parameter to support environments for rules.  */
+export type RulesEnvironmentParam = { env: Environment; address?: string };
 
 /** A default Testnet Environment object  */
 export const testnetEnvironment: RulesEnvironmentParam = { env: 'testnet' };

package/src/types/index.ts

@@ -1,7 +1,9 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef, SuiObjectRef, TransactionArgument } from '@mysten/sui.js';
+import { SharedObjectRef } from '@mysten/sui.js/bcs';
+import { SuiObjectRef } from '@mysten/sui.js/client';
+import { TransactionArgument } from '@mysten/sui.js/transactions';
 
 export * from './kiosk';
 export * from './transfer-policy';

package/src/types/kiosk.ts

@@ -1,13 +1,8 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-	ObjectDigest,
-	ObjectId,
-	ObjectType,
-	PaginatedObjectsResponse,
-	TransactionArgument,
-} from '@mysten/sui.js';
+import { PaginatedObjectsResponse } from '@mysten/sui.js/client';
+import { TransactionArgument } from '@mysten/sui.js/transactions';
 import { ObjectArgument } from '.';
 
 /** The Kiosk module. */
@@ -77,7 +72,7 @@ export type PurchaseOptionalParams = {
  */
 export type KioskListing = {
 	/** The ID of the Item */
-	objectId: ObjectId;
+	objectId: string;
 	/**
 	 * Whether or not there's a `PurchaseCap` issued. `true` means that
 	 * the listing is controlled by some logic and can't be purchased directly.
@@ -86,7 +81,7 @@ export type KioskListing = {
 	 */
 	isExclusive: boolean;
 	/** The ID of the listing */
-	listingId: ObjectId;
+	listingId: string;
 	price?: string;
 };
 
@@ -96,9 +91,9 @@ export type KioskListing = {
  */
 export type KioskItem = {
 	/** The ID of the Item */
-	objectId: ObjectId;
+	objectId: string;
 	/** The type of the Item */
-	type: ObjectType;
+	type: string;
 	/** Whether the item is Locked (there must be a `Lock` Dynamic Field) */
 	isLocked: boolean;
 	/** Optional listing */
@@ -109,15 +104,15 @@ export type KioskItem = {
  */
 export type KioskData = {
 	items: KioskItem[];
-	itemIds: ObjectId[];
-	listingIds: ObjectId[];
+	itemIds: string[];
+	listingIds: string[];
 	kiosk?: Kiosk;
 	extensions: any[]; // type will be defined on later versions of the SDK.
 };
 
 export type PagedKioskData = {
 	data: KioskData;
-	nextCursor: string | null;
+	nextCursor: string | null | undefined;
 	hasNextPage: boolean;
 };
 
@@ -128,12 +123,12 @@ export type FetchKioskOptions = {
 
 export type OwnedKiosks = {
 	kioskOwnerCaps: KioskOwnerCap[];
-	kioskIds: ObjectId[];
+	kioskIds: string[];
 } & Omit<PaginatedObjectsResponse, 'data'>;
 
 export type KioskOwnerCap = {
-	objectId: ObjectId;
-	kioskId: ObjectId;
-	digest: ObjectDigest;
+	objectId: string;
+	kioskId: string;
+	digest: string;
 	version: string;
 };

package/src/types/transfer-policy.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ObjectOwner } from '@mysten/sui.js';
+import { ObjectOwner } from '@mysten/sui.js/client';
 
 /** The Transfer Policy module. */
 export const TRANSFER_POLICY_MODULE = '0x2::transfer_policy';

package/src/utils.ts

@@ -1,21 +1,14 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-	JsonRpcProvider,
-	ObjectId,
-	PaginationArguments,
-	SharedObjectRef,
-	SuiObjectRef,
-	SuiObjectResponse,
-	TransactionArgument,
-	TransactionBlock,
-	getObjectFields,
-} from '@mysten/sui.js';
-import { type DynamicFieldInfo } from '@mysten/sui.js';
+import { SharedObjectRef } from '@mysten/sui.js/bcs';
+import { SuiObjectRef, SuiObjectResponse } from '@mysten/sui.js/client';
+import { TransactionBlock, TransactionArgument } from '@mysten/sui.js/transactions';
+import { type DynamicFieldInfo } from '@mysten/sui.js/client';
 import { bcs } from './bcs';
 import { KIOSK_TYPE, Kiosk, KioskData, KioskListing, RulesEnvironmentParam } from './types';
 import { MAINNET_RULES_PACKAGE_ADDRESS, TESTNET_RULES_PACKAGE_ADDRESS } from './constants';
+import { SuiClient, PaginationArguments } from '@mysten/sui.js/client';
 
 /* A simple map to the rule package addresses */
 // TODO: Supply the mainnet and devnet addresses.
@@ -56,8 +49,8 @@ export function objArg(
 	throw new Error('Invalid argument type');
 }
 
-export async function getKioskObject(provider: JsonRpcProvider, id: string): Promise<Kiosk> {
-	const queryRes = await provider.getObject({ id, options: { showBcs: true } });
+export async function getKioskObject(client: SuiClient, id: string): Promise<Kiosk> {
+	const queryRes = await client.getObject({ id, options: { showBcs: true } });
 
 	if (!queryRes || queryRes.error || !queryRes.data) {
 		throw new Error(`Kiosk ${id} not found; ${queryRes.error}`);
@@ -92,13 +85,13 @@ export function extractKioskData(
 				case 'kiosk::Listing':
 					acc.listingIds.push(val.objectId);
 					listings.push({
-						objectId: val.name.value.id,
+						objectId: (val.name.value as { id: string }).id,
 						listingId: val.objectId,
-						isExclusive: val.name.value.is_exclusive,
+						isExclusive: (val.name.value as { is_exclusive: boolean }).is_exclusive,
 					});
 					break;
 				case 'kiosk::Lock':
-					lockedItemIds?.push(val.name.value.id);
+					lockedItemIds?.push((val.name.value as { id: string }).id);
 					break;
 			}
 			return acc;
@@ -122,18 +115,20 @@ export function attachListingsAndPrices(
 ) {
 	// map item listings as {item_id: KioskListing}
 	// for easier mapping on the nex
-	const itemListings = listings.reduce<Record<ObjectId, KioskListing>>(
-		(acc: Record<ObjectId, KioskListing>, item, idx) => {
+	const itemListings = listings.reduce<Record<string, KioskListing>>(
+		(acc: Record<string, KioskListing>, item, idx) => {
 			acc[item.objectId] = { ...item };
 
 			// return in case we don't have any listing objects.
 			// that's the case when we don't have the `listingPrices` included.
 			if (listingObjects.length === 0) return acc;
 
-			const data = getObjectFields(listingObjects[idx]);
+			const content = listingObjects[idx].data?.content;
+			const data = content?.dataType === 'moveObject' ? content?.fields : null;
+
 			if (!data) return acc;
 
-			acc[item.objectId].price = data.value;
+			acc[item.objectId].price = (data as { value: string }).value;
 			return acc;
 		},
 		{},
@@ -147,10 +142,10 @@ export function attachListingsAndPrices(
 /**
  * A Helper to attach locked state to items in Kiosk Data.
  */
-export function attachLockedItems(kioskData: KioskData, lockedItemIds: ObjectId[]) {
+export function attachLockedItems(kioskData: KioskData, lockedItemIds: string[]) {
 	// map lock status in an array of type { item_id: true }
-	const lockedStatuses = lockedItemIds.reduce<Record<ObjectId, boolean>>(
-		(acc: Record<ObjectId, boolean>, item: string) => {
+	const lockedStatuses = lockedItemIds.reduce<Record<string, boolean>>(
+		(acc: Record<string, boolean>, item: string) => {
 			acc[item] = true;
 			return acc;
 		},
@@ -182,8 +177,8 @@ export function getRulePackageAddress(environment: RulesEnvironmentParam): strin
  * RPC calls that allow filtering of Type / batch fetching of spec
  */
 export async function getAllDynamicFields(
-	provider: JsonRpcProvider,
-	parentId: ObjectId,
+	client: SuiClient,
+	parentId: string,
 	pagination: PaginationArguments<string>,
 ) {
 	let hasNextPage = true;
@@ -191,7 +186,7 @@ export async function getAllDynamicFields(
 	const data: DynamicFieldInfo[] = [];
 
 	while (hasNextPage) {
-		const result = await provider.getDynamicFields({
+		const result = await client.getDynamicFields({
 			parentId,
 			limit: pagination.limit || undefined,
 			cursor,