@tradeport/sui-trading-sdk 0.4.39 → 0.4.40

package/src/methods/placeNftBids/addPlaceNftBidTxs.ts

@@ -1,4 +1,5 @@
 import { type SuiClient } from '@mysten/sui/client';
+import { type Transaction } from '@mysten/sui/transactions';
 import { fromHex, normalizeSuiObjectId } from '@mysten/sui/utils';
 import {
 	DYNAMIC_COLLECTION_IDS,
@@ -7,16 +8,13 @@ import {
 	TRADEPORT_MULTI_BID_STORE,
 } from '../../constants';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
-import {
-	fetchMultibidChainIdAndExpiredSingleBidsById,
-	fetchMultibidChainIdById,
-} from '../../graphql/queries/fetchMultibidById';
+import { fetchMultibidChainIdAndExpiredSingleBidsById } from '../../graphql/queries/fetchMultibidById';
 import { getNativeKioskTransferPolicies } from '../../helpers/kiosk/getNativeKioskTransferPolicies';
 import { isOriginByteCollection } from '../../helpers/originByte/isOriginByteCollection';
+import { mergeSwapCoinWithSuiBalance } from '../../helpers/swap/swap';
 import { normalizedNftType } from '../../utils/normalizeNftType';
-import { type PlaceNftBidTx } from './placeNftBids';
 import { addCancelSingleBidForMultibidChainId } from '../removeNftBids/addRemoveNftBidTxs';
-import { type Transaction } from '@mysten/sui/transactions';
+import { type PlaceNftBidTx } from './placeNftBids';
 
 export async function addTradePortPlaceNftBidTxHandler(txData: PlaceNftBidTx) {
 	if (
@@ -36,6 +34,7 @@ export async function addTradePortPlaceNftBidTxHandler(txData: PlaceNftBidTx) {
 		bcsHex,
 		expireAt,
 		coinToSplit,
+		amountToSplitFromSuiBalance,
 	} = txData;
 	let bcs: Uint8Array | undefined;
 	if (nftTokenId && isDynamicCollection(collectionId)) {
@@ -104,8 +103,10 @@ export async function addTradePortPlaceNftBidTxHandler(txData: PlaceNftBidTx) {
 		txWithState.hasCancelBidTransactions.set(multiBidChainId, true);
 	}
 
+	mergeSwapCoinWithSuiBalance(tx, coinToSplit, amountToSplitFromSuiBalance);
+
 	const [coin] = tx.splitCoins(coinToSplit ? coinToSplit : tx.gas, [
-		 multiBidChainId ? 0n : price + fee + royalty,
+		multiBidChainId ? 0n : price + fee + royalty,
 	]);
 	tx.moveCall({
 		target: `${TRADEPORT_MULTI_BID_PACKAGE}::tradeport_biddings::create_bid_with${transferPolicy ? '' : 'out'}_transfer_policy`,

package/src/methods/placeNftBids/placeNftBids.ts

@@ -8,8 +8,12 @@ import {
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
 import { fetchNftsById } from '../../graphql/queries/fetchNftsById';
 import { deserializeOrCreateTxBlock } from '../../helpers/deserializeOrCreateTxBlock';
-import { extractSwapResultCoinFromTxBlock } from '../../helpers/extractSwapResultCoin';
 import { getNftType } from '../../helpers/getNftType';
+import {
+	handleSwapCleanup,
+	handleSwapSetup,
+	type SwapAndPayOptions,
+} from '../../helpers/swap/swap';
 import { addTradePortPlaceNftBidTxHandler } from './addPlaceNftBidTxs';
 
 export type PlaceNftBidTx = {
@@ -27,6 +31,7 @@ export type PlaceNftBidTx = {
 	transferPolicies: any;
 	bcsHex?: string;
 	coinToSplit?: any;
+	amountToSplitFromSuiBalance?: bigint;
 };
 
 export type PlaceNftBids = {
@@ -39,14 +44,29 @@ export type PlaceNftBids = {
 	multiBidId?: string;
 	multiBidChainId?: any;
 	tx?: Transaction | string;
+	swapAndPayOptions?: SwapAndPayOptions;
 };
 
 export const placeNftBids = async (
-	{ bids, walletAddress, multiBidId, multiBidChainId, tx: existingTx }: PlaceNftBids,
+	{
+		bids,
+		walletAddress,
+		multiBidId,
+		multiBidChainId,
+		tx: existingTx,
+		swapAndPayOptions,
+	}: PlaceNftBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
-	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 res = await gqlChainRequest({
 		chain: 'sui',
@@ -88,6 +108,7 @@ export const placeNftBids = async (
 			multiBidChainId,
 			expireAt: bid?.expireAt,
 			coinToSplit: swapResultCoin,
+			amountToSplitFromSuiBalance: BigInt(swapAndPayOptions?.amountToSplitFromSuiBalance ?? 0n),
 		};
 
 		await addTradePortPlaceNftBidTxHandler(txData);
@@ -100,9 +121,7 @@ export const placeNftBids = async (
 		});
 	}
 
-	if (swapResultCoin) {
-		tx.transferObjects([swapResultCoin], walletAddress);
-	}
+	handleSwapCleanup(tx, swapResultCoin, walletAddress);
 
 	// if (process.env.ENABLE_SEGMENT_TRACKING === 'true' && nftsForTracking.length > 0) {
 	// 	trackMethodCall({
@@ -113,5 +132,5 @@ export const placeNftBids = async (
 	// 	});
 	// }
 
-	return Transaction.from(tx);
+	return tx instanceof Transaction ? tx : Transaction.from(tx);
 };

package/src/methods/removeCollectionBids/removeCollectionBids.ts

@@ -113,5 +113,5 @@ export const removeCollectionBids = async (
 	// 	});
 	// }
 
-	return Transaction.from(tx);
+	return tx instanceof Transaction ? tx : Transaction.from(tx);
 };

package/src/methods/removeNftBids/removeNftBids.ts

@@ -112,5 +112,5 @@ export const removeNftBids = async (
 	// 	});
 	// }
 
-	return Transaction.from(tx);
+	return tx instanceof Transaction ? tx : Transaction.from(tx);
 };

package/src/methods/transferNfts/transferNfts.ts

@@ -207,5 +207,5 @@ export const transferNfts = async (
 	// 	});
 	// }
 
-	return Transaction.from(tx);
+	return tx instanceof Transaction ? tx : Transaction.from(tx);
 };

package/src/methods/unlistListings/unlistListings.ts

@@ -20,7 +20,6 @@ import {
 	addTocenUnlistTxHandler,
 	addTradePortUnlistTxHandler,
 } from './addUnlistListingTxs';
-import { normalizeSuiAddress } from '@mysten/sui/utils';
 
 export type UnlistListingTx = {
 	tx: Transaction;
@@ -158,5 +157,5 @@ export const unlistListings = async (
 	// 	});
 	// }
 
-	return Transaction.from(tx);
+	return tx instanceof Transaction ? tx : Transaction.from(tx);
 };

package/src/methods/updateMultiBid/updateMultiBid.ts

@@ -1,10 +1,15 @@
+import { type SuiClient } from '@mysten/sui/client';
 import { type Transaction } from '@mysten/sui/transactions';
 import { TRADEPORT_MULTI_BID_PACKAGE, TRADEPORT_MULTI_BID_STORE } from '../../constants';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
 import { fetchMultibidChainIdById } from '../../graphql/queries/fetchMultibidById';
 import { deserializeOrCreateTxBlock } from '../../helpers/deserializeOrCreateTxBlock';
-import { extractSwapResultCoinFromTxBlock } from '../../helpers/extractSwapResultCoin';
-
+import {
+	handleSwapCleanup,
+	handleSwapSetup,
+	mergeSwapCoinWithSuiBalance,
+	type SwapAndPayOptions,
+} from '../../helpers/swap/swap';
 export interface UpdateMultiBid {
 	walletAddress: string;
 	multiBidId?: string;
@@ -13,6 +18,8 @@ export interface UpdateMultiBid {
 	amountToWithdraw?: bigint;
 	tx?: Transaction | string;
 	multiBidChainId?: any;
+	swapAndPayOptions?: SwapAndPayOptions;
+	suiClient?: SuiClient;
 }
 
 export async function updateMultiBid({
@@ -22,9 +29,23 @@ export async function updateMultiBid({
 	amountToWithdraw,
 	tx: existingTx,
 	multiBidChainId,
+	swapAndPayOptions,
+	suiClient,
+	walletAddress,
 }: UpdateMultiBid): Promise<Transaction> {
-	const tx = deserializeOrCreateTxBlock({ existingTx });
-	const swapResultCoin = extractSwapResultCoinFromTxBlock(tx);
+	let tx = deserializeOrCreateTxBlock({ existingTx });
+
+	let swapResultCoin;
+	if (suiClient) {
+		const { transaction: updatedTx, swapResultCoin: coin } = await handleSwapSetup(
+			suiClient,
+			walletAddress,
+			tx,
+			swapAndPayOptions,
+		);
+		tx = updatedTx;
+		swapResultCoin = coin;
+	}
 
 	if (!multiBidChainId) {
 		const { chain_id: chainId, cancelled_at } =
@@ -46,6 +67,12 @@ export 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`,
@@ -58,5 +85,9 @@ export async function updateMultiBid({
 		],
 	});
 
+	if (suiClient) {
+		handleSwapCleanup(tx, swapResultCoin, walletAddress);
+	}
+
 	return tx;
 }

package/src/methods/withdrawProfitsFromKiosks/withdrawProfitsFromKiosks.ts

@@ -55,7 +55,7 @@ export async function withdrawProfitsFromKiosks(
 				).personalCap?.id;
 
 				kioskTx = new KioskTransaction({
-					transactionBlock: tx as any,
+					transaction: tx as any,
 					kioskClient: context.kioskClient,
 					cap: {
 						isPersonal: true,
@@ -75,7 +75,7 @@ export async function withdrawProfitsFromKiosks(
 				).ownerCap?.id;
 
 				kioskTx = new KioskTransaction({
-					transactionBlock: tx as any,
+					transaction: tx as any,
 					kioskClient: context.kioskClient,
 					cap: {
 						isPersonal: false,
@@ -96,5 +96,5 @@ export async function withdrawProfitsFromKiosks(
 		console.log('err', err);
 	}
 
-	return Transaction.from(tx);
+	return tx instanceof Transaction ? tx : Transaction.from(tx);
 }

package/src/helpers/extractSwapResultCoin.ts

@@ -1,17 +0,0 @@
-import { type Transaction } from '@mysten/sui/transactions';
-
-export const extractSwapResultCoinFromTxBlock = (txBlock: Transaction | string) => {
-	if (!txBlock) return undefined;
-
-	const tx = typeof txBlock === 'string' ? JSON.parse(txBlock) : txBlock?.getData();
-	const commands = tx.commands ?? [];
-
-	const index = commands.findIndex(
-		(cmd: any) =>
-			cmd?.MoveCall?.module === 'universal_router' && cmd?.MoveCall?.function === 'settle',
-	);
-
-	if (index === -1) return undefined;
-
-	return { $kind: 'Result', Result: index };
-};