@tradeport/sui-trading-sdk 0.4.2 → 0.4.4

package/.env.demo

@@ -1,4 +1,5 @@
 GRAPHQL_API_USER=
 GRAPHQL_API_KEY=
 SUI_WALLET_SECRET_KEY=
-SUI_WALLET_PUBLIC_KEY=
+SUI_WALLET_PUBLIC_KEY=
+SUI_RPC_URL=

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tradeport/sui-trading-sdk
 
+## 0.4.4
+
+### Patch Changes
+
+- 81db18f: Fix normalizing sui object for removing bids
+
 ## 0.4.2
 
 ### Patch Changes

package/dist/index.js

@@ -1505,10 +1505,7 @@ var kioskTxWrapper = async ({
         version: ""
       }
     });
-  } else if (shouldConvertToPersonalKiosk || kiosks.length === 0) {
-    kioskTx = new import_kiosk3.KioskTransaction({ transactionBlock: tx, kioskClient });
-    kioskTx.createPersonal(true);
-  } else {
+  } else if (kiosks.length > 0 && !shouldConvertToPersonalKiosk) {
     const kioskCapId = (await gqlChainRequest({
       chain: "sui",
       query: fetchOwnerCapByKiosk,
@@ -1525,9 +1522,11 @@ var kioskTxWrapper = async ({
         version: ""
       }
     });
+  } else {
+    kioskTx = new import_kiosk3.KioskTransaction({ transactionBlock: tx, kioskClient });
+    kioskTx.createPersonal(true);
   }
   await runCommands(kioskTx);
-  kioskTx.finalize();
 };
 
 // src/helpers/originByte/confirmOBTranfer.ts
@@ -1643,8 +1642,9 @@ var getObjectType = async ({
   suiClient,
   objectId
 }) => {
-  if ((0, import_utils.isValidSuiObjectId)(objectId)) {
-    const res = await suiClient.getObject({ id: objectId, options: { showType: true } });
+  const normalizedObjectId = objectId.startsWith("0x") ? addLeadingZerosAfter0x(objectId) : objectId;
+  if ((0, import_utils.isValidSuiObjectId)(normalizedObjectId)) {
+    const res = await suiClient.getObject({ id: normalizedObjectId, options: { showType: true } });
     return res.data.type;
   }
   return "";
@@ -4461,16 +4461,17 @@ var addClaimTransferredNftWithPurchaseCapTx = async ({
   kioskClient,
   nftTokenId,
   nftType,
-  sellerKiosk
+  sellerKiosk,
+  preloadedTransferPolicyId
 }) => {
-  const transferPolicyId = (await getKioskTransferPolicies(nftType))?.at(0)?.id;
+  const transferPolicyId = preloadedTransferPolicyId ?? (await getKioskTransferPolicies(nftType))?.at(0)?.id;
   const [transferRequest] = tx.moveCall({
     target: "0x49642273ca7db3d942f9fd810c93467974c40e73ea7f03e8e7a632f1222aca73::kiosk_transfers::claim_with_purchase_cap",
     arguments: [
       tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
       tx.object(sellerKiosk),
-      tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
-      tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+      kioskTx.kiosk,
+      kioskTx.kioskCap,
       tx.pure.address(nftTokenId),
       tx.object(transferPolicyId)
     ],
@@ -4542,7 +4543,9 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     variables: { ownerAddress: addLeadingZerosAfter0x(walletAddress) }
   });
   const walletAddressKiosks = kiosksByOwnerRes?.kiosks;
+  let globalKioskTx;
   for (const nft of res.nfts) {
+    let existingKioskTx;
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(nft?.token_id)) {
       throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
     }
@@ -4591,9 +4594,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kioskOwner: txData?.claimer,
           kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addBluemoveClaimAcceptedBidNft({
               ...txData,
               suiClient: context.suiClient,
@@ -4610,9 +4615,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kioskOwner: txData?.claimer,
           kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimAcceptedBidNftTx({ ...txData, kioskTx });
           }
         });
@@ -4623,9 +4630,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kioskOwner: txData?.claimer,
           kioskOwnerKiosks: walletAddressKiosks,
           kiosk: txData?.sellerKiosk,
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAssertNftInSharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimAcceptedBidNftWithPurchaseCapTx({ ...txData, kioskTx });
           }
         });
@@ -4651,9 +4660,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kiosk: txData?.sellerKiosk,
           kioskOwnerKiosks: walletAddressKiosks,
           kioskStrategy: "exclude",
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimTransferredNftTx({ ...txData, kioskTx });
           }
         });
@@ -4665,15 +4676,19 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
           kiosk: txData?.sellerKiosk,
           kioskOwnerKiosks: walletAddressKiosks,
           kioskStrategy: "exclude",
+          kioskTx: globalKioskTx,
           shouldConvertToPersonalKiosk: true,
           shouldAllowNftUnsharedKiosk: true,
           async runCommands(kioskTx) {
+            existingKioskTx = kioskTx;
             await addClaimTransferredNftWithPurchaseCapTx({ ...txData, kioskTx });
           }
         });
       }
     }
+    globalKioskTx = existingKioskTx;
   }
