@tradeport/sui-trading-sdk 0.1.78 → 0.1.80

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.80
+
+### Patch Changes
+
+- 32d6883: Refactored to get nftType from collection.chain_state
+
+## 0.1.79
+
+### Patch Changes
+
+- e633f1f: Updated assertion for nfts in unshared kiosks to make sure that nft kiosk is found
+
 ## 0.1.78
 
 ### Patch Changes

package/dist/index.js

@@ -150,6 +150,9 @@ var fetchNftById = import_graphql_request5.gql`
 				nonce
 				market_name
 			}
+			collection {
+				chain_state
+			}
 		}
 	}
 `;
@@ -166,6 +169,9 @@ var fetchNftsById = import_graphql_request5.gql`
 			contract {
 				properties
 			}
+			collection {
+				chain_state
+			}
 		}
 	}
 `;
@@ -187,17 +193,25 @@ var fetchNftsWithListingsById = import_graphql_request5.gql`
 				price
 				nonce
 			}
+			collection {
+				chain_state
+			}
 		}
 	}
 `;
 
-// src/helpers/getNftTypeFromNft.ts
-var getNftTypeFromNft = (nft) => {
+// src/helpers/getNftType.ts
+var getNftType = ({
+  collectionChainState,
+  nft
+}) => {
+  if (collectionChainState?.nft_type)
+    return collectionChainState.nft_type;
   let nftType = nft?.properties?.nft_type;
   if (!nftType || nftType?.split("::")?.length <= 1) {
     nftType = nft?.contract?.properties?.nft_type;
   }
-  return nftType;
+  return nftType ?? "";
 };
 
 // src/constants.ts
@@ -417,8 +431,8 @@ var assertNftInSharedKiosk = async ({
     });
     kiosksToCheck = res?.kiosks;
   }
-  const isNftInSharedKiosk = kiosksToCheck?.filter((k) => k.is_shared && k.id === kioskId)?.length > 0;
-  if (!isNftInSharedKiosk) {
+  const nftKiosk = kiosksToCheck?.find((k) => k.id === kioskId);
+  if (nftKiosk && !nftKiosk?.is_shared) {
     throw new Error("NFT is inside a kiosk that is not shared");
   }
 };
