@tradeport/sui-trading-sdk 0.1.22 → 0.1.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.24
+
+### Patch Changes
+
+- b28ad7b: Fixed price locks
+
+## 0.1.23
+
+### Patch Changes
+
+- ce63fb8: Fixed price lock issues
+
 ## 0.1.22
 
 ### Patch Changes

package/dist/index.d.mts

@@ -11,6 +11,7 @@ type AcceptNftBids = {
     bidIds: string[];
     tx?: Transaction;
     kioskTx?: KioskTransaction;
+    beforeResolveKioskTransferRequest?: (transferRequest: any) => void | Promise<void>;
 };
 
 type BuyAndExerciseLongLocks = {
@@ -27,6 +28,7 @@ type BuyListings = {
     walletAddress: string;
     tx?: Transaction;
     kioskTx?: KioskTransaction;
+    beforeResolveKioskTransferRequest?: (transferRequest: any) => void | Promise<void>;
 };
 
 type BuyLocks = {

package/dist/index.d.ts

@@ -11,6 +11,7 @@ type AcceptNftBids = {
     bidIds: string[];
     tx?: Transaction;
     kioskTx?: KioskTransaction;
+    beforeResolveKioskTransferRequest?: (transferRequest: any) => void | Promise<void>;
 };
 
 type BuyAndExerciseLongLocks = {
@@ -27,6 +28,7 @@ type BuyListings = {
     walletAddress: string;
     tx?: Transaction;
     kioskTx?: KioskTransaction;
+    beforeResolveKioskTransferRequest?: (transferRequest: any) => void | Promise<void>;
 };
 
 type BuyLocks = {

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 = "0x5a3fd22413e0340f27353cb2f1b693f1ec83587e979fd07a099ec9793aabbf14";
-var TRADEPORT_PRICE_LOCK_STORE = "0x56fa8d9303151c699c02931dc911c1974674355c5901d6ebf21ba18ee491586a";
+var TRADEPORT_PRICE_LOCK_PACKAGE = "0x027c64473c0b9bc5364a22a08e7fc9af059151433b4e631c4baf25f540426977";
+var TRADEPORT_PRICE_LOCK_STORE = "0xaf60ed2cb8c671dcc27e5721371869f0ae9c508297a011716244b50ec12d02a1";
 var COLLECTION_IDS_WITH_ZERO_COMMISSION = [
   ""
 ];
@@ -243,7 +243,6 @@ var MASC_ROYALTY_DECIMAL_PERCENT = 0.085;
 var BASC_ROYALTY_DECIMAL_PERCENT = 0.055;
 var DSL_LEGACY_ROYALTY_DECIMAL_PERCENT = 0.05;
 var PREMIUM_NOMINATOR = 300n;
-var PREMIUM_FEE_NOMINATOR = 2500n;
 var ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK = [
   "0xc4fc5b341858ac6fff4859d8105e345b195847cd230e8538d61a2f319ae8093c::bluemove_launchpad::GOATsOfSui"
 ];
@@ -870,7 +869,8 @@ async function addTradeportKioskAcceptNftBidTx({
   nftTokenId,
   nftType,
   royaltyRulePackageId,
-  royaltyRuleModule
+  royaltyRuleModule,
+  beforeResolveKioskTransferRequest
 }) {
   const { transferPolicy } = sharedObjects;
   const [feeCoin, transferRequest] = tx.moveCall({
@@ -889,6 +889,7 @@ async function addTradeportKioskAcceptNftBidTx({
     typeArguments: [nftType],
     arguments: [tx.object(transferPolicy), transferRequest, feeCoin]
   });
+  await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
     kioskTx,
@@ -1501,7 +1502,14 @@ function addTocenAcceptCollectionBidTxHandler(txData) {
 
 // src/methods/acceptCollectionBid/acceptCollectionBid.ts
 var ERROR_UNLIST_FIRST = "Item must be unlisted first before you can accept a collection bid with it";
-var acceptCollectionBid = async ({ bid, nftId, walletAddress, tx: existingTx, kioskTx }, context) => {
+var acceptCollectionBid = async ({
+  bid,
+  nftId,
+  walletAddress,
+  tx: existingTx,
+  kioskTx,
+  beforeResolveKioskTransferRequest
+}, context) => {
   const nftRes = await gqlChainRequest({
     chain: "sui",
     query: fetchNftById,
@@ -1532,7 +1540,8 @@ var acceptCollectionBid = async ({ bid, nftId, walletAddress, tx: existingTx, ki
     sellerKiosk: nft?.chain_state?.kiosk_id,
     collectionId: nft?.collection_id,
     isListedOnBluemove: nft?.listings?.[0]?.market_name === "bluemove",
-    bidMarketName: bid?.market_contract?.name
+    bidMarketName: bid?.market_contract?.name,
+    beforeResolveKioskTransferRequest
   };
   switch (txData.bidMarketName) {
     case "tradeport":
@@ -1607,7 +1616,7 @@ var fetchBidsById = import_graphql_request12.gql`
 
 // src/methods/acceptNftBids/acceptNftBids.ts
 var ERROR_UNLIST_FIRST2 = "Item must be unlisted first before you can accept a solo bid on it";
-var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx }, context) => {
+var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx, beforeResolveKioskTransferRequest }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchBidsById,
@@ -1640,7 +1649,8 @@ var acceptNftBids = async ({ bidIds, tx: existingTx, kioskTx }, context) => {
       bidAmount: bid?.price,
       sellerKiosk: bid?.nft?.chain_state?.kiosk_id,
       isListedOnBluemove: bid?.nft?.listings?.[0]?.market_name === "bluemove",
-      bidMarketName: bid?.market_contract?.name
+      bidMarketName: bid?.market_contract?.name,
+      beforeResolveKioskTransferRequest
     };
     switch (txData.bidMarketName) {
       case "tradeport":
@@ -1683,9 +1693,6 @@ var import_transactions3 = require("@mysten/sui/transactions");
 function calculatePremium(price) {
   return BigInt(price) * PREMIUM_NOMINATOR / 10000n;
 }
-function calculatePremiumFee(premium) {
-  return BigInt(premium) * PREMIUM_FEE_NOMINATOR / 10000n;
-}
 
 // src/graphql/queries/fetchLockById.ts
 var import_graphql_request13 = require("graphql-request");
@@ -1732,8 +1739,7 @@ async function buyLocks({ lockIds, transaction }) {
       throw new Error(`Lock ${lockId} must be in active state`);
     }
     const premiumAmount = calculatePremium(lock.maker_price);
-    const premiumFee = calculatePremiumFee(premiumAmount);
-    const [premium] = tx.splitCoins(tx.gas, [premiumAmount + premiumFee]);
+    const [premium] = tx.splitCoins(tx.gas, [premiumAmount]);
     tx.moveCall({
       target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::buy_lock`,
       typeArguments: [lock.nft_type],
@@ -1850,11 +1856,11 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             collectionId: lock.collection_id
           })
         );
-        const [creatorRewardWithFee] = tx.splitCoins(tx.gas, [
+        const [makerRewardWithFee] = tx.splitCoins(tx.gas, [
           BigInt(lock.maker_price) + marketplaceFee
         ]);
-        const [transferRequest] = tx.moveCall({
-          target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::confirm_long_lock`,
+        const [transferRequest, confirmLockRequest] = tx.moveCall({
+          target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_long_lock`,
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
@@ -1863,9 +1869,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             tx.object(lock.chain_state.makerKioskId),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
             tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
-            tx.object(transferPolicyId),
-            tx.pure.u64(bid?.price ?? 0n),
-            creatorRewardWithFee
+            tx.object(transferPolicyId)
           ]
         });
         await resolveTransferPolicies({
@@ -1877,14 +1881,36 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           shouldSkipKioskLocking: true
         });
         if (bid) {
+          const beforeResolveKioskTransferRequest = (transferRequest2) => {
+            tx.moveCall({
+              target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::end_confirm_long_lock_with_bid`,
+              typeArguments: [lock.nft_type],
+              arguments: [
+                tx.object(TRADEPORT_PRICE_LOCK_STORE),
+                confirmLockRequest,
+                transferRequest2,
+                makerRewardWithFee
+              ]
+            });
+          };
           switch (bid.type) {
             case "solo": {
-              await acceptNftBids({ bidIds: [bidId], tx, kioskTx }, context);
+              await acceptNftBids(
+                { bidIds: [bidId], tx, kioskTx, beforeResolveKioskTransferRequest },
+                context
+              );
               break;
             }
             case "collection": {
               await acceptCollectionBid(
-                { bid, tx, nftId: lock.nft?.id, walletAddress, kioskTx },
+                {
+                  bid,
+                  tx,
+                  nftId: lock.nft?.id,
+                  walletAddress,
+                  kioskTx,
+                  beforeResolveKioskTransferRequest
+                },
                 context
               );
               break;
@@ -1893,6 +1919,25 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
               throw new Error(`Unsupported bid type ${bid.type}`);
             }
           }
+        } else {
+          const [transferRequest2] = tx.moveCall({
+            target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::end_confirm_long_lock`,
+            typeArguments: [lock.nft_type],
+            arguments: [
+              tx.object(TRADEPORT_PRICE_LOCK_STORE),
+              confirmLockRequest,
+              tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+              makerRewardWithFee
+            ]
+          });
+          await resolveTransferPolicies({
+            tx,
+            kioskTx,
+            nftType: lock.nft_type,
+            price: lock.maker_price.toString(),
+            transferRequest: transferRequest2,
+            shouldSkipKioskLocking: true
+          });
         }
       }
     });
@@ -2024,7 +2069,8 @@ var addTradeportKioskBuyTx = async ({
   nftType,
   nftTokenId,
   price,
-  sellerKiosk
+  sellerKiosk,
+  beforeResolveKioskTransferRequest
 }) => {
   const [coin] = splitCoins({ tx, amounts: [tx.pure.u64(price)] });
   if (!coin)
@@ -2040,6 +2086,7 @@ var addTradeportKioskBuyTx = async ({
     ],
     typeArguments: [nftType]
   });
+  await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
     kioskTx,
@@ -2091,7 +2138,8 @@ var addHyperspaceKioskBuyTx = async ({
   nftType,
   nftTokenId,
   price,
-  sellerKiosk
+  sellerKiosk,
+  beforeResolveKioskTransferRequest
 }) => {
   const [coin] = splitCoins({ tx, amounts: [tx.pure.u64(price)] });
   if (!coin)
@@ -2111,6 +2159,7 @@ var addHyperspaceKioskBuyTx = async ({
       transferRequest: hyperspaceMpTransferRequest
     }
   ];
+  await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
     kioskTx,
@@ -2145,7 +2194,8 @@ async function addBluemoveKioskBuyTx({
   nftTokenId,
   nftType,
   price,
-  sellerKiosk
+  sellerKiosk,
+  beforeResolveKioskTransferRequest
 }) {
   const { transferPolicy } = sharedObjects;
   const [coin1, coin2] = splitCoins({
@@ -2168,6 +2218,7 @@ async function addBluemoveKioskBuyTx({
     ],
     typeArguments: [nftType]
   });
+  await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
     kioskTx,
@@ -2395,7 +2446,13 @@ function addTocenBuyTxHandler(txData) {
 }
 
 // src/methods/buyListings/buyListings.ts
-var buyListings = async ({ listingIds, walletAddress, tx: existingTx, kioskTx }, context) => {
+var buyListings = async ({
+  listingIds,
+  walletAddress,
+  tx: existingTx,
+  kioskTx,
+  beforeResolveKioskTransferRequest
+}, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchListingsById,
@@ -2428,7 +2485,8 @@ var buyListings = async ({ listingIds, walletAddress, tx: existingTx, kioskTx },
       price: listing?.price,
       sellerKiosk: listing.nft?.chain_state?.kiosk_id,
       collectionId: listing?.nft?.collection_id,
-      nftContractId: listing?.nft?.contract_id
+      nftContractId: listing?.nft?.contract_id,
+      beforeResolveKioskTransferRequest
     };
     switch (listing?.market_name) {
       case "tradeport":
@@ -2798,6 +2856,17 @@ var getActiveLockStateByNftId = async (nftId) => {
   return res?.locks?.[0] ?? void 0;
 };
 
+// src/helpers/calculateRoyaltyFee.ts
+function calculateRoyaltyFee(transferPolicyRules, price) {
+  const royaltyRules = transferPolicyRules.filter(
+    (rule) => rule.type === "royalty_rule"
+  );
+  return royaltyRules.reduce(
+    (sum, rule) => sum + BigInt(rule.min_amount) + BigInt(rule.amount_bp) * price / 10000n,
+    0n
+  );
+}
+
 // src/methods/createLongLocks/createLongLocks.ts
 async function createLongLocks({
   walletAddress,
@@ -2820,6 +2889,11 @@ async function createLongLocks({
       variables: { nftId: argNft.id }
     }))?.nfts?.[0];
     const nftType = getNftTypeFromNft(nft);
+    const transferPolicy = (await getKioskTransferPolicies(nftType))?.at(0);
+    if (!transferPolicy) {
+      throw new Error(`Missing transfer policy for ${nftType}`);
+    }
+    const royalty = calculateRoyaltyFee(transferPolicy.rules, BigInt(argNft.priceInMist));
     await kioskTxWrapper({
       tx,
       kioskOwner: walletAddress,
@@ -2842,6 +2916,7 @@ async function createLongLocks({
                 })
               )
             ),
+            tx.pure.u64(royalty),
             tx.pure.u64(premium),
             tx.pure.u64(expireIn)
           ]
@@ -2854,19 +2929,6 @@ async function createLongLocks({
 
 // src/methods/createShortLocks/createShortLocks.ts
 var import_transactions10 = require("@mysten/sui/transactions");
-
-// src/helpers/calculateRoyaltyFee.ts
-function calculateRoyaltyFee(transferPolicyRules, price) {
-  const royaltyRules = transferPolicyRules.filter(
-    (rule) => rule.type === "royalty_rule"
-  );
-  return royaltyRules.reduce(
-    (sum, rule) => sum + BigInt(rule.min_amount) + BigInt(rule.amount_bp) * price / 10000n,
-    0n
-  );
-}
-
-// src/methods/createShortLocks/createShortLocks.ts
 async function createShortLocks({ nfts }) {
   const expireIn = 7 * 24 * 3600 * 1e3;
   const tx = new import_transactions10.Transaction();
@@ -2885,10 +2947,9 @@ async function createShortLocks({ nfts }) {
         collectionId: argNft.collectionId
       })
     );
-    const transferFees = calculateRoyaltyFee(transferPolicy.rules, 0n) + // transfer
-    calculateRoyaltyFee(transferPolicy.rules, BigInt(argNft.priceInMist));
+    const royalty = calculateRoyaltyFee(transferPolicy.rules, BigInt(argNft.priceInMist));
     const [deposit] = tx.splitCoins(tx.gas, [
-      BigInt(argNft.priceInMist) + marketplaceFee + transferFees
+      BigInt(argNft.priceInMist) + royalty + marketplaceFee
     ]);
     tx.moveCall({
       target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::create_short_lock`,
@@ -2897,6 +2958,7 @@ async function createShortLocks({ nfts }) {
         tx.object(TRADEPORT_PRICE_LOCK_STORE),
         tx.pure.u64(BigInt(argNft.priceInMist)),
         tx.pure.u64(marketplaceFee),
+        tx.pure.u64(royalty),
         tx.pure.u64(premium),
         tx.pure.u64(expireIn),
         deposit
@@ -2920,12 +2982,10 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
     if (!transferPolicy) {
       throw new Error(`Transfer policy is not found for ${lock.nft_type}`);
     }
-    const transferPolicyId = transferPolicy?.id;
     const sharedObjects = await getSharedObjects(lock.nft_type);
     if (lock.nft?.token_id) {
       throw new Error(`The short lock ${lockId} must not have any nft`);
     }
-    const requiredCoins = BigInt(lock.maker_price) + calculateRoyaltyFee(transferPolicy.rules, 0n);
     let listing = null;
     if (listingId) {
       const res = await gqlChainRequest({
@@ -2969,51 +3029,66 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
       kioskOwner: walletAddress,
       kiosk: nftIdArg ? nft?.chain_state?.kiosk_id : null,
       async runCommands(kioskTx) {
-        const [request] = tx.moveCall({
-          target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_short_lock`,
-          typeArguments: [lock.nft_type],
-          arguments: [
-            tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
-            tx.pure.id(lock.lock_id),
-            tx.pure.u64(requiredCoins)
-          ]
-        });
+        let confirmLockRequest;
         if (listing) {
+          const beforeResolveKioskTransferRequest = async (transferRequest) => {
+            const [request] = tx.moveCall({
+              target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_short_lock_with_buy_listing`,
+              typeArguments: [lock.nft_type],
+              arguments: [
+                tx.object(TRADEPORT_PRICE_LOCK_STORE),
+                tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
+                tx.pure.id(lock.lock_id),
+                tx.pure.u64(listing.price),
+                tx.pure.u64(calculateRoyaltyFee(transferPolicy.rules, BigInt(listing.price))),
+                transferRequest
+              ]
+            });
+            confirmLockRequest = request;
+          };
           await buyListings(
             {
               listingIds: [listingId],
               walletAddress,
               tx,
-              kioskTx
+              kioskTx,
+              beforeResolveKioskTransferRequest
             },
             context
           );
+        } else {
+          const [buyListinTransferRequest, request] = tx.moveCall({
+            target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_short_lock`,
+            typeArguments: [lock.nft_type],
+            arguments: [
+              tx.object(TRADEPORT_PRICE_LOCK_STORE),
+              tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
+              tx.pure.id(lock.lock_id),
+              tx.pure.id(nft.token_id),
+              tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk)
+            ]
+          });
+          confirmLockRequest = request;
+          await resolveTransferPolicies({
+            tx,
+            kioskTx,
+            nftType: lock.nft_type,
+            price: lock.maker_price.toString(),
+            transferRequest: buyListinTransferRequest,
+            shouldSkipKioskLocking: true
+          });
         }
-        const [transferRequest] = tx.moveCall({
+        tx.moveCall({
           target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::end_confirm_short_lock`,
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
             tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
-            request,
-            tx.pure.id(nft.token_id),
-            tx.object(TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK),
+            confirmLockRequest,
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
-            tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
-            tx.object(transferPolicyId),
-            tx.pure.u64(listing?.price ?? 0n)
+            tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap)
           ]
         });
-        await resolveTransferPolicies({
-          tx,
-          kioskTx,
-          nftType: lock.nft_type,
-          price: "0",
-          transferRequest,
-          kioskToLockRuleProve: TRADEPORT_KIOSK_TRANSFERS_ESCROW_KIOSK,
-          shouldSkipKioskLocking: true
-        });
       }
     });
   }