@tradeport/sui-trading-sdk 0.1.108 → 0.2.0

package/CHANGELOG.md

@@ -1,46 +1,22 @@
 # @tradeport/sui-trading-sdk
 
-## 0.1.108
+## 0.2.0
 
-### Patch Changes
-
-- 88ab94f: Added error handling for listing nonces that are not found, and refactored the deleted bid nonce error handling
-
-## 0.1.107
-
-### Patch Changes
-
-- b6aeaa9: Fixed error handling message for deleted bid in one spot
-
-## 0.1.106
-
-### Patch Changes
-
-- ccc8281: Added error handling for sui object fetch
-- 33fb6c4: Fixed error handling for accepting deleted bids
-
-## 0.1.105
-
-### Patch Changes
-
-- c6cc55a: Updated transfer nfts validation for recipient address
-
-## 0.1.104
-
-### Patch Changes
+### Minor Changes
 
-- 63f48f8: Removed analytics-node dependency
+- 2c14d7d: Reverted parallel batching of txs because it doesnt work with Sui trying to access the same objects at same time
 
 ## 0.1.103
 
 ### Patch Changes
 
-- 61923bd: Reenabled only removing solo bids for the flagged Deloreans
+- 924b52c: Reverted parallel batching of txs because it doesnt work with Sui trying to access the same objects at same time
 
 ## 0.1.102
 
 ### Patch Changes
 
+- 032ffe5: Reverted parallel batching of txs because it doesnt work with Sui trying to access the same objects at same time
 - 03e03db: Disabled trading for 900 Delorean NFTs that were flagged
 
 ## 0.1.100

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { Transaction } from '@mysten/sui/transactions';
-import { GraphQLClient } from 'graphql-request';
 import { KioskTransaction } from '@mysten/kiosk';
+import { GraphQLClient } from 'graphql-request';
 
 type AcceptCollectionBid = {
     bidId: string;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Transaction } from '@mysten/sui/transactions';
-import { GraphQLClient } from 'graphql-request';
 import { KioskTransaction } from '@mysten/kiosk';
