@tradeport/sui-trading-sdk 0.4.2 → 0.4.4

package/package.json

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

package/src/graphql/queries/fetchNftsByKioskId.ts

@@ -21,3 +21,25 @@ export const fetchNftsByKioskId = gql`
 		}
 	}
 `;
+
+export const fetchBulkNftsByKioskId = gql`
+	query fetchNftsByKioskId($where: nfts_bool_exp) {
+		nfts(where: $where) {
+			id
+			name
+			token_id
+			properties
+			chain_state
+			collection_id
+			claimable_reason
+			owner
+			contract {
+				properties
+			}
+			collection {
+				id
+				chain_state
+			}
+		}
+	}
+`;

package/src/helpers/destroyZeroCoin.ts

@@ -8,7 +8,7 @@ type Args = {
 export const destroyZeroCoin = ({ tx, coin }: Args) => {
 	tx.moveCall({
 		target: '0x2::coin::destroy_zero',
-		arguments: [tx.object(coin)],
+		arguments: [tx.object(coin as any)],
 		typeArguments: ['0x2::sui::SUI'],
 	});
 };

package/src/helpers/kiosk/kioskTxWrapper.ts

@@ -114,10 +114,7 @@ export const kioskTxWrapper = async ({
 				version: '',
 			},
 		});
