@tradeport/sui-trading-sdk 0.4.39 → 0.4.41

package/src/methods/unlistListings/addUnlistListingTxs.ts

@@ -9,6 +9,8 @@ import {
 	TOCEN_MARKETPLACE_OBJECT,
 	TRADEPORT_KIOSK_LISTING_STORE,
 	TRADEPORT_LISTING_STORE,
+	TRADEPORT_LISTINGS_PACKAGE,
+	TRADEPORT_LISTINGS_STORE,
 } from '../../constants';
 import { getSharedObjects } from '../../helpers/getSharedObjects';
 import { hasNativeKioskTransferPolicyRules } from '../../helpers/hasTransferPolicyRules';
@@ -20,7 +22,7 @@ import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import { normalizedNftType } from '../../utils/normalizeNftType';
 import { type UnlistListingTx } from './unlistListings';
 
-export function addTradePortUnlistTx({ tx, listingNonce, nftType }: UnlistListingTx) {
+export function addLegacyTradePortUnlistTx({ tx, listingNonce, nftType }: UnlistListingTx) {
 	tx.moveCall({
 		target: '0xb42dbb7413b79394e1a0175af6ae22b69a5c7cc5df259cd78072b6818217c027::listings::unlist',
 		arguments: [tx.object(TRADEPORT_LISTING_STORE), tx.pure.address(listingNonce)],
@@ -28,7 +30,7 @@ export function addTradePortUnlistTx({ tx, listingNonce, nftType }: UnlistListin
 	});
 }
 
-export async function addTradePortKioskUnlistTx({
+export async function addLegacyTradePortKioskUnlistTx({
 	tx,
 	kioskTx,
 	nftTokenId,
@@ -47,6 +49,32 @@ export async function addTradePortKioskUnlistTx({
 	});
 }
 
+export function addTradePortUnlistTx({ tx, nftTokenId, nftType }: UnlistListingTx) {
+	tx.moveCall({
+		target: `${TRADEPORT_LISTINGS_PACKAGE}::tradeport_listings::cancel_listing_without_transfer_policy`,
+		arguments: [tx.object(TRADEPORT_LISTINGS_STORE), tx.pure.id(nftTokenId)],
+		typeArguments: [nftType],
+	});
+}
+
+export async function addKioskTradePortUnlistTx({
+	tx,
+	kioskTx,
+	nftTokenId,
+	nftType,
+}: UnlistListingTx) {
+	tx.moveCall({
+		target: `${TRADEPORT_LISTINGS_PACKAGE}::tradeport_listings::cancel_listing_with_transfer_policy`,
+		arguments: [
+			tx.object(TRADEPORT_LISTINGS_STORE),
+			tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+			tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+			tx.pure.id(nftTokenId),
+		],
+		typeArguments: [nftType],
+	});
+}
+
 export function addOriginByteUnlistTx({
 	tx,
 	sharedObjects,
@@ -175,14 +203,47 @@ export async function addTradePortUnlistTxHandler(txData: UnlistListingTx) {
 		return;
 	}
 
+	// If non kiosk listing (nonce starts with "0::")
+	if (txData?.listingNonce?.startsWith('0::')) {
+		addTradePortUnlistTx(txData);
+		return;
+	}
+
+	// If kiosk listing (nonce starts with "1::")
+	if (txData?.listingNonce?.startsWith('1::')) {
+		return kioskTxWrapper({
+			tx: txData?.tx,
+			kioskClient: txData?.kioskClient,
+			kioskOwner: txData?.seller,
+			kiosk: txData?.sellerKiosk,
+			shouldAllowNftUnsharedKiosk: true,
+			sharedKioskState: txData?.sharedKioskState,
+			shouldUseSharedKioskTx: false,
+			async runCommands(kioskTx) {
+				await addKioskTradePortUnlistTx({
+					...txData,
+					kioskTx,
+				});
+			},
+		});
+	}
+
+	// Fallback to legacy contract logic
 	if (
 		txData?.listingNonce &&
 		(await isNonKioskListing({ suiClient: txData?.suiClient, listingNonce: txData?.listingNonce }))
 	) {
-		addTradePortUnlistTx(txData);
+		if (txData?.isPartOfRelist) {
+			throw new Error(
+				'Cannot relist this non kiosk NFT in one transaction from legacy contract. You must unlist and list again',
+			);
+		}
+
+		addLegacyTradePortUnlistTx(txData);
 		return;
 	}
 
+	// If legacy kiosk listing
 	if (txData?.sellerKiosk) {
 		return kioskTxWrapper({
 			tx: txData?.tx,
@@ -193,7 +254,7 @@ export async function addTradePortUnlistTxHandler(txData: UnlistListingTx) {
 			sharedKioskState: txData?.sharedKioskState,
 			shouldUseSharedKioskTx: false,
 			async runCommands(kioskTx) {
-				await addTradePortKioskUnlistTx({
+				await addLegacyTradePortKioskUnlistTx({
 					...txData,
 					kioskTx,
 				});
@@ -211,6 +272,7 @@ export async function addTradePortUnlistTxHandler(txData: UnlistListingTx) {
 						kioskOwner: txData?.seller,
 					});
 
+					// Transfer the borrowed item back to the seller
 					txData?.tx.transferObjects(
 						[txData?.tx.object(borrowedItem)],
 						txData?.tx.pure.address(addLeadingZerosAfter0x(txData?.seller)),
@@ -220,7 +282,8 @@ export async function addTradePortUnlistTxHandler(txData: UnlistListingTx) {
 		});
 	}
 
-	addTradePortUnlistTx(txData);
+	// If legacy non kiosk listing
+	addLegacyTradePortUnlistTx(txData);
 }
 
 export async function addHyperspaceUnlistTxHandler(txData: UnlistListingTx) {

package/src/methods/unlistListings/unlistListings.ts

@@ -37,6 +37,7 @@ export type UnlistListingTx = {
 	listingNonce: string;
 	price: number;
 	sellerKiosk: string;
+	isPartOfRelist?: boolean;
 };
 
 export type UnlistListing = {
@@ -76,12 +77,7 @@ export const unlistListings = async (
 		}
 
 		// Allow the owner to unlist expired listing
-		if (
-			!listing?.listed &&
-			!listing?.nonce /* &&
-				listing?.seller &&
-				normalizeSuiAddress(listing?.seller) === normalizeSuiAddress(walletAddress) */
-		) {
+		if (!listing?.listed && !listing?.nonce) {
 			throw new Error(`Listing ${listing?.id} is not listed`);
 		}
 

package/src/tests/SuiWallet.ts

@@ -1,10 +1,13 @@
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+import { decodeSuiPrivateKey } from '@mysten/sui/cryptography';
 import { type Transaction } from '@mysten/sui/transactions';
 import createSuiClient from '../apiClients/createSuiClient';
 import { toUint8Array } from '../utils/toUint8Array';
 
 export class SuiWallet {
-	readonly keypair = Ed25519Keypair.fromSecretKey(toUint8Array(process.env.SUI_WALLET_SECRET_KEY));
+	readonly keypair = process.env.SUI_WALLET_SECRET_KEY.startsWith('suiprivkey')
+		? Ed25519Keypair.fromSecretKey(decodeSuiPrivateKey(process.env.SUI_WALLET_SECRET_KEY).secretKey)
+		: Ed25519Keypair.fromSecretKey(toUint8Array(process.env.SUI_WALLET_SECRET_KEY));
 
 	private readonly suiClient: ReturnType<typeof createSuiClient>;
 	private balanceAmount = 0n;

package/src/utils/printTxBlockTxs.ts

@@ -1,5 +1,11 @@
 import { type Transaction } from '@mysten/sui/transactions';
 
 export const printTxBlockTxs = async (tx: Transaction) => {
-	console.log(JSON.stringify(tx?.getData(), null, 2));
+	console.log(
+		JSON.stringify(
+			tx?.getData(),
+			(key, value) => (typeof value === 'bigint' ? value.toString() : value),
+			2,
+		),
+	);
 };

package/src/utils/pureValues.ts

@@ -0,0 +1,13 @@
+import BigNumber from '../bigNumberConfig';
+
+export const toDecimalValue = (value: string | number | BigNumber, decimals: number): BigNumber => {
+	if (!value || decimals === undefined) return new BigNumber(0);
+
+	return new BigNumber(value).div(10 ** decimals);
+};
+
+export const toPureValue = (value: string | number | BigNumber, decimals: number): BigNumber => {
+	if (!value || decimals === undefined) return new BigNumber(0);
+
+	return new BigNumber(new BigNumber(value).multipliedBy(10 ** decimals).toFixed(0));
+};