+import { GraphQLClient } from 'graphql-request';
 
 type AcceptCollectionBid = {
     bidId: string;

package/dist/index.js

@@ -43,7 +43,7 @@ var createSuiClient_default = createSuiClient;
 
 // src/apiClients/graphqlClient.ts
 var import_graphql_request = require("graphql-request");
-var graphqlClient = new import_graphql_request.GraphQLClient("https://api.indexer.xyz/graphql2");
+var graphqlClient = new import_graphql_request.GraphQLClient("https://api.indexer.xyz/graphql");
 var getGraphqlClient = () => graphqlClient;
 function setGraphqlClient(client) {
   graphqlClient = client;
@@ -1271,19 +1271,6 @@ var normalizedNftType = (nftType) => {
 // src/helpers/getRoyaltyRuleModule.ts
 var getRoyaltyRuleModule = (nftType) => normalizedNftType(nftType) === "0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard" ? "kiosk_royalty_rule" : "royalty_rule";
 
-// src/helpers/handleGetBidNonceTypeError.ts
-function handleGetBidNonceTypeError(error, bidNonce) {
-  if (error instanceof Error) {
-    if (error.message.includes("deleted")) {
-      throw new Error(`Bid ${bidNonce} already accepted`);
-    }
-    if (error.message.includes("notExists")) {
-      throw new Error(`Bid ${bidNonce} does not exist`);
-    }
-  }
-  throw error;
-}
-
 // src/graphql/queries/fetchTransferPoliciesByType.ts
 var import_graphql_request7 = require("graphql-request");
 var fetchTransferPoliciesByType = import_graphql_request7.gql`
@@ -1436,10 +1423,11 @@ var kioskTxWrapper = async ({
   kioskTx,
   kioskOwner,
   kiosk,
+  kioskOwnerKiosks,
   runCommands,
   shouldConvertToPersonalKiosk,
   shouldAssertNftInSharedKiosk,
-  shouldUseNftUnsharedKiosk,
+  shouldAllowNftUnsharedKiosk,
   kioskStrategy,
   failIfNoKiosk
 }) => {
@@ -1447,15 +1435,15 @@ var kioskTxWrapper = async ({
     await runCommands(kioskTx);
     return;
   }
-  let kiosks = (await gqlChainRequest({
+  let kiosks = kioskOwnerKiosks ?? ((await gqlChainRequest({
     chain: "sui",
     query: fetchKiosksByOwner,
     variables: { ownerAddress: addLeadingZerosAfter0x(kioskOwner) }
-  })).kiosks ?? [];
+  })).kiosks ?? []);
   if (shouldAssertNftInSharedKiosk) {
     await assertNftInSharedKiosk({ kioskId: kiosk, walletAddress: kioskOwner, kiosks });
   }
-  kiosks = kiosks?.filter((k) => !k.is_origin_byte && (shouldUseNftUnsharedKiosk || k.is_shared));
+  kiosks = kiosks?.filter((k) => !k.is_origin_byte && (shouldAllowNftUnsharedKiosk || k.is_shared));
   if (kiosk) {
     let filteredKiosks = [];
     switch (kioskStrategy ?? "include") {
@@ -1634,13 +1622,7 @@ var getObjectType = async ({
   objectId
 }) => {
   if ((0, import_utils.isValidSuiObjectId)(objectId)) {
-    const res = await suiClient.getObject({
-      id: objectId,
-      options: { showType: true }
-    });
-    if (res.error) {
-      throw new Error(`Error fetching Sui object: ${res.error.code}`);
-    }
+    const res = await suiClient.getObject({ id: objectId, options: { showType: true } });
     return res.data.type;
   }
   return "";
@@ -2196,12 +2178,7 @@ function addBluemoveAcceptNftBidTx({
   });
 }
 async function addTradePortAcceptNftBidTxHandler(txData) {
-  let bidType;
-  try {
-    bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
-  } catch (error) {
-    handleGetBidNonceTypeError(error, txData?.bidNonce);
-  }
+  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
   if (isOriginByteBid(bidType)) {
     if (isOriginByteTx(txData?.sharedObjects)) {
       await addOriginByteAcceptNftBidTx(txData);
@@ -2392,7 +2369,7 @@ async function addTradePortUnlistTxHandler(txData) {
       kioskClient: txData?.kioskClient,
       kioskOwner: txData?.seller,
       kiosk: txData?.sellerKiosk,
-      shouldUseNftUnsharedKiosk: true,
+      shouldAllowNftUnsharedKiosk: true,
       async runCommands(kioskTx) {
         await addTradePortKioskUnlistTx({
           ...txData,
@@ -2413,7 +2390,7 @@ async function addHyperspaceUnlistTxHandler(txData) {
     kioskClient: txData?.kioskClient,
     kioskOwner: txData?.seller,
     kiosk: txData?.sellerKiosk,
-    shouldUseNftUnsharedKiosk: true,
+    shouldAllowNftUnsharedKiosk: true,
     async runCommands(kioskTx) {
       await addHyperspaceKioskUnlistTx({
         ...txData,
@@ -2433,7 +2410,7 @@ async function addBluemoveUnlistTxHandler(txData) {
       kioskClient: txData?.kioskClient,
       kioskOwner: txData?.seller,
       kiosk: txData?.sellerKiosk,
-      shouldUseNftUnsharedKiosk: true,
+      shouldAllowNftUnsharedKiosk: true,
       async runCommands(kioskTx) {
         await addBluemoveKioskUnlistTx({
           ...txData,
@@ -2631,12 +2608,7 @@ function addTocenAcceptCollectionBidTx({
   });
 }
 async function addTradePortAcceptCollectionBidTxHandler(txData) {
-  let bidType;
-  try {
-    bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
-  } catch (error) {
-    handleGetBidNonceTypeError(error, txData?.bidNonce);
-  }
+  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
   if (isOriginByteBid(bidType)) {
     if (isOriginByteTx(txData?.sharedObjects)) {
       await addOriginByteAcceptCollectionBidTx(txData);
@@ -2692,12 +2664,7 @@ async function addTradePortAcceptCollectionBidTxHandler(txData) {
   addTradeportAcceptCollectionBidTx(txData);
 }
 async function addBluemoveAcceptCollectionBidTxHandler(txData) {
-  let bidType;
-  try {
-    bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
-  } catch (error) {
-    handleGetBidNonceTypeError(error, txData?.bidNonce);
-  }
+  const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
   if (isOriginByteBid(bidType)) {
     if (isOriginByteTx(txData?.sharedObjects)) {
       await addOriginByteAcceptCollectionBidTx(txData);
@@ -3367,19 +3334,6 @@ var destroyZeroCoin = ({ tx, coin }) => {
   });
 };
 
-// src/helpers/handleGetListingNonceError.ts
-function handleGetListingNonceTypeError(error, listingNonce) {
-  if (error instanceof Error) {
-    if (error.message.includes("deleted")) {
-      throw new Error(`Listing ${listingNonce} already bought`);
-    }
-    if (error.message.includes("notExists")) {
-      throw new Error(`Listing ${listingNonce} does not exist`);
-    }
-  }
-  throw error;
-}
-
 // src/helpers/splitCoins.ts
 var splitCoins = ({ tx, amounts }) => {
   const res = tx.splitCoins(tx.gas, amounts);
@@ -3435,7 +3389,7 @@ var addTradeportKioskBuyTx = async ({
     name: { type: "0x2::object::ID", value: nftTokenId }
   });
   if (response.error?.code === "dynamicFieldNotFound") {
-    throw new Error(`Token ${nftTokenId} is not listed. Kiosk listing object not found.`);
+    throw new Error(`Not found kiosk listing object of token ${nftTokenId}`);
   }
   const coin = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [
     tx.pure.u64(price + Number(response.data.content.fields.commission))
@@ -3732,18 +3686,18 @@ async function addTradePortBuyTxHandler(txData) {
     await addOriginByteBuyTx(txData);
     return;
   }
-  let listingNonceType;
-  try {
-    listingNonceType = await getObjectType({
-      suiClient: txData?.suiClient,
-      objectId: txData?.listingNonce
+  if (txData.listingNonce?.startsWith("0x")) {
+    const response = await txData?.suiClient.getObject({
+      id: txData.listingNonce,
+      options: { showType: true }
     });
-  } catch (error) {
-    handleGetListingNonceTypeError(error, txData?.listingNonce);
-  }
-  if (listingNonceType === NON_KIOSK_LISTING_NONCE_TYPE) {
-    addTradePortBuyTx(txData);
-    return;
+    if (response.error) {
+      throw new Error(response.error.code);
+    }
+    if (response.data.type === NON_KIOSK_LISTING_NONCE_TYPE) {
+      addTradePortBuyTx(txData);
+      return;
+    }
   }
   if (txData?.sellerKiosk) {
     return kioskTxWrapper({
@@ -4199,22 +4153,12 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
     if (!txData.senderKiosk || isSenderKioskOriginByte) {
       throw new Error("NFT is not inside a native kiosk, cannot cancel transfer");
     }
-    const res2 = await gqlChainRequest({
-      chain: "sui",
-      query: fetchKiosksByOwner,
-      variables: { ownerAddress: addLeadingZerosAfter0x(walletAddress) }
-    });
-    const kiosks = res2?.kiosks;
-    let shouldUseNftUnsharedKiosk = false;
-    if (kiosks?.filter((k) => k.id === txData?.senderKiosk)?.[0]?.is_shared === false) {
-      shouldUseNftUnsharedKiosk = true;
-    }
     await kioskTxWrapper({
       tx: txData?.tx,
       kioskClient: context.kioskClient,
       kioskOwner: txData?.senderAddress,
       kiosk: txData?.senderKiosk,
-      shouldUseNftUnsharedKiosk,
+      shouldAllowNftUnsharedKiosk: true,
       async runCommands(kioskTx) {
         await addTradeportKioskCancelNftTransferTx({ ...txData, kioskTx });
       }
@@ -4434,6 +4378,12 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
   }
   const nftsForTracking = [];
   const tx = existingTx ?? new import_transactions12.Transaction();
+  const kiosksByOwnerRes = await gqlChainRequest({
+    chain: "sui",
+    query: fetchKiosksByOwner,
+    variables: { ownerAddress: addLeadingZerosAfter0x(walletAddress) }
+  });
+  const walletAddressKiosks = kiosksByOwnerRes?.kiosks;
   for (const nft of res.nfts) {
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(nft?.token_id)) {
       throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
@@ -4449,8 +4399,8 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
       collectionChainState: nft?.collection?.chain_state,
       nft
     });
-    const sharedObjects = await getSharedObjects(nftType);
     if (nft?.chain_state?.claimable_trade_id) {
+      const sharedObjects = await getSharedObjects(nftType);
       const txData = {
         tx,
         kioskClient: context.kioskClient,
@@ -4470,38 +4420,22 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
         tx,
         suiClient: context.suiClient,
         kioskClient: context.kioskClient,
-        sharedObjects,
         claimer: walletAddress,
         nftType,
         nftTokenId: nft?.token_id,
         sellerKiosk: nft?.chain_state?.kiosk_id,
         seller: nft?.owner
       };
-      const res2 = await gqlChainRequest({
-        chain: "sui",
-        query: fetchKiosksByOwner,
-        variables: { ownerAddress: addLeadingZerosAfter0x(walletAddress) }
-      });
-      const kiosks = res2?.kiosks;
-      let shouldUseNftUnsharedKiosk = false;
-      if (kiosks?.filter((k) => k.id === txData?.sellerKiosk)?.[0]?.is_shared === false) {
-        shouldUseNftUnsharedKiosk = true;
-      }
       if (BLUEMOVE_CLAIMABLE_CONTRACT_KEYS?.includes(nft?.chain_state?.claimable_contract_key)) {
         await kioskTxWrapper({
           tx,
           kioskClient: context.kioskClient,
           kioskOwner: txData?.claimer,
+          kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
           shouldConvertToPersonalKiosk: true,
-          shouldUseNftUnsharedKiosk,
+          shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
-            if (!shouldUseNftUnsharedKiosk) {
-              await assertNftInSharedKiosk({
-                kioskId: txData?.sellerKiosk,
-                walletAddress: txData?.seller
-              });
-            }
             await addBluemoveClaimAcceptedBidNft({
               ...txData,
               suiClient: context.suiClient,
@@ -4516,16 +4450,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           tx,
           kioskClient: context.kioskClient,
           kioskOwner: txData?.claimer,
+          kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
           shouldConvertToPersonalKiosk: true,
-          shouldUseNftUnsharedKiosk,
+          shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
-            if (!shouldUseNftUnsharedKiosk) {
-              await assertNftInSharedKiosk({
-                kioskId: txData?.sellerKiosk,
-                walletAddress: txData?.seller
-              });
-            }
             await addClaimAcceptedBidNftTx({ ...txData, kioskTx });
           }
         });
@@ -4534,16 +4463,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           tx,
           kioskClient: context.kioskClient,
           kioskOwner: txData?.claimer,
+          kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
           shouldConvertToPersonalKiosk: true,
-          shouldUseNftUnsharedKiosk,
+          shouldAssertNftInSharedKiosk: true,
           async runCommands(kioskTx) {
-            if (!shouldUseNftUnsharedKiosk) {
-              await assertNftInSharedKiosk({
-                kioskId: txData?.sellerKiosk,
-                walletAddress: txData?.seller
-              });
-            }
             await addClaimAcceptedBidNftWithPurchaseCapTx({ ...txData, kioskTx });
           }
         });
@@ -4555,39 +4479,23 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
         tx,
         suiClient: context.suiClient,
         kioskClient: context.kioskClient,
-        sharedObjects,
         claimer: walletAddress,
         nftType,
         nftTokenId: nft?.token_id,
         sellerKiosk: nft?.chain_state?.kiosk_id,
         seller: nft?.owner
       };
-      const res2 = await gqlChainRequest({
-        chain: "sui",
-        query: fetchKiosksByOwner,
-        variables: { ownerAddress: addLeadingZerosAfter0x(walletAddress) }
-      });
-      const kiosks = res2?.kiosks;
-      let shouldUseNftUnsharedKiosk = false;
-      if (kiosks?.filter((k) => k.id === txData?.sellerKiosk)?.[0]?.is_shared === false) {
-        shouldUseNftUnsharedKiosk = true;
-      }
       if (useOldClaim) {
         await kioskTxWrapper({
           tx,
           kioskClient: context.kioskClient,
           kioskOwner: txData?.claimer,
           kiosk: txData?.sellerKiosk,
+          kioskOwnerKiosks: walletAddressKiosks,
           kioskStrategy: "exclude",
           shouldConvertToPersonalKiosk: true,
-          shouldUseNftUnsharedKiosk,
+          shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
-            if (!shouldUseNftUnsharedKiosk) {
-              await assertNftInSharedKiosk({
-                kioskId: txData?.sellerKiosk,
-                walletAddress: txData?.seller
-              });
-            }
             await addClaimTransferredNftTx({ ...txData, kioskTx });
           }
         });
@@ -4597,26 +4505,16 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kioskClient: context.kioskClient,
           kioskOwner: txData?.claimer,
           kiosk: txData?.sellerKiosk,
+          kioskOwnerKiosks: walletAddressKiosks,
           kioskStrategy: "exclude",
           shouldConvertToPersonalKiosk: true,
-          shouldUseNftUnsharedKiosk,
+          shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
-            if (!shouldUseNftUnsharedKiosk) {
-              await assertNftInSharedKiosk({
-                kioskId: txData?.sellerKiosk,
-                walletAddress: txData?.seller
-              });
-            }
             await addClaimTransferredNftWithPurchaseCapTx({ ...txData, kioskTx });
           }
         });
       }
     }
-    nftsForTracking.push({
-      nftType,
-      claimer: walletAddress,
-      claimReason: nft?.chain_state?.claimable_reason
-    });
   }
   return import_transactions12.Transaction.from(tx);
 };
@@ -5265,7 +5163,7 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress }, context)
         kioskClient: context?.kioskClient,
         kioskOwner: walletAddress,
         kiosk: unsharedNativeKiosk,
-        shouldUseNftUnsharedKiosk: true,
+        shouldAllowNftUnsharedKiosk: true,
         async runCommands(kioskTx) {
           await addTradeportKioskTransferTx({
             tx,
@@ -6033,6 +5931,9 @@ var removeNftBids = async ({ bidIds }, context) => {
   const bidsForTracking = [];
   const tx = new import_transactions20.Transaction();
   for (const bid of res.bids) {
+    if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
+      throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
+    }
     const nftType = getNftType({
       collectionId: bid?.collection?.id,
       collectionChainState: bid?.collection?.chain_state,
@@ -6118,47 +6019,16 @@ var addOneDollarFee = async (tx) => {
   );
 };
 
-// src/utils/removeLeadingZerosAfter0x.ts
-var removeLeadingZerosAfter0x = (address) => {
-  if (!address.startsWith("0x")) return address;
-  if (!address) return null;
-  address = address?.toLowerCase();
-  if (address?.startsWith("0x")) {
-    address = address?.slice(2);
+// src/helpers/rpc/getAcountBalance.ts
+var getAccountBalance = async ({ suiClient, owner }) => {
+  try {
+    const res = await suiClient.getBalance({
+      owner: addLeadingZerosAfter0x(owner)
+    });
+    return Number(res?.totalBalance);
+  } catch (err) {
+    return 0;
   }
-  address = address?.replace(/^0+/, "");
-  return `0x${address}`;
-};
-
-// src/helpers/isValidHexAddressFormat.ts
-var hexRegex = /^[0-9a-fA-F]+$/;
-var reserved = [
-  "0x0",
-  "0x1",
-  "0x2",
-  "0x3",
-  "0x4",
-  "0x5",
-  "0x6",
-  "0x7",
-  "0x8",
-  "0x9",
-  "0xa",
-  "0xb",
-  "0xc",
-  "0xd",
-  "0xe",
-  "0xf",
-  "0x403",
-  "0xdee9"
-];
-var isValidHexAddressFormat = (address) => {
-  const cleaned = address.replace("0x", "").padStart(64, "0");
-  const isHex = hexRegex.test(cleaned);
-  const length = cleaned.length <= 64;
-  const isReserved = reserved.includes(removeLeadingZerosAfter0x(address));
-  const isEmpty = removeLeadingZerosAfter0x(address) === "0x" || !address.includes("0x");
-  return isHex && length && !isReserved && !isEmpty;
 };
 
 // src/methods/transferNfts/transferNfts.ts
@@ -6166,8 +6036,12 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
   if (addLeadingZerosAfter0x(recipientAddress) === addLeadingZerosAfter0x(walletAddress)) {
     throw new Error("Cannot transfer to self");
   }
-  if (!isValidHexAddressFormat(recipientAddress)) {
-    throw new Error("Invalid hexadecimal recipient address format.");
+  const recipientAddressBalance = await getAccountBalance({
+    suiClient: context.suiClient,
+    owner: recipientAddress
+  });
+  if (!recipientAddressBalance || !recipientAddress?.includes("0x") || recipientAddress?.length < 65) {
+    throw new Error("Invalid recipient address");
   }
   const res = await gqlChainRequest({
     chain: "sui",