@tradeport/sui-trading-sdk 0.4.3 → 0.4.4

package/package.json

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

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/claimNfts.ts

@@ -90,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);
 		}
@@ -151,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,
@@ -172,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 });
 					},
 				});
@@ -185,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 });
 					},
 				});
@@ -217,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 });
 					},
 				});
@@ -231,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 });
 					},
 				});
@@ -245,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) {
@@ -256,5 +269,6 @@ export const claimNfts = async (
 	// 	});
 	// }
 
+	globalKioskTx?.finalize();
 	return Transaction.from(tx);
 };

package/src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts

@@ -99,8 +99,6 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 		?.filter((k: any) => !k.is_shared && !k.is_origin_byte)
 		?.map((k: any) => k.id);
 
-	let globalKioskTx: any;
-
 	const allNfts = await gqlChainRequest({
 		chain: 'sui',
 		query: fetchBulkNftsByKioskId,
@@ -133,7 +131,7 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 	}, []);
 
 	const transferPolicies = await Promise.all(
-		allNftTypes.map((type: string) => getKioskTransferPolicies(type)),
+		allNftTypes.map(async (type: string) => getKioskTransferPolicies(type)),
 	);
 
 	const mappedTrasferPolicies: Record<string, any> = {};
@@ -141,6 +139,7 @@ export async function migrateNftsFromUnsharedToSharedKiosks(
 		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;