@tradeport/sui-trading-sdk 0.0.1 → 0.0.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tradeport/sui-trading-sdk
 
+## 0.0.2
+
+### Patch Changes
+
+- 485e023: Bug Fix: Fixed handling of Suiduckz and Cyberpills txs to list on TradePort's normal contract since they are untradable on OB or Kiosk contracts
+
 ## 0.0.1
 
 ### Patch Changes

package/dist/index.js

@@ -317,27 +317,50 @@ var getSharedObjects = async (nftType) => {
   };
 };
 
-// src/apiClients/kioskClient.ts
-var import_kiosk = require("@mysten/kiosk");
-var kioskClient = new import_kiosk.KioskClient({
-  // @ts-ignore
-  client: suiClient_default,
-  network: import_kiosk.Network.MAINNET
-});
-var kioskClient_default = kioskClient;
+// src/graphql/queries/fetchTransferPoliciesByType.ts
+var import_graphql_request7 = require("graphql-request");
+var fetchTransferPoliciesByType = import_graphql_request7.gql`
+	query fetchTransferPoliciesByType($type: String!) {
+		transfer_policies_by_type(type: $type) {
+			id
+			is_origin_byte
+			rules
+			type
+		}
+	}
+`;
 
-// src/helpers/hasTransferPolicyRules.ts
-var hasTransferPolicyRules = async (nftType) => {
+// src/helpers/kiosk/getKioskTransferPolicies.ts
+var getKioskTransferPolicies = async (nftType) => {
   const nftTypeSplit = nftType?.split("::");
   if (nftTypeSplit?.[0])
     nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
-  const res = await kioskClient_default.getTransferPolicies({ type: nftTypeSplit?.join("::") });
-  return res?.some((policy) => policy?.rules?.length > 0);
+  const res = await gqlChainRequest({
+    chain: "sui",
+    query: fetchTransferPoliciesByType,
+    variables: { type: nftTypeSplit?.join("::") }
+  });
+  return res?.transfer_policies_by_type?.filter((policy) => !policy?.is_origin_byte);
+};
+
+// src/helpers/hasTransferPolicyRules.ts
+var hasTransferPolicyRules = async (nftType) => {
+  const transferPolicies = await getKioskTransferPolicies(nftType);
+  return transferPolicies?.some((policy) => policy?.rules?.length > 0);
 };
 
 // src/helpers/kiosk/getRulePackageId.ts
 var import_kiosk2 = require("@mysten/kiosk");
 
+// src/apiClients/kioskClient.ts
+var import_kiosk = require("@mysten/kiosk");
+var kioskClient = new import_kiosk.KioskClient({
+  // @ts-ignore
+  client: suiClient_default,
+  network: import_kiosk.Network.MAINNET
+});
+var kioskClient_default = kioskClient;
+
 // src/utils/addHexPrefix.ts
 function addHexPrefix(input) {
   if (input.startsWith("0x")) {
@@ -372,8 +395,8 @@ var isTradePortKioskBid = (bidType) => bidType === TRADEPORT_KIOSK_BID_NONCE_TYP
 var import_kiosk3 = require("@mysten/kiosk");
 
 // src/graphql/queries/fetchKiosksByOwner.ts
-var import_graphql_request7 = require("graphql-request");
-var fetchKiosksByOwner = import_graphql_request7.gql`
+var import_graphql_request8 = require("graphql-request");
+var fetchKiosksByOwner = import_graphql_request8.gql`
 	query fetchKiosksByOwner($ownerAddress: String!) {
 		kiosks: kiosks_by_owner_address(owner_address: $ownerAddress) {
 			id
@@ -386,8 +409,8 @@ var fetchKiosksByOwner = import_graphql_request7.gql`
 `;
 
 // src/graphql/queries/fetchOwnerCapByKiosk.ts
-var import_graphql_request8 = require("graphql-request");
-var fetchOwnerCapByKiosk = import_graphql_request8.gql`
+var import_graphql_request9 = require("graphql-request");
+var fetchOwnerCapByKiosk = import_graphql_request9.gql`
 	query fetchOwnerCapByKiosk($kioskId: String!) {
 		ownerCap: kiosk_owner_cap_by_kiosk(kiosk_id: $kioskId) {
 			id
@@ -397,8 +420,8 @@ var fetchOwnerCapByKiosk = import_graphql_request8.gql`
 `;
 
 // src/graphql/queries/fetchPersonalCapByKiosk.ts
-var import_graphql_request9 = require("graphql-request");
-var fetchPersonalCapByKiosk = import_graphql_request9.gql`
+var import_graphql_request10 = require("graphql-request");
+var fetchPersonalCapByKiosk = import_graphql_request10.gql`
 	query fetchPersonalCapByKiosk($kioskId: String!) {
 		personalCap: personal_kiosk_cap_by_kiosk(kiosk_id: $kioskId) {
 			id
@@ -515,8 +538,8 @@ var createOBKiosk = async ({ txBlock, createMethod = "new" }) => {
 };
 
 // src/helpers/originByte/getOBKiosk.ts
-var import_graphql_request10 = require("graphql-request");
-var fetchAccountKiosks = import_graphql_request10.gql`
+var import_graphql_request11 = require("graphql-request");
+var fetchAccountKiosks = import_graphql_request11.gql`
 	query fetchAccountKiosks($accountAddress: String!) {
 		kiosks: kiosks_by_owner_address(owner_address: $accountAddress) {
 			id
@@ -1544,8 +1567,8 @@ var acceptCollectionBid = async ({
 var import_transactions2 = require("@mysten/sui.js/transactions");
 
 // src/graphql/queries/fetchBidsById.ts
-var import_graphql_request11 = require("graphql-request");
-var fetchBidsById = import_graphql_request11.gql`
+var import_graphql_request12 = require("graphql-request");
+var fetchBidsById = import_graphql_request12.gql`
 	query fetchBidsById($bidIds: [uuid!]) {
 		bids(where: { id: { _in: $bidIds } }) {
 			nonce
@@ -1633,8 +1656,8 @@ var acceptNftBids = async ({ bidIds }) => {
 var import_transactions3 = require("@mysten/sui.js/transactions");
 
 // src/graphql/queries/fetchListingsById.ts
-var import_graphql_request12 = require("graphql-request");
-var fetchListingsById = import_graphql_request12.gql`
+var import_graphql_request13 = require("graphql-request");
+var fetchListingsById = import_graphql_request13.gql`
 	query fetchListingsById($listingIds: [uuid!]) {
 		listings(where: { id: { _in: $listingIds } }) {
 			seller
@@ -1669,8 +1692,8 @@ var addThirdPartyTxFee = async (txBlock, price) => {
 };
 
 // src/graphql/queries/fetchCommissionByListingId.ts
-var import_graphql_request13 = require("graphql-request");
-var fetchCommissionByNftContractId = import_graphql_request13.gql`
+var import_graphql_request14 = require("graphql-request");
+var fetchCommissionByNftContractId = import_graphql_request14.gql`
 	query fetchCommissionByNftContractId($nftContractId: uuid!) {
 		commissions(where: { contract_id: { _eq: $nftContractId } }) {
 			is_custodial
@@ -2699,8 +2722,8 @@ var listNfts = async ({ nfts, walletAddress }) => {
 var import_transactions6 = require("@mysten/sui.js/transactions");
 
 // src/graphql/queries/fetchCollectionsById.ts
-var import_graphql_request14 = require("graphql-request");
-var fetchCollectionsById = import_graphql_request14.gql`
+var import_graphql_request15 = require("graphql-request");
+var fetchCollectionsById = import_graphql_request15.gql`
 	query fetchCollectionsById($collectionIds: [uuid!]) {
 		collections(where: { id: { _in: $collectionIds } }) {
 			id
@@ -2710,7 +2733,7 @@ var fetchCollectionsById = import_graphql_request14.gql`
 		}
 	}
 `;
-var fetchCollectionsByIdWithOneNft = import_graphql_request14.gql`
+var fetchCollectionsByIdWithOneNft = import_graphql_request15.gql`
 	query fetchCollectionsByIdWithOneNft($collectionIds: [uuid!]) {
 		collections(where: { id: { _in: $collectionIds } }) {
 			id
@@ -2745,12 +2768,9 @@ var getTradeportBiddingContractBidAmount = ({ bidAmount, collectionId }) => {
 
 // src/helpers/hasRoyaltyRule.ts
 var hasRoyaltyRule = async (nftType) => {
-  const nftTypeSplit = nftType?.split("::");
-  if (nftTypeSplit?.[0])
-    nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
-  const res = await kioskClient_default.getTransferPolicies({ type: nftTypeSplit?.join("::") });
-  return res?.some(
-    (policy) => policy?.rules?.filter((rule) => rule?.includes("royalty_rule"))?.length > 0
+  const transferPolicies = await getKioskTransferPolicies(nftType);
+  return transferPolicies?.some(
+    (policy) => policy?.rules?.filter((rule) => rule?.type?.includes("royalty_rule"))?.length > 0
   );
 };
 
@@ -2783,36 +2803,48 @@ function addTradePortKioskCollectionBidTx({
   nftType,
   bidAmount,
   sharedObjects,
-  bidder,
   royaltyRulePackageId,
   royaltyRuleModule
 }) {
   const { transferPolicy } = sharedObjects;
-  const marketFeePrice = getMarketFeePrice({ price: bidAmount, collectionId });
-  const fee = txBlock.moveCall({
-    target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
-    arguments: [txBlock.object(transferPolicy), txBlock.pure(bidAmount)],
-    typeArguments: [nftType]
-  });
-  const [coin1, coin2] = splitCoins({
-    txBlock,
-    amounts: [txBlock.pure(bidAmount + marketFeePrice), txBlock.object(fee)]
-  });
-  if (!coin1 || !coin2)
-    throw new Error("Coin could not be split");
-  txBlock.mergeCoins(txBlock.object(coin1), [txBlock.object(coin2)]);
+  const marketFeePrice = getMarketFeePrice({
+    price: bidAmount,
+    collectionId
+  });
+  let coin;
+  if (royaltyRulePackageId && royaltyRuleModule) {
+    const fee = txBlock.moveCall({
+      target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
+      arguments: [txBlock.object(transferPolicy), txBlock.pure(bidAmount)],
+      typeArguments: [nftType]
+    });
+    const [coin1, coin2] = splitCoins({
+      txBlock,
+      amounts: [txBlock.pure(bidAmount + marketFeePrice), txBlock.object(fee)]
+    });
+    coin = coin1;
+    if (!coin1 || !coin2)
+      throw new Error("Coin could not be split");
+    txBlock.mergeCoins(txBlock.object(coin1), [txBlock.object(coin2)]);
+  } else {
+    const [coin1] = splitCoins({
+      txBlock,
+      amounts: [txBlock.pure(bidAmount + marketFeePrice)]
+    });
+    coin = coin1;
+  }
   txBlock.moveCall({
     target: "0x33a9e4a3089d911c2a2bf16157a1d6a4a8cbd9a2106a98ecbaefe6ed370d7a25::kiosk_biddings::collection_bid",
     arguments: [
       txBlock.object(TRADEPORT_KIOSK_BIDDING_STORE),
       txBlock.pure(bidAmount),
-      txBlock.object(coin1),
+      txBlock.object(coin),
       txBlock.pure(marketFeePrice),
       txBlock.pure(TRADEPORT_BENEFICIARY_ADDRESS)
     ],
     typeArguments: [nftType]
   });
-  destroyZeroCoin({ txBlock, coin: coin1 });
+  destroyZeroCoin({ txBlock, coin });
 }
 async function addOriginByteCollectionBidTx({
   txBlock,
@@ -3315,8 +3347,8 @@ var removeNftBids = async ({ bidIds }) => {
 var import_transactions10 = require("@mysten/sui.js/transactions");
 
 // src/graphql/queries/fetchCryptoToUsdRate.ts
-var import_graphql_request15 = require("graphql-request");
-var fetchCryptoToUsdRate = import_graphql_request15.gql`
+var import_graphql_request16 = require("graphql-request");
+var fetchCryptoToUsdRate = import_graphql_request16.gql`
 	query fetchCryptoToUsdRate($crypto: String!) {
 		crypto_rates(where: { crypto: { _eq: $crypto }, fiat: { _eq: "USD" } }) {
 			crypto
@@ -3354,8 +3386,8 @@ var addOneDollarFee = async (txBlock) => {
 };
 
 // src/graphql/queries/fetchAccountKiosks.ts
-var import_graphql_request16 = require("graphql-request");
-var fetchAccountKiosks2 = import_graphql_request16.gql`
+var import_graphql_request17 = require("graphql-request");
+var fetchAccountKiosks2 = import_graphql_request17.gql`
 	query fetchAccountKiosks($accountAddress: String!) {
 		kiosks: kiosks_by_owner_address(owner_address: $accountAddress) {
 			id