@tradeport/sui-trading-sdk 0.4.48 → 0.4.49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tradeport/sui-trading-sdk",
   "license": "MIT",
-  "version": "0.4.48",
+  "version": "0.4.49",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",

package/src/constants.ts

@@ -1,4 +1,5 @@
-export const MYSTEN_TRANFER_POLICY_RULES_PACKAGE_ID = '0x434b5bd8f6a7b05fede0ff46c6e511d71ea326ed38056e3bcd681d2d7c2a7879';
+export const MYSTEN_TRANSFER_POLICY_RULES_PACKAGE_ID = '0x434b5bd8f6a7b05fede0ff46c6e511d71ea326ed38056e3bcd681d2d7c2a7879';
+export const MYSTEN_TRANSFER_POLICY_RULES_PACKAGE_ID_V2 = '0x0cb4bcc0560340eb1a1b929cabe56b33fc6449820ec8c1980d69bb98b649b802';
 
 export const TRADEPORT_BENEFICIARY_ADDRESS = '0xbca3b5c01c8d1a93aed3a036feff45145518292dd3c1db1d67cc99a699a7b517';
 export const TRADEPORT_DEFAULT_FEE_DECIMAL_PERCENT = 0.03;
@@ -7,7 +8,7 @@ export const TRADEPORT_LISTINGS_DEFAULT_COMMISSION_BPS = 300; // 3%
 export const TRADEPORT_LISTING_STORE = '0x47cba0b6309a12ce39f9306e28b899ed4b3698bce4f4911fd0c58ff2329a2ff6';
 export const TRADEPORT_BIDDING_STORE = '0x3d3b0c6e616fdc1a45b2b73d022bc085448e78bd729d28081c7a340abb33cba1';
 export const TRADEPORT_MARKETPLACE_OBJECT = '0xc5f87120e388b532ee774f7bac23347679f632a1f2d59f4ed2bbf2ffe5a61b6f';
-export const TRADEPORT_LISTINGS_PACKAGE = '0x046de0d9c1d7aea8b27744308a0607515677cf9035e1c98d88cb27bbc84a77ae';
+export const TRADEPORT_LISTINGS_PACKAGE = '0x6cfe7388ccf732432906d7faebcc33fd91e11d4c2f8cb3ae0082b8d3269e3d5b';
 export const TRADEPORT_LISTINGS_STORE = '0xf96f9363ac5a64c058bf7140723226804d74c0dab2dd27516fb441a180cd763b';
 export const TRADEPORT_KIOSK_LISTING_STORE = '0xbff3161b047fb8b727883838c09b08afa9e0dd0f5488bde9e99e80643da9b9e0';
 export const TRADEPORT_KIOSK_TRANSFERS_STORE = '0xe0f61b6915d3fd4ec8bbe4618514e2152a82841605bfa00cde22ace434153a1b';
@@ -19,7 +20,7 @@ export const TRADEPORT_KIOSK_BID_NONCE_TYPE = '0xec175e537be9e48f75fa6929291de64
 export const TRADEPORT_PRICE_LOCK_PACKAGE = '0x3cb532a2548290780a3d70ad6f4f06abc5bebb75ec6f8dd0197d4d2b2860c5d8';
 export const TRADEPORT_PRICE_LOCK_STORE = '0x4b705de46a79b29276baf45009bc7d6f70cc0f1407f0c9e03cac5729c0c47946';
 
-export const TRADEPORT_MULTI_BID_PACKAGE = '0xd1dedf8379f1781469e95cb92eed7e155c8ad141c8528c3855f59ce2a5d9d659';
+export const TRADEPORT_MULTI_BID_PACKAGE = '0x63ce6caee2ba264e92bca2d160036eb297d99b2d91d4db89d48a9bffca66e55b';
 export const TRADEPORT_MULTI_BID_PACKAGE_ORIGINAL = '0x53134eb544c5a0b5085e99efaf7eab13b28ad123de35d61f941f8c8c40b72033'; // V1
 export const TRADEPORT_MULTI_BID_STORE = '0x8aaed7e884343fb8b222c721d02eaac2c6ae2abbb4ddcdf16cb55cf8754ee860';
 
@@ -1021,3 +1022,5 @@ export const DYNAMIC_COLLECTION_IDS = [
   'fdf8a578-2914-47aa-a318-3a0a80b29025', // Phantom Froze Over
   '75381a59-abde-4e4b-aac9-b1c5ba10b4da', // Claynosaurz: Phantom Purr-ize Patch
 ];
