@tradeport/sui-trading-sdk 0.4.13 → 0.4.15

package/dist/index.js

@@ -1280,7 +1280,7 @@ var getSharedObjects = async (nftType) => {
 };
 
 // src/methods/acceptCollectionBid/addAcceptCollectionBIdTxs.ts
-var import_utils3 = require("@mysten/sui/utils");
+var import_utils4 = require("@mysten/sui/utils");
 
 // src/utils/normalizeNftType.ts
 var normalizedNftType = (nftType) => {
@@ -1319,10 +1319,7 @@ var hasPersonalKioskRule = (transferPolicies) => getNativeKioskTransferPolicies(
 );
 
 // src/helpers/hasTransferPolicyRules.ts
-var hasNativeKioskTransferPolicyRules = (transferPolicies) => {
-  const nativeKioskTransferPolicies = getNativeKioskTransferPolicies(transferPolicies);
-  return nativeKioskTransferPolicies?.some((policy) => policy?.rules?.length > 0);
-};
+var hasNativeKioskTransferPolicyRules = (transferPolicies) => getNativeKioskTransferPolicies(transferPolicies)?.length > 0;
 
 // src/helpers/isSIngleBid.ts
 var isSingleBid = (bidType) => {
@@ -1382,16 +1379,52 @@ function addHexPrefix(input) {
   return "0x" + input;
 }
 
+// src/helpers/getTransferPolicyRuleNamesFromSuiObject.ts
+var import_utils = require("@mysten/sui/utils");
+var getTransferPolicyRuleNamesFromSuiObject = async ({
+  suiClient,
+  transferPolicyId
+}) => {
+  const { data, error } = await suiClient.getObject({
+    id: (0, import_utils.normalizeSuiObjectId)(transferPolicyId),
+    options: {
+      showContent: true
+    }
+  });
+  if (error) {
+    throw new Error(`Error on getting SUI object ${transferPolicyId}: ${error.code}`);
+  }
+  const content = data.content;
+  const ruleNames = content.fields.rules.fields.contents.map(
+    (rule) => (0, import_utils.normalizeStructTag)(rule.fields.name)
+  );
+  return ruleNames;
+};
+
 // src/helpers/kiosk/getRulePackageId.ts
 var getRulePackageId = async ({
+  transferPolicies,
   nftType,
   ruleType,
-  kioskClient
+  kioskClient,
+  suiClient
 }) => {
-  const transferPolicies = await kioskClient.getTransferPolicies({
+  const transferPoliciesFromMystenSdk = await kioskClient.getTransferPolicies({
     type: normalizedNftType(nftType)
   });
-  const rule = transferPolicies.flatMap((policy) => policy.rules).filter((rule2) => rule2?.split("::")?.[1] === ruleType)?.[0];
+  let rule;
+  if (transferPoliciesFromMystenSdk.length > 0) {
+    rule = transferPoliciesFromMystenSdk.flatMap((policy) => policy.rules).filter((rule2) => rule2?.split("::")?.[1] === ruleType)?.[0];
+  } else if (transferPolicies.length > 0) {
+    const transferPolicyId = getNativeKioskTransferPolicies(transferPolicies)?.at(0)?.id;
+    const ruleNames = await getTransferPolicyRuleNamesFromSuiObject({
+      suiClient,
+      transferPolicyId
+    });
+    rule = ruleNames.filter((ruleName) => ruleName?.split("::")?.[1] === ruleType)?.[0];
+  } else {
+    throw new Error(`No transfer policy found for ${nftType}`);
+  }
   const ruleDefinition = kioskClient.rules.find(
     (x) => (0, import_kiosk2.getNormalizedRuleType)(x.rule) === (0, import_kiosk2.getNormalizedRuleType)(rule)
   );
@@ -1640,13 +1673,13 @@ var shareOriginByteKiosk = async ({ tx, kiosk }) => {
 };
 
 // src/helpers/rpc/getObjectType.ts
-var import_utils = require("@mysten/sui/utils");
+var import_utils2 = require("@mysten/sui/utils");
 var getObjectType = async ({
   suiClient,
   objectId
 }) => {
   const normalizedObjectId = objectId.startsWith("0x") ? addLeadingZerosAfter0x(objectId) : objectId;
-  if ((0, import_utils.isValidSuiObjectId)(normalizedObjectId)) {
+  if ((0, import_utils2.isValidSuiObjectId)(normalizedObjectId)) {
     const res = await suiClient.getObject({ id: normalizedObjectId, options: { showType: true } });
     return res.data.type;
   }
@@ -1654,7 +1687,7 @@ var getObjectType = async ({
 };
 
 // src/methods/acceptNftBids/addAcceptNftBidTxs.ts
-var import_utils2 = require("@mysten/sui/utils");
+var import_utils3 = require("@mysten/sui/utils");
 
 // src/graphql/queries/fetchMultibidById.ts
 var import_graphql_request11 = require("graphql-request");
@@ -1867,6 +1900,7 @@ async function resolveRoyaltyRule({
 var originByteRuleModules = ["royalty_strategy_bps", "transfer_allowlist"];
 var resolveTransferPolicies = async ({
   tx,
+  transferPolicies,
   suiClient,
   walletAddress,
   kioskClient,
@@ -1882,35 +1916,51 @@ var resolveTransferPolicies = async ({
   coinToSplit,
   beforeResolveKioskTransferRequest
 }) => {
-  const transferPolicies = await kioskClient.getTransferPolicies({
+  const transferPoliciesFromMystenSdk = await kioskClient.getTransferPolicies({
     type: normalizedNftType(nftType)
   });
-  if (transferPolicies.length === 0 && (customTransferPolicies ?? []).every(
-    (p) => p.transferRequest !== transferRequest
-  )) {
-    throw new Error(
-      `Missing transfer policy of ${nftType}. No way to resolve the transfer request.`
-    );
-  }
-  let policies = transferPolicies.length > 0 ? [
-    {
-      data: transferPolicies?.filter(
-        (policy) => policy?.rules?.filter(
-          (rule) => rule?.includes("royalty_rule") || rule?.includes("kiosk_lock_rule") || rule?.includes("personal_kiosk_rule") || rule?.includes("floor_price_rule")
-        )?.length > 0
-      )?.[0],
-      transferRequest,
-      isCustom: false
-    }
-  ] : [];
-  if (!policies?.[0]?.data && transferPolicies.length > 0) {
+  let policies = [];
+  if (transferPoliciesFromMystenSdk.length > 0) {
     policies = [
       {
-        data: transferPolicies?.[0],
+        data: (
+          // Find first policy with relevant rules, or fall back to first policy
+          transferPoliciesFromMystenSdk.find(
+            (policy) => policy?.rules?.some(
+              (rule) => knownTransferPolicyRules.some((ruleType) => rule?.includes(ruleType))
+            )
+          ) ?? transferPoliciesFromMystenSdk[0]
+        ),
         transferRequest,
         isCustom: false
       }
     ];
+  } else if (transferPolicies.length > 0) {
+    const transferPolicyId = getNativeKioskTransferPolicies(transferPolicies)?.at(0)?.id;
+    if (transferPolicyId) {
+      const ruleNames = await getTransferPolicyRuleNamesFromSuiObject({
+        suiClient,
+        transferPolicyId
+      });
+      if (ruleNames.length > 0) {
+        policies = [
+          {
+            data: {
+              id: transferPolicyId,
+              rules: ruleNames
+            },
+            transferRequest,
+            isCustom: false
+          }
+        ];
+      }
+    }
+  } else if ((customTransferPolicies ?? []).every(
+    (p) => p.transferRequest !== transferRequest
+  )) {
+    throw new Error(
+      `Missing transfer policy of ${nftType}. No way to resolve the transfer request.`
+    );
   }
   if (customTransferPolicies) {
     for (const customTransferPolicy of customTransferPolicies) {
@@ -2104,6 +2154,7 @@ async function addTradeportKioskAcceptNftBidTx({
     await beforeResolveKioskTransferRequest?.(feeCoin, transferRequest);
     await resolveTransferPolicies({
       tx,
+      transferPolicies,
       suiClient,
       walletAddress: seller,
       kioskTx,
@@ -2136,6 +2187,7 @@ async function addTradeportKioskAcceptNftBidTx({
     }
     await resolveTransferPolicies({
       tx,
+      transferPolicies,
       suiClient,
       walletAddress: seller,
       kioskTx,
@@ -2218,7 +2270,7 @@ function addBluemoveAcceptNftBidTx({
   });
 }
 async function addSingleBidAcceptNftBidTx(txData) {
-  const { nftType, tx, bidNonce, multiBidId, kioskClient, nftTokenId } = txData;
+  const { nftType, tx, bidNonce, multiBidId, kioskClient, nftTokenId, suiClient } = txData;
   const transferPolicies = getNativeKioskTransferPolicies(txData?.transferPolicies);
   const transferPolicy = transferPolicies?.find(
     (policy) => policy?.rules?.length > 0
@@ -2233,9 +2285,15 @@ async function addSingleBidAcceptNftBidTx(txData) {
   }
   if (transferPolicy) {
     const transferPolicies2 = await kioskClient.getTransferPolicies({
-      type: (0, import_utils2.normalizeStructTag)(nftType)
+      type: (0, import_utils3.normalizeStructTag)(nftType)
     });
-    const { rules: allRules } = transferPolicies2.find((p) => p.id === transferPolicy.id);
+    let { rules: allRules } = transferPolicies2.find((p) => p.id === transferPolicy.id);
+    if (allRules.length === 0) {
+      allRules = await getTransferPolicyRuleNamesFromSuiObject({
+        suiClient,
+        transferPolicyId: transferPolicy.id
+      });
+    }
     const unsupportedRule = allRules.find(
       (r) => !knownTransferPolicyRules.includes(r.split("::").at(1))
     );
@@ -2255,9 +2313,9 @@ async function addSingleBidAcceptNftBidTx(txData) {
           target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::accept_bid_with_transfer_policy`,
           typeArguments: [nftType],
           arguments: [
-            tx.object(import_utils2.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
             tx.object(TRADEPORT_MULTI_BID_STORE),
-            tx.pure.id((0, import_utils2.normalizeSuiObjectId)(bidNonce)),
+            tx.pure.id((0, import_utils3.normalizeSuiObjectId)(bidNonce)),
             tx.pure.option("id", multiBidChainId),
             tx.object(kioskTx.getKiosk()),
             tx.object(kioskTx.getKioskCap()),
@@ -2277,7 +2335,7 @@ async function addSingleBidAcceptNftBidTx(txData) {
     target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::accept_bid_without_transfer_policy`,
     typeArguments: [nftType],
     arguments: [
-      tx.object(import_utils2.SUI_CLOCK_OBJECT_ID),
+      tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
       tx.object(TRADEPORT_MULTI_BID_STORE),
       tx.pure.id(bidNonce),
       tx.pure.option("id", multiBidChainId),
@@ -2288,7 +2346,7 @@ async function addSingleBidAcceptNftBidTx(txData) {
 async function addTradePortAcceptNftBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils2.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils3.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isSingleBid(bidType)) {
     await addSingleBidAcceptNftBidTx(txData);
@@ -2308,6 +2366,8 @@ async function addTradePortAcceptNftBidTxHandler(txData) {
     if (txData?.sellerKiosk) {
       const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
       const royaltyRulePackageId = await getRulePackageId({
+        transferPolicies: txData?.transferPolicies,
+        suiClient: txData?.suiClient,
         nftType: txData?.nftType,
         ruleType: "royalty_rule",
         kioskClient: txData?.kioskClient
@@ -2733,7 +2793,7 @@ function addTocenAcceptCollectionBidTx({
 async function addTradePortAcceptCollectionBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils3.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils4.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isSingleBid(bidType)) {
     await addSingleBidAcceptNftBidTx(txData);
@@ -2769,6 +2829,8 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
   if (isTradePortKioskBid(bidType)) {
     const royaltyRuleModule = getRoyaltyRuleModule(txData?.nftType);
     const royaltyRulePackageId = await getRulePackageId({
+      transferPolicies: txData?.transferPolicies,
+      suiClient: txData?.suiClient,
       nftType: txData?.nftType,
       ruleType: "royalty_rule",
       kioskClient: txData?.kioskClient
@@ -3078,7 +3140,7 @@ var acceptNftBids = async ({
 var import_transactions6 = require("@mysten/sui/transactions");
 
 // src/methods/buyLocks/buyLocks.ts
-var import_utils4 = require("@mysten/sui.js/utils");
+var import_utils5 = require("@mysten/sui.js/utils");
 var import_transactions4 = require("@mysten/sui/transactions");
 
 // src/helpers/calculatePremium.ts
@@ -3244,7 +3306,7 @@ async function buyLocks({ lockIds, transaction }, context) {
       typeArguments: [lock.nft_type],
       arguments: [
         tx.object(TRADEPORT_PRICE_LOCK_STORE),
-        tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
+        tx.object(import_utils5.SUI_CLOCK_OBJECT_ID),
         tx.pure.id(lock.lock_id),
         tx.pure.u64(lock.maker_price),
         tx.pure.u64(marketplaceFee),
@@ -3258,7 +3320,7 @@ async function buyLocks({ lockIds, transaction }, context) {
 }
 
 // src/methods/exerciseLongLocks/exerciseLongLocks.ts
-var import_utils5 = require("@mysten/sui.js/utils");
+var import_utils6 = require("@mysten/sui.js/utils");
 var import_transactions5 = require("@mysten/sui/transactions");
 async function exerciseLongLocks({ walletAddress, transaction, locks }, context) {
   const tx = transaction ?? new import_transactions5.Transaction();
@@ -3316,7 +3378,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils5.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils6.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(lock.chain_state.makerKioskId),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
@@ -3326,6 +3388,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
         });
         await resolveTransferPolicies({
           tx,
+          transferPolicies,
           suiClient: context.suiClient,
           walletAddress,
           kioskTx,
@@ -3393,6 +3456,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           });
           await resolveTransferPolicies({
             tx,
+            transferPolicies,
             suiClient: context.suiClient,
             walletAddress,
             kioskTx,
@@ -3421,7 +3485,7 @@ async function buyAndExerciseLongLocks({ walletAddress, locks, tx: existingTx },
 var import_transactions9 = require("@mysten/sui/transactions");
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
-var import_utils6 = require("@mysten/sui.js/utils");
+var import_utils7 = require("@mysten/sui.js/utils");
 var import_transactions8 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchListingsById.ts
@@ -3545,6 +3609,7 @@ function addTradePortBuyTx({ tx, nftType, listingNonce, price, sharedObjects })
 }
 var addTradeportKioskBuyTx = async ({
   tx,
+  transferPolicies,
   kioskTx,
   suiClient,
   kioskClient,
@@ -3581,6 +3646,7 @@ var addTradeportKioskBuyTx = async ({
   });
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: seller,
     kioskTx,
@@ -3633,6 +3699,7 @@ async function addOriginByteBuyTx({
 }
 var addHyperspaceKioskBuyTx = async ({
   tx,
+  transferPolicies,
   suiClient,
   kioskTx,
   kioskClient,
@@ -3664,6 +3731,7 @@ var addHyperspaceKioskBuyTx = async ({
   await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: seller,
     kioskTx,
@@ -3728,6 +3796,7 @@ async function addBluemoveKioskBuyTx({
   await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: seller,
     kioskTx,
@@ -4144,7 +4213,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils6.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils7.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id)
           ]
         });
@@ -4195,6 +4264,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           });
           await resolveTransferPolicies({
             tx,
+            transferPolicies,
             suiClient: context.suiClient,
             walletAddress,
             kioskTx,
@@ -4225,7 +4295,7 @@ async function buyAndExerciseShortLocks({ walletAddress, locks, tx: existingTx }
 }
 
 // src/methods/cancelLocks/cancelLocks.ts
-var import_utils7 = require("@mysten/sui.js/utils");
+var import_utils8 = require("@mysten/sui.js/utils");
 var import_transactions10 = require("@mysten/sui/transactions");
 async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context) {
   const tx = existingTx ?? new import_transactions10.Transaction();
@@ -4248,7 +4318,7 @@ async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context)
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils7.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils8.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk)
           ]
@@ -4426,6 +4496,7 @@ var addClaimAcceptedBidNftTx = async ({
   });
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: claimer,
     kioskTx,
@@ -4462,6 +4533,7 @@ var addClaimAcceptedBidNftWithPurchaseCapTx = async ({
   });
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: claimer,
     kioskTx,
@@ -4497,6 +4569,7 @@ var addClaimTransferredNftTx = async ({
   });
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: claimer,
     kioskTx,
@@ -4534,6 +4607,7 @@ var addClaimTransferredNftWithPurchaseCapTx = async ({
   });
   await resolveTransferPolicies({
     tx,
+    transferPolicies,
     suiClient,
     walletAddress: claimer,
     kioskTx,
@@ -5363,7 +5437,6 @@ var fetchBulkNftsByKioskId = import_graphql_request19.gql`
 `;
 
 // src/methods/transferNfts/addTransferNftTx.ts
-var import_utils8 = require("@mysten/sui/utils");
 async function addOriginByteTransferNftTx({
   tx,
   nftTokenId,
@@ -5502,19 +5575,10 @@ async function getTransferPolicyForDirectTransfer(suiClient, collectionChainStat
     ).length === 0
   );
   if (validateRules && candidatePolicy) {
-    const { data, error } = await suiClient.getObject({
-      id: (0, import_utils8.normalizeSuiObjectId)(candidatePolicy.id),
-      options: {
-        showContent: true
-      }
+    const ruleNames = await getTransferPolicyRuleNamesFromSuiObject({
+      suiClient,
+      transferPolicyId: candidatePolicy.id
     });
-    if (error) {
-      throw new Error(`Error on getting SUI object ${candidatePolicy.id}: ${error.code}`);
-    }
-    const content = data.content;
-    const ruleNames = content.fields.rules.fields.contents.map(
-      (rule) => (0, import_utils8.normalizeStructTag)(rule.fields.name)
-    );
     if (!ruleNames.every((name) => name.startsWith(MYSTEN_TRANFER_POLICY_RULES_PACKAGE_ID))) {
       return void 0;
     }