@tradeport/sui-trading-sdk 0.0.1 → 0.0.2

package/package.json

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

package/src/helpers/hasRoyaltyRule.ts

@@ -1,14 +1,9 @@
-import kioskClient from '../apiClients/kioskClient';
-import { addLeadingZerosAfter0x } from '../utils/addLeadingZerosAfter0x';
+import { getKioskTransferPolicies } from './kiosk/getKioskTransferPolicies';
 
 export const hasRoyaltyRule = async (nftType: string): Promise<boolean> => {
-	const nftTypeSplit = nftType?.split('::');
-	if (nftTypeSplit?.[0]) nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
-
-	const res = await kioskClient.getTransferPolicies({ type: nftTypeSplit?.join('::') });
-
-	return res?.some(
+	const transferPolicies = await getKioskTransferPolicies(nftType);
+	return transferPolicies?.some(
 		(policy: any) =>
-			policy?.rules?.filter((rule: any) => rule?.includes('royalty_rule'))?.length > 0,
+			policy?.rules?.filter((rule: any) => rule?.type?.includes('royalty_rule'))?.length > 0,
 	);
 };

package/src/helpers/hasTransferPolicyRules.ts

@@ -1,21 +1,6 @@
-import kioskClient from '../apiClients/kioskClient';
-import { addLeadingZerosAfter0x } from '../utils/addLeadingZerosAfter0x';
+import { getKioskTransferPolicies } from './kiosk/getKioskTransferPolicies';
 
 export const hasTransferPolicyRules = async (nftType: string): Promise<boolean> => {
-	const nftTypeSplit = nftType?.split('::');
-	if (nftTypeSplit?.[0]) nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
-
-	// const res = await gqlChainRequest({
-	// 	chain: 'sui',
-	// 	query: fetchTransferPoliciesByType,
-	// 	variables: { type: nftTypeSplit?.join('::') },
-	// });
-
-	// return res?.transfer_policies_by_type
-	// 	?.filter((policy: any) => !policy?.is_origin_byte)
-	// 	?.some((policy: any) => policy?.rules?.length > 0);
-
-	const res = await kioskClient.getTransferPolicies({ type: nftTypeSplit?.join('::') });
-
-	return res?.some((policy: any) => policy?.rules?.length > 0);
+	const transferPolicies = await getKioskTransferPolicies(nftType);
+	return transferPolicies?.some((policy: any) => policy?.rules?.length > 0);
 };

package/src/helpers/kiosk/getKioskTransferPolicies.ts

@@ -0,0 +1,16 @@
+import { gqlChainRequest } from '../../graphql/gqlChainRequest';
+import { fetchTransferPoliciesByType } from '../../graphql/queries/fetchTransferPoliciesByType';
+import { addLeadingZerosAfter0x } from '../../utils/addLeadingZerosAfter0x';
+
+export const getKioskTransferPolicies = async (nftType: string) => {
+	const nftTypeSplit = nftType?.split('::');
+	if (nftTypeSplit?.[0]) nftTypeSplit[0] = addLeadingZerosAfter0x(nftTypeSplit[0]);
+
+	const res = await gqlChainRequest({
+		chain: 'sui',
+		query: fetchTransferPoliciesByType,
+		variables: { type: nftTypeSplit?.join('::') },
+	});
+
+	return res?.transfer_policies_by_type?.filter((policy: any) => !policy?.is_origin_byte);
+};

package/src/methods/placeCollectionBids/addPlaceCollectionBidTxs.ts

@@ -44,28 +44,40 @@ export function addTradePortKioskCollectionBidTx({
 	nftType,
 	bidAmount,
 	sharedObjects,
-	bidder,
 	royaltyRulePackageId,
 	royaltyRuleModule,
 }: PlaceCollectionBidTx) {
 	const { transferPolicy } = sharedObjects;
 
-	const marketFeePrice = getMarketFeePrice({ price: bidAmount, collectionId });
-
-	const fee = txBlock.moveCall({
-		target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
-		arguments: [txBlock.object(transferPolicy), txBlock.pure(bidAmount)],
-		typeArguments: [nftType],
-	});
-
-	const [coin1, coin2] = splitCoins({
-		txBlock,
-		amounts: [txBlock.pure(bidAmount + marketFeePrice), txBlock.object(fee)],
+	const marketFeePrice = getMarketFeePrice({
+		price: bidAmount,
+		collectionId,
 	});
 
-	if (!coin1 || !coin2) throw new Error('Coin could not be split');
-
-	txBlock.mergeCoins(txBlock.object(coin1), [txBlock.object(coin2)]);
+	let coin;
+	if (royaltyRulePackageId && royaltyRuleModule) {
+		const fee = txBlock.moveCall({
+			target: `${royaltyRulePackageId}::${royaltyRuleModule}::fee_amount`,
+			arguments: [txBlock.object(transferPolicy), txBlock.pure(bidAmount)],
+			typeArguments: [nftType],
+		});
+
+		const [coin1, coin2] = splitCoins({
+			txBlock,
+			amounts: [txBlock.pure(bidAmount + marketFeePrice), txBlock.object(fee)],
+		});
+		coin = coin1;
+
+		if (!coin1 || !coin2) throw new Error('Coin could not be split');
+
+		txBlock.mergeCoins(txBlock.object(coin1), [txBlock.object(coin2)]);
+	} else {
+		const [coin1] = splitCoins({
+			txBlock,
+			amounts: [txBlock.pure(bidAmount + marketFeePrice)],
+		});
+		coin = coin1;
+	}
 
 	txBlock.moveCall({
 		target:
@@ -73,14 +85,14 @@ export function addTradePortKioskCollectionBidTx({
 		arguments: [
 			txBlock.object(TRADEPORT_KIOSK_BIDDING_STORE),
 			txBlock.pure(bidAmount),
-			txBlock.object(coin1),
+			txBlock.object(coin),
 			txBlock.pure(marketFeePrice),
 			txBlock.pure(TRADEPORT_BENEFICIARY_ADDRESS),
 		],
 		typeArguments: [nftType],
 	});
 
-	destroyZeroCoin({ txBlock, coin: coin1 });
+	destroyZeroCoin({ txBlock, coin });
 }
 
 export async function addOriginByteCollectionBidTx({