@tradeport/sui-trading-sdk 0.2.2 → 0.3.1

package/package.json

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

package/src/SuiTradingClient.ts

@@ -5,7 +5,7 @@ import createKioskClient from './apiClients/createKioskClient';
 import createSuiClient from './apiClients/createSuiClient';
 import { getGraphqlClient, setGraphqlClient } from './apiClients/graphqlClient';
 import { gqlChainRequest } from './graphql/gqlChainRequest';
-import { fetchCollectionBidById } from './graphql/queries/fetchCollectionBidById';
+import { fetchCollectionBidsById } from './graphql/queries/fetchCollectionBidById';
 import { fetchCollectionBidsAtSamePrice } from './graphql/queries/fetchCollectionBidsAtSamePrice';
 import {
 	acceptCollectionBid,
@@ -52,9 +52,9 @@ import {
 } from './methods/placeCollectionBids/placeCollectionBids';
 import { placeNftBids, type PlaceNftBids } from './methods/placeNftBids/placeNftBids';
 import {
-	removeCollectionBid,
-	type RemoveCollectionBid,
-} from './methods/removeCollectionBid/removeCollectionBid';
+	removeCollectionBids,
+	type RemoveCollectionBids,
+} from './methods/removeCollectionBids/removeCollectionBids';
 import { removeNftBids, type RemoveNftBids } from './methods/removeNftBids/removeNftBids';
 import { transferNfts, type TransferNfts } from './methods/transferNfts/transferNfts';
 import { unlistListings, type UnlistListings } from './methods/unlistListings/unlistListings';
@@ -146,7 +146,7 @@ class SuiTradingClient {
 		return placeNftBids({ nfts, walletAddress }, context);
 	}
 
