@tradeport/sui-trading-sdk 0.4.3 → 0.4.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.4.5
+
+### Patch Changes
+
+- 41ffd43: normalize bid nonce IDs across all bid-related operations
+
+## 0.4.4
+
+### Patch Changes
+
+- 81db18f: Fix normalizing sui object for removing bids
+
 ## 0.4.2
 
 ### Patch Changes

package/dist/index.js

@@ -1642,8 +1642,9 @@ var getObjectType = async ({
   suiClient,
   objectId
 }) => {
-  if ((0, import_utils.isValidSuiObjectId)(objectId)) {
-    const res = await suiClient.getObject({ id: objectId, options: { showType: true } });
+  const normalizedObjectId = objectId.startsWith("0x") ? addLeadingZerosAfter0x(objectId) : objectId;
+  if ((0, import_utils.isValidSuiObjectId)(normalizedObjectId)) {
+    const res = await suiClient.getObject({ id: normalizedObjectId, options: { showType: true } });
     return res.data.type;
   }
   return "";
@@ -2263,7 +2264,7 @@ async function addSingleBidAcceptNftBidTx(txData) {
           arguments: [
             tx.object(import_utils2.SUI_CLOCK_OBJECT_ID),
             tx.object(TRADEPORT_MULTI_BID_STORE),
-            tx.pure.id(bidNonce),
+            tx.pure.id((0, import_utils2.normalizeSuiObjectId)(bidNonce)),
             tx.pure.option("id", multiBidChainId),
             tx.object(kioskTx.getKiosk()),
             tx.object(kioskTx.getKioskCap()),
@@ -2292,7 +2293,10 @@ async function addSingleBidAcceptNftBidTx(txData) {
   });
 }
 async function addTradePortAcceptNftBidTxHandler(txData) {
-  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
+  const bidType = await getObjectType({
+    suiClient: txData?.suiClient,
+    objectId: (0, import_utils2.normalizeSuiObjectId)(txData?.bidNonce)
+  });
   if (isSingleBid(bidType)) {
     await addSingleBidAcceptNftBidTx(txData);
     return;
@@ -2560,6 +2564,7 @@ function addTocenUnlistTxHandler(txData) {
 }
 
 // src/methods/acceptCollectionBid/addAcceptCollectionBIdTxs.ts
+var import_utils3 = require("@mysten/sui/utils");
 function addTradeportAcceptCollectionBidTx({
   tx,
   sharedObjects,
@@ -2726,7 +2731,10 @@ function addTocenAcceptCollectionBidTx({
   });
 }
 async function addTradePortAcceptCollectionBidTxHandler(txData) {
-  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
+  const bidType = await getObjectType({
+    suiClient: txData?.suiClient,
+    objectId: (0, import_utils3.normalizeSuiObjectId)(txData?.bidNonce)
+  });
   if (isSingleBid(bidType)) {
     await addSingleBidAcceptNftBidTx(txData);
     return;
@@ -3063,7 +3071,7 @@ var acceptNftBids = async ({
 var import_transactions6 = require("@mysten/sui/transactions");
 
 // src/methods/buyLocks/buyLocks.ts
-var import_utils3 = require("@mysten/sui.js/utils");
+var import_utils4 = require("@mysten/sui.js/utils");
 var import_transactions4 = require("@mysten/sui/transactions");
 
 // src/helpers/calculatePremium.ts
@@ -3206,7 +3214,7 @@ async function buyLocks({ lockIds, transaction }, context) {
       typeArguments: [lock.nft_type],
       arguments: [
         tx.object(TRADEPORT_PRICE_LOCK_STORE),
-        tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
+        tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
         tx.pure.id(lock.lock_id),
         tx.pure.u64(lock.maker_price),
         tx.pure.u64(marketplaceFee),
@@ -3220,7 +3228,7 @@ async function buyLocks({ lockIds, transaction }, context) {
 }
 
 // src/methods/exerciseLongLocks/exerciseLongLocks.ts
-var import_utils4 = require("@mysten/sui.js/utils");
+var import_utils5 = require("@mysten/sui.js/utils");
 var import_transactions5 = require("@mysten/sui/transactions");
 async function exerciseLongLocks({ walletAddress, transaction, locks }, context) {
   const tx = transaction ?? new import_transactions5.Transaction();
@@ -3278,7 +3286,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils5.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(lock.chain_state.makerKioskId),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
@@ -3383,7 +3391,7 @@ async function buyAndExerciseLongLocks({ walletAddress, locks, tx: existingTx },
 var import_transactions9 = require("@mysten/sui/transactions");
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
-var import_utils5 = require("@mysten/sui.js/utils");
+var import_utils6 = require("@mysten/sui.js/utils");
 var import_transactions8 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchListingsById.ts
@@ -4092,7 +4100,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils5.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils6.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id)
           ]
         });
@@ -4173,7 +4181,7 @@ async function buyAndExerciseShortLocks({ walletAddress, locks, tx: existingTx }
 }
 
 // src/methods/cancelLocks/cancelLocks.ts
-var import_utils6 = require("@mysten/sui.js/utils");
+var import_utils7 = require("@mysten/sui.js/utils");
 var import_transactions10 = require("@mysten/sui/transactions");
 async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context) {
   const tx = existingTx ?? new import_transactions10.Transaction();
@@ -4196,7 +4204,7 @@ async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context)
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils6.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils7.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk)
           ]
@@ -4542,7 +4550,9 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     variables: { ownerAddress: addLeadingZerosAfter0x(walletAddress) }
   });
   const walletAddressKiosks = kiosksByOwnerRes?.kiosks;
+  let globalKioskTx;
   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);
     }
@@ -4591,9 +4601,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           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,
@@ -4610,9 +4622,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kioskOwner: txData?.claimer,
           kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimAcceptedBidNftTx({ ...txData, kioskTx });
           }
         });
