@tradeport/sui-trading-sdk 0.1.80 → 0.1.81

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.81
+
+### Patch Changes
+
+- 7661409: Fix Dungeon Move by using nft type from nft properties
+
 ## 0.1.80
 
 ### Patch Changes

package/dist/index.js

@@ -151,6 +151,7 @@ var fetchNftById = import_graphql_request5.gql`
 				market_name
 			}
 			collection {
+				id
 				chain_state
 			}
 		}
@@ -170,6 +171,7 @@ var fetchNftsById = import_graphql_request5.gql`
 				properties
 			}
 			collection {
+				id
 				chain_state
 			}
 		}
@@ -194,6 +196,7 @@ var fetchNftsWithListingsById = import_graphql_request5.gql`
 				nonce
 			}
 			collection {
+				id
 				chain_state
 			}
 		}
@@ -202,9 +205,13 @@ var fetchNftsWithListingsById = import_graphql_request5.gql`
 
 // src/helpers/getNftType.ts
 var getNftType = ({
+  collectionId,
   collectionChainState,
   nft
 }) => {
+  if (collectionId === "a6fabb11-4713-4203-bce8-a3c4f673b5a7") {
+    return nft?.properties?.nft_type;
+  }
   if (collectionChainState?.nft_type)
     return collectionChainState.nft_type;
   let nftType = nft?.properties?.nft_type;
@@ -701,8 +708,10 @@ var getObjectType = async ({
 }) => {
   try {
     const res = await suiClient.getObject({ id: objectId, options: { showType: true } });
+    console.log("res", res);
     return res?.data?.type;
   } catch (err) {
+    console.log("err", err);
     return "";
   }
 };
@@ -1008,6 +1017,7 @@ async function addTradeportKioskAcceptNftBidTx({
   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",
@@ -1044,6 +1054,7 @@ async function addTradeportKioskAcceptNftBidTx({
       ],
       typeArguments: [nftType]
     });
+    console.log("1");
     if (!shouldSplitRoyaltyFromUserGasCoins) {
       tx.moveCall({
         target: `${royaltyRulePackageId}::${royaltyRuleModule}::pay`,
@@ -1061,6 +1072,7 @@ async function addTradeportKioskAcceptNftBidTx({
       shouldSkipKioskLocking: true,
       shouldSkipResolvingRoyaltyRule: !shouldSplitRoyaltyFromUserGasCoins
     });
+    console.log("2");
     if (shouldSplitRoyaltyFromUserGasCoins) {
       tx.transferObjects([tx.object(feeCoin)], tx.pure.address(addLeadingZerosAfter0x(seller)));
     }
@@ -1597,7 +1609,9 @@ 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({
@@ -1605,6 +1619,7 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
         ruleType: "royalty_rule",
         kioskClient: txData?.kioskClient
       });
+      console.log("2");
       return kioskTxWrapper({
         tx: txData?.tx,
         kioskClient: txData?.kioskClient,
@@ -1732,6 +1747,7 @@ var acceptCollectionBid = async ({
   const bidsForTracking = [];
   const tx = existingTx ?? new import_transactions.Transaction();
   const nftType = getNftType({
+    collectionId: nft?.collection_id,
     collectionChainState: nft?.collection?.chain_state,
     nft
   });
@@ -1758,6 +1774,7 @@ var acceptCollectionBid = async ({
     shouldSplitRoyaltyFromUserGasCoins,
     beforeResolveKioskTransferRequest
   };
+  console.log("txData", txData);
   switch (txData.bidMarketName) {
     case "tradeport":
       if (txData?.listingPrice && txData?.listingPrice > 0) {
@@ -1826,6 +1843,7 @@ var fetchBidsById = import_graphql_request12.gql`
 				name
 			}
 			collection {
+				id
 				chain_state
 			}
 		}
@@ -1853,6 +1871,7 @@ var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx, beforeResolveKiosk
       throw new Error("Bid is not an individual item bid. Use acceptCollectionBid() instead.");
     }
     const nftType = getNftType({
+      collectionId: bid?.collection?.id,
       collectionChainState: bid?.collection?.chain_state,
       nft: bid?.nft
     });
@@ -2242,6 +2261,7 @@ var fetchListingsById = import_graphql_request14.gql`
 				}
 			}
 			collection {
+				id
 				chain_state
 			}
 		}
@@ -2777,6 +2797,7 @@ var buyListings = async ({
       throw new Error(`Listing ${listing?.id} is not listed`);
     }
     const nftType = getNftType({
+      collectionId: listing?.collection?.id,
       collectionChainState: listing?.collection?.chain_state,
       nft: listing?.nft
     });
@@ -3093,6 +3114,7 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
       throw new Error("Cannot cancel transfer of NFT that is not currently transferring");
     }
     const nftType = getNftType({
+      collectionId: nft?.collection?.id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
@@ -3301,6 +3323,7 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
       throw new Error(`Nft ID: ${nft?.id} is not claimable`);
     }
     const nftType = getNftType({
+      collectionId: nft?.collection?.id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
@@ -3498,6 +3521,7 @@ async function createLongLocks({ walletAddress, nfts }, context) {
       variables: { nftId: argNft.id }
     }))?.nfts?.[0];
     const nftType = getNftType({
+      collectionId: nft?.collection?.id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
@@ -3800,6 +3824,7 @@ async function relistNft({
     sharedObjects,
     nftTokenId: nft?.token_id,
     nftType: getNftType({
+      collectionId: nft?.collection?.id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     }),
@@ -3889,6 +3914,7 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
   const tx = new import_transactions14.Transaction();
   for (const nft of res.nfts) {
     const nftType = getNftType({
+      collectionId: nft?.collection?.id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
@@ -3949,6 +3975,7 @@ var fetchNftsByKioskId = import_graphql_request18.gql`
 				properties
 			}
 			collection {
+				id
 				chain_state
 			}
 		}
@@ -4039,6 +4066,7 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress }, context)
         continue;
       }
       const nftType = getNftType({
+        collectionId: nft?.collection?.id,
         collectionChainState: nft?.collection?.chain_state,
         nft
       });
@@ -4079,6 +4107,7 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress }, context)
         continue;
       }
       const nftType = getNftType({
+        collectionId: nft?.collection?.id,
         collectionChainState: nft?.collection?.chain_state,
         nft
       });
@@ -4349,6 +4378,7 @@ var placeCollectionBids = async ({ collections, walletAddress }, context) => {
   const tx = new import_transactions16.Transaction();
   for (const collection of res.collections) {
     const nftType = getNftType({
+      collectionId: collection?.id,
       collectionChainState: collection?.chain_state,
       nft: collection?.nfts?.[0]
     });
@@ -4491,6 +4521,7 @@ var placeNftBids = async ({ nfts, walletAddress }, context) => {
   const tx = new import_transactions17.Transaction();
   for (const nft of res.nfts) {
     const nftType = getNftType({
+      collectionId: nft?.collection_id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
@@ -4635,6 +4666,7 @@ async function addTradePortRemoveCollectionBidTxHandler(txData) {
     suiClient: txData?.suiClient,
     objectId: txData?.bidNonce
   });
+  console.log("bidType", bidType);
   if (isOriginByteBid(bidType)) {
     addOriginByteRemoveCollectionBidTx(txData);
     return;
@@ -4680,6 +4712,7 @@ var removeCollectionBid = async ({ bidId }, context) => {
       variables: { collectionIds: [bid?.collection_id] }
     });
     const nftType = getNftType({
+      collectionId: collectionWithOneNftRes?.collections?.[0]?.id,
       collectionChainState: collectionWithOneNftRes?.collections?.[0]?.chain_state,
       nft: collectionWithOneNftRes?.collections?.[0]?.nfts?.[0]
     });
@@ -4696,6 +4729,7 @@ 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);
@@ -4735,6 +4769,7 @@ var removeNftBids = async ({ bidIds }, context) => {
   const tx = new import_transactions19.Transaction();
   for (const bid of res.bids) {
     const nftType = getNftType({
+      collectionId: bid?.collection?.id,
       collectionChainState: bid?.collection?.chain_state,
       nft: bid?.nft
     });
@@ -4857,6 +4892,7 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
       throw new Error("Cannot transfer a listed NFT");
     }
     const nftType = getNftType({
+      collectionId: nft?.collection?.id,
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
@@ -4923,6 +4959,7 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
       throw new Error(`Listing ${listing?.id} is not listed`);
     }
     const nftType = getNftType({
+      collectionId: listing?.collection?.id,
       collectionChainState: listing?.collection?.chain_state,
       nft: listing?.nft
     });
@@ -4940,6 +4977,7 @@ 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);