@tradeport/sui-trading-sdk 0.1.81 → 0.1.83

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.83
+
+### Patch Changes
+
+- 6d0fdea: Fixed locking items in kiosks in accept collection bid
+
+## 0.1.82
+
+### Patch Changes
+
+- 506f1f9: Converts kiosks to personal kiosks in accept bids if has personal kiosk rule
+- 5e654f0: Converts kiosks to personal kiosks in accept bids if has personal kiosk rule
+
 ## 0.1.81
 
 ### Patch Changes

package/dist/index.js

@@ -402,6 +402,14 @@ var getKioskTransferPolicies = async (nftType) => {
   return transferPolicies;
 };
 
+// src/helpers/hasPersonalKioskRule.ts
+var hasPersonalKioskRule = async (nftType) => {
+  const transferPolicies = await getKioskTransferPolicies(nftType);
+  return transferPolicies?.some(
+    (policy) => policy?.rules?.filter((rule) => rule?.type?.includes("personal_kiosk_rule"))?.length > 0
+  );
+};
+
 // src/helpers/hasTransferPolicyRules.ts
 var hasTransferPolicyRules = async (nftType) => {
   const transferPolicies = await getKioskTransferPolicies(nftType);
@@ -716,6 +724,36 @@ var getObjectType = async ({
   }
 };
 
+// src/helpers/kiosk/lockNftInsideKioskIfNotLocked.ts
+var lockNftInsideKioskIfNotLocked = async ({
+  tx,
+  kioskClient,
+  kioskTx,
+  sellerKiosk,
+  nftTokenId,
+  nftType,
+  transferPolicyId
+}) => {
+  const res = await kioskClient.getKiosk({ id: sellerKiosk });
+  const isLocked = res?.items?.find((i) => i.objectId === nftTokenId)?.isLocked;
+  if (!isLocked) {
+    const item = kioskTx.take({
+      itemId: nftTokenId,
+      itemType: nftType
+    });
+    tx.moveCall({
+      target: "0x2::kiosk::lock",
+      typeArguments: [nftType],
+      arguments: [
+        tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+        tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+        tx.object(transferPolicyId),
+        tx.object(item)
+      ]
+    });
+  }
+};
+
 // src/helpers/kiosk/resolveTransferPolicies.ts
 var import_kiosk4 = require("@mysten/kiosk");
 
@@ -964,11 +1002,6 @@ var getOBBidderKiosk = async ({
   return bidObject.data?.content?.fields?.kiosk;
 };
 
-// src/utils/printTxBlockTxs.ts
-var printTxBlockTxs = async (tx) => {
-  console.log(JSON.stringify(tx?.getData(), null, 2));
-};
-
 // src/methods/acceptNftBids/addAcceptNftBidTxs.ts
 function addTradeportAcceptNftBidTx({
   tx,
@@ -1013,11 +1046,11 @@ async function addTradeportKioskAcceptNftBidTx({
   royaltyRulePackageId,
   royaltyRuleModule,
   bidAmount,
+  sellerKiosk,
   shouldSplitRoyaltyFromUserGasCoins,
   beforeResolveKioskTransferRequest
 }) {
   const transferPolicyId = (await getKioskTransferPolicies(nftType))?.at(0)?.id;
-  console.log("transferPolicyId", transferPolicyId);
   if (beforeResolveKioskTransferRequest) {
     const [feeCoin, transferRequest] = tx.moveCall({
       target: "0x6468e232af988cd8be608b1901863f0d7dbaa16764c1834daa39b023cb3b2fc8::kiosk_biddings::accept_bid_with_price_lock",
@@ -1043,6 +1076,15 @@ async function addTradeportKioskAcceptNftBidTx({
     });
     tx.transferObjects([tx.object(feeCoin)], tx.pure.address(addLeadingZerosAfter0x(seller)));
   } else {
+    await lockNftInsideKioskIfNotLocked({
+      tx,
+      kioskClient,
+      kioskTx,
+      sellerKiosk,
+      nftTokenId,
+      nftType,
+      transferPolicyId
+    });
     const [feeCoin, transferRequest] = tx.moveCall({
       target: "0xf527efa4c02d079f15389fb596b04688cd5767948d953942e494ff455f11aa7b::kiosk_biddings::accept_bid_with_purchase_cap",
       arguments: [
@@ -1054,7 +1096,6 @@ async function addTradeportKioskAcceptNftBidTx({
       ],
       typeArguments: [nftType]
     });
-    console.log("1");
     if (!shouldSplitRoyaltyFromUserGasCoins) {
       tx.moveCall({
         target: `${royaltyRulePackageId}::${royaltyRuleModule}::pay`,
@@ -1072,11 +1113,9 @@ async function addTradeportKioskAcceptNftBidTx({
       shouldSkipKioskLocking: true,
       shouldSkipResolvingRoyaltyRule: !shouldSplitRoyaltyFromUserGasCoins
     });
-    console.log("2");
     if (shouldSplitRoyaltyFromUserGasCoins) {
       tx.transferObjects([tx.object(feeCoin)], tx.pure.address(addLeadingZerosAfter0x(seller)));
     }
-    await printTxBlockTxs(tx);
   }
 }
 async function addOriginByteAcceptNftBidTx({
@@ -1170,6 +1209,7 @@ async function addTradePortAcceptNftBidTxHandler(txData) {
         kioskTx: txData?.kioskTx,
         kioskOwner: txData?.itemOwner,
         kiosk: txData?.sellerKiosk,
+        shouldConvertToPersonalKiosk: Boolean(await hasPersonalKioskRule(txData?.nftType)),
         shouldAssertNftInSharedKiosk: true,
         async runCommands(kioskTx) {
           await addTradeportKioskAcceptNftBidTx({
@@ -1609,9 +1649,7 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
       }
     });
   }
-  console.log("bidType", bidType);
   if (isTradePortKioskBid(bidType)) {
-    console.log("1");
     if (txData?.sellerKiosk) {
       const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
       const royaltyRulePackageId = await getRulePackageId({
@@ -1619,13 +1657,13 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
         ruleType: "royalty_rule",
         kioskClient: txData?.kioskClient
       });
-      console.log("2");
       return kioskTxWrapper({
         tx: txData?.tx,
         kioskClient: txData?.kioskClient,
         kioskTx: txData?.kioskTx,
         kioskOwner: txData?.itemOwner,
         kiosk: txData?.sellerKiosk,
+        shouldConvertToPersonalKiosk: Boolean(await hasPersonalKioskRule(txData?.nftType)),
         shouldAssertNftInSharedKiosk: true,
         async runCommands(kioskTx) {
           await addTradeportKioskAcceptCollectionBidTx({
@@ -1650,6 +1688,7 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
         kioskTx: txData?.kioskTx,
         kioskOwner: txData?.seller,
         kiosk: txData?.sellerKiosk,
+        shouldConvertToPersonalKiosk: Boolean(await hasPersonalKioskRule(txData?.nftType)),
         async runCommands(kioskTx) {
           kioskTx.place({
             item: txData?.nftTokenId,
@@ -1774,7 +1813,6 @@ var acceptCollectionBid = async ({
     shouldSplitRoyaltyFromUserGasCoins,
     beforeResolveKioskTransferRequest
   };
-  console.log("txData", txData);
   switch (txData.bidMarketName) {
     case "tradeport":
       if (txData?.listingPrice && txData?.listingPrice > 0) {
@@ -4666,7 +4704,6 @@ async function addTradePortRemoveCollectionBidTxHandler(txData) {
     suiClient: txData?.suiClient,
     objectId: txData?.bidNonce
   });
-  console.log("bidType", bidType);
   if (isOriginByteBid(bidType)) {
     addOriginByteRemoveCollectionBidTx(txData);
     return;
@@ -4729,7 +4766,6 @@ var removeCollectionBid = async ({ bidId }, context) => {
       sellerKiosk: bid?.nft?.chain_state?.kiosk_id,
       bidMarketName: bid?.market_contract?.name
     };
-    console.log("txData", txData);
     switch (txData.bidMarketName) {
       case "tradeport":
         await addTradePortRemoveCollectionBidTxHandler(txData);
@@ -4977,7 +5013,6 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
       collectionId: listing?.nft?.collection_id,
       seller: walletAddress
     };
-    console.log("txData", txData);
     switch (listing?.market_name) {
       case "tradeport":
         await addTradePortUnlistTxHandler(txData);