@tradeport/sui-trading-sdk 0.4.39 → 0.4.40

package/dist/index.mjs

@@ -106,7 +106,7 @@ var fetchCollectionBidsAtSamePrice = gql3`
 `;
 
 // src/methods/acceptCollectionBid/acceptCollectionBid.ts
-import { Transaction as Transaction2 } from "@mysten/sui/transactions";
+import { Transaction as Transaction3 } from "@mysten/sui/transactions";
 
 // src/constants.ts
 var MYSTEN_TRANFER_POLICY_RULES_PACKAGE_ID = "0x434b5bd8f6a7b05fede0ff46c6e511d71ea326ed38056e3bcd681d2d7c2a7879";
@@ -1514,7 +1514,7 @@ var kioskTxWrapper = async ({
       variables: { kioskId: personalKiosk.id }
     })).personalCap.id;
     kioskTx = new KioskTransaction({
-      transactionBlock: tx,
+      transaction: tx,
       kioskClient,
       cap: {
         isPersonal: true,
@@ -1531,7 +1531,7 @@ var kioskTxWrapper = async ({
       variables: { kioskId: kiosks[0].id }
     })).ownerCap?.id;
     kioskTx = new KioskTransaction({
-      transactionBlock: tx,
+      transaction: tx,
       kioskClient,
       cap: {
         isPersonal: false,
@@ -1542,7 +1542,7 @@ var kioskTxWrapper = async ({
       }
     });
   } else {
-    kioskTx = new KioskTransaction({ transactionBlock: tx, kioskClient });
+    kioskTx = new KioskTransaction({ transaction: tx, kioskClient });
     kioskTx.createPersonal(true);
   }
   if (shouldUseSharedKioskTx && sharedKioskState) {
@@ -1719,10 +1719,87 @@ function resolvePersonalKioskRule({ tx, packageId, nftType, kiosk, transferReque
   });
 }
 
+// src/helpers/swap/swap.ts
+import { AggregatorQuoter, Protocol, TradeBuilder } from "@flowx-finance/sdk";
+import { Transaction } from "@mysten/sui/transactions";
+import { normalizeStructTag as normalizeStructTag2, normalizeSuiAddress } from "@mysten/sui/utils";
+import ms from "ms";
+var aggregatorQuoter = new AggregatorQuoter("mainnet");
+var suiCointType = "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI";
+async function createBuyTransaction(client, walletAddress, suiAmount, options) {
+  const transaction = options?.transaction ?? new Transaction();
+  transaction.setSender(normalizeSuiAddress(walletAddress));
+  const {
+    coinType,
+    coinAmount = 0n,
+    slippage = 1,
+    ttl = "15m",
+    excludeSources = [Protocol.STEAMM]
+  } = options ?? {};
+  if (!coinType || normalizeStructTag2(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 TradeBuilder("mainnet", routes);
+  const trade = tradeBuilder.sender(normalizeSuiAddress(walletAddress)).slippage(slippage).deadline(Date.now() + ms(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
 import { bcs } from "@mysten/sui/bcs";
 import {
-  Transaction
+  Transaction as Transaction2
 } from "@mysten/sui/transactions";
 async function getKioskCollectionRoyaltyFeeAmount({
   tx,
@@ -1742,7 +1819,7 @@ async function getKioskCollectionRoyaltyFeeAmount({
     console.warn("Price is undefined or 0");
     return void 0;
   }
-  const feeTx = new Transaction();
+  const feeTx = new Transaction2();
   feeTx.moveCall({
     target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
     arguments: [feeTx.object(transferPolicyId), feeTx.pure.u64(price)],
@@ -1781,7 +1858,8 @@ async function resolveRoyaltyRule({
   nftType,
   price,
   coinToSplit,
-  royaltyFeeAmount
+  royaltyFeeAmount,
+  amountToSplitFromSuiBalance
 }) {
   let feeAmount = royaltyFeeAmount;
   if (!feeAmount) {
@@ -1796,6 +1874,7 @@ async function resolveRoyaltyRule({
       nftType
     });
   }
+  mergeSwapCoinWithSuiBalance(tx, coinToSplit, amountToSplitFromSuiBalance);
   const feeCoin = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [feeAmount]);
   tx.moveCall({
     target: `${packageId}::${moduleName}::pay`,
@@ -1823,7 +1902,8 @@ var resolveTransferPolicies = async ({
   coinToSplit,
   beforeResolveKioskTransferRequest,
   transferPoliciesToResolve,
-  royaltyFeeAmount
+  royaltyFeeAmount,
+  amountToSplitFromSuiBalance
 }) => {
   const policies = transferPoliciesToResolve ?? await getTransferPoliciesToResolve({
     transferPolicies,
@@ -1873,7 +1953,8 @@ var resolveTransferPolicies = async ({
             nftType: policy.isCustom && policy.type ? policy.type : nftType,
             price,
             coinToSplit,
-            royaltyFeeAmount
+            royaltyFeeAmount,
+            amountToSplitFromSuiBalance
           });
           break;
         case "floor_price_rule":
@@ -1924,8 +2005,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)
     ],
@@ -1939,7 +2024,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
     ],
@@ -2202,7 +2289,7 @@ var lockNftInsideKioskIfNotLocked = async ({
       takenNftId = "value" in takenNft ? takenNft.value : takenNft;
     }
     kioskTx.lock({
-      itemId: takenNftId ?? nftTokenId,
+      item: takenNftId ?? nftTokenId,
       itemType: nftType,
       policy: transferPolicyId
     });
@@ -3149,7 +3236,7 @@ var acceptCollectionBid = async ({
     throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
   }
   const bidsForTracking = [];
-  const tx = existingTx ?? new Transaction2();
+  const tx = existingTx ?? new Transaction3();
   const sharedKioskState = {
     kioskTx: kioskTx ?? void 0
   };
@@ -3219,11 +3306,11 @@ var acceptCollectionBid = async ({
     bidder: bid?.bidder
   });
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction2.from(tx);
+  return tx instanceof Transaction3 ? tx : Transaction3.from(tx);
 };
 
 // src/methods/acceptNftBids/acceptNftBids.ts
-import { Transaction as Transaction3 } from "@mysten/sui/transactions";
+import { Transaction as Transaction4 } from "@mysten/sui/transactions";
 
 // src/graphql/queries/fetchBidsById.ts
 import { gql as gql11 } from "graphql-request";
@@ -3280,7 +3367,7 @@ var acceptNftBids = async ({
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = existingTx ?? new Transaction3();
+  const tx = existingTx ?? new Transaction4();
   const sharedKioskState = {
     kioskTx: kioskTx ?? void 0
   };
@@ -3353,15 +3440,15 @@ var acceptNftBids = async ({
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction3.from(tx);
+  return tx instanceof Transaction4 ? tx : Transaction4.from(tx);
 };
 
 // src/methods/buyAndExerciseLongLocks/buyAndExerciseLongLocks.ts
-import { Transaction as Transaction6 } from "@mysten/sui/transactions";
+import { Transaction as Transaction7 } from "@mysten/sui/transactions";
 
 // src/methods/buyLocks/buyLocks.ts
 import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID2 } from "@mysten/sui.js/utils";
-import { Transaction as Transaction4 } from "@mysten/sui/transactions";
+import { Transaction as Transaction5 } from "@mysten/sui/transactions";
 
 // src/helpers/calculatePremium.ts
 function calculatePremium(price) {
@@ -3499,7 +3586,7 @@ var getNativeKioskTransferPoliciesByNftType = async (nftType) => {
 
 // src/methods/buyLocks/buyLocks.ts
 async function buyLocks({ lockIds, transaction }, context) {
-  const tx = transaction ?? new Transaction4();
+  const tx = transaction ?? new Transaction5();
   for (const lockId of lockIds) {
     const lock = await getLockById(lockId);
     if (!lock) {
@@ -3541,9 +3628,9 @@ async function buyLocks({ lockIds, transaction }, context) {
 
 // src/methods/exerciseLongLocks/exerciseLongLocks.ts
 import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID3 } from "@mysten/sui.js/utils";
-import { Transaction as Transaction5 } from "@mysten/sui/transactions";
+import { Transaction as Transaction6 } from "@mysten/sui/transactions";
 async function exerciseLongLocks({ walletAddress, transaction, locks }, context) {
-  const tx = transaction ?? new Transaction5();
+  const tx = transaction ?? new Transaction6();
   for (const { id: lockId, bidId } of locks) {
     const lock = await getLockById(lockId);
     if (!transaction && lock.state !== "bought") {
@@ -3695,18 +3782,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 Transaction6();
+  const transaction = existingTx ?? new Transaction7();
   await buyLocks({ lockIds: locks?.map((lock) => lock?.id), transaction }, context);
   await exerciseLongLocks({ locks, walletAddress, transaction }, context);
   return transaction;
 }
 
 // src/methods/buyAndExerciseShortLocks/buyAndExerciseShortLocks.ts
-import { Transaction as Transaction11 } from "@mysten/sui/transactions";
+import { Transaction as Transaction12 } from "@mysten/sui/transactions";
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
 import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID4 } from "@mysten/sui.js/utils";
-import { Transaction as Transaction10 } from "@mysten/sui/transactions";
+import { Transaction as Transaction11 } from "@mysten/sui/transactions";
 
 // src/graphql/queries/fetchListingsById.ts
 import { gql as gql14 } from "graphql-request";
@@ -3739,7 +3826,7 @@ var fetchListingsById = gql14`
 `;
 
 // src/methods/buyListings/buyListings.ts
-import { Transaction as Transaction9 } from "@mysten/sui/transactions";
+import { Transaction as Transaction10 } from "@mysten/sui/transactions";
 
 // src/helpers/addThirdPartyTxFee.ts
 var addThirdPartyTxFee = async (tx, price) => {
@@ -3753,31 +3840,19 @@ var addThirdPartyTxFee = async (tx, price) => {
 };
 
 // src/helpers/deserializeOrCreateTxBlock.ts
-import { Transaction as Transaction7 } from "@mysten/sui/transactions";
+import { Transaction as Transaction8 } from "@mysten/sui/transactions";
 var deserializeOrCreateTxBlock = ({
   existingTx
 }) => {
   if (typeof existingTx === "string") {
-    return Transaction7.from(existingTx);
+    return Transaction8.from(existingTx);
   }
-  return existingTx ?? new Transaction7();
-};
-
-// 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 Transaction8();
 };
 
 // src/helpers/kiosk/preProcessSharedBulkBuyingData.ts
 import { bcs as bcs2 } from "@mysten/sui/bcs";
-import { Transaction as Transaction8 } from "@mysten/sui/transactions";
+import { Transaction as Transaction9 } from "@mysten/sui/transactions";
 var preProcessSharedBulkBuyingData = async ({
   listings,
   suiClient,
@@ -3827,7 +3902,7 @@ var preProcessSharedBulkBuyingData = async ({
       (policy) => policy.moduleName === "royalty_rule" || policy.moduleName === "kiosk_royalty_rule"
     );
     if (royaltyRuleToResolve?.rulePackageId && royaltyRuleToResolve?.moduleName) {
-      const feeTx = new Transaction8();
+      const feeTx = new Transaction9();
       for (const listing of tradeportKioskListings) {
         feeTx.moveCall({
           target: `${royaltyRuleToResolve.rulePackageId}::${royaltyRuleToResolve.moduleName}::fee_amount`,
@@ -3968,7 +4043,8 @@ var addTradeportKioskBuyTx = async ({
   coinToSplit,
   beforeResolveKioskTransferRequest,
   sharedBulkBuyingDataByNftType,
-  collectionId
+  collectionId,
+  amountToSplitFromSuiBalance
 }) => {
   let commissionFeeAmount = sharedBulkBuyingDataByNftType?.[nftType]?.commissionFeeAmountsByListingId?.[listingId] ?? 0;
   if (!commissionFeeAmount) {
@@ -3984,6 +4060,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)
   ]);
@@ -4013,7 +4090,8 @@ var addTradeportKioskBuyTx = async ({
     coinToSplit,
     beforeResolveKioskTransferRequest,
     transferPoliciesToResolve: sharedBulkBuyingDataByNftType?.[nftType]?.transferPoliciesToResolve,
-    royaltyFeeAmount: sharedBulkBuyingDataByNftType?.[nftType]?.royaltyFeeAmountsByListingId?.[listingId]
+    royaltyFeeAmount: sharedBulkBuyingDataByNftType?.[nftType]?.royaltyFeeAmountsByListingId?.[listingId],
+    amountToSplitFromSuiBalance
   });
   destroyZeroCoin({ tx, coin });
 };
@@ -4417,7 +4495,8 @@ var buyListings = async ({
   tx: existingTx,
   kioskTx,
   coinToSplit,
-  beforeResolveKioskTransferRequest
+  beforeResolveKioskTransferRequest,
+  swapAndPayOptions
 }, context, marketFeeDecimalPercent) => {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -4428,8 +4507,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;
@@ -4478,7 +4563,8 @@ var buyListings = async ({
       marketFeeDecimalPercent,
       beforeResolveKioskTransferRequest,
       sharedKioskState,
-      sharedBulkBuyingDataByNftType
+      sharedBulkBuyingDataByNftType,
+      amountToSplitFromSuiBalance: BigInt(swapAndPayOptions?.amountToSplitFromSuiBalance ?? 0n)
     };
     switch (listing?.market_name) {
       case "tradeport":
@@ -4523,9 +4609,7 @@ var buyListings = async ({
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  if (swapResultCoin) {
-    tx.transferObjects([swapResultCoin], walletAddress);
-  }
+  handleSwapCleanup(tx, swapResultCoin, walletAddress);
   if (tocenTokenIds?.length > 0) {
     addTocenBuyTxHandler({
       tx,
@@ -4534,12 +4618,12 @@ var buyListings = async ({
       price: tocenTotalPrice
     });
   }
-  return Transaction9.from(tx);
+  return tx instanceof Transaction10 ? tx : Transaction10.from(tx);
 };
 
 // src/methods/exerciseShortLocks/exerciseShortLocks.ts
 async function exerciseShortLocks({ walletAddress, transaction, locks }, context) {
-  const tx = transaction ?? new Transaction10();
+  const tx = transaction ?? new Transaction11();
   for (const { id: lockId, listingId, nftId: nftIdArg } of locks) {
     const lock = await getLockById(lockId);
     if (!transaction && lock.state !== "bought") {
@@ -4677,7 +4761,7 @@ async function exerciseShortLocks({ walletAddress, transaction, locks }, context
 
 // src/methods/buyAndExerciseShortLocks/buyAndExerciseShortLocks.ts
 async function buyAndExerciseShortLocks({ walletAddress, locks, tx: existingTx }, context) {
-  const transaction = existingTx ?? new Transaction11();
+  const transaction = existingTx ?? new Transaction12();
   await buyLocks({ lockIds: locks?.map((lock) => lock?.id), transaction }, context);
   await exerciseShortLocks({ locks, walletAddress, transaction }, context);
   return transaction;
@@ -4685,9 +4769,9 @@ async function buyAndExerciseShortLocks({ walletAddress, locks, tx: existingTx }
 
 // src/methods/cancelLocks/cancelLocks.ts
 import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID5 } from "@mysten/sui.js/utils";
-import { Transaction as Transaction12 } from "@mysten/sui/transactions";
+import { Transaction as Transaction13 } from "@mysten/sui/transactions";
 async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context) {
-  const tx = existingTx ?? new Transaction12();
+  const tx = existingTx ?? new Transaction13();
   for (const lockId of lockIds) {
     const lock = await getLockById(lockId);
     if (!lock) {
@@ -4719,7 +4803,7 @@ async function cancelLocks({ lockIds, walletAddress, tx: existingTx }, context)
 }
 
 // src/methods/cancelMultiBid/cancelMultiBid.ts
-import { Transaction as Transaction13 } from "@mysten/sui/transactions";
+import { Transaction as Transaction14 } from "@mysten/sui/transactions";
 
 // src/methods/removeNftBids/addRemoveNftBidTxs.ts
 import { normalizeSuiObjectId as normalizeSuiObjectId4 } from "@mysten/sui/utils";
@@ -4821,7 +4905,7 @@ async function cancelMultiBid({ multiBidId }) {
   if (cancelled_at) {
     throw new Error(`MultiBid ${multiBidId} already cancelled`);
   }
-  const tx = new Transaction13();
+  const tx = new Transaction14();
   if (bids.length > 1022) {
     throw new Error(`Too many bids to cancel in one transaction`);
   }
@@ -4836,7 +4920,7 @@ async function cancelMultiBid({ multiBidId }) {
 }
 
 // src/methods/cancelNftTransfers/cancelNftTransfers.ts
-import { Transaction as Transaction14 } from "@mysten/sui/transactions";
+import { Transaction as Transaction15 } from "@mysten/sui/transactions";
 
 // src/graphql/queries/fetchAccountKiosks.ts
 import { gql as gql16 } from "graphql-request";
@@ -4890,7 +4974,7 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
-  const tx = new Transaction14();
+  const tx = new Transaction15();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -4934,11 +5018,11 @@ var cancelNftTransfers = async ({ nftIds, walletAddress }, context) => {
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction14.from(tx);
+  return tx instanceof Transaction15 ? tx : Transaction15.from(tx);
 };
 
 // src/methods/claimNfts/claimNfts.ts
-import { Transaction as Transaction15 } from "@mysten/sui/transactions";
+import { Transaction as Transaction16 } from "@mysten/sui/transactions";
 
 // src/helpers/splitCoins.ts
 var splitCoins = ({ tx, amounts }) => {
@@ -5163,7 +5247,7 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
-  const tx = existingTx ?? new Transaction15();
+  const tx = existingTx ?? new Transaction16();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -5306,11 +5390,11 @@ var claimNfts = async ({ nftIds, walletAddress, tx: existingTx }, context, useOl
     }
   }
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction15.from(tx);
+  return tx instanceof Transaction16 ? tx : Transaction16.from(tx);
 };
 
 // src/methods/createLongLocks/createLongLocks.ts
-import { Transaction as Transaction16 } from "@mysten/sui/transactions";
+import { Transaction as Transaction17 } from "@mysten/sui/transactions";
 
 // src/graphql/queries/fetchActiveLockStateByNftId.ts
 import { gql as gql17 } from "graphql-request";
@@ -5341,7 +5425,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 Transaction16();
+  const tx = new Transaction17();
   for (const argNft of nfts) {
     const existingLock = await getActiveLockStateByNftId(argNft.id);
     if (existingLock) {
@@ -5410,10 +5494,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",
@@ -5428,6 +5525,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`,
@@ -5439,16 +5541,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`,
@@ -5460,17 +5560,18 @@ async function createMultiBid({
       multiBidChainId,
       amount,
       name,
-      tx
+      tx,
+      suiClient: context.suiClient
     });
   }
   return { multiBidChainId, tx };
 }
 
 // src/methods/createShortLocks/createShortLocks.ts
-import { Transaction as Transaction17 } from "@mysten/sui/transactions";
+import { Transaction as Transaction18 } from "@mysten/sui/transactions";
 async function createShortLocks({ nfts }, context) {
   const expireIn = 7 * 24 * 3600 * 1e3;
-  const tx = new Transaction17();
+  const tx = new Transaction18();
   for (const argNft of nfts) {
     const premium = calculatePremium(BigInt(argNft.priceInMist));
     if (!argNft.type) {
@@ -5508,8 +5609,8 @@ async function createShortLocks({ nfts }, context) {
 }
 
 // src/methods/listNfts/listNfts.ts
-import { Transaction as Transaction18 } from "@mysten/sui/transactions";
-import { normalizeSuiAddress } from "@mysten/sui/utils";
+import { Transaction as Transaction19 } from "@mysten/sui/transactions";
+import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui/utils";
 
 // src/methods/listNfts/addListTxs.ts
 async function addOriginByteListTx({
@@ -5839,7 +5940,7 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
     throw new Error("No nfts found");
   }
   const nftsForTracking = [];
-  const tx = new Transaction18();
+  const tx = new Transaction19();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -5854,7 +5955,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 && normalizeSuiAddress(listing.seller) === normalizeSuiAddress(walletAddress)
+      (listing) => listing.nonce && listing.seller && normalizeSuiAddress2(listing.seller) === normalizeSuiAddress2(walletAddress)
     )) {
       await relistNft({
         tx,
@@ -5892,11 +5993,11 @@ var listNfts = async ({ nfts, walletAddress }, context) => {
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction18.from(tx);
+  return tx instanceof Transaction19 ? tx : Transaction19.from(tx);
 };
 
 // src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts
-import { Transaction as Transaction19 } from "@mysten/sui/transactions";
+import { Transaction as Transaction20 } from "@mysten/sui/transactions";
 
 // src/graphql/queries/fetchNftsByKioskId.ts
 import { gql as gql18 } from "graphql-request";
@@ -6099,7 +6200,7 @@ async function getTransferPolicyForDirectTransfer(suiClient, collectionChainStat
 
 // src/methods/migrateNftsFromUnsharedToSharedKiosks/migrateNftsFromUnsharedToSharedKiosks.ts
 async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }, context) {
-  const tx = new Transaction19();
+  const tx = new Transaction20();
   const res = await gqlChainRequest({
     chain: "sui",
     query: fetchKiosksByOwner,
@@ -6265,11 +6366,11 @@ async function migrateNftsFromUnsharedToSharedKiosks({ walletAddress, max = 50 }
     }
   }
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction19.from(tx);
+  return tx instanceof Transaction20 ? tx : Transaction20.from(tx);
 }
 
 // src/methods/placeCollectionBids/placeCollectionBids.ts
-import { Transaction as Transaction20 } from "@mysten/sui/transactions";
+import { Transaction as Transaction21 } from "@mysten/sui/transactions";
 
 // src/graphql/queries/fetchCollectionsById.ts
 import { gql as gql19 } from "graphql-request";
@@ -6324,7 +6425,8 @@ async function addTradePortPlaceNftBidTxHandler(txData) {
     collectionId,
     bcsHex,
     expireAt,
-    coinToSplit
+    coinToSplit,
+    amountToSplitFromSuiBalance
   } = txData;
   let bcs4;
   if (nftTokenId && isDynamicCollection(collectionId)) {
@@ -6378,6 +6480,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
   ]);
@@ -6483,7 +6586,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,
@@ -6493,8 +6603,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,
@@ -6514,7 +6630,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))) {
@@ -6541,17 +6658,28 @@ var placeCollectionBids = async ({ collections, walletAddress, multiBidId, multi
       bidder: walletAddress
     });
   }
-  if (swapResultCoin) {
-    tx.transferObjects([swapResultCoin], walletAddress);
-  }
-  return Transaction20.from(tx);
+  handleSwapCleanup(tx, swapResultCoin, walletAddress);
+  return tx instanceof Transaction21 ? tx : Transaction21.from(tx);
 };
 
 // src/methods/placeNftBids/placeNftBids.ts
-import { Transaction as Transaction21 } from "@mysten/sui/transactions";
-var placeNftBids = async ({ bids, walletAddress, multiBidId, multiBidChainId, tx: existingTx }, context) => {
-  const tx = deserializeOrCreateTxBlock({ existingTx });
-  const swapResultCoin = extractSwapResultCoinFromTxBlock(tx);
+import { Transaction as Transaction22 } from "@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,
@@ -6585,7 +6713,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({
@@ -6595,14 +6724,12 @@ var placeNftBids = async ({ bids, walletAddress, multiBidId, multiBidChainId, tx
       bidder: walletAddress
     });
   }
-  if (swapResultCoin) {
-    tx.transferObjects([swapResultCoin], walletAddress);
-  }
-  return Transaction21.from(tx);
+  handleSwapCleanup(tx, swapResultCoin, walletAddress);
+  return tx instanceof Transaction22 ? tx : Transaction22.from(tx);
 };
 
 // src/methods/removeCollectionBids/removeCollectionBids.ts
-import { Transaction as Transaction22 } from "@mysten/sui/transactions";
+import { Transaction as Transaction23 } from "@mysten/sui/transactions";
 
 // src/methods/removeCollectionBids/addRemoveCollectionBidsTxs.ts
 import { normalizeSuiObjectId as normalizeSuiObjectId6 } from "@mysten/sui/utils";
@@ -6710,7 +6837,7 @@ var removeCollectionBids = async ({ bidIds, tx: existingTx }, context) => {
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = existingTx ? Transaction22.from(existingTx) : new Transaction22();
+  const tx = existingTx ? Transaction23.from(existingTx) : new Transaction23();
   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);
@@ -6758,11 +6885,11 @@ var removeCollectionBids = async ({ bidIds, tx: existingTx }, context) => {
       bidder: bid?.bidder
     });
   }
-  return Transaction22.from(tx);
+  return tx instanceof Transaction23 ? tx : Transaction23.from(tx);
 };
 
 // src/methods/removeNftBids/removeNftBids.ts
-import { Transaction as Transaction23 } from "@mysten/sui/transactions";
+import { Transaction as Transaction24 } from "@mysten/sui/transactions";
 var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -6773,7 +6900,7 @@ var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
     throw new Error("No bids found");
   }
   const bidsForTracking = [];
-  const tx = existingTx ? Transaction23.from(existingTx) : new Transaction23();
+  const tx = existingTx ? Transaction24.from(existingTx) : new Transaction24();
   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);
@@ -6818,11 +6945,11 @@ var removeNftBids = async ({ bidIds, tx: existingTx }, context) => {
       bidder: bid?.bidder
     });
   }
-  return Transaction23.from(tx);
+  return tx instanceof Transaction24 ? tx : Transaction24.from(tx);
 };
 
 // src/methods/transferNfts/transferNfts.ts
-import { Transaction as Transaction24 } from "@mysten/sui/transactions";
+import { Transaction as Transaction25 } from "@mysten/sui/transactions";
 var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context) => {
   if (addLeadingZerosAfter0x(recipientAddress) === addLeadingZerosAfter0x(walletAddress)) {
     throw new Error("Cannot transfer to self");
@@ -6840,7 +6967,7 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
   }
   const nftsForTracking = [];
   const nftsToTransferDirectly = [];
-  const tx = new Transaction24();
+  const tx = new Transaction25();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -6943,11 +7070,11 @@ var transferNfts = async ({ nftIds, recipientAddress, walletAddress }, context)
     context.suiClient
   );
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction24.from(tx);
+  return tx instanceof Transaction25 ? tx : Transaction25.from(tx);
 };
 
 // src/methods/unlistListings/unlistListings.ts
-import { Transaction as Transaction25 } from "@mysten/sui/transactions";
+import { Transaction as Transaction26 } from "@mysten/sui/transactions";
 var unlistListings = async ({ listingIds, walletAddress }, context) => {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -6958,7 +7085,7 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
     throw new Error("No listings found");
   }
   const listingsForTracking = [];
-  const tx = new Transaction25();
+  const tx = new Transaction26();
   const sharedKioskState = {
     kioskTx: void 0
   };
@@ -7027,12 +7154,12 @@ var unlistListings = async ({ listingIds, walletAddress }, context) => {
     });
   }
   sharedKioskState?.kioskTx?.finalize();
-  return Transaction25.from(tx);
+  return tx instanceof Transaction26 ? tx : Transaction26.from(tx);
 };
 
 // src/methods/withdrawProfitsFromKiosks/withdrawProfitsFromKiosks.ts
 import { KioskTransaction as KioskTransaction2 } from "@mysten/kiosk";
-import { Transaction as Transaction26 } from "@mysten/sui/transactions";
+import { Transaction as Transaction27 } from "@mysten/sui/transactions";
 async function withdrawProfitsFromKiosks({ walletAddress }, context) {
   const res = await gqlChainRequest({
     chain: "sui",
@@ -7052,7 +7179,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 Transaction26();
+  const tx = new Transaction27();
   try {
     for (const kiosk of kiosksWithProfit) {
       let kioskTx;
@@ -7063,7 +7190,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
           variables: { kioskId: kiosk.id }
         })).personalCap?.id;
         kioskTx = new KioskTransaction2({
-          transactionBlock: tx,
+          transaction: tx,
           kioskClient: context.kioskClient,
           cap: {
             isPersonal: true,
@@ -7080,7 +7207,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
           variables: { kioskId: kiosk.id }
         })).ownerCap?.id;
         kioskTx = new KioskTransaction2({
-          transactionBlock: tx,
+          transaction: tx,
           kioskClient: context.kioskClient,
           cap: {
             isPersonal: false,
@@ -7098,7 +7225,7 @@ async function withdrawProfitsFromKiosks({ walletAddress }, context) {
   } catch (err) {
     console.log("err", err);
   }
-  return Transaction26.from(tx);
+  return tx instanceof Transaction27 ? tx : Transaction27.from(tx);
 }
 
 // src/SuiTradingClient.ts
@@ -7117,14 +7244,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 = {
@@ -7179,7 +7311,8 @@ var SuiTradingClient = class {
     multiBidId,
     multiBidChainId,
     expireAt,
-    tx
+    tx,
+    swapAndPayOptions
   }) {
     const context = {
       apiUser: this.apiUser,
@@ -7200,7 +7333,8 @@ var SuiTradingClient = class {
         walletAddress,
         multiBidId,
         multiBidChainId,
-        tx
+        tx,
+        swapAndPayOptions
       },
       context
     );
@@ -7426,13 +7560,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;