+
+export const XOCIETY_FRONTIER_COLLECTION_ID = '9a0fcf4f-c77c-42d8-acad-5054e025eb53';

package/src/methods/buyListings/addBuyListingTxs.ts

@@ -19,6 +19,7 @@ import {
 	TRADEPORT_LISTING_STORE,
 	TRADEPORT_LISTINGS_PACKAGE,
 	TRADEPORT_LISTINGS_STORE,
+	XOCIETY_FRONTIER_COLLECTION_ID,
 } from '../../constants';
 import { getCommissionByNftContractId } from '../../graphql/queries/getCommissionByListingId';
 import { destroyZeroCoin } from '../../helpers/destroyZeroCoin';
@@ -36,6 +37,7 @@ import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import { type BuyTx, type TocenBuyTx } from './buyListings';
 import BigNumber from '../../bigNumberConfig';
 import { calculateRoyaltyFee } from '../../helpers/calculateRoyaltyFee';
+import { takeAndBorrowNftFromKiosk } from '../../helpers/kiosk/takeAndBorrowNftFromKiosk';
 
 export function addLegacyTradePortBuyTx({
 	tx,
@@ -601,6 +603,25 @@ export async function addTradePortBuyTxHandler(txData: BuyTx) {
 					...txData,
 					kioskTx,
 				});
+
+				// If XOCIETY Frontier collection, take NFT out of kiosk and transfer it back to user (buyer)
+				if (txData?.collectionId === XOCIETY_FRONTIER_COLLECTION_ID) {
+					const borrowedItem = await takeAndBorrowNftFromKiosk({
+						tx: txData?.tx,
+						transferPolicies: txData?.transferPolicies,
+						kioskTx,
+						kioskClient: txData?.kioskClient,
+						nftTokenId: txData?.nftTokenId,
+						nftType: txData?.nftType,
+						suiClient: txData?.suiClient,
+						kioskOwner: txData?.buyer,
+					});
+
+					txData?.tx.transferObjects(
+						[txData?.tx.object(borrowedItem)],
+						txData?.tx.pure.address(addLeadingZerosAfter0x(txData?.buyer)),
+					);
+				}
 			},
 		});
 	}

package/src/methods/transferNfts/addTransferNftTx.ts

@@ -2,7 +2,8 @@ import { type KioskClient } from '@mysten/kiosk';
 import { type SuiClient } from '@mysten/sui/client';
 import { type Transaction } from '@mysten/sui/transactions';
 import {
-	MYSTEN_TRANFER_POLICY_RULES_PACKAGE_ID,
+	MYSTEN_TRANSFER_POLICY_RULES_PACKAGE_ID,
+	MYSTEN_TRANSFER_POLICY_RULES_PACKAGE_ID_V2,
 	TRADEPORT_KIOSK_TRANSFERS_STORE,
 } from '../../constants';
 import { destroyZeroCoin } from '../../helpers/destroyZeroCoin';
@@ -112,19 +113,6 @@ export async function addTradeportKioskDirectTransferTx(
 		return;
 	}
 
