@tradeport/sui-trading-sdk 0.1.26 → 0.1.28

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.28
+
+### Patch Changes
+
+- Fixed exercising short locks for a profit
+
+## 0.1.27
+
+### Patch Changes
+
+- Fixe buyAndExerciseShortLocks
+- abea54b: Fixed buyAndExerciseShortLocks
+
 ## 0.1.26
 
 ### Patch Changes

package/dist/index.d.mts

@@ -27,8 +27,7 @@ type BuyAndExerciseShortLocks = {
     walletAddress: string;
     locks: Array<{
         id: string;
-        listingId?: string;
-        nftId?: string;
+        nftId: string;
     }>;
     tx?: Transaction;
 };
@@ -38,6 +37,7 @@ type BuyListings = {
     walletAddress: string;
     tx?: Transaction;
     kioskTx?: KioskTransaction;
+    coinToSplit?: any;
     beforeResolveKioskTransferRequest?: (transferRequest: any) => void | Promise<void>;
 };
 

package/dist/index.d.ts

@@ -27,8 +27,7 @@ type BuyAndExerciseShortLocks = {
     walletAddress: string;
     locks: Array<{
         id: string;
-        listingId?: string;
-        nftId?: string;
+        nftId: string;
     }>;
     tx?: Transaction;
 };
@@ -38,6 +37,7 @@ type BuyListings = {
     walletAddress: string;
     tx?: Transaction;
     kioskTx?: KioskTransaction;
+    coinToSplit?: any;
     beforeResolveKioskTransferRequest?: (transferRequest: any) => void | Promise<void>;
 };
 

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 = "0x027c64473c0b9bc5364a22a08e7fc9af059151433b4e631c4baf25f540426977";
-var TRADEPORT_PRICE_LOCK_STORE = "0xaf60ed2cb8c671dcc27e5721371869f0ae9c508297a011716244b50ec12d02a1";
+var TRADEPORT_PRICE_LOCK_PACKAGE = "0xcf523cab6fdf00222ed1d9f20d926af79723b4c948afd7d9816336c30dbe7f2e";
+var TRADEPORT_PRICE_LOCK_STORE = "0x4b705de46a79b29276baf45009bc7d6f70cc0f1407f0c9e03cac5729c0c47946";
 var COLLECTION_IDS_WITH_ZERO_COMMISSION = [
   ""
 ];