-	public async removeNftBids({ bidIds }: RemoveNftBids) {
+	public async removeNftBids({ bidIds, tx }: RemoveNftBids) {
 		const context: RequestContext = {
 			apiUser: this.apiUser,
 			apiKey: this.apiKey,
@@ -154,7 +154,7 @@ class SuiTradingClient {
 			kioskClient: this.kioskClient,
 		};
 
-		return removeNftBids({ bidIds }, context);
+		return removeNftBids({ bidIds, tx }, context);
 	}
 
 	public async acceptNftBids({ bidIds }: AcceptNftBids) {
@@ -206,8 +206,8 @@ class SuiTradingClient {
 
 		const collectionBidRes = await gqlChainRequest({
 			chain: 'sui',
-			query: fetchCollectionBidById,
-			variables: { bidId },
+			query: fetchCollectionBidsById,
+			variables: { bidIds: [bidId] },
 		});
 		const bid = collectionBidRes?.bids?.[0];
 
@@ -283,7 +283,7 @@ class SuiTradingClient {
 		}
 	}
 
-	public async removeCollectionBid({ bidId }: RemoveCollectionBid) {
+	public async removeCollectionBids({ bidIds, tx }: RemoveCollectionBids) {
 		const context: RequestContext = {
 			apiUser: this.apiUser,
 			apiKey: this.apiKey,
@@ -291,7 +291,7 @@ class SuiTradingClient {
 			kioskClient: this.kioskClient,
 		};
 
-		return removeCollectionBid({ bidId }, context);
+		return removeCollectionBids({ bidIds, tx }, context);
 	}
 
 	public async transferNfts({ nftIds, recipientAddress, walletAddress }: TransferNfts) {

package/src/graphql/queries/fetchCollectionBidById.ts

@@ -1,8 +1,8 @@
 import { gql } from 'graphql-request';
 
-export const fetchCollectionBidById = gql`
-	query fetchCollectionBidById($bidId: uuid!) {
-		bids(where: { id: { _eq: $bidId } }) {
+export const fetchCollectionBidsById = gql`
+	query fetchCollectionBidsById($bidIds: [uuid!]) {
+		bids(where: { id: { _in: $bidIds } }) {
 			nonce
 			price
 			bidder

package/src/methods/{removeCollectionBid/addRemoveCollectionBidTxs.ts → removeCollectionBids/addRemoveCollectionBidsTxs.ts}

@@ -3,13 +3,14 @@ import {
 	BLUEMOVE_OFFER_COLLECTION_DATA_OBJECT,
 	TRADEPORT_BIDDING_STORE,
 } from '../../constants';
+import { getSharedObjects } from '../../helpers/getSharedObjects';
 import { isBluemoveKioskBid } from '../../helpers/kiosk/isBluemoveKioskBid';
 import { isTradePortKioskBid } from '../../helpers/kiosk/isTradePortKioskBid';
 import { isOriginByteBid } from '../../helpers/originByte/isOriginByteBid';
 import { getObjectType } from '../../helpers/rpc/getObjectType';
 import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import { addTradeportKioskRemoveNftBidTx } from '../removeNftBids/addRemoveNftBidTxs';
-import { type RemoveCollectionBidTx } from './removeCollectionBid';
+import { type RemoveCollectionBidTx } from './removeCollectionBids';
 
 export function addTradeportRemoveCollectionBidTx({
 	tx,
@@ -82,7 +83,8 @@ export async function addTradePortRemoveCollectionBidTxHandler(txData: RemoveCol
 	});
 
 	if (isOriginByteBid(bidType)) {
-		addOriginByteRemoveCollectionBidTx(txData);
+		const sharedObjects = await getSharedObjects(txData?.nftType);
+		addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 		return;
 	}
 
@@ -98,7 +100,8 @@ export async function addBluemoveRemoveCollectionBidTxHandler(txData: RemoveColl
 	const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
 
 	if (isOriginByteBid(bidType)) {
-		addOriginByteRemoveCollectionBidTx(txData);
+		const sharedObjects = await getSharedObjects(txData?.nftType);
+		addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 		return;
 	}
 
@@ -111,5 +114,6 @@ export async function addBluemoveRemoveCollectionBidTxHandler(txData: RemoveColl
 }
 
 export async function addClutchyRemoveCollectionBidTxHandler(txData: RemoveCollectionBidTx) {
-	addOriginByteRemoveCollectionBidTx(txData);
+	const sharedObjects = await getSharedObjects(txData?.nftType);
+	addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 }

package/src/methods/{removeCollectionBid/removeCollectionBid.ts → removeCollectionBids/removeCollectionBids.ts}

@@ -1,25 +1,24 @@
 import type { SuiClient } from '@mysten/sui/client';
 import { Transaction } from '@mysten/sui/transactions';
 import { type RequestContext } from '../../SuiTradingClient';
+import {
+	DELOREAN_TOKEN_IDS_TO_DISABLE,
+	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
+} from '../../constants';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
-import { fetchCollectionBidById } from '../../graphql/queries/fetchCollectionBidById';
+import { fetchCollectionBidsById } from '../../graphql/queries/fetchCollectionBidById';
 import { fetchCollectionsByIdWithOneNft } from '../../graphql/queries/fetchCollectionsById';
 import { getNftType } from '../../helpers/getNftType';
-import { getSharedObjects } from '../../helpers/getSharedObjects';
 import {
 	addBluemoveRemoveCollectionBidTxHandler,
 	addClutchyRemoveCollectionBidTxHandler,
 	addTradePortRemoveCollectionBidTxHandler,
-} from './addRemoveCollectionBidTxs';
-import {
-	DELOREAN_TOKEN_IDS_TO_DISABLE,
-	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
-} from '../../constants';
+} from './addRemoveCollectionBidsTxs';
 
 export type RemoveCollectionBidTx = {
 	tx: Transaction;
 	suiClient: SuiClient;
-	sharedObjects: any;
+	sharedObjects?: any;
 	bidNonce: string;
 	bidder: string;
 	nftType: string;
@@ -29,18 +28,19 @@ export type RemoveCollectionBidTx = {
 	bidMarketName: string;
 };
 
-export type RemoveCollectionBid = {
-	bidId: string;
+export type RemoveCollectionBids = {
+	bidIds: string[];
+	tx?: Transaction;
 };
 
-export const removeCollectionBid = async (
-	{ bidId }: RemoveCollectionBid,
+export const removeCollectionBids = async (
+	{ bidIds, tx: existingTx }: RemoveCollectionBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
 	const res = await gqlChainRequest({
 		chain: 'sui',
-		query: fetchCollectionBidById,
-		variables: { bidId },
+		query: fetchCollectionBidsById,
+		variables: { bidIds },
 	});
 
 	if (res?.bids?.length === 0) {
@@ -48,7 +48,7 @@ export const removeCollectionBid = async (
 	}
 
 	const bidsForTracking = [];
-	const tx = new Transaction();
+	const tx = existingTx ?? new Transaction();
 
 	for (const bid of res.bids) {
 		if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
@@ -67,12 +67,9 @@ export const removeCollectionBid = async (
 			nft: collectionWithOneNftRes?.collections?.[0]?.nfts?.[0],
 		});
 
-		const sharedObjects = await getSharedObjects(nftType);
-
 		const txData: RemoveCollectionBidTx = {
 			tx,
 			suiClient: context.suiClient,
-			sharedObjects,
 			bidNonce: bid?.nonce,
 			bidder: bid?.bidder,
 			nftType,

package/src/methods/removeNftBids/removeNftBids.ts

@@ -1,25 +1,24 @@
 import type { SuiClient } from '@mysten/sui/client';
 import { Transaction } from '@mysten/sui/transactions';
 import { type RequestContext } from '../../SuiTradingClient';
+import {
+	DELOREAN_TOKEN_IDS_TO_DISABLE,
+	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
+} from '../../constants';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
 import { fetchBidsById } from '../../graphql/queries/fetchBidsById';
 import { getNftType } from '../../helpers/getNftType';
-import { getSharedObjects } from '../../helpers/getSharedObjects';
 import {
 	addBluemoveRemoveNftBidTx,
 	addOriginByteRemoveNftBidTx,
 	addTocenRemoveNftBidTx,
 	addTradePortRemoveNftBidTxHandler,
 } from './addRemoveNftBidTxs';
-import {
-	DELOREAN_TOKEN_IDS_TO_DISABLE,
-	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
-} from '../../constants';
 
 export type RemoveNftBidTx = {
 	tx: Transaction;
 	suiClient: SuiClient;
-	sharedObjects: any;
+	sharedObjects?: any;
 	bidNonce: string;
 	nftType: string;
 	nftTokenId: string;
@@ -34,10 +33,11 @@ export type RemoveNftBid = {
 
 export type RemoveNftBids = {
 	bidIds: string[];
+	tx?: Transaction;
 };
 
 export const removeNftBids = async (
-	{ bidIds }: RemoveNftBids,
+	{ bidIds, tx: existingTx }: RemoveNftBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
 	const res = await gqlChainRequest({
@@ -51,7 +51,7 @@ export const removeNftBids = async (
 	}
 
 	const bidsForTracking = [];
-	const tx = new Transaction();
+	const tx = existingTx ?? new Transaction();
 
 	for (const bid of res.bids) {
 		if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
@@ -64,12 +64,9 @@ export const removeNftBids = async (
 			nft: bid?.nft,
 		});
 
-		const sharedObjects = await getSharedObjects(nftType);
-
 		const txData: RemoveNftBidTx = {
 			tx,
 			suiClient: context.suiClient,
-			sharedObjects,
 			bidNonce: bid?.nonce,
 			nftType,
 			nftTokenId: bid?.nft?.token_id,

package/src/methods/transferNfts/addTransferNftTx.ts

@@ -1,9 +1,23 @@
+import { type Transaction } from '@mysten/sui/dist/cjs/transactions';
 import { TRADEPORT_KIOSK_TRANSFERS_STORE } from '../../constants';
+import { destroyZeroCoin } from '../../helpers/destroyZeroCoin';
+import { getNftType } from '../../helpers/getNftType';
 import { assertNftInSharedKiosk } from '../../helpers/kiosk/assertNftInSharedKiosk';
 import { getKioskTransferPolicies } from '../../helpers/kiosk/getKioskTransferPolicies';
+import { kioskTxWrapper } from '../../helpers/kiosk/kioskTxWrapper';
 import { getOBKiosk } from '../../helpers/originByte/getOBKiosk';
 import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import { type TransferNftTx } from './transferNfts';
+import { type KioskClient } from '@mysten/kiosk';
+
+type CollectionChainState = {
+	transfer_policies: TransferPolicy[];
+};
+type TransferPolicy = {
+	id: string;
+	rules: Array<{ type: string; min_amount?: string }>;
+	is_origin_byte: boolean;
+};
 
 export async function addOriginByteTransferNftTx({
 	tx,
@@ -69,3 +83,97 @@ export async function addTradeportKioskTransferTx({
 		typeArguments: [nftType],
 	});
 }
+
+export async function addTradeportKioskDirectTransferTx(
+	txData: {
+		tx: Transaction;
+		recipientAddress: string;
+		kioskClient: KioskClient;
+		senderAddress: string;
+	},
+	nfts: any[],
+) {
+	const { tx, recipientAddress, kioskClient, senderAddress } = txData;
+	if (nfts.length === 0) {
+		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 totalRoyaltyAmount = nfts.reduce(
+		(sum: bigint, nft) =>
+			sum +
+			BigInt(
+				getTransferPolicyForDirectTransfer(nft.collection.chain_state)?.rules?.find(
+					(rule) => rule.type === 'royalty_rule',
+				)?.min_amount ?? 0n,
+			),
+		0n,
+	);
+	const [royaltyCoin] = tx.splitCoins(tx.gas, [tx.pure.u64(totalRoyaltyAmount)]);
+	for (const nft of nfts) {
+		const nftType = getNftType({
+			collectionId: nft?.collection?.id,
+			collectionChainState: nft?.collection?.chain_state,
+			nft,
+		});
+
+		await kioskTxWrapper({
+			tx,
+			kioskClient,
+			kioskOwner: senderAddress,
+			kiosk: nft?.chain_state?.kiosk_id,
+			async runCommands(kioskTx) {
+				tx.moveCall({
+					target:
+						'0xd0ad5bf7ac7d372cdcfee5273d5e487dabad724040e089c626cba2a01127ccd6::kiosk_transfers::direct_transfer',
+					arguments: [
+						tx.object(kioskTx.getKiosk() as any),
+						tx.object(kioskTx.getKioskCap() as any),
+						tx.object(receiverKiosk),
+						tx.object(receiverKioskCap),
+						tx.pure.id(nft.token_id),
+						tx.object(getTransferPolicyForDirectTransfer(nft.collection.chain_state).id),
+						royaltyCoin,
+					],
+					typeArguments: [nftType],
+				});
+			},
+		});
+	}
+
+	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 });
+}
+
+export function canBeTransferedDirectly(collectionChainState?: CollectionChainState) {
+	return getTransferPolicyForDirectTransfer(collectionChainState) !== undefined;
+}
+
+export function getTransferPolicyForDirectTransfer(
+	collectionChainState?: CollectionChainState,
+): TransferPolicy | undefined {
+	return collectionChainState?.transfer_policies?.find(
+		(policy) =>
+			!policy.is_origin_byte &&
+			policy.rules?.filter(
+				(rule) => rule.type !== 'kiosk_lock_rule' && rule.type !== 'royalty_rule',
+			).length === 0,
+	);
+}

package/src/methods/transferNfts/transferNfts.ts

@@ -13,7 +13,12 @@ import { kioskTxWrapper } from '../../helpers/kiosk/kioskTxWrapper';
 import { isOBKiosk } from '../../helpers/originByte/isOBKiosk';
 import { getAccountBalance } from '../../helpers/rpc/getAcountBalance';
 import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
-import { addOriginByteTransferNftTx, addTradeportKioskTransferTx } from './addTransferNftTx';
+import {
+	addOriginByteTransferNftTx,
+	addTradeportKioskDirectTransferTx,
+	addTradeportKioskTransferTx,
+	canBeTransferedDirectly,
+} from './addTransferNftTx';
 
 export type TransferNftTx = {
 	tx: Transaction;
@@ -66,6 +71,7 @@ export const transferNfts = async (
 	}
 
 	const nftsForTracking = [];
+	const nftsToTransferDirectly = [];
 	const tx = new Transaction();
 
 	for (const nft of res.nfts) {
@@ -115,16 +121,22 @@ export const transferNfts = async (
 		}
 
 		// If NFT is inside native kiosk
-		await kioskTxWrapper({
-			tx: txData?.tx,
-			kioskClient: txData?.kioskClient,
-			kioskOwner: txData?.senderAddress,
-			kiosk: txData?.senderKiosk,
-			shouldAssertNftInSharedKiosk: true,
-			async runCommands(kioskTx) {
-				await addTradeportKioskTransferTx({ ...txData, kioskTx });
-			},
-		});
+
+		// If NFT can be transfered directly by creating new kiosk for receiver
+		if (canBeTransferedDirectly(nft?.collection?.chain_state)) {
+			nftsToTransferDirectly.push(nft);
+		} else {
+			await kioskTxWrapper({
+				tx: txData?.tx,
+				kioskClient: txData?.kioskClient,
+				kioskOwner: txData?.senderAddress,
+				kiosk: txData?.senderKiosk,
+				shouldAssertNftInSharedKiosk: true,
+				async runCommands(kioskTx) {
+					await addTradeportKioskTransferTx({ ...txData, kioskTx });
+				},
+			});
+		}
 
 		nftsForTracking.push({
 			nftType,
@@ -133,6 +145,11 @@ export const transferNfts = async (
 		});
 	}
 
+	await addTradeportKioskDirectTransferTx(
+		{ tx, kioskClient: context.kioskClient, senderAddress: walletAddress, recipientAddress },
+		nftsToTransferDirectly,
+	);
+
 	// currently turned off $1 bulk transfer fee
 	// if (res?.nfts?.length > 1) {
 	// 	await addOneDollarFee(tx);

package/src/tests/SuiWallet.ts

@@ -28,7 +28,7 @@ export class SuiWallet {
 	}
 
 	async simulateCall(tx: Transaction): Promise<any> {
-		tx.setSenderIfNotSet('0x645e9f833ddc10e73e8c8aad0cf7abf2f48ad92b45c80ef33f68a56488effaf0');
+		tx.setSenderIfNotSet('0x7cb678cc0446b986bab45d612a25946b2a63763d2252b1e554d1763eb788f660');
 		const rawTransaction = await tx.build({ client: this.suiClient });
 		const result = await this.suiClient.dryRunTransactionBlock({
 			transactionBlock: rawTransaction,