@tradeport/sui-trading-sdk 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.2
+
+### Patch Changes
+
+- 73006f7: Fixed S Card trading issues
+
+## 0.1.1
+
+### Patch Changes
+
+- 6ef2c2b: Fixed Goats of Sui collection trading
+
 ## 0.1.0
 
 ### Minor Changes

package/dist/index.js

@@ -243,6 +243,9 @@ var BASC_ROYALTY_DECIMAL_PERCENT = 0.055;
 var DSL_LEGACY_ROYALTY_DECIMAL_PERCENT = 0.05;
 var PREMIUM_NOMINATOR = 300n;
 var PREMIUM_FEE_NOMINATOR = 2500n;
+var ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK = [
+  "0xc4fc5b341858ac6fff4859d8105e345b195847cd230e8538d61a2f319ae8093c::bluemove_launchpad::GOATsOfSui"
+];
 
 // src/graphql/queries/fetchSharedObjectsByType.ts
 var import_graphql_request6 = require("graphql-request");
@@ -296,18 +299,15 @@ var getSharedObjects = async (nftType) => {
   if (nftType === "0x5fe8e884960f6977f813d871a3d43049d72d19d4ad07819b979c06434f60af4d::mint::SuiEcosystemNFT") {
     allowList = SUI_ECOSYSTEM_ORIGIN_BYTE_ALLOW_LIST_OBJECT;
   }
-  let transferPolicy = res?.sharedObjects?.filter(
+  const transferPolicy = res?.sharedObjects?.filter(
     (object) => object?.module === "transfer_policy"
   )?.[0]?.id;
+  let orderbook = res?.sharedObjects?.filter((object) => object?.module === "orderbook")?.[0]?.id;
   if (nftTypeSplit?.join("::")?.includes("keepsake_nft::KEEPSAKE")) {
-    transferPolicy = res?.sharedObjects?.filter(
-      (object) => object?.type?.includes(
-        "0x02be8c4a1a3cea4d3255d870d367c87838a8cc2bfe4f216a6b67b153027087a7::transfer_policy::TransferPolicy"
-      )
-    )?.[0]?.id;
+    orderbook = null;
   }
   return {
-    orderbook: res?.sharedObjects?.filter((object) => object?.module === "orderbook")?.[0]?.id,
+    orderbook,
     collection: res?.sharedObjects?.filter((object) => object?.module === "collection")?.[0]?.id,
     marketplace: res?.sharedObjects?.filter((object) => object?.module === "marketplace")?.[0]?.id,
     royaltyStrategy: res?.sharedObjects?.filter(
@@ -321,6 +321,17 @@ var getSharedObjects = async (nftType) => {
   };
 };
 
+// src/utils/normalizeNftType.ts
+var normalizedNftType = (nftType) => {
+  const nftTypeSplit = nftType?.split("::");
+  if (nftTypeSplit?.[0])
+    nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
+  return nftTypeSplit?.join("::");
+};
+
+// src/helpers/getRoyaltyRuleModule.ts
+var getRoyaltyRuleModule = (nftType) => normalizedNftType(nftType) === "0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard" ? "kiosk_royalty_rule" : "royalty_rule";
+
 // src/graphql/queries/fetchTransferPoliciesByType.ts
 var import_graphql_request7 = require("graphql-request");
 var fetchTransferPoliciesByType = import_graphql_request7.gql`
@@ -334,14 +345,6 @@ var fetchTransferPoliciesByType = import_graphql_request7.gql`
 	}
 `;
 
-// src/utils/normalizeNftType.ts
-var normalizedNftType = (nftType) => {
-  const nftTypeSplit = nftType?.split("::");
-  if (nftTypeSplit?.[0])
-    nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
-  return nftTypeSplit?.join("::");
-};
-
 // src/helpers/kiosk/getKioskTransferPolicies.ts
 var getKioskTransferPolicies = async (nftType) => {
   const res = await gqlChainRequest({
@@ -865,7 +868,8 @@ async function addTradeportKioskAcceptNftBidTx({
   bidNonce,
   nftTokenId,
   nftType,
-  royaltyRulePackageId
+  royaltyRulePackageId,
+  royaltyRuleModule
 }) {
   const { transferPolicy } = sharedObjects;
   const [feeCoin, transferRequest] = tx.moveCall({
@@ -882,7 +886,7 @@ async function addTradeportKioskAcceptNftBidTx({
     typeArguments: [nftType]
   });
   tx.moveCall({
-    target: `${royaltyRulePackageId}::royalty_rule::pay`,
+    target: `${royaltyRulePackageId}::${royaltyRuleModule}::pay`,
     typeArguments: [nftType],
     arguments: [tx.object(transferPolicy), transferRequest, feeCoin]
   });
@@ -970,7 +974,8 @@ async function addTradePortAcceptNftBidTxHandler(txData) {
   }
   if (isTradePortKioskBid(bidType)) {
     if (txData?.sellerKiosk) {
-      const royaltyRulePackageId = await getRulePackageId(txData.nftType, "royalty_rule");
+      const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
+      const royaltyRulePackageId = await getRulePackageId(txData.nftType, royaltyRuleModule);
       return kioskTxWrapper({
         tx: txData?.tx,
         kioskTx: txData?.kioskTx,
@@ -980,7 +985,8 @@ async function addTradePortAcceptNftBidTxHandler(txData) {
           await addTradeportKioskAcceptNftBidTx({
             ...txData,
             kioskTx,
-            royaltyRulePackageId
+            royaltyRulePackageId,
+            royaltyRuleModule
           });
         }
       });
@@ -1130,7 +1136,7 @@ function addSomisUnlistTx({
   });
 }
 async function addTradePortUnlistTxHandler(txData) {
-  if (txData?.listingNonce && isOriginByteTx(txData?.sharedObjects)) {
+  if (txData?.listingNonce && isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     addOriginByteUnlistTx(txData);
     return;
   }
@@ -1154,7 +1160,7 @@ async function addTradePortUnlistTxHandler(txData) {
   addTradePortUnlistTx(txData);
 }
 async function addHyperspaceUnlistTxHandler(txData) {
-  if (txData?.listingNonce && isOriginByteTx(txData?.sharedObjects)) {
+  if (txData?.listingNonce && isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     addOriginByteUnlistTx(txData);
     return;
   }
@@ -1171,7 +1177,7 @@ async function addHyperspaceUnlistTxHandler(txData) {
   });
 }
 async function addBluemoveUnlistTxHandler(txData) {
-  if (txData?.listingNonce && isOriginByteTx(txData?.sharedObjects)) {
+  if (txData?.listingNonce && isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     addOriginByteUnlistTx(txData);
     return;
   }
@@ -1399,7 +1405,8 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
   }
   if (isTradePortKioskBid(bidType)) {
     if (txData?.sellerKiosk) {
-      const royaltyRulePackageId = await getRulePackageId(txData.nftType, "royalty_rule");
+      const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
+      const royaltyRulePackageId = await getRulePackageId(txData.nftType, royaltyRuleModule);
       return kioskTxWrapper({
         tx: txData?.tx,
         kioskOwner: txData?.itemOwner,
@@ -1408,13 +1415,15 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
           await addTradeportKioskAcceptCollectionBidTx({
             ...txData,
             kioskTx,
-            royaltyRulePackageId
+            royaltyRulePackageId,
+            royaltyRuleModule
           });
         }
       });
     }
     if (await hasTransferPolicyRules(txData?.nftType) && !txData?.sellerKiosk) {
-      const royaltyRulePackageId = await getRulePackageId(txData.nftType, "royalty_rule");
+      const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
+      const royaltyRulePackageId = await getRulePackageId(txData.nftType, royaltyRuleModule);
       return kioskTxWrapper({
         tx: txData?.tx,
         kioskOwner: txData?.seller,
@@ -1427,7 +1436,8 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
           await addTradeportKioskAcceptCollectionBidTx({
             ...txData,
             kioskTx,
-            royaltyRulePackageId
+            royaltyRulePackageId,
+            royaltyRuleModule
           });
         }
       });
@@ -2521,7 +2531,7 @@ async function addTradePortKioskListTx({
   });
 }
 async function addTradePortListTxHandler(txData) {
-  if (isOriginByteTx(txData?.sharedObjects)) {
+  if (isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     await addOriginByteListTx(txData);
     return;
   }
@@ -2627,7 +2637,7 @@ async function relistNft({ tx, nft, listPrice, sharedObjects, walletAddress }) {
   };
   switch (nft?.listings?.[0]?.market_name) {
     case "tradeport":
-      if (!isOriginByteTx(txData?.sharedObjects) && txData?.listingNonce && await isNonKioskListing(txData?.listingNonce)) {
+      if ((!isOriginByteTx(txData?.sharedObjects) || ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) && txData?.listingNonce && await isNonKioskListing(txData?.listingNonce)) {
         addTradePortRelistTx({ ...txData, listPrice });
       } else {
         return kioskTxWrapper({
@@ -2653,7 +2663,7 @@ async function relistNft({ tx, nft, listPrice, sharedObjects, walletAddress }) {
       await addTradePortListTxHandler({ ...txData, listPrice });
       break;
     case "bluemove":
-      if (!isOriginByteTx(txData?.sharedObjects) && !txData?.sellerKiosk) {
+      if (!isOriginByteTx(txData?.sharedObjects) || ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType)) && !txData?.sellerKiosk) {
         addBlueMoveRelistTx({ ...txData, listPrice });
       } else {
         await addBluemoveUnlistTxHandler(txData);
@@ -2880,8 +2890,11 @@ async function addOriginByteCollectionBidTx({
 }
 async function addTradePortPlaceCollectionBidTxHandler(txData) {
   if (await hasRoyaltyRule(txData?.nftType)) {
-    const royaltyRuleModule = txData?.collectionId === "fa58ae52-b18d-4179-a2d4-c2471ede5f14" ? "kiosk_royalty_rule" : "royalty_rule";
-    const royaltyRulePackageId = await getRulePackageId(txData.nftType, royaltyRuleModule);
+    const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
+    const royaltyRulePackageId = await getRulePackageId(
+      txData.nftType,
+      getRoyaltyRuleModule(txData?.collectionId)
+    );
     addTradePortKioskCollectionBidTx({ ...txData, royaltyRulePackageId, royaltyRuleModule });
     return;
   }
@@ -2929,7 +2942,7 @@ var placeCollectionBids = async ({
       bidAmount: collections?.find((c) => c.id === collection?.id)?.bidAmountInMist
     };
     const numOfBids = collections?.find((c) => c.id === collection?.id)?.numOfBids;
-    if (isOriginByteTx(txData?.sharedObjects)) {
+    if (isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
       const { kiosk: bidderKiosk, isNewKiosk: isNewBidderKiosk } = await getOrCreateOBKiosk({
         tx,
         address: txData.bidder
@@ -2984,12 +2997,13 @@ function addTradePortKioskPlaceNftBidTx({
   nftTokenId,
   nftType,
   bidAmount,
-  royaltyRulePackageId
+  royaltyRulePackageId,
+  royaltyRuleModule
 }) {
   const { transferPolicy } = sharedObjects;
   const marketFeePrice = getMarketFeePrice({ price: bidAmount, collectionId });
   const royaltyCoin = tx.moveCall({
-    target: `${royaltyRulePackageId}::royalty_rule::fee_amount`,
+    target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
     arguments: [tx.object(transferPolicy), tx.pure.u64(bidAmount?.toString())],
     typeArguments: [nftType]
   });
@@ -3041,13 +3055,14 @@ async function addOriginBytePlaceNftBidTx({
   destroyZeroCoin({ tx, coin });
 }
 async function addTradePortPlaceNftBidTxHandler(txData) {
-  if (isOriginByteTx(txData?.sharedObjects)) {
+  if (isOriginByteTx(txData?.sharedObjects) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     await addOriginBytePlaceNftBidTx(txData);
     return;
   }
   if (await hasTransferPolicyRules(txData?.nftType) && txData?.sellerKiosk) {
-    const royaltyRulePackageId = await getRulePackageId(txData.nftType, "royalty_rule");
-    addTradePortKioskPlaceNftBidTx({ ...txData, royaltyRulePackageId });
+    const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
+    const royaltyRulePackageId = await getRulePackageId(txData.nftType, royaltyRuleModule);
+    addTradePortKioskPlaceNftBidTx({ ...txData, royaltyRulePackageId, royaltyRuleModule });
     return;
   }
   addTradePortPlaceNftBidTx(txData);