@tradeport/sui-trading-sdk 0.3.0 → 0.3.2

package/package.json

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

package/src/SuiTradingClient.ts

@@ -5,7 +5,7 @@ import createKioskClient from './apiClients/createKioskClient';
 import createSuiClient from './apiClients/createSuiClient';
 import { getGraphqlClient, setGraphqlClient } from './apiClients/graphqlClient';
 import { gqlChainRequest } from './graphql/gqlChainRequest';
-import { fetchCollectionBidById } from './graphql/queries/fetchCollectionBidById';
+import { fetchCollectionBidsById } from './graphql/queries/fetchCollectionBidById';
 import { fetchCollectionBidsAtSamePrice } from './graphql/queries/fetchCollectionBidsAtSamePrice';
 import {
 	acceptCollectionBid,
@@ -52,9 +52,9 @@ import {
 } from './methods/placeCollectionBids/placeCollectionBids';
 import { placeNftBids, type PlaceNftBids } from './methods/placeNftBids/placeNftBids';
 import {
-	removeCollectionBid,
-	type RemoveCollectionBid,
-} from './methods/removeCollectionBid/removeCollectionBid';
+	removeCollectionBids,
+	type RemoveCollectionBids,
+} from './methods/removeCollectionBids/removeCollectionBids';
 import { removeNftBids, type RemoveNftBids } from './methods/removeNftBids/removeNftBids';
 import { transferNfts, type TransferNfts } from './methods/transferNfts/transferNfts';
 import { unlistListings, type UnlistListings } from './methods/unlistListings/unlistListings';
@@ -146,7 +146,7 @@ class SuiTradingClient {
 		return placeNftBids({ nfts, walletAddress }, context);
 	}
 
