@tradeport/sui-trading-sdk 0.1.12 → 0.1.14

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.14
+
+### Patch Changes
+
+- cd4da4d: Updated to new personal kiosk compatible kiosk_biddings and kiosk_transfers modules
+
+## 0.1.13
+
+### Patch Changes
+
+- 7157dff: Fixed exerciseShortLocks
+
 ## 0.1.12
 
 ### Patch Changes

package/dist/index.js

@@ -874,15 +874,13 @@ async function addTradeportKioskAcceptNftBidTx({
 }) {
   const { transferPolicy } = sharedObjects;
   const [feeCoin, transferRequest] = tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_biddings::accept_bid",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_biddings::accept_bid_with_purchase_cap",
     arguments: [
       tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
       tx.pure.address(bidNonce),
-      tx.object(TRADEPORT_KIOSK_BIDDING_ESCROW_KIOSK),
       tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
       tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
-      tx.pure.address(nftTokenId),
-      tx.object(transferPolicy)
+      tx.pure.address(nftTokenId)
     ],
     typeArguments: [nftType]
   });
@@ -897,7 +895,6 @@ async function addTradeportKioskAcceptNftBidTx({
     nftType,
     price: "0",
     transferRequest,
-    kioskToLockRuleProve: TRADEPORT_KIOSK_BIDDING_ESCROW_KIOSK,
     shouldSkipKioskLocking: true,
     shouldSkipResolvingRoyaltyRule: true
   });
@@ -1026,7 +1023,7 @@ async function addTradePortKioskUnlistTx({
   nftType
 }) {
   tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_listings::unlist",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_listings::unlist",
     arguments: [
       tx.object(TRADEPORT_KIOSK_LISTING_STORE),
       tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
@@ -1827,9 +1824,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             query: fetchBidsById,
             variables: { bidIds: [bidId] }
           });
-          bid = res.bids.find(
-            (bid2) => bid2.status === "active"
-          );
+          bid = res.bids.find((bid2) => bid2.status === "active");
           if (!bid) {
             throw new Error(`Active bid ${bidId} is missing for ${lock.nft_type}`);
           }