@@ -4623,9 +4637,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kioskOwner: txData?.claimer,
           kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAssertNftInSharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimAcceptedBidNftWithPurchaseCapTx({ ...txData, kioskTx });
           }
         });
@@ -4651,9 +4667,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kiosk: txData?.sellerKiosk,
           kioskOwnerKiosks: walletAddressKiosks,
           kioskStrategy: "exclude",
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimTransferredNftTx({ ...txData, kioskTx });
           }
         });
@@ -4665,15 +4683,19 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kiosk: txData?.sellerKiosk,
           kioskOwnerKiosks: walletAddressKiosks,
           kioskStrategy: "exclude",
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimTransferredNftWithPurchaseCapTx({ ...txData, kioskTx });
           }
         });
       }
     }
+    globalKioskTx = existingKioskTx;
   }
+  globalKioskTx?.finalize();
   return import_transactions13.Transaction.from(tx);
 };
 
@@ -5467,7 +5489,6 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }
     }
   }
   const unsharedNativeKiosks = res?.kiosks?.filter((k) => !k.is_shared && !k.is_origin_byte)?.map((k) => k.id);
-  let globalKioskTx;
   const allNfts = await gqlChainRequest({
     chain: "sui",
     query: fetchBulkNftsByKioskId,
@@ -5497,12 +5518,13 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }
     return acc;
   }, []);
   const transferPolicies = await Promise.all(
-    allNftTypes.map((type) => getKioskTransferPolicies(type))
+    allNftTypes.map(async (type) => getKioskTransferPolicies(type))
   );
   const mappedTrasferPolicies = {};
   transferPolicies.forEach((tp) => {
     mappedTrasferPolicies[tp.transfer_policies_by_type?.[0]?.type] = tp.transfer_policies_by_type;
   });
