bsv-mcp 0.0.3 → 0.0.5

package/package.json

@@ -2,7 +2,7 @@
 	"name": "bsv-mcp",
 	"module": "index.ts",
 	"type": "module",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"bin": {
 		"bsv-mcp": "./index.ts"
 	},

package/tools/ordinals/marketListings.ts

@@ -37,11 +37,6 @@ export const marketListingsArgsSchema = z.object({
 		.enum(["recent", "price", "num", "height", "price_per_token"])
 		.default("recent")
 		.describe("Sort method (recent, price, num, height, price_per_token)"),
-	bsv20Type: z
-		.enum(["v1", "v2", "all"])
-		.default("all")
-		.optional()
-		.describe("BSV20 token type (v1, v2, or all)"),
 	id: z.string().optional().describe("Token ID in outpoint format"),
 	tick: z.string().optional().describe("Token ticker symbol"),
 	pending: z.boolean().default(false).optional().describe("Include pending sales"),
@@ -114,7 +109,6 @@ export function registerMarketListingsTool(server: McpServer): void {
 					minPrice,
 					maxPrice,
 					tokenType,
-					bsv20Type,
 					id,
 					tick,
 					pending,
@@ -124,12 +118,9 @@ export function registerMarketListingsTool(server: McpServer): void {
 				let baseUrl = "https://ordinals.gorillapool.io/api";
 				let useTokenParams = false;
 				
-				if (tokenType === "bsv20") {
+				if (tokenType === "bsv20" || tokenType === "bsv21") {
 					baseUrl += "/bsv20/market";
 					useTokenParams = true;
-				} else if (tokenType === "bsv21") {
-					baseUrl += "/bsv21/market"; // Assuming BSV21 endpoint follows similar pattern
-					useTokenParams = true;
 				} else if (tokenType === "nft" || tokenType === "all") {
 					baseUrl += "/market";
 				}
@@ -147,8 +138,8 @@ export function registerMarketListingsTool(server: McpServer): void {
 						url.searchParams.append("sort", sort);
 					}
 					// Add token-specific parameters
-					if (bsv20Type && bsv20Type !== "all") {
-						url.searchParams.append("type", bsv20Type);
+					if (tokenType === "bsv21") {
+						url.searchParams.append("type", "v2");
 					}
 					if (id) url.searchParams.append("id", id);
 					if (tick) url.searchParams.append("tick", tick);

package/tools/ordinals/marketSales.ts

@@ -24,11 +24,6 @@ export const marketSalesArgsSchema = z.object({
 		.enum(["bsv20", "bsv21", "all"])
 		.default("bsv20")
 		.describe("Type of token to search for (bsv20, bsv21, or all)"),
-	bsv20Type: z
-		.enum(["v1", "v2", "all"])
-		.default("all")
-		.optional()
-		.describe("BSV20 token type (v1, v2, or all)"),
 	id: z.string().optional().describe("Token ID in outpoint format"),
 	tick: z.string().optional().describe("Token ticker symbol"),
 	pending: z.boolean().default(false).optional().describe("Include pending sales"),
@@ -85,7 +80,6 @@ export function registerMarketSalesTool(server: McpServer): void {
 					offset, 
 					dir, 
 					tokenType, 
-					bsv20Type, 
 					id, 
 					tick, 
 					pending, 
@@ -94,13 +88,9 @@ export function registerMarketSalesTool(server: McpServer): void {
 
 				// Determine the API endpoint based on tokenType
 				let baseUrl = "https://ordinals.gorillapool.io/api";
-				
-				if (tokenType === "bsv21") {
-					baseUrl += "/bsv21/market/sales";
-				} else {
-					// Default to BSV20 for "bsv20" or "all"
-					baseUrl += "/bsv20/market/sales";
-				}
+
+				// Default to BSV20 for all token types
+				baseUrl += "/bsv20/market/sales";
 
 				// Build the URL with query parameters
 				const url = new URL(baseUrl);
@@ -108,9 +98,9 @@ export function registerMarketSalesTool(server: McpServer): void {
 				url.searchParams.append("offset", offset.toString());
 				url.searchParams.append("dir", dir);
 				
-				// Add type parameter for bsv20 only if specified
-				if (bsv20Type && bsv20Type !== "all") {
-					url.searchParams.append("type", bsv20Type);
+				// Add type parameter for bsv21 if needed
+				if (tokenType === "bsv21") {
+					url.searchParams.append("type", "v2");
 				}
 
 				if (id) url.searchParams.append("id", id);

package/tools/wallet/purchaseListing.ts

@@ -6,6 +6,7 @@ import {
 	type ChangeResult,
 	type ExistingListing,
 	type Payment,
+	type Royalty,
 	type TokenUtxo,
 	type Utxo,
 	TokenType,
@@ -23,11 +24,27 @@ import { purchaseListingArgsSchema } from "./schemas";
 import type { Wallet } from "./wallet";
 
 // Define types for 1Sat API response
-interface ListingResponse {
+interface OrdUtxo {
 	txid: string;
 	vout: number;
 	satoshis: number;
 	script: string;
+	origin?: {
+		outpoint: string;
+		data?: {
+			map?: {
+				royalties?: string;
+				[key: string]: string | number | boolean | null | undefined;
+			};
+			insc?: {
+				text?: string;
+				file?: {
+					type?: string;
+					size?: number;
+				};
+			};
+		};
+	};
 	data?: {
 		list?: {
 			price: number;
@@ -79,7 +96,7 @@ export function registerPurchaseListingTool(server: McpServer, wallet: Wallet) {
 					);
 				}
 
-				const listingData = (await response.json()) as ListingResponse;
+				const listingData = (await response.json()) as OrdUtxo;
 
 				// Check if the listing is valid and has a price
 				if (!listingData.data?.list?.price) {
@@ -183,6 +200,7 @@ Please fund this wallet address with enough BSV to cover the purchase price
 						satoshis: 1, // TokenUtxo's satoshis must be exactly 1
 						amt: listingData.data.bsv20.amt,
 						id: args.tokenID,
+            payout: listingData.data.list.payout,
 					};
 					
 					transaction = await purchaseOrdTokenListing({
@@ -210,6 +228,16 @@ Please fund this wallet address with enough BSV to cover the purchase price
 						listingUtxo,
 					};
 					
+					// Check for royalties in the NFT origin data
+					let royalties: Royalty[] = [];
+					if (listingData.origin?.data?.map?.royalties) {
+						try {
+							royalties = JSON.parse(listingData.origin.data.map.royalties);
+						} catch (error) {
+							console.warn("Failed to parse royalties:", error);
+						}
+					}
+					
 					transaction = await purchaseOrdListing({
 						utxos: paymentUtxos,
 						paymentPk,
@@ -217,6 +245,7 @@ Please fund this wallet address with enough BSV to cover the purchase price
 						listing,
 						additionalPayments,
 						metaData,
+						royalties,
 					});
 				}
 
@@ -263,6 +292,8 @@ Please fund this wallet address with enough BSV to cover the purchase price
 								price: listingData.data.list.price,
 								marketFee,
 								marketFeeAddress: MARKET_WALLET_ADDRESS,
+								royaltiesPaid: args.listingType === "nft" && listingData.origin?.data?.map?.royalties ? 
+									JSON.parse(listingData.origin.data.map.royalties) : undefined,
 							}),
 						},
 					],

package/tools/wallet/schemas.ts

@@ -261,7 +261,7 @@ export const getAddressArgsSchema = z.object({});
 export const sendToAddressArgsSchema = z.object({
 	address: z.string(),
 	amount: z.number(),
-	currency: z.enum(["BSV", "USD"]).optional(),
+	currency: z.enum(["BSV", "USD"]).optional().default("BSV"),
 	description: z.string().optional(),
 });
 
@@ -275,22 +275,24 @@ export const purchaseListingArgsSchema = z.object({
 	ordAddress: z
 		.string()
 		.describe("The ordinal address to receive the purchased item"),
-	description: z
-		.string()
-		.optional()
-		.describe("Optional description for the transaction"),
 	listingType: z
 		.enum(["nft", "token"])
 		.default("nft")
 		.describe("Type of listing: 'nft' for ordinal NFTs, 'token' for BSV-20 tokens"),
 	tokenProtocol: z
 		.enum(["bsv-20", "bsv-21"])
-		.optional()
+		.optional().default("bsv-21")
 		.describe("Token protocol for token listings (required when listingType is 'token')"),
 	tokenID: z
 		.string()
 		.optional()
 		.describe("Token ID for BSV-21 tokens or ticker for BSV-20 tokens (required when listingType is 'token')"),
+	description: z
+		.string()
+		.optional()
+		.describe("Optional description for the transaction"),
 });
 
+// Export types
+export type SendToAddressArgs = z.infer<typeof sendToAddressArgsSchema>;
 export type PurchaseListingArgs = z.infer<typeof purchaseListingArgsSchema>;