@tradeport/sui-trading-sdk 0.2.2 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.3.1
+
+### Patch Changes
+
+- f04f941: Added bulk remove bids
+
+## 0.3.0
+
+### Minor Changes
+
+- b86b77a: Added kiosk direct transfers
+
 ## 0.2.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -126,12 +126,14 @@ type PlaceNftBids = {
     walletAddress: string;
 };
 
-type RemoveCollectionBid = {
-    bidId: string;
+type RemoveCollectionBids = {
+    bidIds: string[];
+    tx?: Transaction;
 };
 
 type RemoveNftBids = {
     bidIds: string[];
+    tx?: Transaction;
 };
 
 type TransferNfts = {
@@ -166,11 +168,11 @@ declare class SuiTradingClient {
     listNfts({ nfts, walletAddress }: ListNfts): Promise<Transaction>;
     unlistListings({ listingIds, walletAddress }: UnlistListings): Promise<Transaction>;
     placeNftBids({ nfts, walletAddress }: PlaceNftBids): Promise<Transaction>;
-    removeNftBids({ bidIds }: RemoveNftBids): Promise<Transaction>;
+    removeNftBids({ bidIds, tx }: RemoveNftBids): Promise<Transaction>;
     acceptNftBids({ bidIds }: AcceptNftBids): Promise<Transaction>;
     placeCollectionBid({ collectionId, bidAmountInMist, numOfBids, walletAddress, }: PlaceCollectionBid): Promise<Transaction>;
     acceptCollectionBid({ bidId, nftId, walletAddress }: AcceptCollectionBid): Promise<Transaction>;
-    removeCollectionBid({ bidId }: RemoveCollectionBid): Promise<Transaction>;
+    removeCollectionBids({ bidIds, tx }: RemoveCollectionBids): Promise<Transaction>;
     transferNfts({ nftIds, recipientAddress, walletAddress }: TransferNfts): Promise<Transaction>;
     cancelNftTransfers({ nftIds, walletAddress }: CancelNftTransfers): Promise<Transaction>;
     claimNfts({ nftIds, walletAddress }: ClaimNfts): Promise<Transaction>;

package/dist/index.d.ts

@@ -126,12 +126,14 @@ type PlaceNftBids = {
     walletAddress: string;
 };
 
-type RemoveCollectionBid = {
-    bidId: string;
+type RemoveCollectionBids = {
+    bidIds: string[];
+    tx?: Transaction;
 };
 
 type RemoveNftBids = {
     bidIds: string[];
+    tx?: Transaction;
 };
 
 type TransferNfts = {
@@ -166,11 +168,11 @@ declare class SuiTradingClient {
     listNfts({ nfts, walletAddress }: ListNfts): Promise<Transaction>;
     unlistListings({ listingIds, walletAddress }: UnlistListings): Promise<Transaction>;
     placeNftBids({ nfts, walletAddress }: PlaceNftBids): Promise<Transaction>;
-    removeNftBids({ bidIds }: RemoveNftBids): Promise<Transaction>;
+    removeNftBids({ bidIds, tx }: RemoveNftBids): Promise<Transaction>;
     acceptNftBids({ bidIds }: AcceptNftBids): Promise<Transaction>;
     placeCollectionBid({ collectionId, bidAmountInMist, numOfBids, walletAddress, }: PlaceCollectionBid): Promise<Transaction>;
     acceptCollectionBid({ bidId, nftId, walletAddress }: AcceptCollectionBid): Promise<Transaction>;
-    removeCollectionBid({ bidId }: RemoveCollectionBid): Promise<Transaction>;
+    removeCollectionBids({ bidIds, tx }: RemoveCollectionBids): Promise<Transaction>;
     transferNfts({ nftIds, recipientAddress, walletAddress }: TransferNfts): Promise<Transaction>;
     cancelNftTransfers({ nftIds, walletAddress }: CancelNftTransfers): Promise<Transaction>;
     claimNfts({ nftIds, walletAddress }: ClaimNfts): Promise<Transaction>;

package/dist/index.js

@@ -81,9 +81,9 @@ var gqlChainRequest = async ({ chain, query, variables }) => {
 
 // src/graphql/queries/fetchCollectionBidById.ts
 var import_graphql_request3 = require("graphql-request");
-var fetchCollectionBidById = import_graphql_request3.gql`
-	query fetchCollectionBidById($bidId: uuid!) {
-		bids(where: { id: { _eq: $bidId } }) {
+var fetchCollectionBidsById = import_graphql_request3.gql`
+	query fetchCollectionBidsById($bidIds: [uuid!]) {
+		bids(where: { id: { _in: $bidIds } }) {
 			nonce
 			price
 			bidder
@@ -5089,6 +5089,79 @@ async function addTradeportKioskTransferTx({
     typeArguments: [nftType]
   });
 }
+async function addTradeportKioskDirectTransferTx(txData, nfts) {
+  const { tx, recipientAddress, kioskClient, senderAddress } = txData;
+  if (nfts.length === 0) {
+    return;
+  }
+  const [receiverKiosk, receiverKioskCap] = tx.moveCall({
+    target: "0x2::kiosk::new",
+    arguments: []
+  });
+  const recipientAddressWithPrefix = addLeadingZerosAfter0x(recipientAddress);
+  tx.moveCall({
+    target: "0x2::kiosk::set_owner_custom",
+    arguments: [
+      tx.object(receiverKiosk),
+      tx.object(receiverKioskCap),
+      tx.pure.address(recipientAddressWithPrefix)
+    ]
+  });
+  const totalRoyaltyAmount = nfts.reduce(
+    (sum, nft) => sum + BigInt(
+      getTransferPolicyForDirectTransfer(nft.collection.chain_state)?.rules?.find(
+        (rule) => rule.type === "royalty_rule"
+      )?.min_amount ?? 0n
+    ),
+    0n
+  );
+  const [royaltyCoin] = tx.splitCoins(tx.gas, [tx.pure.u64(totalRoyaltyAmount)]);
+  for (const nft of nfts) {
+    const nftType = getNftType({
+      collectionId: nft?.collection?.id,
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
+    await kioskTxWrapper({
+      tx,
+      kioskClient,
+      kioskOwner: senderAddress,
+      kiosk: nft?.chain_state?.kiosk_id,
+      async runCommands(kioskTx) {
+        tx.moveCall({
+          target: "0xd0ad5bf7ac7d372cdcfee5273d5e487dabad724040e089c626cba2a01127ccd6::kiosk_transfers::direct_transfer",
+          arguments: [
+            tx.object(kioskTx.getKiosk()),
+            tx.object(kioskTx.getKioskCap()),
+            tx.object(receiverKiosk),
+            tx.object(receiverKioskCap),
+            tx.pure.id(nft.token_id),
+            tx.object(getTransferPolicyForDirectTransfer(nft.collection.chain_state).id),
+            royaltyCoin
+          ],
+          typeArguments: [nftType]
+        });
+      }
+    });
+  }
+  tx.transferObjects([receiverKioskCap], tx.pure.address(recipientAddressWithPrefix));
+  tx.moveCall({
+    target: "0x2::transfer::public_share_object",
+    arguments: [receiverKiosk],
+    typeArguments: ["0x2::kiosk::Kiosk"]
+  });
+  destroyZeroCoin({ tx, coin: royaltyCoin });
+}
+function canBeTransferedDirectly(collectionChainState) {
+  return getTransferPolicyForDirectTransfer(collectionChainState) !== void 0;
+}
+function getTransferPolicyForDirectTransfer(collectionChainState) {
+  return collectionChainState?.transfer_policies?.find(
+    (policy) => !policy.is_origin_byte && policy.rules?.filter(
+      (rule) => rule.type !== "kiosk_lock_rule" && rule.type !== "royalty_rule"
+    ).length === 0
+  );
+}
 
 // src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts
 async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress }, context) {
@@ -5710,7 +5783,7 @@ var placeNftBids = async ({ nfts, walletAddress }, context) => {
   return import_transactions18.Transaction.from(tx);
 };
 
-// src/methods/removeCollectionBid/removeCollectionBid.ts
+// src/methods/removeCollectionBids/removeCollectionBids.ts
 var import_transactions19 = require("@mysten/sui/transactions");
 
 // src/methods/removeNftBids/addRemoveNftBidTxs.ts
@@ -5770,7 +5843,7 @@ async function addTradePortRemoveNftBidTxHandler(txData) {
   addTradeportRemoveNftBidTx(txData);
 }
 
-// src/methods/removeCollectionBid/addRemoveCollectionBidTxs.ts
+// src/methods/removeCollectionBids/addRemoveCollectionBidsTxs.ts
 function addTradeportRemoveCollectionBidTx({
   tx,
   nftType,
@@ -5829,7 +5902,8 @@ async function addTradePortRemoveCollectionBidTxHandler(txData) {
     objectId: txData?.bidNonce
   });
   if (isOriginByteBid(bidType)) {
-    addOriginByteRemoveCollectionBidTx(txData);
+    const sharedObjects = await getSharedObjects(txData?.nftType);
+    addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
     return;
   }
   if (isTradePortKioskBid(bidType)) {
@@ -5841,7 +5915,8 @@ async function addTradePortRemoveCollectionBidTxHandler(txData) {
 async function addBluemoveRemoveCollectionBidTxHandler(txData) {
   const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
   if (isOriginByteBid(bidType)) {
-    addOriginByteRemoveCollectionBidTx(txData);
+    const sharedObjects = await getSharedObjects(txData?.nftType);
+    addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
     return;
   }
   if (isBluemoveKioskBid(txData?.bidNonce)) {
@@ -5851,21 +5926,22 @@ async function addBluemoveRemoveCollectionBidTxHandler(txData) {
   addBluemoveRemoveCollectionBidTx(txData);
 }
 async function addClutchyRemoveCollectionBidTxHandler(txData) {
-  addOriginByteRemoveCollectionBidTx(txData);
+  const sharedObjects = await getSharedObjects(txData?.nftType);
+  addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 }
 
-// src/methods/removeCollectionBid/removeCollectionBid.ts
-var removeCollectionBid = async ({ bidId }, context) => {
+// src/methods/removeCollectionBids/removeCollectionBids.ts
+var removeCollectionBids = async ({ bidIds, tx: existingTx }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
-    query: fetchCollectionBidById,
-    variables: { bidId }
+    query: fetchCollectionBidsById,
+    variables: { bidIds }
   });
   if (res?.bids?.length === 0) {
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = new import_transactions19.Transaction();
+  const tx = existingTx ?? new import_transactions19.Transaction();
   for (const bid of res.bids) {
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
       throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
@@ -5880,11 +5956,9 @@ var removeCollectionBid = async ({ bidId }, context) => {
       collectionChainState: collectionWithOneNftRes?.collections?.[0]?.chain_state,
       nft: collectionWithOneNftRes?.collections?.[0]?.nfts?.[0]
     });
-    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       suiClient: context.suiClient,
-      sharedObjects,
       bidNonce: bid?.nonce,
       bidder: bid?.bidder,
       nftType,
@@ -5919,7 +5993,7 @@ var removeCollectionBid = async ({ bidId }, context) => {
 
 // src/methods/removeNftBids/removeNftBids.ts
 var import_transactions20 = require("@mysten/sui/transactions");
-var removeNftBids = async ({ bidIds }, context) => {
+var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchBidsById,
@@ -5929,7 +6003,7 @@ var removeNftBids = async ({ bidIds }, context) => {
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = new import_transactions20.Transaction();
+  const tx = existingTx ?? new import_transactions20.Transaction();
   for (const bid of res.bids) {
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
       throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
@@ -5939,11 +6013,9 @@ var removeNftBids = async ({ bidIds }, context) => {
       collectionChainState: bid?.collection?.chain_state,
       nft: bid?.nft
     });
-    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       suiClient: context.suiClient,
-      sharedObjects,
       bidNonce: bid?.nonce,
       nftType,
       nftTokenId: bid?.nft?.token_id,
@@ -6014,6 +6086,7 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
+  const nftsToTransferDirectly = [];
   const tx = new import_transactions21.Transaction();
   for (const nft of res.nfts) {
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(nft?.token_id)) {
@@ -6050,22 +6123,30 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
       await addOriginByteTransferNftTx(txData);
       continue;
     }
-    await kioskTxWrapper({
-      tx: txData?.tx,
-      kioskClient: txData?.kioskClient,
-      kioskOwner: txData?.senderAddress,
-      kiosk: txData?.senderKiosk,
-      shouldAssertNftInSharedKiosk: true,
-      async runCommands(kioskTx) {
-        await addTradeportKioskTransferTx({ ...txData, kioskTx });
-      }
-    });
+    if (canBeTransferedDirectly(nft?.collection?.chain_state)) {
+      nftsToTransferDirectly.push(nft);
+    } else {
+      await kioskTxWrapper({
+        tx: txData?.tx,
+        kioskClient: txData?.kioskClient,
+        kioskOwner: txData?.senderAddress,
+        kiosk: txData?.senderKiosk,
+        shouldAssertNftInSharedKiosk: true,
+        async runCommands(kioskTx) {
+          await addTradeportKioskTransferTx({ ...txData, kioskTx });
+        }
+      });
+    }
     nftsForTracking.push({
       nftType,
       senderAddress: walletAddress,
       recipientAddress
     });
   }
+  await addTradeportKioskDirectTransferTx(
+    { tx, kioskClient: context.kioskClient, senderAddress: walletAddress, recipientAddress },
+    nftsToTransferDirectly
+  );
   return import_transactions21.Transaction.from(tx);
 };
 
@@ -6268,14 +6349,14 @@ var SuiTradingClient = class {
     };
     return placeNftBids({ nfts, walletAddress }, context);
   }
-  async removeNftBids({ bidIds }) {
+  async removeNftBids({ bidIds, tx }) {
     const context = {
       apiUser: this.apiUser,
       apiKey: this.apiKey,
       suiClient: this.suiClient,
       kioskClient: this.kioskClient
     };
-    return removeNftBids({ bidIds }, context);
+    return removeNftBids({ bidIds, tx }, context);
   }
   async acceptNftBids({ bidIds }) {
     const context = {
@@ -6321,8 +6402,8 @@ var SuiTradingClient = class {
     };
     const collectionBidRes = await gqlChainRequest({
       chain: "sui",
-      query: fetchCollectionBidById,
-      variables: { bidId }
+      query: fetchCollectionBidsById,
+      variables: { bidIds: [bidId] }
     });
     const bid = collectionBidRes?.bids?.[0];
     if (!bid) {
@@ -6384,14 +6465,14 @@ var SuiTradingClient = class {
       }
     }
   }
-  async removeCollectionBid({ bidId }) {
+  async removeCollectionBids({ bidIds, tx }) {
     const context = {
       apiUser: this.apiUser,
       apiKey: this.apiKey,
       suiClient: this.suiClient,
       kioskClient: this.kioskClient
     };
-    return removeCollectionBid({ bidId }, context);
+    return removeCollectionBids({ bidIds, tx }, context);
   }
   async transferNfts({ nftIds, recipientAddress, walletAddress }) {
     const context = {