@tradeport/sui-trading-sdk 0.3.7 → 0.3.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tradeport/sui-trading-sdk",
   "license": "MIT",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",

package/src/SuiTradingClient.ts

@@ -157,7 +157,7 @@ class SuiTradingClient {
 		return removeNftBids({ bidIds, tx }, context);
 	}
 
-	public async acceptNftBids({ bidIds }: AcceptNftBids) {
+	public async acceptNftBids({ bidIds, walletAddress }: AcceptNftBids) {
 		const context: RequestContext = {
 			apiUser: this.apiUser,
 			apiKey: this.apiKey,
@@ -165,7 +165,7 @@ class SuiTradingClient {
 			kioskClient: this.kioskClient,
 		};
 
-		return acceptNftBids({ bidIds }, context);
+		return acceptNftBids({ bidIds, walletAddress }, context);
 	}
 
 	public async placeCollectionBid({
@@ -215,6 +215,10 @@ class SuiTradingClient {
 			throw new Error('No bid found');
 		}
 
+		if (addLeadingZerosAfter0x(bid?.bidder) === addLeadingZerosAfter0x(walletAddress)) {
+			throw new Error('Wallet cannot accept its own bid');
+		}
+
 		if (bid?.status !== 'active') {
 			throw new Error('Bid not active');
 		}

package/src/helpers/kiosk/kioskTxWrapper.ts

@@ -110,7 +110,10 @@ export const kioskTxWrapper = async ({
 				version: '',
 			},
 		});
-	} else if (kiosks.length > 0) {
+	} else if (shouldConvertToPersonalKiosk || kiosks.length === 0) {
+		kioskTx = new KioskTransaction({ transactionBlock: tx as any, kioskClient });
+		kioskTx.createPersonal(true);
+	} else {
 		const kioskCapId = (
 			await gqlChainRequest({
 				chain: 'sui',
@@ -130,10 +133,6 @@ export const kioskTxWrapper = async ({
 				version: '',
 			},
 		});
-	} else {
-		// creating new personal kiosk
-		kioskTx = new KioskTransaction({ transactionBlock: tx as any, kioskClient });
-		kioskTx.createPersonal(true);
 	}
 
 	await runCommands(kioskTx);

package/src/methods/acceptNftBids/acceptNftBids.ts

@@ -2,19 +2,20 @@ import { type KioskClient, type KioskTransaction } from '@mysten/kiosk';
 import { type SuiClient } from '@mysten/sui/client';
 import { Transaction } from '@mysten/sui/transactions';
 import { type RequestContext } from '../../SuiTradingClient';
+import {
+	DELOREAN_TOKEN_IDS_TO_DISABLE,
+	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
+} from '../../constants';
 import { gqlChainRequest } from '../../graphql/gqlChainRequest';
 import { fetchBidsById } from '../../graphql/queries/fetchBidsById';
 import { getNftType } from '../../helpers/getNftType';
 import { getSharedObjects } from '../../helpers/getSharedObjects';
+import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import {
 	addBluemoveAcceptNftBidTx,
 	addOriginByteAcceptNftBidTx,
 	addTradePortAcceptNftBidTxHandler,
 } from './addAcceptNftBidTxs';
-import {
-	DELOREAN_TOKEN_IDS_TO_DISABLE,
-	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
-} from '../../constants';
 
 export type AcceptNftBidTx = {
 	tx: Transaction;
@@ -38,12 +39,9 @@ export type AcceptNftBidTx = {
 	beforeResolveKioskTransferRequest?: (coin: any, transferRequest: any) => void | Promise<void>;
 };
 
-export type AcceptNftBid = {
-	bidId: string;
-};
-
 export type AcceptNftBids = {
 	bidIds: string[];
+	walletAddress: string;
 	tx?: Transaction;
 	kioskTx?: KioskTransaction;
 	beforeResolveKioskTransferRequest?: (coin: any, transferRequest: any) => void | Promise<void>;
@@ -52,7 +50,13 @@ export type AcceptNftBids = {
 const ERROR_UNLIST_FIRST = 'Item must be unlisted first before you can accept a solo bid on it';
 
 export const acceptNftBids = async (
-	{ bidIds, tx: existingTx, kioskTx, beforeResolveKioskTransferRequest }: AcceptNftBids,
+	{
+		bidIds,
+		walletAddress,
+		tx: existingTx,
+		kioskTx,
+		beforeResolveKioskTransferRequest,
+	}: AcceptNftBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
 	const res = await gqlChainRequest({
@@ -73,6 +77,10 @@ export const acceptNftBids = async (
 			throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
 		}
 
+		if (addLeadingZerosAfter0x(bid?.bidder) === addLeadingZerosAfter0x(walletAddress)) {
+			throw new Error('Wallet cannot accept its own bid');
+		}
+
 		if (bid?.status !== 'active') {
 			throw new Error('Bid not active');
 		}