@tradeport/sui-trading-sdk 0.4.0 → 0.4.2

package/package.json

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

package/src/SuiTradingClient.ts

@@ -23,12 +23,14 @@ import {
 import { buyListings, type BuyListings } from './methods/buyListings/buyListings';
 import { buyLocks, type BuyLocks } from './methods/buyLocks/buyLocks';
 import { cancelLocks, type CancelLocks } from './methods/cancelLocks/cancelLocks';
+import { cancelMultiBid, type CancelMultiBid } from './methods/cancelMultiBid/cancelMultiBid';
 import {
 	cancelNftTransfers,
 	type CancelNftTransfers,
 } from './methods/cancelNftTransfers/cancelNftTransfers';
 import { claimNfts, type ClaimNfts } from './methods/claimNfts/claimNfts';
 import { createLongLocks, type CreateLongLocks } from './methods/createLongLocks/createLongLocks';
+import { createMultiBid, type CreateMultiBid } from './methods/createMultiBid/createMultiBid';
 import {
 	createShortLocks,
 	type CreateShortLocks,
@@ -58,14 +60,12 @@ import {
 import { removeNftBids, type RemoveNftBids } from './methods/removeNftBids/removeNftBids';
 import { transferNfts, type TransferNfts } from './methods/transferNfts/transferNfts';
 import { unlistListings, type UnlistListings } from './methods/unlistListings/unlistListings';
+import { updateMultiBid, type UpdateMultiBid } from './methods/updateMultiBid/updateMultiBid';
 import {
 	withdrawProfitsFromKiosks,
 	type WithdrawProfitsFromKiosks,
 } from './methods/withdrawProfitsFromKiosks/withdrawProfitsFromKiosks';
 import { addLeadingZerosAfter0x } from './utils/addLeadingZerosAfter0x';
-import { createMultiBid, type CreateMultiBid } from './methods/createMultiBid/createMultiBid';
-import { cancelMultiBid, type CancelMultiBid } from './methods/cancelMultiBid/cancelMultiBid';
-import { updateMultiBid, type UpdateMultiBid } from './methods/updateMultiBid/updateMultiBid';
 
 type ApiConfig = {
 	apiUser: string;
@@ -179,6 +179,7 @@ class SuiTradingClient {
 		multiBidId,
 		multiBidChainId,
 		expireAt,
+		tx,
 	}: PlaceCollectionBid): Promise<Transaction> {
 		const context: RequestContext = {
 			apiUser: this.apiUser,
@@ -194,12 +195,13 @@ class SuiTradingClient {
 						id: collectionId,
 						bidAmountInMist,
 						numOfBids,
+						expireAt,
 					},
 				],
 				walletAddress,
 				multiBidId,
 				multiBidChainId,
-				expireAt,
+				tx,
 			},
 			context,
 		);

package/src/constants.ts

@@ -15,8 +15,8 @@ export const TRADEPORT_KIOSK_BID_NONCE_TYPE = '0xec175e537be9e48f75fa6929291de64
 export const TRADEPORT_PRICE_LOCK_PACKAGE = '0x3cb532a2548290780a3d70ad6f4f06abc5bebb75ec6f8dd0197d4d2b2860c5d8';
 export const TRADEPORT_PRICE_LOCK_STORE = '0x4b705de46a79b29276baf45009bc7d6f70cc0f1407f0c9e03cac5729c0c47946';
 
-export const TRADEPORT_MULTI_BID_PACKAGE = '0xb32c899d9fb0d79a7e384bfbf2830a19ee26ccf51d6cadaaf1a14c4a2817886a'; // Upgrade Cap 0x7fdc0ebfd6265f7642e68269eb085fb551f02a9953d38f1872370d59613207c7
-export const TRADEPORT_MULTI_BID_STORE = '0x2617658a6b03dcf6df2df4d256341bc4690d3a3d299c9552ca6ac9799ceb0ed7';
+export const TRADEPORT_MULTI_BID_PACKAGE = '0x53134eb544c5a0b5085e99efaf7eab13b28ad123de35d61f941f8c8c40b72033'; 
+export const TRADEPORT_MULTI_BID_STORE = '0x8aaed7e884343fb8b222c721d02eaac2c6ae2abbb4ddcdf16cb55cf8754ee860';
 
 export const COLLECTION_IDS_WITH_ZERO_COMMISSION = [
 	'',

package/src/methods/placeCollectionBids/placeCollectionBids.ts

@@ -1,4 +1,5 @@
 import { type KioskClient } from '@mysten/kiosk';
+import { type SuiClient } from '@mysten/sui/client';
 import { Transaction } from '@mysten/sui/transactions';
 import { type RequestContext } from '../../SuiTradingClient';
 import { ORIGIN_BYTE_NFT_TYPES_MISSING_ORDERBOOK } from '../../constants';
@@ -10,9 +11,8 @@ import { getOrCreateOBKiosk } from '../../helpers/originByte/getOrCreateOBKiosk'
 import { isOriginByteTx } from '../../helpers/originByte/isOriginByteTx';
 import { shareOriginByteKiosk } from '../../helpers/originByte/shareOriginByteKiosk';
 import { normalizedNftType } from '../../utils/normalizeNftType';
-import { addOriginByteCollectionBidTx } from './addPlaceCollectionBidTxs';
-import { type SuiClient } from '@mysten/sui/client';
 import { addTradePortPlaceNftBidTxHandler } from '../placeNftBids/addPlaceNftBidTxs';
+import { addOriginByteCollectionBidTx } from './addPlaceCollectionBidTxs';
 
 export type PlaceCollectionBidTx = {
 	tx: Transaction;
@@ -39,7 +39,7 @@ export type PlaceCollectionBid = {
 	multiBidId?: string;
 	multiBidChainId?: any;
 	expireAt?: Date;
-	tx?: Transaction;
+	tx?: Transaction | string;
 };
 
 export type PlaceCollectionBids = {
@@ -47,23 +47,16 @@ export type PlaceCollectionBids = {
 		id: string;
 		bidAmountInMist: number;
 		numOfBids: number;
+		expireAt?: Date;
 	}>;
 	walletAddress: string;
 	multiBidId?: string;
 	multiBidChainId?: any;
-	expireAt?: Date;
-	tx?: Transaction;
+	tx?: Transaction | string;
 };
 
 export const placeCollectionBids = async (
-	{
-		collections,
-		walletAddress,
-		multiBidId,
-		multiBidChainId,
-		expireAt,
-		tx: existingTx,
-	}: PlaceCollectionBids,
+	{ collections, walletAddress, multiBidId, multiBidChainId, tx: existingTx }: PlaceCollectionBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
 	const res = await gqlChainRequest({
@@ -77,7 +70,7 @@ export const placeCollectionBids = async (
 	}
 
 	const collectionsForTracking = [];
-	const tx = existingTx ?? new Transaction();
+	const tx = existingTx ? Transaction.from(existingTx) : new Transaction();
 
 	for (const collection of res.collections) {
 		const nftType = getNftType({
@@ -99,7 +92,7 @@ export const placeCollectionBids = async (
 			bidAmount: collections?.find((c) => c.id === collection?.id)?.bidAmountInMist,
 			multiBidId,
 			multiBidChainId,
-			expireAt,
+			expireAt: collections?.find((c) => c.id === collection?.id)?.expireAt,
 		};
 
 		const numOfBids = collections?.find((c) => c.id === collection?.id)?.numOfBids;

package/src/methods/placeNftBids/placeNftBids.ts

@@ -1,15 +1,15 @@
 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 { fetchNftsById } from '../../graphql/queries/fetchNftsById';
 import { getNftType } from '../../helpers/getNftType';
 import { getSharedObjects } from '../../helpers/getSharedObjects';
 import { addTradePortPlaceNftBidTxHandler } from './addPlaceNftBidTxs';
-import {
-	DELOREAN_TOKEN_IDS_TO_DISABLE,
-	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
-} from '../../constants';
 
 export type PlaceNftBidTx = {
 	tx: Transaction;
@@ -32,30 +32,31 @@ export type PlaceNftBid = {
 	walletAddress: string;
 	multiBidId?: string;
 	multiBidChainId?: any;
-	tx?: Transaction;
+	tx?: Transaction | string;
 };
 
 export type PlaceNftBids = {
-	nfts: Array<{
-		id: string;
+	bids: Array<{
+		nftId: string;
 		bidAmountInMist: number;
+		expireAt?: Date;
 	}>;
 	walletAddress: string;
 	multiBidId?: string;
 	multiBidChainId?: any;
-	expireAt?: Date;
-	tx?: Transaction;
+	tx?: Transaction | string;
 };
 
 export const placeNftBids = async (
-	{ nfts, walletAddress, multiBidId, multiBidChainId, expireAt, tx: existingTx }: PlaceNftBids,
+	{ bids, walletAddress, multiBidId, multiBidChainId, tx: existingTx }: PlaceNftBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
-	const tx = existingTx ?? new Transaction();
+	const tx = existingTx ? Transaction.from(existingTx) : new Transaction();
+
 	const res = await gqlChainRequest({
 		chain: 'sui',
 		query: fetchNftsById,
-		variables: { nftIds: nfts.map((nft) => nft.id) },
+		variables: { nftIds: bids.map((bid) => bid.nftId) },
 	});
 
 	if (res?.nfts?.length === 0) {
@@ -63,7 +64,9 @@ export const placeNftBids = async (
 	}
 
 	const nftsForTracking = [];
-	for (const nft of res.nfts) {
+	for (const bid of bids) {
+		const nft = res.nfts?.find((nft: any) => nft.id === bid.nftId);
+
 		if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(nft?.token_id)) {
 			throw new Error(DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE);
 		}
@@ -84,11 +87,11 @@ export const placeNftBids = async (
 			collectionId: nft?.collection_id,
 			nftTokenId: nft?.token_id,
 			nftType,
-			bidAmount: BigInt(nfts?.find((n) => n.id === nft?.id)?.bidAmountInMist ?? 0n),
+			bidAmount: BigInt(bid?.bidAmountInMist ?? 0n),
 			bcsHex: nft.chain_state?.bcs?.bcsHex,
 			multiBidId,
 			multiBidChainId,
-			expireAt,
+			expireAt: bid?.expireAt,
 		};
 
 		await addTradePortPlaceNftBidTxHandler(txData);
@@ -96,7 +99,7 @@ export const placeNftBids = async (
 		nftsForTracking.push({
 			nftType,
 			collectionId: nft?.collection_id,
-			bidAmount: nfts?.find((n) => n.id === nft?.id)?.bidAmountInMist,
+			bidAmount: bid?.bidAmountInMist,
 			bidder: walletAddress,
 		});
 	}