-	public async removeNftBids({ bidIds }: RemoveNftBids) {
+	public async removeNftBids({ bidIds, tx }: RemoveNftBids) {
 		const context: RequestContext = {
 			apiUser: this.apiUser,
 			apiKey: this.apiKey,
@@ -154,7 +154,7 @@ class SuiTradingClient {
 			kioskClient: this.kioskClient,
 		};
 
-		return removeNftBids({ bidIds }, context);
+		return removeNftBids({ bidIds, tx }, context);
 	}
 
 	public async acceptNftBids({ bidIds }: AcceptNftBids) {
@@ -206,8 +206,8 @@ class SuiTradingClient {
 
 		const collectionBidRes = await gqlChainRequest({
 			chain: 'sui',
-			query: fetchCollectionBidById,
-			variables: { bidId },
+			query: fetchCollectionBidsById,
+			variables: { bidIds: [bidId] },
 		});
 		const bid = collectionBidRes?.bids?.[0];
 
@@ -283,7 +283,7 @@ class SuiTradingClient {
 		}
 	}
 
-	public async removeCollectionBid({ bidId }: RemoveCollectionBid) {
+	public async removeCollectionBids({ bidIds, tx }: RemoveCollectionBids) {
 		const context: RequestContext = {
 			apiUser: this.apiUser,
 			apiKey: this.apiKey,
@@ -291,7 +291,7 @@ class SuiTradingClient {
 			kioskClient: this.kioskClient,
 		};
 
-		return removeCollectionBid({ bidId }, context);
+		return removeCollectionBids({ bidIds, tx }, context);
 	}
 
 	public async transferNfts({ nftIds, recipientAddress, walletAddress }: TransferNfts) {

package/src/graphql/queries/fetchCollectionBidById.ts

@@ -1,8 +1,8 @@
 import { gql } from 'graphql-request';
 
-export const fetchCollectionBidById = gql`
-	query fetchCollectionBidById($bidId: uuid!) {
-		bids(where: { id: { _eq: $bidId } }) {
+export const fetchCollectionBidsById = gql`
+	query fetchCollectionBidsById($bidIds: [uuid!]) {
+		bids(where: { id: { _in: $bidIds } }) {
 			nonce
 			price
 			bidder

package/src/methods/{removeCollectionBid/addRemoveCollectionBidTxs.ts → removeCollectionBids/addRemoveCollectionBidsTxs.ts}

@@ -3,13 +3,14 @@ import {
 	BLUEMOVE_OFFER_COLLECTION_DATA_OBJECT,
 	TRADEPORT_BIDDING_STORE,
 } from '../../constants';
+import { getSharedObjects } from '../../helpers/getSharedObjects';
 import { isBluemoveKioskBid } from '../../helpers/kiosk/isBluemoveKioskBid';
 import { isTradePortKioskBid } from '../../helpers/kiosk/isTradePortKioskBid';
 import { isOriginByteBid } from '../../helpers/originByte/isOriginByteBid';
 import { getObjectType } from '../../helpers/rpc/getObjectType';
 import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
 import { addTradeportKioskRemoveNftBidTx } from '../removeNftBids/addRemoveNftBidTxs';
-import { type RemoveCollectionBidTx } from './removeCollectionBid';
+import { type RemoveCollectionBidTx } from './removeCollectionBids';
 
 export function addTradeportRemoveCollectionBidTx({
 	tx,
@@ -82,7 +83,8 @@ export async function addTradePortRemoveCollectionBidTxHandler(txData: RemoveCol
 	});
 
 	if (isOriginByteBid(bidType)) {
-		addOriginByteRemoveCollectionBidTx(txData);
+		const sharedObjects = await getSharedObjects(txData?.nftType);
+		addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 		return;
 	}
 
@@ -98,7 +100,8 @@ export async function addBluemoveRemoveCollectionBidTxHandler(txData: RemoveColl
 	const bidType = await getObjectType({ suiClient: txData?.suiClient, objectId: txData?.bidNonce });
 
 	if (isOriginByteBid(bidType)) {
-		addOriginByteRemoveCollectionBidTx(txData);
+		const sharedObjects = await getSharedObjects(txData?.nftType);
+		addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 		return;
 	}
 
@@ -111,5 +114,6 @@ export async function addBluemoveRemoveCollectionBidTxHandler(txData: RemoveColl
 }
 
 export async function addClutchyRemoveCollectionBidTxHandler(txData: RemoveCollectionBidTx) {
-	addOriginByteRemoveCollectionBidTx(txData);
+	const sharedObjects = await getSharedObjects(txData?.nftType);
+	addOriginByteRemoveCollectionBidTx({ ...txData, sharedObjects });
 }

package/src/methods/{removeCollectionBid/removeCollectionBid.ts → removeCollectionBids/removeCollectionBids.ts}

@@ -1,25 +1,24 @@
 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 { fetchCollectionBidById } from '../../graphql/queries/fetchCollectionBidById';
+import { fetchCollectionBidsById } from '../../graphql/queries/fetchCollectionBidById';
 import { fetchCollectionsByIdWithOneNft } from '../../graphql/queries/fetchCollectionsById';
 import { getNftType } from '../../helpers/getNftType';
-import { getSharedObjects } from '../../helpers/getSharedObjects';
 import {
 	addBluemoveRemoveCollectionBidTxHandler,
 	addClutchyRemoveCollectionBidTxHandler,
 	addTradePortRemoveCollectionBidTxHandler,
-} from './addRemoveCollectionBidTxs';
-import {
-	DELOREAN_TOKEN_IDS_TO_DISABLE,
-	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
-} from '../../constants';
+} from './addRemoveCollectionBidsTxs';
 
 export type RemoveCollectionBidTx = {
 	tx: Transaction;
 	suiClient: SuiClient;
-	sharedObjects: any;
+	sharedObjects?: any;
 	bidNonce: string;
 	bidder: string;
 	nftType: string;
@@ -29,18 +28,19 @@ export type RemoveCollectionBidTx = {
 	bidMarketName: string;
 };
 
-export type RemoveCollectionBid = {
-	bidId: string;
+export type RemoveCollectionBids = {
+	bidIds: string[];
+	tx?: Transaction | string;
 };
 
-export const removeCollectionBid = async (
-	{ bidId }: RemoveCollectionBid,
+export const removeCollectionBids = async (
+	{ bidIds, tx: existingTx }: RemoveCollectionBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
 	const res = await gqlChainRequest({
 		chain: 'sui',
-		query: fetchCollectionBidById,
-		variables: { bidId },
+		query: fetchCollectionBidsById,
+		variables: { bidIds },
 	});
 
 	if (res?.bids?.length === 0) {
@@ -48,7 +48,7 @@ export const removeCollectionBid = async (
 	}
 
 	const bidsForTracking = [];
-	const tx = new Transaction();
+	const tx = Transaction.from(existingTx) ?? new Transaction();
 
 	for (const bid of res.bids) {
 		if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
@@ -67,12 +67,9 @@ export const removeCollectionBid = async (
 			nft: collectionWithOneNftRes?.collections?.[0]?.nfts?.[0],
 		});
 
-		const sharedObjects = await getSharedObjects(nftType);
-
 		const txData: RemoveCollectionBidTx = {
 			tx,
 			suiClient: context.suiClient,
-			sharedObjects,
 			bidNonce: bid?.nonce,
 			bidder: bid?.bidder,
 			nftType,

package/src/methods/removeNftBids/removeNftBids.ts

@@ -1,25 +1,24 @@
 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 {
 	addBluemoveRemoveNftBidTx,
 	addOriginByteRemoveNftBidTx,
 	addTocenRemoveNftBidTx,
 	addTradePortRemoveNftBidTxHandler,
 } from './addRemoveNftBidTxs';
-import {
-	DELOREAN_TOKEN_IDS_TO_DISABLE,
-	DELOREAN_TOKEN_IDS_TO_DISABLE_MESSAGE,
-} from '../../constants';
 
 export type RemoveNftBidTx = {
 	tx: Transaction;
 	suiClient: SuiClient;
-	sharedObjects: any;
+	sharedObjects?: any;
 	bidNonce: string;
 	nftType: string;
 	nftTokenId: string;
@@ -34,10 +33,11 @@ export type RemoveNftBid = {
 
 export type RemoveNftBids = {
 	bidIds: string[];
+	tx?: Transaction | string;
 };
 
 export const removeNftBids = async (
-	{ bidIds }: RemoveNftBids,
+	{ bidIds, tx: existingTx }: RemoveNftBids,
 	context: RequestContext,
 ): Promise<Transaction> => {
 	const res = await gqlChainRequest({
@@ -51,7 +51,7 @@ export const removeNftBids = async (
 	}
 
 	const bidsForTracking = [];
-	const tx = new Transaction();
+	const tx = Transaction.from(existingTx) ?? new Transaction();
 
 	for (const bid of res.bids) {
 		if (DELOREAN_TOKEN_IDS_TO_DISABLE?.includes(bid?.nft?.token_id)) {
@@ -64,12 +64,9 @@ export const removeNftBids = async (
 			nft: bid?.nft,
 		});
 
-		const sharedObjects = await getSharedObjects(nftType);
-
 		const txData: RemoveNftBidTx = {
 			tx,
 			suiClient: context.suiClient,
-			sharedObjects,
 			bidNonce: bid?.nonce,
 			nftType,
 			nftTokenId: bid?.nft?.token_id,

package/src/tests/SuiWallet.ts

@@ -28,7 +28,7 @@ export class SuiWallet {
 	}
 
 	async simulateCall(tx: Transaction): Promise<any> {
-		tx.setSenderIfNotSet('0x645e9f833ddc10e73e8c8aad0cf7abf2f48ad92b45c80ef33f68a56488effaf0');
+		tx.setSenderIfNotSet('0x7cb678cc0446b986bab45d612a25946b2a63763d2252b1e554d1763eb788f660');
 		const rawTransaction = await tx.build({ client: this.suiClient });
 		const result = await this.suiClient.dryRunTransactionBlock({
 			transactionBlock: rawTransaction,