-	const [receiverKiosk, receiverKioskCap] = tx.moveCall({
-		target: '0x2::kiosk::new',
-		arguments: [],
-	});
-	const recipientAddressWithPrefix = addLeadingZerosAfter0x(recipientAddress);
-	tx.moveCall({
-		target: '0x2::kiosk::set_owner_custom',
-		arguments: [
-			tx.object(receiverKiosk),
-			tx.object(receiverKioskCap),
-			tx.pure.address(recipientAddressWithPrefix),
-		],
-	});
 	const transferPolicies = new Map<string, TransferPolicy>(
 		await Promise.all(
 			nfts.map(
@@ -158,12 +146,11 @@ export async function addTradeportKioskDirectTransferTx(
 			async runCommands(kioskTx) {
 				tx.moveCall({
 					target:
-						'0xd0ad5bf7ac7d372cdcfee5273d5e487dabad724040e089c626cba2a01127ccd6::kiosk_transfers::direct_transfer',
+						'0x4acc0efedd243eb61ab8f8a3e9c24b09a1838c43d16029e8c8985004dfd67239::kiosk_transfers::direct_transfer_to_receiver',
 					arguments: [
 						tx.object(kioskTx.getKiosk() as any),
 						tx.object(kioskTx.getKioskCap() as any),
-						tx.object(receiverKiosk),
-						tx.object(receiverKioskCap),
+						tx.pure.address(recipientAddress),
 						tx.pure.id(nft.token_id),
 						tx.object(transferPolicies.get(nft.id).id),
 						royaltyCoin,
@@ -174,12 +161,6 @@ export async function addTradeportKioskDirectTransferTx(
 		});
 	}
 
-	tx.transferObjects([receiverKioskCap], tx.pure.address(recipientAddressWithPrefix));
-	tx.moveCall({
-		target: '0x2::transfer::public_share_object',
-		arguments: [receiverKiosk],
-		typeArguments: ['0x2::kiosk::Kiosk'],
-	});
 	destroyZeroCoin({ tx, coin: royaltyCoin });
 }
 
@@ -203,7 +184,10 @@ export async function getTransferPolicyForDirectTransfer(
 			!policy.is_disabled &&
 			policy.rules.length > 0 &&
 			policy.rules?.filter(
-				(rule) => rule.type !== 'kiosk_lock_rule' && rule.type !== 'royalty_rule',
+				(rule) =>
+					rule.type !== 'kiosk_lock_rule' &&
+					rule.type !== 'royalty_rule' &&
+					rule.type !== 'personal_kiosk_rule',
 			).length === 0,
 	);
 
@@ -212,7 +196,13 @@ export async function getTransferPolicyForDirectTransfer(
 			suiClient,
 			transferPolicyId: candidatePolicy.id,
 		});
-		if (!ruleNames.every((name) => name.startsWith(MYSTEN_TRANFER_POLICY_RULES_PACKAGE_ID))) {
+		if (
+			!ruleNames.every(
+				(name) =>
+					name.startsWith(MYSTEN_TRANSFER_POLICY_RULES_PACKAGE_ID) ||
+					name.startsWith(MYSTEN_TRANSFER_POLICY_RULES_PACKAGE_ID_V2),
+			)
+		) {
 			return undefined;
 		}
 	}

package/src/methods/transferNfts/transferNfts.ts

@@ -5,6 +5,7 @@ import { type RequestContext } from '../../SuiTradingClient';
 import {
 	DELOREAN_TOKEN_IDS_TO_DISABLE,
 	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
+	XOCIETY_FRONTIER_COLLECTION_ID,
 } from '../../constants';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
 import { fetchNftsById } from '../../graphql/queries/fetchNftsById';
@@ -122,8 +123,12 @@ export const transferNfts = async (
 			continue;
 		}
 
-		// if nft is inside native kiosk and has no transfer policy rules, take it out of the kiosk and transfer it directly
-		if (txData?.senderKiosk && !hasNativeKioskTransferPolicyRules(txData?.transferPolicies)) {
+		// If NFT is inside native kiosk and has no transfer policy rules or is XOCIETY Frontier collection, take it out of the kiosk and transfer it directly
+		if (
+			txData?.senderKiosk &&
+			(!hasNativeKioskTransferPolicyRules(txData?.transferPolicies) ||
+				nft?.collection?.id === XOCIETY_FRONTIER_COLLECTION_ID)
+		) {
 			await kioskTxWrapper({
 				tx: txData?.tx,
 				kioskClient: txData?.kioskClient,

package/src/methods/unlistListings/addUnlistListingTxs.ts

@@ -11,6 +11,7 @@ import {
 	TRADEPORT_LISTING_STORE,
 	TRADEPORT_LISTINGS_PACKAGE,
 	TRADEPORT_LISTINGS_STORE,
+	XOCIETY_FRONTIER_COLLECTION_ID,
 } from '../../constants';
 import { getSharedObjects } from '../../helpers/getSharedObjects';
 import { hasNativeKioskTransferPolicyRules } from '../../helpers/hasTransferPolicyRules';
@@ -224,6 +225,25 @@ export async function addTradePortUnlistTxHandler(txData: UnlistListingTx) {
 					...txData,
 					kioskTx,
 				});
+
+				// If XOCIETY Frontier collection, take NFT out of kiosk and transfer it back to user (seller)
+				if (txData?.collectionId === XOCIETY_FRONTIER_COLLECTION_ID) {
+					const borrowedItem = await takeAndBorrowNftFromKiosk({
+						tx: txData?.tx,
+						transferPolicies: txData?.transferPolicies,
+						kioskTx,
+						kioskClient: txData?.kioskClient,
+						nftTokenId: txData?.nftTokenId,
+						nftType: txData?.nftType,
+						suiClient: txData?.suiClient,
+						kioskOwner: txData?.seller,
+					});
+
+					txData?.tx.transferObjects(
+						[txData?.tx.object(borrowedItem)],
+						txData?.tx.pure.address(addLeadingZerosAfter0x(txData?.seller)),
+					);
+				}
 			},
 		});
 	}