@@ -2026,7 +2021,7 @@ var addTradeportKioskBuyTx = async ({
   if (!coin)
     throw new Error("Coin could not be split");
   const [kioskItem, transferRequest, kioskPrice] = tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_listings::buy",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_listings::buy",
     arguments: [
       tx.object(TRADEPORT_KIOSK_LISTING_STORE),
       tx.object(sellerKiosk),
@@ -2544,7 +2539,7 @@ var addClaimAcceptedBidNftTx = async ({
 }) => {
   const { transferPolicy } = sharedObjects;
   const [transferRequest] = tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_biddings::claim_bid",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_biddings::claim_bid",
     arguments: [
       tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
       tx.object(TRADEPORT_KIOSK_BIDDING_ESCROW_KIOSK),
@@ -2564,6 +2559,36 @@ var addClaimAcceptedBidNftTx = async ({
     shouldSkipKioskLocking: true
   });
 };
+var addClaimAcceptedBidNftWithPurchaseCapTx = async ({
+  tx,
+  kioskTx,
+  sharedObjects,
+  nftTokenId,
+  nftType,
+  sellerKiosk
+}) => {
+  const { transferPolicy } = sharedObjects;
+  const [transferRequest] = tx.moveCall({
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_biddings::claim_bid_with_purchase_cap",
+    arguments: [
+      tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
+      tx.object(sellerKiosk),
+      tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+      tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+      tx.pure.address(nftTokenId),
+      tx.object(transferPolicy)
+    ],
+    typeArguments: [nftType]
+  });
+  await resolveTransferPolicies({
+    tx,
+    kioskTx,
+    nftType,
+    price: "0",
+    transferRequest,
+    shouldSkipKioskLocking: true
+  });
+};
 var addClaimTransferredNftTx = async ({
   tx,
   sharedObjects,
@@ -2573,7 +2598,7 @@ var addClaimTransferredNftTx = async ({
 }) => {
   const { transferPolicy } = sharedObjects;
   const [transferRequest] = tx.moveCall({
-    target: "0x78eae99d1a7edae714b5de107f4b44ccbdf5f9ca6919498d9b024ef378dc13f7::kiosk_transfers::claim",
+    target: "0x49642273ca7db3d942f9fd810c93467974c40e73ea7f03e8e7a632f1222aca73::kiosk_transfers::claim",
     arguments: [
       tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
       tx.object(TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK),
@@ -2593,6 +2618,36 @@ var addClaimTransferredNftTx = async ({
     shouldSkipKioskLocking: true
   });
 };
+var addClaimTransferredNftWithPurchaseCapTx = async ({
+  tx,
+  sharedObjects,
+  kioskTx,
+  nftTokenId,
+  nftType,
+  sellerKiosk
+}) => {
+  const { transferPolicy } = sharedObjects;
+  const [transferRequest] = tx.moveCall({
+    target: "0x49642273ca7db3d942f9fd810c93467974c40e73ea7f03e8e7a632f1222aca73::kiosk_transfers::claim_with_purchase_cap",
+    arguments: [
+      tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
+      tx.object(sellerKiosk),
+      tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+      tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+      tx.pure.address(nftTokenId),
+      tx.object(transferPolicy)
+    ],
+    typeArguments: [nftType]
+  });
+  await resolveTransferPolicies({
+    tx,
+    kioskTx,
+    nftType,
+    price: "0",
+    transferRequest,
+    shouldSkipKioskLocking: true
+  });
+};
 
 // src/methods/claimNfts/claimNfts.ts
 var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context) => {
@@ -2639,14 +2694,25 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context) => {
         nftTokenId: nft?.token_id,
         sellerKiosk: nft?.chain_state?.kiosk_id
       };
-      await kioskTxWrapper({
-        tx,
-        kioskOwner: txData?.claimer,
-        kiosk: txData?.sellerKiosk,
-        async runCommands(kioskTx) {
-          await addClaimAcceptedBidNftTx({ ...txData, kioskTx });
-        }
-      });
+      try {
+        await kioskTxWrapper({
+          tx,
+          kioskOwner: txData?.claimer,
+          kiosk: txData?.sellerKiosk,
+          async runCommands(kioskTx) {
+            await addClaimAcceptedBidNftWithPurchaseCapTx({ ...txData, kioskTx });
+          }
+        });
+      } catch {
+        await kioskTxWrapper({
+          tx,
+          kioskOwner: txData?.claimer,
+          kiosk: txData?.sellerKiosk,
+          async runCommands(kioskTx) {
+            await addClaimAcceptedBidNftTx({ ...txData, kioskTx });
+          }
+        });
+      }
       continue;
     }
     if (nft?.chain_state?.claimable_reason === "offer-transfer") {
@@ -2658,14 +2724,25 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context) => {
         nftTokenId: nft?.token_id,
         sellerKiosk: nft?.chain_state?.kiosk_id
       };
-      await kioskTxWrapper({
-        tx,
-        kioskOwner: txData?.claimer,
-        kiosk: txData?.sellerKiosk,
-        async runCommands(kioskTx) {
-          await addClaimTransferredNftTx({ ...txData, kioskTx });
-        }
-      });
+      try {
+        await kioskTxWrapper({
+          tx,
+          kioskOwner: txData?.claimer,
+          kiosk: txData?.sellerKiosk,
+          async runCommands(kioskTx) {
+            await addClaimTransferredNftWithPurchaseCapTx({ ...txData, kioskTx });
+          }
+        });
+      } catch {
+        await kioskTxWrapper({
+          tx,
+          kioskOwner: txData?.claimer,
+          kiosk: txData?.sellerKiosk,
+          async runCommands(kioskTx) {
+            await addClaimTransferredNftTx({ ...txData, kioskTx });
+          }
+        });
+      }
     }
     nftsForTracking.push({
       nftType: getNftTypeFromNft(nft),
@@ -2794,52 +2871,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],
@@ -2882,6 +2960,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           nftType: lock.nft_type,
           price: "0",
           transferRequest,
+          kioskToLockRuleProve: TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK,
           shouldSkipKioskLocking: true
         });
       }
@@ -2966,7 +3045,7 @@ async function addTradePortKioskListTx({
 }) {
   const marketFeePrice = getMarketFeePrice({ price: listPrice, collectionId });
   tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_listings::list",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_listings::list",
     arguments: [
       tx.object(TRADEPORT_KIOSK_LISTING_STORE),
       tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
@@ -3309,7 +3388,7 @@ function addTradePortKioskCollectionBidTx({
     coin = coin1;
   }
   tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_biddings::collection_bid",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_biddings::collection_bid",
     arguments: [
       tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
       tx.pure.u64(bidAmount),
@@ -3475,7 +3554,7 @@ function addTradePortKioskPlaceNftBidTx({
   });
   tx.mergeCoins(tx.object(coin1), [tx.object(coin2)]);
   tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_biddings::bid",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_biddings::bid",
     arguments: [
       tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
       tx.pure.address(nftTokenId),
@@ -3580,7 +3659,7 @@ function addTradeportRemoveNftBidTx({ tx, bidNonce, nftType }) {
 }
 function addTradeportKioskRemoveNftBidTx({ tx, bidNonce, nftType }) {
   tx.moveCall({
-    target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_biddings::cancel_bid",
+    target: "0xc94af80a10796ad0732cca33b38a858f712256da0763a65bafb2a63cf3e6a0d0::kiosk_biddings::cancel_bid",
     arguments: [tx.object(TRADEPORT_KIOSK_BIDDING_STORE), tx.pure.address(bidNonce)],
     typeArguments: [nftType]
   });
@@ -3938,35 +4017,22 @@ async function addOriginByteTransferNftTx({
 }
 async function addTradeportKioskTransferTx({
   tx,
-  sharedObjects,
   kioskTx,
   nftTokenId,
   nftType,
   recipientAddress
 }) {
-  const { transferPolicy } = sharedObjects;
-  const [transferRequest] = tx.moveCall({
-    target: "0x78eae99d1a7edae714b5de107f4b44ccbdf5f9ca6919498d9b024ef378dc13f7::kiosk_transfers::transfer",
+  tx.moveCall({
+    target: "0x49642273ca7db3d942f9fd810c93467974c40e73ea7f03e8e7a632f1222aca73::kiosk_transfers::transfer_with_purchase_capability",
     arguments: [
       tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
-      tx.object(TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK),
       tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
       tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
       tx.pure.address(nftTokenId),
-      tx.pure.address(addLeadingZerosAfter0x(recipientAddress)),
-      tx.object(transferPolicy)
+      tx.pure.address(addLeadingZerosAfter0x(recipientAddress))
     ],
     typeArguments: [nftType]
   });
-  await resolveTransferPolicies({
-    tx,
-    kioskTx,
-    nftType,
-    price: "0",
-    transferRequest,
-    kioskToLockRuleProve: TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK,
-    shouldSkipKioskLocking: true
-  });
 }
 
 // src/methods/transferNfts/transferNfts.ts