@tradeport/sui-trading-sdk 0.1.11 → 0.1.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.13
+
+### Patch Changes
+
+- 7157dff: Fixed exerciseShortLocks
+
+## 0.1.12
+
+### Patch Changes
+
+- 8b610ab: Updated exercising long price locks to accept collection bid
+
 ## 0.1.11
 
 ### Patch Changes

package/dist/index.js

@@ -1499,7 +1499,7 @@ function addTocenAcceptCollectionBidTxHandler(txData) {
 
 // src/methods/acceptCollectionBid/acceptCollectionBid.ts
 var ERROR_UNLIST_FIRST = "Item must be unlisted first before you can accept a collection bid with it";
-var acceptCollectionBid = async ({ bid, nftId, walletAddress }, context) => {
+var acceptCollectionBid = async ({ bid, nftId, walletAddress, tx: existingTx }, context) => {
   const nftRes = await gqlChainRequest({
     chain: "sui",
     query: fetchNftById,
@@ -1510,7 +1510,7 @@ var acceptCollectionBid = async ({ bid, nftId, walletAddress }, context) => {
     throw new Error("No nft found");
   }
   const bidsForTracking = [];
-  const tx = new import_transactions.Transaction();
+  const tx = existingTx ?? new import_transactions.Transaction();
   const sharedObjects = await getSharedObjects(
     nft?.properties?.nft_type || nft?.contract?.properties?.nft_type
   );
@@ -1827,11 +1827,9 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             query: fetchBidsById,
             variables: { bidIds: [bidId] }
           });
-          bid = res.bids.find(
-            (bid2) => bid2.status === "active" && bid2.type === "solo"
-          );
+          bid = res.bids.find((bid2) => bid2.status === "active");
           if (!bid) {
-            throw new Error(`Active solo bid ${bidId} is missing for ${lock.nft_type}`);
+            throw new Error(`Active bid ${bidId} is missing for ${lock.nft_type}`);
           }
         }
         if (bid) {
@@ -1841,7 +1839,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           }
         }
         if (!lock.chain_state.makerKioskId) {
-          throw new Error("Missing makerKioskId int the lock data");
+          throw new Error("Missing makerKioskId in the lock data");
         }
         const marketplaceFee = BigInt(
           getMarketFeePrice({
@@ -1876,7 +1874,19 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           shouldSkipKioskLocking: true
         });
         if (bid) {
-          await acceptNftBids({ bidIds: [bidId], tx, kioskTx }, context);
+          switch (bid.type) {
+            case "solo": {
+              await acceptNftBids({ bidIds: [bidId], tx, kioskTx }, context);
+              break;
+            }
+            case "collection": {
+              await acceptCollectionBid({ bid, tx, nftId: lock.nft?.id, walletAddress }, context);
+              break;
+            }
+            default: {
+              throw new Error(`Unsupported bid type ${bid.type}`);
+            }
+          }
         }
       }
     });
@@ -2782,52 +2792,53 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
     }
     const transferPolicyId = transferPolicy?.id;
     const sharedObjects = await getSharedObjects(lock.nft_type);
+    if (lock.nft?.token_id) {
+      throw new Error(`The short lock ${lockId} must not have any nft`);
+    }
+    let requiredCoins = BigInt(lock.maker_price) + calculateRoyaltyFee(transferPolicy.rules, 0n);
+    let listing = null;
+    if (listingId) {
+      const res = await gqlChainRequest({
+        chain: "sui",
+        query: fetchListingsById,
+        variables: { listingIds: [listingId] }
+      });
+      listing = res.listings[0];
+      if (!listing) {
+        throw new Error(`Missing listing ${listingId}`);
+      }
+    }
+    if (listing) {
+      if (nftId && listing.nft.id !== nftId) {
+        throw new Error(`The listing ${listingId} must be for token ${listing.nft.token_id}`);
+      }
+      if (!nftId) {
+        nftId = listing.nft.id;
+      }
+      if (listing.nonce && isOriginByteTx(sharedObjects) || !listing.nft?.chain_state?.kiosk_id) {
+        throw new Error(`The listing ${listingId} must be for native kiosk`);
+      }
+      requiredCoins += calculateRoyaltyFee(transferPolicy.rules, BigInt(listing.price));
+    }
+    if (!nftId) {
+      throw new Error(`nftId is required for shorts`);
+    }
+    const nft = (await gqlChainRequest({
+      chain: "sui",
+      query: fetchNftById,
+      variables: { nftId }
+    }))?.nfts?.[0];
+    if (!nft) {
+      throw new Error(`No nft ${nftId} found`);
+    }
+    if (!listing && nft.owner !== walletAddress) {
+      throw new Error(`The nft ${nftId} must be owned by ${walletAddress}`);
+    }
     await kioskTxWrapper({
       tx,
       kioskOwner: walletAddress,
+      kiosk: nft?.chain_state?.kiosk_id,
       async runCommands(kioskTx) {
-        if (lock.nft?.token_id) {
-          throw new Error(`The short lock ${lockId} must not have any nft`);
-        }
-        let requiredCoins = BigInt(lock.maker_price) + calculateRoyaltyFee(transferPolicy.rules, 0n);
-        let listing = null;
-        if (listingId) {
-          const res = await gqlChainRequest({
-            chain: "sui",
-            query: fetchListingsById,
-            variables: { listingIds: [listingId] }
-          });
-          listing = res.listings[0];
-          if (!listing) {
-            throw new Error(`Missing listing ${listingId}`);
-          }
-        }
-        if (listing) {
-          if (nftId && listing.nft.id !== nftId) {
-            throw new Error(`The listing ${listingId} must be for token ${listing.nft.token_id}`);
-          }
-          if (!nftId) {
-            nftId = listing.nft.id;
-          }
-          if (listing.nonce && isOriginByteTx(sharedObjects) || !listing.nft?.chain_state?.kiosk_id) {
-            throw new Error(`The listing ${listingId} must be for native kiosk`);
-          }
-          requiredCoins += calculateRoyaltyFee(transferPolicy.rules, BigInt(listing.price));
-        }
-        if (!nftId) {
-          throw new Error(`nftId is required for shorts`);
-        }
-        const nft = (await gqlChainRequest({
-          chain: "sui",
-          query: fetchNftById,
-          variables: { nftId }
-        }))?.nfts?.[0];
-        if (!nft) {
-          throw new Error(`No nft ${nftId} found`);
-        }
-        if (!listing && nft.owner !== walletAddress) {
-          throw new Error(`The nft ${nftId} must be owned by ${walletAddress}`);
-        }
         const [request] = tx.moveCall({
           target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_short_lock`,
           typeArguments: [lock.nft_type],
@@ -2870,6 +2881,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           nftType: lock.nft_type,
           price: "0",
           transferRequest,
+          kioskToLockRuleProve: TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK,
           shouldSkipKioskLocking: true
         });
       }