@tradeport/sui-trading-sdk 0.1.35 → 0.1.36

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tradeport/sui-trading-sdk
 
+## 0.1.36
+
+### Patch Changes
+
+- 5b8c3ad: Fixed exercising longs
+
 ## 0.1.35
 
 ### Patch Changes

package/dist/index.d.mts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -893,6 +893,7 @@ function addTradeportAcceptNftBidTx({
 }
 async function addTradeportKioskAcceptNftBidTx({
   tx,
+  seller,
   sharedObjects,
   kioskTx,
   bidNonce,
@@ -900,35 +901,60 @@ async function addTradeportKioskAcceptNftBidTx({
   nftType,
   royaltyRulePackageId,
   royaltyRuleModule,
+  bidAmount,
   beforeResolveKioskTransferRequest
 }) {
   const { transferPolicy } = sharedObjects;
-  const [feeCoin, transferRequest] = tx.moveCall({
-    target: "0xf527efa4c02d079f15389fb596b04688cd5767948d953942e494ff455f11aa7b::kiosk_biddings::accept_bid_with_purchase_cap",
-    arguments: [
-      tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
-      tx.pure.address(bidNonce),
-      tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
-      tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
-      tx.pure.address(nftTokenId)
-    ],
-    typeArguments: [nftType]
-  });
-  tx.moveCall({
-    target: `${royaltyRulePackageId}::${royaltyRuleModule}::pay`,
-    typeArguments: [nftType],
-    arguments: [tx.object(transferPolicy), transferRequest, feeCoin]
-  });
-  await beforeResolveKioskTransferRequest?.(transferRequest);
-  await resolveTransferPolicies({
-    tx,
-    kioskTx,
-    nftType,
-    price: "0",
-    transferRequest,
-    shouldSkipKioskLocking: true,
-    shouldSkipResolvingRoyaltyRule: true
-  });
+  if (beforeResolveKioskTransferRequest) {
+    const [feeCoin, transferRequest] = tx.moveCall({
+      target: "0x6468e232af988cd8be608b1901863f0d7dbaa16764c1834daa39b023cb3b2fc8::kiosk_biddings::accept_bid_with_price_lock",
+      arguments: [
+        tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
+        tx.pure.address(bidNonce),
+        tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+        tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+        tx.pure.address(nftTokenId)
+      ],
+      typeArguments: [nftType]
+    });
+    await beforeResolveKioskTransferRequest?.(feeCoin, transferRequest);
+    await resolveTransferPolicies({
+      tx,
+      kioskTx,
+      nftType,
+      price: bidAmount?.toString(),
+      transferRequest,
+      coinToSplit: feeCoin,
+      shouldSkipKioskLocking: true
+    });
+    tx.transferObjects([tx.object(feeCoin)], tx.pure.address(addLeadingZerosAfter0x(seller)));
+  } else {
+    const [feeCoin, transferRequest] = tx.moveCall({
+      target: "0xf527efa4c02d079f15389fb596b04688cd5767948d953942e494ff455f11aa7b::kiosk_biddings::accept_bid_with_purchase_cap",
+      arguments: [
+        tx.object(TRADEPORT_KIOSK_BIDDING_STORE),
+        tx.pure.address(bidNonce),
+        tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
+        tx.object(kioskTx.kioskCap.value ?? kioskTx.kioskCap),
+        tx.pure.address(nftTokenId)
+      ],
+      typeArguments: [nftType]
+    });
+    tx.moveCall({
+      target: `${royaltyRulePackageId}::${royaltyRuleModule}::pay`,
+      typeArguments: [nftType],
+      arguments: [tx.object(transferPolicy), transferRequest, feeCoin]
+    });
+    await resolveTransferPolicies({
+      tx,
+      kioskTx,
+      nftType,
+      price: "0",
+      transferRequest,
+      shouldSkipKioskLocking: true,
+      shouldSkipResolvingRoyaltyRule: true
+    });
+  }
 }
 async function addOriginByteAcceptNftBidTx({
   tx,
@@ -1922,9 +1948,6 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             collectionId: lock.collection_id
           })
         );
-        const [makerRewardWithFee] = tx.splitCoins(tx.gas, [
-          BigInt(lock.maker_price) + marketplaceFee
-        ]);
         const [transferRequest, confirmLockRequest] = tx.moveCall({
           target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::start_confirm_long_lock`,
           typeArguments: [lock.nft_type],
@@ -1947,7 +1970,10 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           shouldSkipKioskLocking: true
         });
         if (bid) {
-          const beforeResolveKioskTransferRequest = (transferRequest2) => {
+          const beforeResolveKioskTransferRequest = (coin, transferRequest2) => {
+            const [makerRewardWithFee] = tx.splitCoins(coin, [
+              BigInt(lock.maker_price) + marketplaceFee
+            ]);
             tx.moveCall({
               target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::end_confirm_long_lock_with_bid`,
               typeArguments: [lock.nft_type],
@@ -1960,13 +1986,6 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             });
           };
           switch (bid.type) {
-            case "solo": {
-              await acceptNftBids(
-                { bidIds: [bidId], tx, kioskTx, beforeResolveKioskTransferRequest },
-                context
-              );
-              break;
-            }
             case "collection": {
               await acceptCollectionBid(
                 {
@@ -1986,6 +2005,9 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
             }
           }
         } else {
+          const [makerRewardWithFee] = tx.splitCoins(tx.gas, [
+            BigInt(lock.maker_price) + marketplaceFee
+          ]);
           const [transferRequest2] = tx.moveCall({
             target: `${TRADEPORT_PRICE_LOCK_PACKAGE}::tradeport_price_lock::end_confirm_long_lock`,
             typeArguments: [lock.nft_type],