-	} else if (shouldConvertToPersonalKiosk || kiosks.length === 0) {
-		kioskTx = new KioskTransaction({ transactionBlock: tx as any, kioskClient });
-		kioskTx.createPersonal(true);
-	} else {
+	} else if (kiosks.length > 0 && !shouldConvertToPersonalKiosk) {
 		const kioskCapId = (
 			await gqlChainRequest({
 				chain: 'sui',
@@ -137,9 +134,11 @@ export const kioskTxWrapper = async ({
 				version: '',
 			},
 		});
+	} else {
+		// creating new personal kiosk
+		kioskTx = new KioskTransaction({ transactionBlock: tx as any, kioskClient });
+		kioskTx.createPersonal(true);
 	}
 
 	await runCommands(kioskTx);
-
-	kioskTx.finalize();
 };

package/src/helpers/kiosk/resolveTransferPolicies.ts

@@ -193,7 +193,7 @@ export const resolveTransferPolicies = async ({
 						packageId: rulePackageId,
 						nftType: policy.isCustom && policy.type ? policy.type : nftType,
 						policyId: policy.data.id,
-						transferRequest: policy.transferRequest,
+						transferRequest: policy.transferRequest as any,
 					});
 					break;
 				default:

package/src/helpers/rpc/getObjectType.ts

@@ -1,5 +1,6 @@
 import { type SuiClient } from '@mysten/sui/client';
 import { isValidSuiObjectId } from '@mysten/sui/utils';
+import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 
 export const getObjectType = async ({
 	suiClient,
@@ -8,8 +9,11 @@ export const getObjectType = async ({
 	suiClient: SuiClient;
 	objectId: string;
 }): Promise<string> => {
-	if (isValidSuiObjectId(objectId)) {
-		const res = await suiClient.getObject({ id: objectId, options: { showType: true } });
+	const normalizedObjectId = objectId.startsWith('0x')
+		? addLeadingZerosAfter0x(objectId)
+		: objectId;
+	if (isValidSuiObjectId(normalizedObjectId)) {
+		const res = await suiClient.getObject({ id: normalizedObjectId, options: { showType: true } });
 		return res.data.type;
 	}
 

package/src/methods/claimNfts/addClaimNftsTxs.ts

@@ -165,8 +165,10 @@ export const addClaimTransferredNftWithPurchaseCapTx = async ({
 	nftTokenId,
 	nftType,
 	sellerKiosk,
+	preloadedTransferPolicyId,
 }: ClaimTransferredNftTx) => {
-	const transferPolicyId = (await getKioskTransferPolicies(nftType))?.at(0)?.id;
+	const transferPolicyId =
+		preloadedTransferPolicyId ?? (await getKioskTransferPolicies(nftType))?.at(0)?.id;
 
 	const [transferRequest] = tx.moveCall({
 		target:
@@ -174,8 +176,8 @@ export const addClaimTransferredNftWithPurchaseCapTx = async ({
 		arguments: [
 			tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
 			tx.object(sellerKiosk),
-			tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
-			tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+			kioskTx.kiosk,
+			kioskTx.kioskCap,
 			tx.pure.address(nftTokenId),
 			tx.object(transferPolicyId),
 		],

package/src/methods/claimNfts/claimNfts.ts

@@ -44,6 +44,7 @@ export type ClaimTransferredNftTx = {
 	nftType: string;
 	sellerKiosk: string;
 	seller: string;
+	preloadedTransferPolicyId?: string;
 };
 
 export type ClaimAcceptedBidNftTx = {
@@ -89,7 +90,9 @@ export const claimNfts = async (
 	});
 	const walletAddressKiosks = kiosksByOwnerRes?.kiosks;
 
+	let globalKioskTx: any;
 	for (const nft of res.nfts) {
+		let existingKioskTx;
 		if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(nft?.token_id)) {
 			throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
 		}
@@ -150,9 +153,11 @@ export const claimNfts = async (
 					kioskOwner: txData?.claimer,
 					kioskOwnerKiosks: walletAddressKiosks,
 					kiosk: txData?.sellerKiosk,
+					kioskTx: globalKioskTx,
 					shouldConvertToPersonalKiosk: true,
 					shouldAllowNftUnsharedKiosk: true,
 					async runCommands(kioskTx) {
+						existingKioskTx = kioskTx;
 						await addBluemoveClaimAcceptedBidNft({
 							...txData,
 							suiClient: context.suiClient,
@@ -171,9 +176,11 @@ export const claimNfts = async (
 					kioskOwner: txData?.claimer,
 					kioskOwnerKiosks: walletAddressKiosks,
 					kiosk: txData?.sellerKiosk,
+					kioskTx: globalKioskTx,
 					shouldConvertToPersonalKiosk: true,
 					shouldAllowNftUnsharedKiosk: true,
 					async runCommands(kioskTx) {
+						existingKioskTx = kioskTx;
 						await addClaimAcceptedBidNftTx({ ...txData, kioskTx });
 					},
 				});
@@ -184,9 +191,11 @@ export const claimNfts = async (
 					kioskOwner: txData?.claimer,
 					kioskOwnerKiosks: walletAddressKiosks,
 					kiosk: txData?.sellerKiosk,
+					kioskTx: globalKioskTx,
 					shouldConvertToPersonalKiosk: true,
 					shouldAssertNftInSharedKiosk: true,
 					async runCommands(kioskTx) {
+						existingKioskTx = kioskTx;
 						await addClaimAcceptedBidNftWithPurchaseCapTx({ ...txData, kioskTx });
 					},
 				});
@@ -216,9 +225,11 @@ export const claimNfts = async (
 					kiosk: txData?.sellerKiosk,
 					kioskOwnerKiosks: walletAddressKiosks,
 					kioskStrategy: 'exclude',
+					kioskTx: globalKioskTx,
 					shouldConvertToPersonalKiosk: true,
 					shouldAllowNftUnsharedKiosk: true,
 					async runCommands(kioskTx) {
+						existingKioskTx = kioskTx;
 						await addClaimTransferredNftTx({ ...txData, kioskTx });
 					},
 				});
@@ -230,9 +241,11 @@ export const claimNfts = async (
 					kiosk: txData?.sellerKiosk,
 					kioskOwnerKiosks: walletAddressKiosks,
 					kioskStrategy: 'exclude',
+					kioskTx: globalKioskTx,
 					shouldConvertToPersonalKiosk: true,
 					shouldAllowNftUnsharedKiosk: true,
 					async runCommands(kioskTx) {
+						existingKioskTx = kioskTx;
 						await addClaimTransferredNftWithPurchaseCapTx({ ...txData, kioskTx });
 					},
 				});
@@ -244,6 +257,7 @@ export const claimNfts = async (
 		// 	claimer: walletAddress,
 		// 	claimReason: nft?.chain_state?.claimable_reason,
 		// });
+		globalKioskTx = existingKioskTx;
 	}
 
 	// if (process.env.ENABLE_SEGMENT_TRACKING === 'true' && nftsForTracking.length > 0) {
@@ -255,5 +269,6 @@ export const claimNfts = async (
 	// 	});
 	// }
 
+	globalKioskTx?.finalize();
 	return Transaction.from(tx);
 };

package/src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts

@@ -2,8 +2,12 @@ import { Transaction } from '@mysten/sui/transactions';
 import { type RequestContext } from '../../SuiTradingClient';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
 import { fetchKiosksByOwner } from '../../graphql/queries/fetchKiosksByOwner';
-import { fetchNftsByKioskId } from '../../graphql/queries/fetchNftsByKioskId';
+import {
+	fetchBulkNftsByKioskId,
+	fetchNftsByKioskId,
+} from '../../graphql/queries/fetchNftsByKioskId';
 import { getNftType } from '../../helpers/getNftType';
+import { getKioskTransferPolicies } from '../../helpers/kiosk/getKioskTransferPolicies';
 import { kioskTxWrapper } from '../../helpers/kiosk/kioskTxWrapper';
 import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import { addClaimTransferredNftWithPurchaseCapTx } from '../claimNfts/addClaimNftsTxs';
@@ -15,7 +19,7 @@ export type MigrateNftsFromUnsharedToSharedKiosks = {
 };
 
 export async function migrateNftsFromUnsharedToSharedKiosks(
-	{ walletAddress, max = 5 }: MigrateNftsFromUnsharedToSharedKiosks,
+	{ walletAddress, max = 50 }: MigrateNftsFromUnsharedToSharedKiosks,
 	context: RequestContext,
 ): Promise<Transaction> {
 	const tx = new Transaction();
@@ -57,11 +61,6 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 				continue;
 			}
 
-			// if (nft?.collection_id === '67ded9ed-4dcc-4d15-9e6f-04dded46f419') {
-			// 	// Novagen, skip until we know what to do with them
-			// 	continue;
-			// }
-
 			const nftType = getNftType({
 				collectionId: nft?.collection?.id,
 				collectionChainState: nft?.collection?.chain_state,
@@ -100,24 +99,59 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 		?.filter((k: any) => !k.is_shared && !k.is_origin_byte)
 		?.map((k: any) => k.id);
 
-	for (const unsharedNativeKiosk of unsharedNativeKiosks) {
-		if (currentMigrationCount >= max) {
-			continue;
+	const allNfts = await gqlChainRequest({
+		chain: 'sui',
+		query: fetchBulkNftsByKioskId,
+		variables: {
+			where: {
+				_or: unsharedNativeKiosks.map((nk: any) => ({
+					chain_state: { _contains: { kiosk_id: nk } },
+				})),
+			},
+		},
+	});
+
+	const formatted: any = {};
+	allNfts.nfts.forEach((e: any) => {
+		if (formatted[e.chain_state.kiosk_id]) {
+			formatted[e.chain_state.kiosk_id]?.push(e);
+		} else {
+			formatted[e.chain_state.kiosk_id] = [e];
 		}
+	});
 
-		const res = await gqlChainRequest({
-			chain: 'sui',
-			query: fetchNftsByKioskId,
-			variables: { jsonFilter: { kiosk_id: unsharedNativeKiosk } },
+	const allNftTypes = allNfts.nfts.reduce((acc: any[], curr: any) => {
+		const type = getNftType({
+			collectionId: curr?.collection?.id,
+			collectionChainState: curr?.collection?.chain_state,
+			nft: curr,
 		});
+		if (!acc.includes(type)) acc.push(type);
+		return acc;
+	}, []);
 
-		const nfts = res?.nfts;
+	const transferPolicies = await Promise.all(
+		allNftTypes.map(async (type: string) => getKioskTransferPolicies(type)),
+	);
 
+	const mappedTrasferPolicies: Record<string, any> = {};
+	transferPolicies.forEach((tp: any) => {
+		mappedTrasferPolicies[tp.transfer_policies_by_type?.[0]?.type] = tp.transfer_policies_by_type;
+	});
+
+	let globalKioskTx: any;
+	for (const unsharedNativeKiosk of unsharedNativeKiosks) {
+		if (currentMigrationCount >= max) {
+			continue;
+		}
+
+		const nfts = formatted[unsharedNativeKiosk] ?? [];
 		if (nfts?.length > 0) {
 			currentMigrationCount++;
 		}
 
 		for (const nft of nfts) {
+			let existingKioskTx;
 			if (nft?.claimable_reason === 'offer-transfer') {
 				// native kiosk kiosk_transfers transfer hold. Transfer needs to be cancelled first in order to be migrated
 				continue;
@@ -128,9 +162,7 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 				collectionChainState: nft?.collection?.chain_state,
 				nft,
 			});
-
 			const nftTokenId = nft?.token_id;
-
 			await kioskTxWrapper({
 				tx,
 				kioskClient: context?.kioskClient,
@@ -147,18 +179,20 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 						recipientAddress: walletAddress,
 						nftTokenId,
 						nftType,
+						transferPolicy: mappedTrasferPolicies[nftType]?.[0],
 					});
 				},
 			});
-
 			await kioskTxWrapper({
 				tx,
 				kioskClient: context.kioskClient,
 				kioskOwner: walletAddress,
 				kiosk: unsharedNativeKiosk,
 				kioskStrategy: 'exclude',
+				kioskTx: globalKioskTx,
 				shouldConvertToPersonalKiosk: true,
 				async runCommands(kioskTx) {
+					existingKioskTx = kioskTx;
 					await addClaimTransferredNftWithPurchaseCapTx({
 						tx,
 						kioskTx,
@@ -170,11 +204,15 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 						nftType,
 						sellerKiosk: unsharedNativeKiosk,
 						seller: nft?.owner,
+						preloadedTransferPolicyId: mappedTrasferPolicies[nftType]?.[0]?.id,
 					});
 				},
 			});
+
+			globalKioskTx = existingKioskTx;
 		}
 	}
 
+	globalKioskTx?.finalize();
 	return Transaction.from(tx);
 }

package/src/methods/transferNfts/addTransferNftTx.ts

@@ -1,3 +1,4 @@
+import { type KioskClient } from '@mysten/kiosk';
 import { type Transaction } from '@mysten/sui/dist/cjs/transactions';
 import { TRADEPORT_KIOSK_TRANSFERS_STORE } from '../../constants';
 import { destroyZeroCoin } from '../../helpers/destroyZeroCoin';
@@ -8,7 +9,6 @@ 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[];
@@ -61,9 +61,10 @@ export async function addTradeportKioskTransferTx({
 	nftTokenId,
 	nftType,
 	recipientAddress,
+	transferPolicy,
 }: TransferNftTx) {
-	const transferPolicy = (await getKioskTransferPolicies(nftType))?.at(0);
-	const hasFloorPriceRule = transferPolicy?.rules?.some(
+	const existingTransferPolicy = transferPolicy ?? (await getKioskTransferPolicies(nftType))?.at(0);
+	const hasFloorPriceRule = existingTransferPolicy?.rules?.some(
 		(rule: any) => rule.type === 'floor_price_rule',
 	);
 	if (hasFloorPriceRule) {

package/src/methods/transferNfts/transferNfts.ts

@@ -30,6 +30,7 @@ export type TransferNftTx = {
 	recipientAddress: string;
 	sharedObjects?: any;
 	kioskTx?: any;
+	transferPolicy?: any;
 };
 
 export type TransferNfts = {