@tradeport/sui-trading-sdk 0.1.16 → 0.1.17

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.17
+
+### Patch Changes
+
+- New Price Locks Package
+
 ## 0.1.16
 
 ### Patch Changes

package/dist/index.d.mts

@@ -36,6 +36,7 @@ type BuyLocks = {
 type CancelLocks = {
     lockIds: string[];
     walletAddress: string;
+    tx?: Transaction;
 };
 
 type ClaimNfts = {

package/dist/index.d.ts

@@ -36,6 +36,7 @@ type BuyLocks = {
 type CancelLocks = {
     lockIds: string[];
     walletAddress: string;
+    tx?: Transaction;
 };
 
 type ClaimNfts = {

package/dist/index.js

@@ -200,8 +200,8 @@ var TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK = "0xa677dab85a93bd8d6845b6cc7914f3bb
 var TRADEPORT_KIOSK_BIDDING_STORE = "0x1e5e7f38e3a61d1d189506d0fc6b7e47e935a292d9e1b23c0f3f1c0f94227772";
 var TRADEPORT_KIOSK_BIDDING_ESCROW_KIOSK = "0x151fbe627d3f8de855f424c879ea2176d89282185a4b9226a7157172dd2919cc";
 var TRADEPORT_KIOSK_BID_NONCE_TYPE = "0xec175e537be9e48f75fa6929291de6454d2502f1091feb22c0d26a22821bbf28::kiosk_biddings::Bid";
-var TRADEPORT_PRICE_LOCK_PACKAGE = "0xac666014b3e3f5db17b833bdfd00dbb6403eeef3815c1ba0a9b88d52e973b176";
-var TRADEPORT_PRICE_LOCK_STORE = "0xad646fe4433a292383b20409e6301bf2014b46d32f4e4a7e0d405616a7b11575";
+var TRADEPORT_PRICE_LOCK_PACKAGE = "0x5a3fd22413e0340f27353cb2f1b693f1ec83587e979fd07a099ec9793aabbf14";
+var TRADEPORT_PRICE_LOCK_STORE = "0x56fa8d9303151c699c02931dc911c1974674355c5901d6ebf21ba18ee491586a";
 var COLLECTION_IDS_WITH_ZERO_COMMISSION = [
   ""
 ];
@@ -1801,8 +1801,8 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
   const tx = transaction ?? new import_transactions4.Transaction();
   for (const { id: lockId, bidId } of locks) {
     const lock = await getLockById(lockId);
-    if (!transaction && lock.state !== "locked") {
-      throw new Error("Lock must be in locked state");
+    if (!transaction && lock.state !== "bought") {
+      throw new Error("Lock must be in bought state");
     }
     const transferPolicy = (await getKioskTransferPolicies(lock.nft_type))?.at(0);
     if (!transferPolicy) {
@@ -1815,7 +1815,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
       kioskOwner: walletAddress,
       async runCommands(kioskTx) {
         if (!lock.nft?.token_id) {
-          throw new Error(`The long lock ${lockId} must have nft to be confirmed`);
+          throw new Error(`The long lock ${lockId} must have nft to be exercised`);
         }
         let bid = null;
         if (bidId) {
@@ -2476,25 +2476,32 @@ var buyListings = async ({ listingIds, walletAddress, tx: existingTx, kioskTx },
 
 // src/methods/cancelLocks/cancelLocks.ts
 var import_transactions7 = require("@mysten/sui/transactions");
-async function cancelLocks({ lockIds, walletAddress }) {
-  const tx = new import_transactions7.Transaction();
+var import_utils3 = require("@mysten/sui.js/utils");
+async function cancelLocks({
+  lockIds,
+  walletAddress,
+  tx: existingTx
+}) {
+  const tx = existingTx ?? new import_transactions7.Transaction();
   for (const lockId of lockIds) {
     const lock = await getLockById(lockId);
     if (!lock) {
       throw new Error(`Lock ${lockId} is not found`);
     }
-    if (!["active", "locked", "expired"].includes(lock.state)) {
-      throw new Error(`Lock ${lockId} is not in state active, locked or expired`);
+    if (!["active", "expired"].includes(lock.state)) {
+      throw new Error(`Lock ${lockId} is not in state active or expired`);
     }
     await kioskTxWrapper({
       tx,
       kioskOwner: walletAddress,
+      kiosk: lock?.chain_state?.makerKioskId,
       async runCommands(kioskTx) {
         tx.moveCall({
           target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::cancel_lock`,
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
+            tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk)
           ]
@@ -2755,6 +2762,29 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
 
 // src/methods/createLongLocks/createLongLocks.ts
 var import_transactions9 = require("@mysten/sui/transactions");
+
+// src/graphql/queries/fetchActiveLockStateByNftId.ts
+var import_graphql_request16 = require("graphql-request");
+var fetchActiveLockStateByNftId = import_graphql_request16.gql`
+	query fetchActiveLockStateByNftId($nftId: uuid!) {
+		locks(where: { state: { _nin: ["exercised", "canceled"] }, nft_meta_id: { _eq: $nftId } }) {
+			id
+			state
+		}
+	}
+`;
+
+// src/helpers/getActiveLockStateByNftId.ts
+var getActiveLockStateByNftId = async (nftId) => {
+  const res = await gqlChainRequest({
+    chain: "sui",
+    query: fetchActiveLockStateByNftId,
+    variables: { nftId }
+  });
+  return res?.locks?.[0] ?? void 0;
+};
+
+// src/methods/createLongLocks/createLongLocks.ts
 async function createLongLocks({
   walletAddress,
   nfts
@@ -2762,6 +2792,13 @@ async function createLongLocks({
   const expireIn = 7 * 24 * 3600 * 1e3;
   const tx = new import_transactions9.Transaction();
   for (const argNft of nfts) {
+    const existingLock = await getActiveLockStateByNftId(argNft.id);
+    if (existingLock) {
+      if (existingLock.state === "bought") {
+        throw new Error(`Nft ${argNft.id} is used by the lock ${existingLock.id}`);
+      }
+      await cancelLocks({ lockIds: [existingLock.id], walletAddress, tx });
+    }
     const premium = calculatePremium(BigInt(argNft.priceInMist));
     const nft = (await gqlChainRequest({
       chain: "sui",
@@ -2856,14 +2893,14 @@ async function createShortLocks({ nfts }) {
 }
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
-var import_utils3 = require("@mysten/sui.js/utils");
+var import_utils4 = require("@mysten/sui.js/utils");
 var import_transactions11 = require("@mysten/sui/transactions");
 async function exerciseShortLocks({ walletAddress, transaction, locks }, context) {
   const tx = transaction ?? new import_transactions11.Transaction();
   for (const { id: lockId, listingId, nftId: nftIdArg } of locks) {
     const lock = await getLockById(lockId);
-    if (!transaction && lock.state !== "locked") {
-      throw new Error("Lock must be in locked state");
+    if (!transaction && lock.state !== "bought") {
+      throw new Error("Lock must be in bought state");
     }
     const transferPolicy = (await getKioskTransferPolicies(lock.nft_type))?.at(0);
     if (!transferPolicy) {
@@ -2923,7 +2960,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.pure.u64(requiredCoins)
           ]
@@ -3269,8 +3306,8 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
 var import_transactions13 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchCollectionsById.ts
-var import_graphql_request16 = require("graphql-request");
-var fetchCollectionsById = import_graphql_request16.gql`
+var import_graphql_request17 = require("graphql-request");
+var fetchCollectionsById = import_graphql_request17.gql`
 	query fetchCollectionsById($collectionIds: [uuid!]) {
 		collections(where: { id: { _in: $collectionIds } }) {
 			id
@@ -3280,7 +3317,7 @@ var fetchCollectionsById = import_graphql_request16.gql`
 		}
 	}
 `;
-var fetchCollectionsByIdWithOneNft = import_graphql_request16.gql`
+var fetchCollectionsByIdWithOneNft = import_graphql_request17.gql`
 	query fetchCollectionsByIdWithOneNft($collectionIds: [uuid!]) {
 		collections(where: { id: { _in: $collectionIds } }) {
 			id
@@ -3297,7 +3334,7 @@ var fetchCollectionsByIdWithOneNft = import_graphql_request16.gql`
 		}
 	}
 `;
-var fetchCollectionsBySlug = import_graphql_request16.gql`
+var fetchCollectionsBySlug = import_graphql_request17.gql`
 	query fetchCollectionsBySlug($slug: String!) {
 		collections(where: { slug: { _eq: $slug } }) {
 			id
@@ -3918,8 +3955,8 @@ var removeNftBids = async ({ bidIds }, context) => {
 var import_transactions17 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchCryptoToUsdRate.ts
-var import_graphql_request17 = require("graphql-request");
-var fetchCryptoToUsdRate = import_graphql_request17.gql`
+var import_graphql_request18 = require("graphql-request");
+var fetchCryptoToUsdRate = import_graphql_request18.gql`
 	query fetchCryptoToUsdRate($crypto: String!) {
 		crypto_rates(where: { crypto: { _eq: $crypto }, fiat: { _eq: "USD" } }) {
 			crypto
@@ -3956,8 +3993,8 @@ var addOneDollarFee = async (tx) => {
 };
 
 // src/graphql/queries/fetchAccountKiosks.ts
-var import_graphql_request18 = require("graphql-request");
-var fetchAccountKiosks2 = import_graphql_request18.gql`
+var import_graphql_request19 = require("graphql-request");
+var fetchAccountKiosks2 = import_graphql_request19.gql`
 	query fetchAccountKiosks($accountAddress: String!) {
 		kiosks: kiosks_by_owner_address(owner_address: $accountAddress) {
 			id