@@ -688,7 +688,8 @@ function resolveRoyaltyRule({
   transferRequest,
   nftType,
   price,
-  priceObjectArgument
+  priceObjectArgument,
+  coinToSplit
 }) {
   const [amount] = tx.moveCall({
     target: `${packageId}::${moduleName}::fee_amount`,
@@ -698,7 +699,7 @@ function resolveRoyaltyRule({
       priceObjectArgument ? tx.object(priceObjectArgument) : tx.pure.u64(price || "0")
     ]
   });
-  const feeCoin = tx.splitCoins(tx.gas, [amount]);
+  const feeCoin = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [amount]);
   tx.moveCall({
     target: `${packageId}::${moduleName}::pay`,
     typeArguments: [nftType],
@@ -718,7 +719,9 @@ var resolveTransferPolicies = async ({
   price,
   priceObjectArgument,
   shouldSkipKioskLocking,
-  shouldSkipResolvingRoyaltyRule
+  shouldSkipResolvingRoyaltyRule,
+  coinToSplit,
+  beforeResolveKioskTransferRequest
 }) => {
   const transferPolicies = await kioskClient_default.getTransferPolicies({
     type: normalizedNftType(nftType)
@@ -769,7 +772,8 @@ var resolveTransferPolicies = async ({
             transferRequest: policy.transferRequest,
             nftType: policy.isCustom && policy.type ? policy.type : nftType,
             price,
-            priceObjectArgument
+            priceObjectArgument,
+            coinToSplit
           });
           break;
         case "kiosk_lock_rule":
@@ -808,15 +812,19 @@ var resolveTransferPolicies = async ({
           throw new Error(`No resolver for the following rule: ${rule}.`);
       }
     }
+  }
+  if (canTransferOutsideKiosk && kioskItem) {
+    kioskTx.place({ itemType: nftType, item: kioskItem });
+  }
+  console.log({ transferRequest });
+  await beforeResolveKioskTransferRequest?.(transferRequest);
+  for (const policy of policies) {
     tx.moveCall({
       target: "0x2::transfer_policy::confirm_request",
       arguments: [tx.object(policy.data.id), policy.transferRequest],
       typeArguments: [policy.isCustom && policy.type ? policy.type : nftType]
     });
   }
-  if (canTransferOutsideKiosk && kioskItem) {
-    kioskTx.place({ itemType: nftType, item: kioskItem });
-  }
 };
 
 // src/helpers/originByte/getOBBidderKiosk.ts
@@ -1694,6 +1702,17 @@ function calculatePremium(price) {
   return BigInt(price) * PREMIUM_NOMINATOR / 10000n;
 }
 
+// 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/graphql/queries/fetchLockById.ts
 var import_graphql_request13 = require("graphql-request");
 var fetchLockById = import_graphql_request13.gql`
@@ -1709,6 +1728,7 @@ var fetchLockById = import_graphql_request13.gql`
 			maker
 			chain_state
 			collection_id
+			expire_in
 			nft {
 				id
 				token_id
@@ -1727,37 +1747,6 @@ var getLockById = async (lockId) => {
   return res?.locks?.[0] ?? void 0;
 };
 
-// src/methods/buyLocks/buyLocks.ts
-async function buyLocks({ lockIds, transaction }) {
-  const tx = transaction ?? new import_transactions3.Transaction();
-  for (const lockId of lockIds) {
-    const lock = await getLockById(lockId);
-    if (!lock) {
-      throw new Error(`Lock ${lockId} is not found`);
-    }
-    if (lock.state !== "active") {
-      throw new Error(`Lock ${lockId} must be in active state`);
-    }
-    const premiumAmount = calculatePremium(lock.maker_price);
-    const [premium] = tx.splitCoins(tx.gas, [premiumAmount]);
-    tx.moveCall({
-      target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::buy_lock`,
-      typeArguments: [lock.nft_type],
-      arguments: [
-        tx.object(TRADEPORT_PRICE_LOCK_STORE),
-        tx.object(import_utils.SUI_CLOCK_OBJECT_ID),
-        tx.pure.id(lock.lock_id),
-        premium
-      ]
-    });
-  }
-  return tx;
-}
-
-// src/methods/exerciseLongLocks/exerciseLongLocks.ts
-var import_utils2 = require("@mysten/sui.js/utils");
-var import_transactions4 = require("@mysten/sui/transactions");
-
 // src/helpers/getMarketFeePrice.ts
 var getMASCMarketFeePrice = (price) => {
   if (price * (MASC_ROYALTY_DECIMAL_PERCENT + TRADEPORT_DEFAULT_FEE_DECIMAL_PERCENT) < 1) {
@@ -1808,7 +1797,51 @@ var getMarketFeePrice = ({ price, collectionId }) => {
   return parseInt(marketFeePrice?.toFixed(0), 10);
 };
 
+// src/methods/buyLocks/buyLocks.ts
+async function buyLocks({ lockIds, transaction }) {
+  const tx = transaction ?? new import_transactions3.Transaction();
+  for (const lockId of lockIds) {
+    const lock = await getLockById(lockId);
+    if (!lock) {
+      throw new Error(`Lock ${lockId} is not found`);
+    }
+    if (lock.state !== "active") {
+      throw new Error(`Lock ${lockId} must be in active state`);
+    }
+    const transferPolicy = (await getKioskTransferPolicies(lock.nft_type))?.at(0);
+    if (!transferPolicy) {
+      throw new Error(`Missing transfer policy for ${lock.nft_type}`);
+    }
+    const marketplaceFee = BigInt(
+      getMarketFeePrice({
+        price: Number(lock.maker_price),
+        collectionId: lock.collection_id
+      })
+    );
+    const royalty = calculateRoyaltyFee(transferPolicy.rules, BigInt(lock.maker_price));
+    const premiumAmount = calculatePremium(lock.maker_price);
+    const [premium] = tx.splitCoins(tx.gas, [premiumAmount]);
+    tx.moveCall({
+      target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::buy_lock`,
+      typeArguments: [lock.nft_type],
+      arguments: [
+        tx.object(TRADEPORT_PRICE_LOCK_STORE),
+        tx.object(import_utils.SUI_CLOCK_OBJECT_ID),
+        tx.pure.id(lock.lock_id),
+        tx.pure.u64(lock.maker_price),
+        tx.pure.u64(marketplaceFee),
+        tx.pure.u64(royalty),
+        tx.pure.u64(lock.expire_in),
+        premium
+      ]
+    });
+  }
+  return tx;
+}
+
 // src/methods/exerciseLongLocks/exerciseLongLocks.ts
+var import_utils2 = require("@mysten/sui.js/utils");
+var import_transactions4 = require("@mysten/sui/transactions");
 async function exerciseLongLocks({ walletAddress, transaction, locks }, context) {
   const tx = transaction ?? new import_transactions4.Transaction();
   for (const { id: lockId, bidId } of locks) {
@@ -1985,17 +2018,6 @@ var fetchListingsById = import_graphql_request14.gql`
 	}
 `;
 
-// 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/buyListings/buyListings.ts
 var import_transactions6 = require("@mysten/sui/transactions");
 
@@ -2088,11 +2110,14 @@ var addTradeportKioskBuyTx = async ({
   nftTokenId,
   price,
   sellerKiosk,
+  coinToSplit,
   collectionId,
   beforeResolveKioskTransferRequest
 }) => {
   const marketFeePrice = getMarketFeePrice({ price, collectionId });
-  const [coin] = splitCoins({ tx, amounts: [tx.pure.u64(price + marketFeePrice)] });
+  const coin = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [
+    tx.pure.u64(price + marketFeePrice)
+  ]);
   if (!coin)
     throw new Error("Coin could not be split");
   const [kioskItem, transferRequest, kioskPrice] = tx.moveCall({
@@ -2106,14 +2131,15 @@ var addTradeportKioskBuyTx = async ({
     ],
     typeArguments: [nftType]
   });
-  await beforeResolveKioskTransferRequest?.(transferRequest);
   await resolveTransferPolicies({
     tx,
     kioskTx,
     nftType,
     priceObjectArgument: kioskPrice,
     kioskItem,
-    transferRequest
+    transferRequest,
+    coinToSplit,
+    beforeResolveKioskTransferRequest
   });
   destroyZeroCoin({ tx, coin });
 };
@@ -2471,6 +2497,7 @@ var buyListings = async ({
   walletAddress,
   tx: existingTx,
   kioskTx,
+  coinToSplit,
   beforeResolveKioskTransferRequest
 }, context) => {
   const res = await gqlChainRequest({
@@ -2506,6 +2533,7 @@ var buyListings = async ({
       sellerKiosk: listing.nft?.chain_state?.kiosk_id,
       collectionId: listing?.nft?.collection_id,
       nftContractId: listing?.nft?.contract_id,
+      coinToSplit,
       beforeResolveKioskTransferRequest
     };
     switch (listing?.market_name) {
@@ -2620,22 +2648,35 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
       kioskOwner: walletAddress,
       kiosk: nftIdArg ? nft?.chain_state?.kiosk_id : null,
       async runCommands(kioskTx) {
-        let confirmLockRequest;
+        const [coin, confirmLockRequest] = 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_utils3.SUI_CLOCK_OBJECT_ID),
+            tx.pure.id(lock.lock_id)
+          ]
+        });
         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`,
+            tx.moveCall({
+              target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::end_confirm_short_lock_with_listing`,
               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.pure.u64(listing.price),
-                tx.pure.u64(calculateRoyaltyFee(transferPolicy.rules, BigInt(listing.price))),
-                transferRequest
+                tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
+                confirmLockRequest,
+                tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+                tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+                transferRequest,
+                tx.object(transferPolicy?.id),
+                tx.object(coin)
               ]
             });
-            confirmLockRequest = request;
+            tx.transferObjects(
+              [tx.object(coin)],
+              tx.pure.address(addLeadingZerosAfter0x(walletAddress))
+            );
           };
           await buyListings(
             {
@@ -2643,43 +2684,38 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
               walletAddress,
               tx,
               kioskTx,
+              coinToSplit: coin,
               beforeResolveKioskTransferRequest
             },
             context
           );
         } else {
-          const [buyListinTransferRequest, request] = tx.moveCall({
-            target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_short_lock`,
+          const [transferRequest] = 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(import_utils3.SUI_CLOCK_OBJECT_ID),
-              tx.pure.id(lock.lock_id),
-              tx.pure.id(nft.token_id),
-              tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk)
+              tx.object(TRADEPORT_KIOSK_TRANSFERS_STORE),
+              confirmLockRequest,
+              tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+              tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+              tx.pure.address(nft?.token_id)
             ]
           });
-          confirmLockRequest = request;
           await resolveTransferPolicies({
             tx,
             kioskTx,
             nftType: lock.nft_type,
             price: lock.maker_price.toString(),
-            transferRequest: buyListinTransferRequest,
-            shouldSkipKioskLocking: true
+            transferRequest,
+            shouldSkipKioskLocking: true,
+            coinToSplit: coin
           });
+          tx.transferObjects(
+            [tx.object(coin)],
+            tx.pure.address(addLeadingZerosAfter0x(walletAddress))
+          );
         }
-        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),
-            confirmLockRequest,
-            tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
-            tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap)
-          ]
-        });
       }
     });
   }