@@ -1717,9 +1731,11 @@ var acceptCollectionBid = async ({
   }
   const bidsForTracking = [];
   const tx = existingTx ?? new import_transactions.Transaction();
-  const sharedObjects = await getSharedObjects(
-    nft?.properties?.nft_type || nft?.contract?.properties?.nft_type
-  );
+  const nftType = getNftType({
+    collectionChainState: nft?.collection?.chain_state,
+    nft
+  });
+  const sharedObjects = await getSharedObjects(nftType);
   const txData = {
     tx,
     kioskTx,
@@ -1727,7 +1743,7 @@ var acceptCollectionBid = async ({
     kioskClient: context.kioskClient,
     sharedObjects,
     bidNonce: bid?.nonce,
-    nftType: getNftTypeFromNft(nft),
+    nftType,
     nftTokenId: nft?.token_id,
     itemOwner: nft?.owner,
     listingPrice: nft?.listings?.[0]?.price,
@@ -1768,7 +1784,7 @@ var acceptCollectionBid = async ({
       throw new Error("Marketplace not supported");
   }
   bidsForTracking.push({
-    nftType: getNftTypeFromNft(nft),
+    nftType,
     collectionId: nft?.collection_id,
     bidAmount: bid?.price,
     bidMarketName: bid?.market_contract?.name,
@@ -1809,6 +1825,9 @@ var fetchBidsById = import_graphql_request12.gql`
 			market_contract {
 				name
 			}
+			collection {
+				chain_state
+			}
 		}
 	}
 `;
@@ -1833,9 +1852,11 @@ var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx, beforeResolveKiosk
     if (bid?.type !== "solo") {
       throw new Error("Bid is not an individual item bid. Use acceptCollectionBid() instead.");
     }
-    const sharedObjects = await getSharedObjects(
-      bid?.nft?.properties?.nft_type || bid?.nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: bid?.collection?.chain_state,
+      nft: bid?.nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       kioskTx,
@@ -1843,7 +1864,7 @@ var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx, beforeResolveKiosk
       kioskClient: context.kioskClient,
       sharedObjects,
       bidNonce: bid?.nonce,
-      nftType: getNftTypeFromNft(bid?.nft),
+      nftType,
       listingPrice: bid?.nft?.listings?.[0]?.price,
       nftTokenId: bid?.nft?.token_id,
       itemOwner: bid?.nft?.owner,
@@ -1872,7 +1893,7 @@ var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx, beforeResolveKiosk
         throw new Error("Marketplace not supported");
     }
     bidsForTracking.push({
-      nftType: getNftTypeFromNft(bid?.nft),
+      nftType,
       collectionId: bid?.nft?.collection_id,
       bidAmount: bid?.price,
       bidMarketName: bid?.market_contract?.name,
@@ -2220,6 +2241,9 @@ var fetchListingsById = import_graphql_request14.gql`
 					properties
 				}
 			}
+			collection {
+				chain_state
+			}
 		}
 	}
 `;
@@ -2752,9 +2776,11 @@ var buyListings = async ({
     if (!listing?.listed) {
       throw new Error(`Listing ${listing?.id} is not listed`);
     }
-    const sharedObjects = await getSharedObjects(
-      listing?.nft?.properties?.nft_type || listing?.nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: listing?.collection?.chain_state,
+      nft: listing?.nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const buyTxData = {
       tx,
       kioskTx,
@@ -2764,7 +2790,7 @@ var buyListings = async ({
       buyer: walletAddress,
       seller: listing?.seller,
       nftTokenId: listing.nft?.token_id,
-      nftType: getNftTypeFromNft(listing?.nft),
+      nftType,
       listingId: listing?.id,
       listingNonce: listing?.nonce,
       price: listing?.price,
@@ -2810,7 +2836,7 @@ var buyListings = async ({
     }
     listingsForTracking.push({
       walletAddress,
-      nftType: getNftTypeFromNft(listing?.nft),
+      nftType,
       collectionId: listing?.nft?.collection_id,
       price: listing?.price,
       seller: listing?.seller,
@@ -3066,10 +3092,14 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
     if (nft?.chain_state?.claimable_reason !== "offer-transfer") {
       throw new Error("Cannot cancel transfer of NFT that is not currently transferring");
     }
-    const sharedObjects = await getSharedObjects(getNftTypeFromNft(nft));
+    const nftType = getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       nftTokenId: nft?.token_id,
       senderKiosk: nft?.chain_state?.kiosk_id,
       senderAddress: walletAddress,
@@ -3270,15 +3300,17 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     if (!nft?.chain_state?.claimable) {
       throw new Error(`Nft ID: ${nft?.id} is not claimable`);
     }
-    const sharedObjects = await getSharedObjects(
-      nft?.properties?.nft_type || nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     if (nft?.chain_state?.claimable_trade_id) {
       const txData = {
         tx,
         kioskClient: context.kioskClient,
         sharedObjects,
-        nftType: getNftTypeFromNft(nft),
+        nftType,
         claimableTradeId: nft?.chain_state?.claimable_trade_id,
         claimableSellerKiosk: nft?.chain_state?.claimable_seller_kiosk,
         claimableBuyerKiosk: nft?.chain_state?.claimable_buyer_kiosk
@@ -3294,7 +3326,7 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
         kioskClient: context.kioskClient,
         sharedObjects,
         claimer: walletAddress,
-        nftType: getNftTypeFromNft(nft),
+        nftType,
         nftTokenId: nft?.token_id,
         sellerKiosk: nft?.chain_state?.kiosk_id,
         seller: nft?.owner
@@ -3354,7 +3386,7 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
         kioskClient: context.kioskClient,
         sharedObjects,
         claimer: walletAddress,
-        nftType: getNftTypeFromNft(nft),
+        nftType,
         nftTokenId: nft?.token_id,
         sellerKiosk: nft?.chain_state?.kiosk_id,
         seller: nft?.owner
@@ -3410,7 +3442,7 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
       }
     }
     nftsForTracking.push({
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       claimer: walletAddress,
       claimReason: nft?.chain_state?.claimable_reason
     });
@@ -3465,7 +3497,10 @@ async function createLongLocks({ walletAddress, nfts }, context) {
       query: fetchNftById,
       variables: { nftId: argNft.id }
     }))?.nfts?.[0];
-    const nftType = getNftTypeFromNft(nft);
+    const nftType = getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
     const transferPolicy = (await getKioskTransferPolicies(nftType))?.at(0);
     if (!transferPolicy) {
       throw new Error(`Missing transfer policy for ${nftType}`);
@@ -3764,7 +3799,10 @@ async function relistNft({
     kioskClient,
     sharedObjects,
     nftTokenId: nft?.token_id,
-    nftType: getNftTypeFromNft(nft),
+    nftType: getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    }),
     listingNonce: nft?.listings?.[0]?.nonce,
     price: nft?.listings?.[0]?.price,
     sellerKiosk: nft?.chain_state?.kiosk_id,
@@ -3850,9 +3888,11 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
   const nftsForTracking = [];
   const tx = new import_transactions14.Transaction();
   for (const nft of res.nfts) {
-    const sharedObjects = await getSharedObjects(
-      nft?.properties?.nft_type || nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     if (nft?.listed) {
       await relistNft({
         tx,
@@ -3871,7 +3911,7 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
         seller: walletAddress,
         collectionId: nft?.collection_id,
         nftTokenId: nft?.token_id,
-        nftType: getNftTypeFromNft(nft),
+        nftType,
         listPrice: nfts?.find((n) => n.id === nft?.id)?.listPriceInMist,
         sellerKiosk: nft?.chain_state?.kiosk_id
       };
@@ -3879,7 +3919,7 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
     }
     nftsForTracking.push({
       walletAddress,
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       collectionId: nft?.collection_id,
       listPrice: nfts?.find((n) => n.id === nft?.id)?.listPriceInMist,
       isRelist: nft?.listed,
@@ -3908,6 +3948,9 @@ var fetchNftsByKioskId = import_graphql_request18.gql`
 			contract {
 				properties
 			}
+			collection {
+				chain_state
+			}
 		}
 	}
 `;
@@ -3995,7 +4038,10 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress }, context)
       if (nft?.collection_id === "67ded9ed-4dcc-4d15-9e6f-04dded46f419") {
         continue;
       }
-      const nftType = getNftTypeFromNft(nft);
+      const nftType = getNftType({
+        collectionChainState: nft?.collection?.chain_state,
+        nft
+      });
       const nftTokenId = nft?.token_id;
       if (sharedOBKiosk) {
         tx.moveCall({
@@ -4032,7 +4078,10 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress }, context)
       if (nft?.claimable_reason === "offer-transfer") {
         continue;
       }
-      const nftType = getNftTypeFromNft(nft);
+      const nftType = getNftType({
+        collectionChainState: nft?.collection?.chain_state,
+        nft
+      });
       const nftTokenId = nft?.token_id;
       await kioskTxWrapper({
         tx,
@@ -4098,6 +4147,7 @@ var fetchCollectionsByIdWithOneNft = import_graphql_request19.gql`
 	query fetchCollectionsByIdWithOneNft($collectionIds: [uuid!]) {
 		collections(where: { id: { _in: $collectionIds } }) {
 			id
+			chain_state
 			contract {
 				properties
 			}
@@ -4298,7 +4348,10 @@ var placeCollectionBids = async ({ collections, walletAddress }, context) => {
   const collectionsForTracking = [];
   const tx = new import_transactions16.Transaction();
   for (const collection of res.collections) {
-    const nftType = collection.id === "07231735-96de-4710-8e11-52c61a482578" ? "0x034c162f6b594cb5a1805264dd01ca5d80ce3eca6522e6ee37fd9ebfb9d3ddca::factory::PrimeMachin" : getNftTypeFromNft(collection?.nfts?.[0]);
+    const nftType = getNftType({
+      collectionChainState: collection?.chain_state,
+      nft: collection?.nfts?.[0]
+    });
     const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
@@ -4437,9 +4490,11 @@ var placeNftBids = async ({ nfts, walletAddress }, context) => {
   const nftsForTracking = [];
   const tx = new import_transactions17.Transaction();
   for (const nft of res.nfts) {
-    const sharedObjects = await getSharedObjects(
-      nft?.properties?.nft_type || nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       kioskClient: context.kioskClient,
@@ -4447,13 +4502,13 @@ var placeNftBids = async ({ nfts, walletAddress }, context) => {
       bidder: walletAddress,
       collectionId: nft?.collection_id,
       nftTokenId: nft?.token_id,
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       bidAmount: nfts?.find((n) => n.id === nft?.id)?.bidAmountInMist,
       sellerKiosk: nft?.chain_state?.kiosk_id
     };
     await addTradePortPlaceNftBidTxHandler(txData);
     nftsForTracking.push({
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       collectionId: nft?.collection_id,
       bidAmount: nfts?.find((n) => n.id === nft?.id)?.bidAmountInMist,
       bidder: walletAddress
@@ -4624,7 +4679,10 @@ var removeCollectionBid = async ({ bidId }, context) => {
       query: fetchCollectionsByIdWithOneNft,
       variables: { collectionIds: [bid?.collection_id] }
     });
-    const nftType = bid?.collection_id === "07231735-96de-4710-8e11-52c61a482578" ? "0x034c162f6b594cb5a1805264dd01ca5d80ce3eca6522e6ee37fd9ebfb9d3ddca::factory::PrimeMachin" : getNftTypeFromNft(collectionWithOneNftRes?.collections?.[0]?.nfts?.[0]) || bid?.contract?.properties?.nft_type;
+    const nftType = getNftType({
+      collectionChainState: collectionWithOneNftRes?.collections?.[0]?.chain_state,
+      nft: collectionWithOneNftRes?.collections?.[0]?.nfts?.[0]
+    });
     const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
@@ -4676,15 +4734,17 @@ var removeNftBids = async ({ bidIds }, context) => {
   const bidsForTracking = [];
   const tx = new import_transactions19.Transaction();
   for (const bid of res.bids) {
-    const sharedObjects = await getSharedObjects(
-      bid?.nft?.properties?.nft_type || bid?.nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: bid?.collection?.chain_state,
+      nft: bid?.nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       suiClient: context.suiClient,
       sharedObjects,
       bidNonce: bid?.nonce,
-      nftType: getNftTypeFromNft(bid?.nft),
+      nftType,
       nftTokenId: bid?.nft?.token_id,
       bidAmount: bid?.price,
       sellerKiosk: bid?.nft?.chain_state?.kiosk_id,
@@ -4707,7 +4767,7 @@ var removeNftBids = async ({ bidIds }, context) => {
         throw new Error("Marketplace not supported");
     }
     bidsForTracking.push({
-      nftType: getNftTypeFromNft(bid?.nft),
+      nftType,
       collectionId: bid?.nft?.collection_id,
       bidAmount: bid?.price,
       bidMarketName: bid?.market_contract?.name,
@@ -4796,11 +4856,15 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
     if (nft?.listed) {
       throw new Error("Cannot transfer a listed NFT");
     }
-    const sharedObjects = await getSharedObjects(getNftTypeFromNft(nft));
+    const nftType = getNftType({
+      collectionChainState: nft?.collection?.chain_state,
+      nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       kioskClient: context.kioskClient,
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       nftTokenId: nft?.token_id,
       senderKiosk: nft?.chain_state?.kiosk_id,
       senderAddress: walletAddress,
@@ -4830,7 +4894,7 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
       }
     });
     nftsForTracking.push({
-      nftType: getNftTypeFromNft(nft),
+      nftType,
       senderAddress: walletAddress,
       recipientAddress
     });
@@ -4858,16 +4922,18 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
     if (!listing?.listed) {
       throw new Error(`Listing ${listing?.id} is not listed`);
     }
-    const sharedObjects = await getSharedObjects(
-      listing?.nft?.properties?.nft_type || listing?.nft?.contract?.properties?.nft_type
-    );
+    const nftType = getNftType({
+      collectionChainState: listing?.collection?.chain_state,
+      nft: listing?.nft
+    });
+    const sharedObjects = await getSharedObjects(nftType);
     const txData = {
       tx,
       suiClient: context.suiClient,
       kioskClient: context.kioskClient,
       sharedObjects,
       nftTokenId: listing.nft?.token_id,
-      nftType: getNftTypeFromNft(listing?.nft),
+      nftType,
       listingNonce: listing?.nonce,
       price: listing?.price,
       sellerKiosk: listing.nft?.chain_state?.kiosk_id,
@@ -4904,7 +4970,7 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
     }
     listingsForTracking.push({
       walletAddress,
-      nftType: getNftTypeFromNft(listing?.nft),
+      nftType,
       collectionId: listing?.nft?.collection_id,
       price: listing?.price,
       seller: listing?.seller,