+  globalKioskTx?.finalize();
   return import_transactions13.Transaction.from(tx);
 };
 
@@ -5254,6 +5269,27 @@ var fetchNftsByKioskId = import_graphql_request19.gql`
 		}
 	}
 `;
+var fetchBulkNftsByKioskId = import_graphql_request19.gql`
+	query fetchNftsByKioskId($where: nfts_bool_exp) {
+		nfts(where: $where) {
+			id
+			name
+			token_id
+			properties
+			chain_state
+			collection_id
+			claimable_reason
+			owner
+			contract {
+				properties
+			}
+			collection {
+				id
+				chain_state
+			}
+		}
+	}
+`;
 
 // src/methods/transferNfts/addTransferNftTx.ts
 async function addOriginByteTransferNftTx({
@@ -5292,10 +5328,11 @@ async function addTradeportKioskTransferTx({
   kioskTx,
   nftTokenId,
   nftType,
-  recipientAddress
+  recipientAddress,
+  transferPolicy
 }) {
-  const transferPolicy = (await getKioskTransferPolicies(nftType))?.at(0);
-  const hasFloorPriceRule = transferPolicy?.rules?.some(
+  const existingTransferPolicy = transferPolicy ?? (await getKioskTransferPolicies(nftType))?.at(0);
+  const hasFloorPriceRule = existingTransferPolicy?.rules?.some(
     (rule) => rule.type === "floor_price_rule"
   );
   if (hasFloorPriceRule) {
@@ -5388,7 +5425,7 @@ function getTransferPolicyForDirectTransfer(collectionChainState) {
 }
 
 // src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts
-async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 5 }, context) {
+async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }, context) {
   const tx = new import_transactions19.Transaction();
   const res = await gqlChainRequest({
     chain: "sui",
@@ -5445,20 +5482,52 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 5 },
     }
   }
   const unsharedNativeKiosks = res?.kiosks?.filter((k) => !k.is_shared && !k.is_origin_byte)?.map((k) => k.id);
+  const allNfts = await gqlChainRequest({
+    chain: "sui",
+    query: fetchBulkNftsByKioskId,
+    variables: {
+      where: {
+        _or: unsharedNativeKiosks.map((nk) => ({
+          chain_state: { _contains: { kiosk_id: nk } }
+        }))
+      }
+    }
+  });
+  const formatted = {};
+  allNfts.nfts.forEach((e) => {
+    if (formatted[e.chain_state.kiosk_id]) {
+      formatted[e.chain_state.kiosk_id]?.push(e);
+    } else {
+      formatted[e.chain_state.kiosk_id] = [e];
+    }
+  });
+  const allNftTypes = allNfts.nfts.reduce((acc, curr) => {
+    const type = getNftType({
+      collectionId: curr?.collection?.id,
+      collectionChainState: curr?.collection?.chain_state,
+      nft: curr
+    });
+    if (!acc.includes(type)) acc.push(type);
+    return acc;
+  }, []);
+  const transferPolicies = await Promise.all(
+    allNftTypes.map(async (type) => getKioskTransferPolicies(type))
+  );
+  const mappedTrasferPolicies = {};
+  transferPolicies.forEach((tp) => {
+    mappedTrasferPolicies[tp.transfer_policies_by_type?.[0]?.type] = tp.transfer_policies_by_type;
+  });
+  let globalKioskTx;
   for (const unsharedNativeKiosk of unsharedNativeKiosks) {
     if (currentMigrationCount >= max) {
       continue;
     }
-    const res2 = await gqlChainRequest({
-      chain: "sui",
-      query: fetchNftsByKioskId,
-      variables: { jsonFilter: { kiosk_id: unsharedNativeKiosk } }
-    });
-    const nfts = res2?.nfts;
+    const nfts = formatted[unsharedNativeKiosk] ?? [];
     if (nfts?.length > 0) {
       currentMigrationCount++;
     }
     for (const nft of nfts) {
+      let existingKioskTx;
       if (nft?.claimable_reason === "offer-transfer") {
         continue;
       }
@@ -5483,7 +5552,8 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 5 },
             senderAddress: walletAddress,
             recipientAddress: walletAddress,
             nftTokenId,
-            nftType
+            nftType,
+            transferPolicy: mappedTrasferPolicies[nftType]?.[0]
           });
         }
       });
@@ -5493,8 +5563,10 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 5 },
         kioskOwner: walletAddress,
         kiosk: unsharedNativeKiosk,
         kioskStrategy: "exclude",
+        kioskTx: globalKioskTx,
         shouldConvertToPersonalKiosk: true,
         async runCommands(kioskTx) {
+          existingKioskTx = kioskTx;
           await addClaimTransferredNftWithPurchaseCapTx({
             tx,
             kioskTx,
@@ -5505,12 +5577,15 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 5 },
             nftTokenId,
             nftType,
             sellerKiosk: unsharedNativeKiosk,
-            seller: nft?.owner
+            seller: nft?.owner,
+            preloadedTransferPolicyId: mappedTrasferPolicies[nftType]?.[0]?.id
           });
         }
       });
+      globalKioskTx = existingKioskTx;
     }
   }
+  globalKioskTx?.finalize();
   return import_transactions19.Transaction.from(tx);
 }