@tradeport/sui-trading-sdk 0.4.39 → 0.4.40

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,14 +17,22 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   SuiTradingClient: () => SuiTradingClient_default
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/SuiTradingClient.ts
 var import_client2 = require("@mysten/sui/client");
@@ -132,7 +142,7 @@ var fetchCollectionBidsAtSamePrice = import_graphql_request4.gql`
 `;
 
 // src/methods/acceptCollectionBid/acceptCollectionBid.ts
-var import_transactions2 = require("@mysten/sui/transactions");
+var import_transactions3 = require("@mysten/sui/transactions");
 
 // src/constants.ts
 var MYSTEN_TRANFER_POLICY_RULES_PACKAGE_ID = "0x434b5bd8f6a7b05fede0ff46c6e511d71ea326ed38056e3bcd681d2d7c2a7879";
@@ -1287,7 +1297,7 @@ var getSharedObjects = async (nftType) => {
 };
 
 // src/methods/acceptCollectionBid/addAcceptCollectionBIdTxs.ts
-var import_utils4 = require("@mysten/sui/utils");
+var import_utils5 = require("@mysten/sui/utils");
 
 // src/utils/normalizeNftType.ts
 var normalizedNftType = (nftType) => {
@@ -1540,7 +1550,7 @@ var kioskTxWrapper = async ({
       variables: { kioskId: personalKiosk.id }
     })).personalCap.id;
     kioskTx = new import_kiosk3.KioskTransaction({
-      transactionBlock: tx,
+      transaction: tx,
       kioskClient,
       cap: {
         isPersonal: true,
@@ -1557,7 +1567,7 @@ var kioskTxWrapper = async ({
       variables: { kioskId: kiosks[0].id }
     })).ownerCap?.id;
     kioskTx = new import_kiosk3.KioskTransaction({
-      transactionBlock: tx,
+      transaction: tx,
       kioskClient,
       cap: {
         isPersonal: false,
@@ -1568,7 +1578,7 @@ var kioskTxWrapper = async ({
       }
     });
   } else {
-    kioskTx = new import_kiosk3.KioskTransaction({ transactionBlock: tx, kioskClient });
+    kioskTx = new import_kiosk3.KioskTransaction({ transaction: tx, kioskClient });
     kioskTx.createPersonal(true);
   }
   if (shouldUseSharedKioskTx && sharedKioskState) {
@@ -1745,9 +1755,86 @@ function resolvePersonalKioskRule({ tx, packageId, nftType, kiosk, transferReque
   });
 }
 
+// src/helpers/swap/swap.ts
+var import_sdk = require("@flowx-finance/sdk");
+var import_transactions = require("@mysten/sui/transactions");
+var import_utils2 = require("@mysten/sui/utils");
+var import_ms = __toESM(require("ms"));
+var aggregatorQuoter = new import_sdk.AggregatorQuoter("mainnet");
+var suiCointType = "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI";
+async function createBuyTransaction(client, walletAddress, suiAmount, options) {
+  const transaction = options?.transaction ?? new import_transactions.Transaction();
+  transaction.setSender((0, import_utils2.normalizeSuiAddress)(walletAddress));
+  const {
+    coinType,
+    coinAmount = 0n,
+    slippage = 1,
+    ttl = "15m",
+    excludeSources = [import_sdk.Protocol.STEAMM]
+  } = options ?? {};
+  if (!coinType || (0, import_utils2.normalizeStructTag)(coinType) === suiCointType) {
+    const [coin] = transaction.splitCoins(transaction.gas, [suiAmount]);
+    return {
+      transaction,
+      suiCoin: coin
+    };
+  }
+  const { routes } = await aggregatorQuoter.getRoutes({
+    tokenIn: coinType,
+    tokenOut: suiCointType,
+    amountIn: coinAmount.toString(),
+    excludeSources
+  });
+  const tradeBuilder = new import_sdk.TradeBuilder("mainnet", routes);
+  const trade = tradeBuilder.sender((0, import_utils2.normalizeSuiAddress)(walletAddress)).slippage(slippage).deadline(Date.now() + (0, import_ms.default)(ttl)).build();
+  const swappedSuiCoin = await trade.swap({
+    client,
+    tx: transaction
+  });
+  if (!swappedSuiCoin) {
+    throw new Error("Swap did not return a valid SUI coin.");
+  }
+  return { transaction, suiCoin: swappedSuiCoin };
+}
+async function handleSwapSetup(client, walletAddress, transaction, swapAndPayOptions) {
+  if (!swapAndPayOptions?.coinType || !swapAndPayOptions?.coinAmount) {
+    return { transaction };
+  }
+  const { transaction: updatedTx, suiCoin } = await createBuyTransaction(
+    client,
+    walletAddress,
+    BigInt(swapAndPayOptions.coinAmount),
+    {
+      transaction,
+      coinType: swapAndPayOptions.coinType,
+      coinAmount: BigInt(swapAndPayOptions.coinAmount),
+      slippage: swapAndPayOptions.slippage,
+      ttl: swapAndPayOptions.ttl,
+      excludeSources: swapAndPayOptions.excludeSources
+    }
+  );
+  return {
+    transaction: updatedTx,
+    swapResultCoin: suiCoin
+  };
+}
+function handleSwapCleanup(transaction, swapResultCoin, walletAddress) {
+  if (swapResultCoin) {
+    transaction.transferObjects([swapResultCoin], walletAddress);
+  }
+}
+function mergeSwapCoinWithSuiBalance(transaction, coinToMergeInto, amountToSplitFromGas) {
+  if (coinToMergeInto && amountToSplitFromGas && amountToSplitFromGas > 0n) {
+    const [coinFromSuiBalance] = transaction.splitCoins(transaction.gas, [
+      transaction.pure.u64(amountToSplitFromGas)
+    ]);
+    transaction.mergeCoins(coinToMergeInto, [coinFromSuiBalance]);
+  }
+}
+
 // src/helpers/kiosk/getKioskCollectionRoyaltyFeeAmount.ts
 var import_bcs = require("@mysten/sui/bcs");
-var import_transactions = require("@mysten/sui/transactions");
+var import_transactions2 = require("@mysten/sui/transactions");
 async function getKioskCollectionRoyaltyFeeAmount({
   tx,
   suiClient,
@@ -1766,7 +1853,7 @@ async function getKioskCollectionRoyaltyFeeAmount({
     console.warn("Price is undefined or 0");
     return void 0;
   }
-  const feeTx = new import_transactions.Transaction();
+  const feeTx = new import_transactions2.Transaction();
   feeTx.moveCall({
     target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
     arguments: [feeTx.object(transferPolicyId), feeTx.pure.u64(price)],
@@ -1805,7 +1892,8 @@ async function resolveRoyaltyRule({
   nftType,
   price,
   coinToSplit,
-  royaltyFeeAmount
+  royaltyFeeAmount,
+  amountToSplitFromSuiBalance
 }) {
   let feeAmount = royaltyFeeAmount;
   if (!feeAmount) {
@@ -1820,6 +1908,7 @@ async function resolveRoyaltyRule({
       nftType
     });
   }
+  mergeSwapCoinWithSuiBalance(tx, coinToSplit, amountToSplitFromSuiBalance);
   const feeCoin = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [feeAmount]);
   tx.moveCall({
     target: `${packageId}::${moduleName}::pay`,
@@ -1847,7 +1936,8 @@ var resolveTransferPolicies = async ({
   coinToSplit,
   beforeResolveKioskTransferRequest,
   transferPoliciesToResolve,
-  royaltyFeeAmount
+  royaltyFeeAmount,
+  amountToSplitFromSuiBalance
 }) => {
   const policies = transferPoliciesToResolve ?? await getTransferPoliciesToResolve({
     transferPolicies,
@@ -1897,7 +1987,8 @@ var resolveTransferPolicies = async ({
             nftType: policy.isCustom && policy.type ? policy.type : nftType,
             price,
             coinToSplit,
-            royaltyFeeAmount
+            royaltyFeeAmount,
+            amountToSplitFromSuiBalance
           });
           break;
         case "floor_price_rule":
@@ -1948,8 +2039,12 @@ var takeLockedNftFromKiosk = async ({
   const [purchase_cap] = tx.moveCall({
     target: "0x2::kiosk::list_with_purchase_cap",
     arguments: [
-      tx.object("value" in kioskTx.kiosk ? kioskTx.kiosk.value : kioskTx.kiosk),
-      tx.object("value" in kioskTx.kioskCap ? kioskTx.kioskCap.value : kioskTx.kioskCap),
+      tx.object(
+        "value" in kioskTx.kiosk ? kioskTx.kiosk.value : kioskTx.kiosk
+      ),
+      tx.object(
+        "value" in kioskTx.kioskCap ? kioskTx.kioskCap.value : kioskTx.kioskCap
+      ),
       tx.pure.address(nftTokenId),
       tx.pure.u64(0)
     ],
@@ -1963,7 +2058,9 @@ var takeLockedNftFromKiosk = async ({
   const [nft, transferRequest] = tx.moveCall({
     target: "0x2::kiosk::purchase_with_cap",
     arguments: [
-      tx.object("value" in kioskTx.kiosk ? kioskTx.kiosk.value : kioskTx.kiosk),
+      tx.object(
+        "value" in kioskTx.kiosk ? kioskTx.kiosk.value : kioskTx.kiosk
+      ),
       purchase_cap,
       zeroCoin
     ],
@@ -2140,13 +2237,13 @@ var shareOriginByteKiosk = ({ tx, kiosk }) => {
 };
 
 // src/helpers/rpc/getObjectType.ts
-var import_utils2 = require("@mysten/sui/utils");
+var import_utils3 = require("@mysten/sui/utils");
 var getObjectType = async ({
   suiClient,
   objectId
 }) => {
   const normalizedObjectId = objectId.startsWith("0x") ? addLeadingZerosAfter0x(objectId) : objectId;
-  if ((0, import_utils2.isValidSuiObjectId)(normalizedObjectId)) {
+  if ((0, import_utils3.isValidSuiObjectId)(normalizedObjectId)) {
     const res = await suiClient.getObject({ id: normalizedObjectId, options: { showType: true } });
     return res.data.type;
   }
@@ -2154,7 +2251,7 @@ var getObjectType = async ({
 };
 
 // src/methods/acceptNftBids/addAcceptNftBidTxs.ts
-var import_utils3 = require("@mysten/sui/utils");
+var import_utils4 = require("@mysten/sui/utils");
 
 // src/graphql/queries/fetchMultibidById.ts
 var import_graphql_request11 = require("graphql-request");
@@ -2226,7 +2323,7 @@ var lockNftInsideKioskIfNotLocked = async ({
       takenNftId = "value" in takenNft ? takenNft.value : takenNft;
     }
     kioskTx.lock({
-      itemId: takenNftId ?? nftTokenId,
+      item: takenNftId ?? nftTokenId,
       itemType: nftType,
       policy: transferPolicyId
     });
@@ -2498,9 +2595,9 @@ async function addSingleBidAcceptNftBidTx(txData) {
           target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::accept_bid_with_transfer_policy`,
           typeArguments: [nftType],
           arguments: [
-            tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
             tx.object(TRADEPORT_MULTI_BID_STORE),
-            tx.pure.id((0, import_utils3.normalizeSuiObjectId)(bidNonce)),
+            tx.pure.id((0, import_utils4.normalizeSuiObjectId)(bidNonce)),
             tx.pure.option("id", multiBidChainId),
             tx.object(kioskTx.getKiosk()),
             tx.object(kioskTx.getKioskCap()),
@@ -2523,7 +2620,7 @@ async function addSingleBidAcceptNftBidTx(txData) {
     target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::accept_bid_without_transfer_policy`,
     typeArguments: [nftType],
     arguments: [
-      tx.object(import_utils3.SUI_CLOCK_OBJECT_ID),
+      tx.object(import_utils4.SUI_CLOCK_OBJECT_ID),
       tx.object(TRADEPORT_MULTI_BID_STORE),
       tx.pure.id(bidNonce),
       tx.pure.option("id", multiBidChainId),
@@ -2534,7 +2631,7 @@ async function addSingleBidAcceptNftBidTx(txData) {
 async function addTradePortAcceptNftBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils3.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils4.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isSingleBid(bidType)) {
     await addSingleBidAcceptNftBidTx(txData);
@@ -3009,7 +3106,7 @@ function addTocenAcceptCollectionBidTx({
 async function addTradePortAcceptCollectionBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils4.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils5.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isSingleBid(bidType)) {
     await addSingleBidAcceptNftBidTx(txData);
@@ -3173,7 +3270,7 @@ var acceptCollectionBid = async ({
     throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
   }
   const bidsForTracking = [];
-  const tx = existingTx ?? new import_transactions2.Transaction();
+  const tx = existingTx ?? new import_transactions3.Transaction();
   const sharedKioskState = {
     kioskTx: kioskTx ?? void 0
   };
@@ -3243,11 +3340,11 @@ var acceptCollectionBid = async ({
     bidder: bid?.bidder
   });
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions2.Transaction.from(tx);
+  return tx instanceof import_transactions3.Transaction ? tx : import_transactions3.Transaction.from(tx);
 };
 
 // src/methods/acceptNftBids/acceptNftBids.ts
-var import_transactions3 = require("@mysten/sui/transactions");
+var import_transactions4 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchBidsById.ts
 var import_graphql_request12 = require("graphql-request");
@@ -3304,7 +3401,7 @@ var acceptNftBids = async ({
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = existingTx ?? new import_transactions3.Transaction();
+  const tx = existingTx ?? new import_transactions4.Transaction();
   const sharedKioskState = {
     kioskTx: kioskTx ?? void 0
   };
@@ -3377,15 +3474,15 @@ var acceptNftBids = async ({
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions3.Transaction.from(tx);
+  return tx instanceof import_transactions4.Transaction ? tx : import_transactions4.Transaction.from(tx);
 };
 
 // src/methods/buyAndExerciseLongLocks/buyAndExerciseLongLocks.ts
-var import_transactions6 = require("@mysten/sui/transactions");
+var import_transactions7 = require("@mysten/sui/transactions");
 
 // src/methods/buyLocks/buyLocks.ts
-var import_utils5 = require("@mysten/sui.js/utils");
-var import_transactions4 = require("@mysten/sui/transactions");
+var import_utils6 = require("@mysten/sui.js/utils");
+var import_transactions5 = require("@mysten/sui/transactions");
 
 // src/helpers/calculatePremium.ts
 function calculatePremium(price) {
@@ -3523,7 +3620,7 @@ var getNativeKioskTransferPoliciesByNftType = async (nftType) => {
 
 // src/methods/buyLocks/buyLocks.ts
 async function buyLocks({ lockIds, transaction }, context) {
-  const tx = transaction ?? new import_transactions4.Transaction();
+  const tx = transaction ?? new import_transactions5.Transaction();
   for (const lockId of lockIds) {
     const lock = await getLockById(lockId);
     if (!lock) {
@@ -3550,7 +3647,7 @@ async function buyLocks({ lockIds, transaction }, context) {
       typeArguments: [lock.nft_type],
       arguments: [
         tx.object(TRADEPORT_PRICE_LOCK_STORE),
-        tx.object(import_utils5.SUI_CLOCK_OBJECT_ID),
+        tx.object(import_utils6.SUI_CLOCK_OBJECT_ID),
         tx.pure.id(lock.lock_id),
         tx.pure.u64(lock.maker_price),
         tx.pure.u64(marketplaceFee),
@@ -3564,10 +3661,10 @@ async function buyLocks({ lockIds, transaction }, context) {
 }
 
 // src/methods/exerciseLongLocks/exerciseLongLocks.ts
-var import_utils6 = require("@mysten/sui.js/utils");
-var import_transactions5 = require("@mysten/sui/transactions");
+var import_utils7 = require("@mysten/sui.js/utils");
+var import_transactions6 = require("@mysten/sui/transactions");
 async function exerciseLongLocks({ walletAddress, transaction, locks }, context) {
-  const tx = transaction ?? new import_transactions5.Transaction();
+  const tx = transaction ?? new import_transactions6.Transaction();
   for (const { id: lockId, bidId } of locks) {
     const lock = await getLockById(lockId);
     if (!transaction && lock.state !== "bought") {
@@ -3622,7 +3719,7 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils6.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils7.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(lock.chain_state.makerKioskId),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk),
@@ -3719,18 +3816,18 @@ async function exerciseLongLocks({ walletAddress, transaction, locks }, context)
 
 // src/methods/buyAndExerciseLongLocks/buyAndExerciseLongLocks.ts
 async function buyAndExerciseLongLocks({ walletAddress, locks, tx: existingTx }, context) {
-  const transaction = existingTx ?? new import_transactions6.Transaction();
+  const transaction = existingTx ?? new import_transactions7.Transaction();
   await buyLocks({ lockIds: locks?.map((lock) => lock?.id), transaction }, context);
   await exerciseLongLocks({ locks, walletAddress, transaction }, context);
   return transaction;
 }
 
 // src/methods/buyAndExerciseShortLocks/buyAndExerciseShortLocks.ts
-var import_transactions11 = require("@mysten/sui/transactions");
+var import_transactions12 = require("@mysten/sui/transactions");
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
-var import_utils7 = require("@mysten/sui.js/utils");
-var import_transactions10 = require("@mysten/sui/transactions");
+var import_utils8 = require("@mysten/sui.js/utils");
+var import_transactions11 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchListingsById.ts
 var import_graphql_request15 = require("graphql-request");
@@ -3763,7 +3860,7 @@ var fetchListingsById = import_graphql_request15.gql`
 `;
 
 // src/methods/buyListings/buyListings.ts
-var import_transactions9 = require("@mysten/sui/transactions");
+var import_transactions10 = require("@mysten/sui/transactions");
 
 // src/helpers/addThirdPartyTxFee.ts
 var addThirdPartyTxFee = async (tx, price) => {
@@ -3777,31 +3874,19 @@ var addThirdPartyTxFee = async (tx, price) => {
 };
 
 // src/helpers/deserializeOrCreateTxBlock.ts
-var import_transactions7 = require("@mysten/sui/transactions");
+var import_transactions8 = require("@mysten/sui/transactions");
 var deserializeOrCreateTxBlock = ({
   existingTx
 }) => {
   if (typeof existingTx === "string") {
-    return import_transactions7.Transaction.from(existingTx);
+    return import_transactions8.Transaction.from(existingTx);
   }
-  return existingTx ?? new import_transactions7.Transaction();
-};
-
-// src/helpers/extractSwapResultCoin.ts
-var extractSwapResultCoinFromTxBlock = (txBlock) => {
-  if (!txBlock) return void 0;
-  const tx = typeof txBlock === "string" ? JSON.parse(txBlock) : txBlock?.getData();
-  const commands = tx.commands ?? [];
-  const index = commands.findIndex(
-    (cmd) => cmd?.MoveCall?.module === "universal_router" && cmd?.MoveCall?.function === "settle"
-  );
-  if (index === -1) return void 0;
-  return { $kind: "Result", Result: index };
+  return existingTx ?? new import_transactions8.Transaction();
 };
 
 // src/helpers/kiosk/preProcessSharedBulkBuyingData.ts
 var import_bcs2 = require("@mysten/sui/bcs");
-var import_transactions8 = require("@mysten/sui/transactions");
+var import_transactions9 = require("@mysten/sui/transactions");
 var preProcessSharedBulkBuyingData = async ({
   listings,
   suiClient,
@@ -3851,7 +3936,7 @@ var preProcessSharedBulkBuyingData = async ({
       (policy) => policy.moduleName === "royalty_rule" || policy.moduleName === "kiosk_royalty_rule"
     );
     if (royaltyRuleToResolve?.rulePackageId && royaltyRuleToResolve?.moduleName) {
-      const feeTx = new import_transactions8.Transaction();
+      const feeTx = new import_transactions9.Transaction();
       for (const listing of tradeportKioskListings) {
         feeTx.moveCall({
           target: `${royaltyRuleToResolve.rulePackageId}::${royaltyRuleToResolve.moduleName}::fee_amount`,
@@ -3992,7 +4077,8 @@ var addTradeportKioskBuyTx = async ({
   coinToSplit,
   beforeResolveKioskTransferRequest,
   sharedBulkBuyingDataByNftType,
-  collectionId
+  collectionId,
+  amountToSplitFromSuiBalance
 }) => {
   let commissionFeeAmount = sharedBulkBuyingDataByNftType?.[nftType]?.commissionFeeAmountsByListingId?.[listingId] ?? 0;
   if (!commissionFeeAmount) {
@@ -4008,6 +4094,7 @@ var addTradeportKioskBuyTx = async ({
   if (commissionFeeAmount === 0) {
     commissionFeeAmount = getMarketFeePrice({ price, collectionId });
   }
+  mergeSwapCoinWithSuiBalance(tx, coinToSplit, amountToSplitFromSuiBalance);
   const coin = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [
     tx.pure.u64(price + commissionFeeAmount)
   ]);
@@ -4037,7 +4124,8 @@ var addTradeportKioskBuyTx = async ({
     coinToSplit,
     beforeResolveKioskTransferRequest,
     transferPoliciesToResolve: sharedBulkBuyingDataByNftType?.[nftType]?.transferPoliciesToResolve,
-    royaltyFeeAmount: sharedBulkBuyingDataByNftType?.[nftType]?.royaltyFeeAmountsByListingId?.[listingId]
+    royaltyFeeAmount: sharedBulkBuyingDataByNftType?.[nftType]?.royaltyFeeAmountsByListingId?.[listingId],
+    amountToSplitFromSuiBalance
   });
   destroyZeroCoin({ tx, coin });
 };
@@ -4441,7 +4529,8 @@ var buyListings = async ({
   tx: existingTx,
   kioskTx,
   coinToSplit,
-  beforeResolveKioskTransferRequest
+  beforeResolveKioskTransferRequest,
+  swapAndPayOptions
 }, context, marketFeeDecimalPercent) => {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -4452,8 +4541,14 @@ var buyListings = async ({
     throw new Error("No listings found");
   }
   const listingsForTracking = [];
-  const tx = deserializeOrCreateTxBlock({ existingTx });
-  const swapResultCoin = extractSwapResultCoinFromTxBlock(tx);
+  let tx = deserializeOrCreateTxBlock({ existingTx });
+  const { transaction: updatedTx, swapResultCoin } = await handleSwapSetup(
+    context.suiClient,
+    walletAddress,
+    tx,
+    swapAndPayOptions
+  );
+  tx = updatedTx;
   const tocenTokenIds = [];
   let tocenNftType = "";
   let tocenTotalPrice = 0;
@@ -4502,7 +4597,8 @@ var buyListings = async ({
       marketFeeDecimalPercent,
       beforeResolveKioskTransferRequest,
       sharedKioskState,
-      sharedBulkBuyingDataByNftType
+      sharedBulkBuyingDataByNftType,
+      amountToSplitFromSuiBalance: BigInt(swapAndPayOptions?.amountToSplitFromSuiBalance ?? 0n)
     };
     switch (listing?.market_name) {
       case "tradeport":
@@ -4547,9 +4643,7 @@ var buyListings = async ({
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  if (swapResultCoin) {
-    tx.transferObjects([swapResultCoin], walletAddress);
-  }
+  handleSwapCleanup(tx, swapResultCoin, walletAddress);
   if (tocenTokenIds?.length > 0) {
     addTocenBuyTxHandler({
       tx,
@@ -4558,12 +4652,12 @@ var buyListings = async ({
       price: tocenTotalPrice
     });
   }
-  return import_transactions9.Transaction.from(tx);
+  return tx instanceof import_transactions10.Transaction ? tx : import_transactions10.Transaction.from(tx);
 };
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
 async function exerciseShortLocks({ walletAddress, transaction, locks }, context) {
-  const tx = transaction ?? new import_transactions10.Transaction();
+  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 !== "bought") {
@@ -4626,7 +4720,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils7.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils8.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id)
           ]
         });
@@ -4701,17 +4795,17 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
 
 // src/methods/buyAndExerciseShortLocks/buyAndExerciseShortLocks.ts
 async function buyAndExerciseShortLocks({ walletAddress, locks, tx: existingTx }, context) {
-  const transaction = existingTx ?? new import_transactions11.Transaction();
+  const transaction = existingTx ?? new import_transactions12.Transaction();
   await buyLocks({ lockIds: locks?.map((lock) => lock?.id), transaction }, context);
   await exerciseShortLocks({ locks, walletAddress, transaction }, context);
   return transaction;
 }
 
 // src/methods/cancelLocks/cancelLocks.ts
-var import_utils8 = require("@mysten/sui.js/utils");
-var import_transactions12 = require("@mysten/sui/transactions");
+var import_utils9 = require("@mysten/sui.js/utils");
+var import_transactions13 = require("@mysten/sui/transactions");
 async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context) {
-  const tx = existingTx ?? new import_transactions12.Transaction();
+  const tx = existingTx ?? new import_transactions13.Transaction();
   for (const lockId of lockIds) {
     const lock = await getLockById(lockId);
     if (!lock) {
@@ -4731,7 +4825,7 @@ async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context)
           typeArguments: [lock.nft_type],
           arguments: [
             tx.object(TRADEPORT_PRICE_LOCK_STORE),
-            tx.object(import_utils8.SUI_CLOCK_OBJECT_ID),
+            tx.object(import_utils9.SUI_CLOCK_OBJECT_ID),
             tx.pure.id(lock.lock_id),
             tx.object(kioskTx.kiosk.value ?? kioskTx.kiosk)
           ]
@@ -4743,10 +4837,10 @@ async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context)
 }
 
 // src/methods/cancelMultiBid/cancelMultiBid.ts
-var import_transactions13 = require("@mysten/sui/transactions");
+var import_transactions14 = require("@mysten/sui/transactions");
 
 // src/methods/removeNftBids/addRemoveNftBidTxs.ts
-var import_utils9 = require("@mysten/sui/utils");
+var import_utils10 = require("@mysten/sui/utils");
 function addTradeportRemoveNftBidTx({ tx, bidNonce, nftType }) {
   tx.moveCall({
     target: "0xb42dbb7413b79394e1a0175af6ae22b69a5c7cc5df259cd78072b6818217c027::biddings::cancel_bid",
@@ -4803,7 +4897,7 @@ function addCancelSingleBidForMultibidChainId(tx, bidNonce, multiBidChainId) {
     target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::cancel_bid`,
     arguments: [
       tx.object(TRADEPORT_MULTI_BID_STORE),
-      tx.pure.id((0, import_utils9.normalizeSuiObjectId)(bidNonce)),
+      tx.pure.id((0, import_utils10.normalizeSuiObjectId)(bidNonce)),
       tx.pure.option("id", multiBidChainId)
     ]
   });
@@ -4811,7 +4905,7 @@ function addCancelSingleBidForMultibidChainId(tx, bidNonce, multiBidChainId) {
 async function addTradePortRemoveNftBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils9.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils10.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isSingleBid(bidType)) {
     await addSingleBidRemoveNftBidTx(txData);
@@ -4845,7 +4939,7 @@ async function cancelMultiBid({ multiBidId }) {
   if (cancelled_at) {
     throw new Error(`MultiBid ${multiBidId} already cancelled`);
   }
-  const tx = new import_transactions13.Transaction();
+  const tx = new import_transactions14.Transaction();
   if (bids.length > 1022) {
     throw new Error(`Too many bids to cancel in one transaction`);
   }
@@ -4860,7 +4954,7 @@ async function cancelMultiBid({ multiBidId }) {
 }
 
 // src/methods/cancelNftTransfers/cancelNftTransfers.ts
-var import_transactions14 = require("@mysten/sui/transactions");
+var import_transactions15 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchAccountKiosks.ts
 var import_graphql_request17 = require("graphql-request");
@@ -4914,7 +5008,7 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
-  const tx = new import_transactions14.Transaction();
+  const tx = new import_transactions15.Transaction();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -4958,11 +5052,11 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions14.Transaction.from(tx);
+  return tx instanceof import_transactions15.Transaction ? tx : import_transactions15.Transaction.from(tx);
 };
 
 // src/methods/claimNfts/claimNfts.ts
-var import_transactions15 = require("@mysten/sui/transactions");
+var import_transactions16 = require("@mysten/sui/transactions");
 
 // src/helpers/splitCoins.ts
 var splitCoins = ({ tx, amounts }) => {
@@ -5187,7 +5281,7 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
-  const tx = existingTx ?? new import_transactions15.Transaction();
+  const tx = existingTx ?? new import_transactions16.Transaction();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -5330,11 +5424,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     }
   }
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions15.Transaction.from(tx);
+  return tx instanceof import_transactions16.Transaction ? tx : import_transactions16.Transaction.from(tx);
 };
 
 // src/methods/createLongLocks/createLongLocks.ts
-var import_transactions16 = require("@mysten/sui/transactions");
+var import_transactions17 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchActiveLockStateByNftId.ts
 var import_graphql_request18 = require("graphql-request");
@@ -5365,7 +5459,7 @@ var getActiveLockStateByNftId = async (nftId) => {
 // src/methods/createLongLocks/createLongLocks.ts
 async function createLongLocks({ walletAddress, nfts }, context) {
   const expireIn = 7 * 24 * 3600 * 1e3;
-  const tx = new import_transactions16.Transaction();
+  const tx = new import_transactions17.Transaction();
   for (const argNft of nfts) {
     const existingLock = await getActiveLockStateByNftId(argNft.id);
     if (existingLock) {
@@ -5434,10 +5528,23 @@ async function updateMultiBid({
   amount,
   amountToWithdraw,
   tx: existingTx,
-  multiBidChainId
+  multiBidChainId,
+  swapAndPayOptions,
+  suiClient,
+  walletAddress
 }) {
-  const tx = deserializeOrCreateTxBlock({ existingTx });
-  const swapResultCoin = extractSwapResultCoinFromTxBlock(tx);
+  let tx = deserializeOrCreateTxBlock({ existingTx });
+  let swapResultCoin;
+  if (suiClient) {
+    const { transaction: updatedTx, swapResultCoin: coin2 } = await handleSwapSetup(
+      suiClient,
+      walletAddress,
+      tx,
+      swapAndPayOptions
+    );
+    tx = updatedTx;
+    swapResultCoin = coin2;
+  }
   if (!multiBidChainId) {
     const { chain_id: chainId, cancelled_at } = (await gqlChainRequest({
       chain: "sui",
@@ -5452,6 +5559,11 @@ async function updateMultiBid({
     }
     multiBidChainId = chainId;
   }
+  mergeSwapCoinWithSuiBalance(
+    tx,
+    swapResultCoin,
+    BigInt(swapAndPayOptions?.amountToSplitFromSuiBalance ?? 0n)
+  );
   const [coin] = tx.splitCoins(swapResultCoin ? swapResultCoin : tx.gas, [amount ?? 0n]);
   tx.moveCall({
     target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::update_multi_bid`,
@@ -5463,16 +5575,14 @@ async function updateMultiBid({
       tx.pure.option("u64", amountToWithdraw)
     ]
   });
+  if (suiClient) {
+    handleSwapCleanup(tx, swapResultCoin, walletAddress);
+  }
   return tx;
 }
 
 // src/methods/createMultiBid/createMultiBid.ts
-async function createMultiBid({
-  walletAddress,
-  name,
-  amount,
-  tx: existingTx
-}) {
+async function createMultiBid({ walletAddress, name, amount, tx: existingTx }, context) {
   const tx = deserializeOrCreateTxBlock({ existingTx });
   const multiBidChainId = tx.moveCall({
     target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::create_multi_bid`,
@@ -5484,17 +5594,18 @@ async function createMultiBid({
       multiBidChainId,
       amount,
       name,
-      tx
+      tx,
+      suiClient: context.suiClient
     });
   }
   return { multiBidChainId, tx };
 }
 
 // src/methods/createShortLocks/createShortLocks.ts
-var import_transactions17 = require("@mysten/sui/transactions");
+var import_transactions18 = require("@mysten/sui/transactions");
 async function createShortLocks({ nfts }, context) {
   const expireIn = 7 * 24 * 3600 * 1e3;
-  const tx = new import_transactions17.Transaction();
+  const tx = new import_transactions18.Transaction();
   for (const argNft of nfts) {
     const premium = calculatePremium(BigInt(argNft.priceInMist));
     if (!argNft.type) {
@@ -5532,8 +5643,8 @@ async function createShortLocks({ nfts }, context) {
 }
 
 // src/methods/listNfts/listNfts.ts
-var import_transactions18 = require("@mysten/sui/transactions");
-var import_utils10 = require("@mysten/sui/utils");
+var import_transactions19 = require("@mysten/sui/transactions");
+var import_utils11 = require("@mysten/sui/utils");
 
 // src/methods/listNfts/addListTxs.ts
 async function addOriginByteListTx({
@@ -5863,7 +5974,7 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
-  const tx = new import_transactions18.Transaction();
+  const tx = new import_transactions19.Transaction();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -5878,7 +5989,7 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
     });
     const transferPolicies = nft?.collection?.chain_state?.transfer_policies;
     if (nft?.listed || nft.listings.some(
-      (listing) => listing.nonce && listing.seller && (0, import_utils10.normalizeSuiAddress)(listing.seller) === (0, import_utils10.normalizeSuiAddress)(walletAddress)
+      (listing) => listing.nonce && listing.seller && (0, import_utils11.normalizeSuiAddress)(listing.seller) === (0, import_utils11.normalizeSuiAddress)(walletAddress)
     )) {
       await relistNft({
         tx,
@@ -5916,11 +6027,11 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions18.Transaction.from(tx);
+  return tx instanceof import_transactions19.Transaction ? tx : import_transactions19.Transaction.from(tx);
 };
 
 // src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts
-var import_transactions19 = require("@mysten/sui/transactions");
+var import_transactions20 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchNftsByKioskId.ts
 var import_graphql_request19 = require("graphql-request");
@@ -6123,7 +6234,7 @@ async function getTransferPolicyForDirectTransfer(suiClient, collectionChainStat
 
 // src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts
 async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }, context) {
-  const tx = new import_transactions19.Transaction();
+  const tx = new import_transactions20.Transaction();
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchKiosksByOwner,
@@ -6289,11 +6400,11 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }
     }
   }
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions19.Transaction.from(tx);
+  return tx instanceof import_transactions20.Transaction ? tx : import_transactions20.Transaction.from(tx);
 }
 
 // src/methods/placeCollectionBids/placeCollectionBids.ts
-var import_transactions20 = require("@mysten/sui/transactions");
+var import_transactions21 = require("@mysten/sui/transactions");
 
 // src/graphql/queries/fetchCollectionsById.ts
 var import_graphql_request20 = require("graphql-request");
@@ -6334,7 +6445,7 @@ var fetchCollectionsBySlug = import_graphql_request20.gql`
 `;
 
 // src/methods/placeNftBids/addPlaceNftBidTxs.ts
-var import_utils11 = require("@mysten/sui/utils");
+var import_utils12 = require("@mysten/sui/utils");
 async function addTradePortPlaceNftBidTxHandler(txData) {
   if (isOriginByteCollection(txData?.transferPolicies) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
     throw new Error("OriginByte bidding not supported currently");
@@ -6348,14 +6459,15 @@ async function addTradePortPlaceNftBidTxHandler(txData) {
     collectionId,
     bcsHex,
     expireAt,
-    coinToSplit
+    coinToSplit,
+    amountToSplitFromSuiBalance
   } = txData;
   let bcs4;
   if (nftTokenId && isDynamicCollection(collectionId)) {
     if (!bcsHex) {
       throw new Error(`No BCS found for token ${nftTokenId}`);
     }
-    bcs4 = (0, import_utils11.fromHex)(bcsHex);
+    bcs4 = (0, import_utils12.fromHex)(bcsHex);
   }
   let multiBidChainId;
   let expiredBids;
@@ -6402,6 +6514,7 @@ async function addTradePortPlaceNftBidTxHandler(txData) {
     }
     txWithState.hasCancelBidTransactions.set(multiBidChainId, true);
   }
+  mergeSwapCoinWithSuiBalance(tx, coinToSplit, amountToSplitFromSuiBalance);
   const [coin] = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [
     multiBidChainId ? 0n : price + fee + royalty
   ]);
@@ -6411,12 +6524,12 @@ async function addTradePortPlaceNftBidTxHandler(txData) {
     arguments: [
       tx.object(TRADEPORT_MULTI_BID_STORE),
       tx.pure.u64(nftTokenId ? 1 : 0),
-      multiBidChainId ? typeof multiBidChainId === "string" ? tx.pure.option("id", (0, import_utils11.normalizeSuiObjectId)(multiBidChainId)) : tx.moveCall({
+      multiBidChainId ? typeof multiBidChainId === "string" ? tx.pure.option("id", (0, import_utils12.normalizeSuiObjectId)(multiBidChainId)) : tx.moveCall({
         target: "0x1::option::some",
         typeArguments: ["0x2::object::ID"],
         arguments: [multiBidChainId]
       }) : void 0,
-      tx.pure.option("id", nftTokenId ? (0, import_utils11.normalizeSuiObjectId)(nftTokenId) : void 0),
+      tx.pure.option("id", nftTokenId ? (0, import_utils12.normalizeSuiObjectId)(nftTokenId) : void 0),
       tx.pure.option("vector<u8>", bcs4 ? [...bcs4] : void 0),
       tx.pure.option("u64", expireAt?.getTime()),
       tx.pure.u64(price),
@@ -6507,7 +6620,14 @@ async function addOriginByteCollectionBidTx({
 }
 
 // src/methods/placeCollectionBids/placeCollectionBids.ts
-var placeCollectionBids = async ({ collections, walletAddress, multiBidId, multiBidChainId, tx: existingTx }, context) => {
+var placeCollectionBids = async ({
+  collections,
+  walletAddress,
+  multiBidId,
+  multiBidChainId,
+  tx: existingTx,
+  swapAndPayOptions
+}, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchCollectionsByIdWithOneNft,
@@ -6517,8 +6637,14 @@ var placeCollectionBids = async ({ collections, walletAddress, multiBidId, multi
     throw new Error("No collection found");
   }
   const collectionsForTracking = [];
-  const tx = deserializeOrCreateTxBlock({ existingTx });
-  const swapResultCoin = extractSwapResultCoinFromTxBlock(tx);
+  let tx = deserializeOrCreateTxBlock({ existingTx });
+  const { transaction: updatedTx, swapResultCoin } = await handleSwapSetup(
+    context.suiClient,
+    walletAddress,
+    tx,
+    swapAndPayOptions
+  );
+  tx = updatedTx;
   for (const collection of res.collections) {
     const nftType = getNftType({
       collectionId: collection?.id,
@@ -6538,7 +6664,8 @@ var placeCollectionBids = async ({ collections, walletAddress, multiBidId, multi
       multiBidId,
       multiBidChainId,
       expireAt: collections?.find((c) => c.id === collection?.id)?.expireAt,
-      coinToSplit: swapResultCoin
+      coinToSplit: swapResultCoin,
+      amountToSplitFromSuiBalance: BigInt(swapAndPayOptions?.amountToSplitFromSuiBalance ?? 0n)
     };
     const numOfBids = collections?.find((c) => c.id === collection?.id)?.numOfBids;
     if (isOriginByteCollection(txData?.transferPolicies) && !ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK?.includes(normalizedNftType(txData?.nftType))) {
@@ -6565,17 +6692,28 @@ var placeCollectionBids = async ({ collections, walletAddress, multiBidId, multi
       bidder: walletAddress
     });
   }
-  if (swapResultCoin) {
-    tx.transferObjects([swapResultCoin], walletAddress);
-  }
-  return import_transactions20.Transaction.from(tx);
+  handleSwapCleanup(tx, swapResultCoin, walletAddress);
+  return tx instanceof import_transactions21.Transaction ? tx : import_transactions21.Transaction.from(tx);
 };
 
 // src/methods/placeNftBids/placeNftBids.ts
-var import_transactions21 = require("@mysten/sui/transactions");
-var placeNftBids = async ({ bids, walletAddress, multiBidId, multiBidChainId, tx: existingTx }, context) => {
-  const tx = deserializeOrCreateTxBlock({ existingTx });
-  const swapResultCoin = extractSwapResultCoinFromTxBlock(tx);
+var import_transactions22 = require("@mysten/sui/transactions");
+var placeNftBids = async ({
+  bids,
+  walletAddress,
+  multiBidId,
+  multiBidChainId,
+  tx: existingTx,
+  swapAndPayOptions
+}, context) => {
+  let tx = deserializeOrCreateTxBlock({ existingTx });
+  const { transaction: updatedTx, swapResultCoin } = await handleSwapSetup(
+    context.suiClient,
+    walletAddress,
+    tx,
+    swapAndPayOptions
+  );
+  tx = updatedTx;
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchNftsById,
@@ -6609,7 +6747,8 @@ var placeNftBids = async ({ bids, walletAddress, multiBidId, multiBidChainId, tx
       multiBidId,
       multiBidChainId,
       expireAt: bid?.expireAt,
-      coinToSplit: swapResultCoin
+      coinToSplit: swapResultCoin,
+      amountToSplitFromSuiBalance: BigInt(swapAndPayOptions?.amountToSplitFromSuiBalance ?? 0n)
     };
     await addTradePortPlaceNftBidTxHandler(txData);
     nftsForTracking.push({
@@ -6619,17 +6758,15 @@ var placeNftBids = async ({ bids, walletAddress, multiBidId, multiBidChainId, tx
       bidder: walletAddress
     });
   }
-  if (swapResultCoin) {
-    tx.transferObjects([swapResultCoin], walletAddress);
-  }
-  return import_transactions21.Transaction.from(tx);
+  handleSwapCleanup(tx, swapResultCoin, walletAddress);
+  return tx instanceof import_transactions22.Transaction ? tx : import_transactions22.Transaction.from(tx);
 };
 
 // src/methods/removeCollectionBids/removeCollectionBids.ts
-var import_transactions22 = require("@mysten/sui/transactions");
+var import_transactions23 = require("@mysten/sui/transactions");
 
 // src/methods/removeCollectionBids/addRemoveCollectionBidsTxs.ts
-var import_utils12 = require("@mysten/sui/utils");
+var import_utils13 = require("@mysten/sui/utils");
 function addTradeportRemoveCollectionBidTx({
   tx,
   nftType,
@@ -6685,7 +6822,7 @@ function addBluemoveKioskRemoveCollectionBidTx({
 async function addTradePortRemoveCollectionBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils12.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils13.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isSingleBid(bidType)) {
     await addSingleBidRemoveNftBidTx(txData);
@@ -6705,7 +6842,7 @@ async function addTradePortRemoveCollectionBidTxHandler(txData) {
 async function addBluemoveRemoveCollectionBidTxHandler(txData) {
   const bidType = await getObjectType({
     suiClient: txData?.suiClient,
-    objectId: (0, import_utils12.normalizeSuiObjectId)(txData?.bidNonce)
+    objectId: (0, import_utils13.normalizeSuiObjectId)(txData?.bidNonce)
   });
   if (isOriginByteBid(bidType)) {
     const sharedObjects = await getSharedObjects(txData?.nftType);
@@ -6734,7 +6871,7 @@ var removeCollectionBids = async ({ bidIds, tx: existingTx }, context) => {
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = existingTx ? import_transactions22.Transaction.from(existingTx) : new import_transactions22.Transaction();
+  const tx = existingTx ? import_transactions23.Transaction.from(existingTx) : new import_transactions23.Transaction();
   for (const bid of res.bids) {
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
       throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
@@ -6782,11 +6919,11 @@ var removeCollectionBids = async ({ bidIds, tx: existingTx }, context) => {
       bidder: bid?.bidder
     });
   }
-  return import_transactions22.Transaction.from(tx);
+  return tx instanceof import_transactions23.Transaction ? tx : import_transactions23.Transaction.from(tx);
 };
 
 // src/methods/removeNftBids/removeNftBids.ts
-var import_transactions23 = require("@mysten/sui/transactions");
+var import_transactions24 = require("@mysten/sui/transactions");
 var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -6797,7 +6934,7 @@ var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = existingTx ? import_transactions23.Transaction.from(existingTx) : new import_transactions23.Transaction();
+  const tx = existingTx ? import_transactions24.Transaction.from(existingTx) : new import_transactions24.Transaction();
   for (const bid of res.bids) {
     if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
       throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
@@ -6842,11 +6979,11 @@ var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
       bidder: bid?.bidder
     });
   }
-  return import_transactions23.Transaction.from(tx);
+  return tx instanceof import_transactions24.Transaction ? tx : import_transactions24.Transaction.from(tx);
 };
 
 // src/methods/transferNfts/transferNfts.ts
-var import_transactions24 = require("@mysten/sui/transactions");
+var import_transactions25 = require("@mysten/sui/transactions");
 var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context) => {
   if (addLeadingZerosAfter0x(recipientAddress) === addLeadingZerosAfter0x(walletAddress)) {
     throw new Error("Cannot transfer to self");
@@ -6864,7 +7001,7 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
   }
   const nftsForTracking = [];
   const nftsToTransferDirectly = [];
-  const tx = new import_transactions24.Transaction();
+  const tx = new import_transactions25.Transaction();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -6967,11 +7104,11 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
     context.suiClient
   );
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions24.Transaction.from(tx);
+  return tx instanceof import_transactions25.Transaction ? tx : import_transactions25.Transaction.from(tx);
 };
 
 // src/methods/unlistListings/unlistListings.ts
-var import_transactions25 = require("@mysten/sui/transactions");
+var import_transactions26 = require("@mysten/sui/transactions");
 var unlistListings = async ({ listingIds, walletAddress }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -6982,7 +7119,7 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
     throw new Error("No listings found");
   }
   const listingsForTracking = [];
-  const tx = new import_transactions25.Transaction();
+  const tx = new import_transactions26.Transaction();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -7051,12 +7188,12 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return import_transactions25.Transaction.from(tx);
+  return tx instanceof import_transactions26.Transaction ? tx : import_transactions26.Transaction.from(tx);
 };
 
 // src/methods/withdrawProfitsFromKiosks/withdrawProfitsFromKiosks.ts
 var import_kiosk5 = require("@mysten/kiosk");
-var import_transactions26 = require("@mysten/sui/transactions");
+var import_transactions27 = require("@mysten/sui/transactions");
 async function withdrawProfitsFromKiosks({ walletAddress }, context) {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -7076,7 +7213,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
   if (kiosksWithProfit.length === 0) {
     throw new Error(`No kiosks with profit to withdraw found for ${walletAddress}`);
   }
-  const tx = new import_transactions26.Transaction();
+  const tx = new import_transactions27.Transaction();
   try {
     for (const kiosk of kiosksWithProfit) {
       let kioskTx;
@@ -7087,7 +7224,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
           variables: { kioskId: kiosk.id }
         })).personalCap?.id;
         kioskTx = new import_kiosk5.KioskTransaction({
-          transactionBlock: tx,
+          transaction: tx,
           kioskClient: context.kioskClient,
           cap: {
             isPersonal: true,
@@ -7104,7 +7241,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
           variables: { kioskId: kiosk.id }
         })).ownerCap?.id;
         kioskTx = new import_kiosk5.KioskTransaction({
-          transactionBlock: tx,
+          transaction: tx,
           kioskClient: context.kioskClient,
           cap: {
             isPersonal: false,
@@ -7122,7 +7259,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
   } catch (err) {
     console.log("err", err);
   }
-  return import_transactions26.Transaction.from(tx);
+  return tx instanceof import_transactions27.Transaction ? tx : import_transactions27.Transaction.from(tx);
 }
 
 // src/SuiTradingClient.ts
@@ -7141,14 +7278,19 @@ var SuiTradingClient = class {
       "x-api-key": apiKey
     });
   }
-  async buyListings({ listingIds, walletAddress, tx }) {
+  async buyListings({
+    listingIds,
+    walletAddress,
+    tx,
+    swapAndPayOptions
+  }) {
     const context = {
       apiUser: this.apiUser,
       apiKey: this.apiKey,
       suiClient: this.suiClient,
       kioskClient: this.kioskClient
     };
-    return buyListings({ listingIds, walletAddress, tx }, context);
+    return buyListings({ listingIds, walletAddress, tx, swapAndPayOptions }, context);
   }
   async listNfts({ nfts, walletAddress }) {
     const context = {
@@ -7203,7 +7345,8 @@ var SuiTradingClient = class {
     multiBidId,
     multiBidChainId,
     expireAt,
-    tx
+    tx,
+    swapAndPayOptions
   }) {
     const context = {
       apiUser: this.apiUser,
@@ -7224,7 +7367,8 @@ var SuiTradingClient = class {
         walletAddress,
         multiBidId,
         multiBidChainId,
-        tx
+        tx,
+        swapAndPayOptions
       },
       context
     );
@@ -7450,13 +7594,19 @@ var SuiTradingClient = class {
     return migrateNftsFromUnsharedToSharedKiosks(args, context);
   }
   async createMultiBid(args) {
-    return createMultiBid(args);
+    const context = {
+      apiUser: this.apiUser,
+      apiKey: this.apiKey,
+      suiClient: this.suiClient,
+      kioskClient: this.kioskClient
+    };
+    return createMultiBid(args, context);
   }
   async cancelMultiBid(args) {
     return cancelMultiBid(args);
   }
   async updateMultiBid(args) {
-    return updateMultiBid(args);
+    return updateMultiBid({ ...args, suiClient: this.suiClient });
   }
 };
 var SuiTradingClient_default = SuiTradingClient;