+  let globalKioskTx;
   for (const unsharedNativeKiosk of unsharedNativeKiosks) {
     if (currentMigrationCount >= max) {
       continue;
@@ -5616,7 +5638,7 @@ var fetchCollectionsBySlug = import_graphql_request20.gql`
 `;
 
 // src/methods/placeNftBids/addPlaceNftBidTxs.ts
-var import_utils7 = require("@mysten/sui/utils");
+var import_utils8 = require("@mysten/sui/utils");
 async function addTradePortPlaceNftBidTxHandler(txData) {
   if (isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     throw new Error("OriginByte bidding not supported currently");
@@ -5636,7 +5658,7 @@ async function addTradePortPlaceNftBidTxHandler(txData) {
     if (!bcsHex) {
       throw new Error(`No BCS found for token ${nftTokenId}`);
     }
-    bcs3 = (0, import_utils7.fromHex)(bcsHex);
+    bcs3 = (0, import_utils8.fromHex)(bcsHex);
   }
   let multiBidChainId;
   if (existingMultiBidChainId) {
@@ -5676,12 +5698,12 @@ async function addTradePortPlaceNftBidTxHandler(txData) {
     arguments: [
       tx.object(TRADEPORT_MULTI_BID_STORE),
       tx.pure.u64(nftTokenId ? 1 : 0),
-      multiBidChainId ? typeof multiBidChainId === "string" ? tx.pure.option("id", (0, import_utils7.normalizeSuiObjectId)(multiBidChainId)) : tx.moveCall({
+      multiBidChainId ? typeof multiBidChainId === "string" ? tx.pure.option("id", (0, import_utils8.normalizeSuiObjectId)(multiBidChainId)) : tx.moveCall({
         target: "0x1::option::some",
         typeArguments: ["0x2::object::ID"],
         arguments: [multiBidChainId]
       }) : void 0,
-      tx.pure.option("id", nftTokenId ? (0, import_utils7.normalizeSuiObjectId)(nftTokenId) : void 0),
+      tx.pure.option("id", nftTokenId ? (0, import_utils8.normalizeSuiObjectId)(nftTokenId) : void 0),
       tx.pure.option("vector<u8>", bcs3 ? [...bcs3] : void 0),
       tx.pure.option("u64", expireAt?.getTime()),
       tx.pure.u64(price),
@@ -5879,7 +5901,11 @@ var placeNftBids = async ({ bids, walletAddress, multiBidId, multiBidChainId, tx
 // src/methods/removeCollectionBids/removeCollectionBids.ts
 var import_transactions22 = require("@mysten/sui/transactions");
 
+// src/methods/removeCollectionBids/addRemoveCollectionBidsTxs.ts
+var import_utils10 = require("@mysten/sui/utils");
+
 // src/methods/removeNftBids/addRemoveNftBidTxs.ts
+var import_utils9 = require("@mysten/sui/utils");
 function addTradeportRemoveNftBidTx({ tx, bidNonce, nftType }) {
   tx.moveCall({
     target: "0xb42dbb7413b79394e1a0175af6ae22b69a5c7cc5df259cd78072b6818217c027::biddings::cancel_bid",
@@ -5933,13 +5959,16 @@ async function addSingleBidRemoveNftBidTx({ tx, bidNonce, multiBidId }) {
     target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::cancel_bid`,
     arguments: [
       tx.object(TRADEPORT_MULTI_BID_STORE),
-      tx.pure.id(bidNonce),
+      tx.pure.id((0, import_utils9.normalizeSuiObjectId)(bidNonce)),
       tx.pure.option("id", multiBidChainId)
     ]
   });
 }
 async function addTradePortRemoveNftBidTxHandler(txData) {
-  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
+  const bidType = await getObjectType({
+    suiClient: txData?.suiClient,
+    objectId: (0, import_utils9.normalizeSuiObjectId)(txData?.bidNonce)
+  });
   if (isSingleBid(bidType)) {
     await addSingleBidRemoveNftBidTx(txData);
     return;
@@ -6011,8 +6040,12 @@ function addBluemoveKioskRemoveCollectionBidTx({
 async function addTradePortRemoveCollectionBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: txData?.bidNonce
+    objectId: (0, import_utils10.normalizeSuiObjectId)(txData?.bidNonce)
   });
+  if (isSingleBid(bidType)) {
+    await addSingleBidRemoveNftBidTx(txData);
+    return;
+  }
   if (isOriginByteBid(bidType)) {
     const sharedObjects = await getSharedObjects(txData?.nftType);
     addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
@@ -6025,11 +6058,10 @@ async function addTradePortRemoveCollectionBidTxHandler(txData) {
   addTradeportRemoveCollectionBidTx(txData);
 }
 async function addBluemoveRemoveCollectionBidTxHandler(txData) {
-  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
-  if (isSingleBid(bidType)) {
-    await addSingleBidRemoveNftBidTx(txData);
-    return;
-  }
+  const bidType = await getObjectType({
+    suiClient: txData?.suiClient,
+    objectId: (0, import_utils10.normalizeSuiObjectId)(txData?.bidNonce)
+  });
   if (isOriginByteBid(bidType)) {
     const sharedObjects = await getSharedObjects(txData?.nftType);
     addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });