bsv-mcp 0.2.0 → 0.2.7

package/tools/wallet/a2bPublishMcp.ts

@@ -1,9 +1,8 @@
-import type { PrivateKey, WalletInterface } from "@bsv/sdk";
+import type { PrivateKey } from "@bsv/sdk";
 import { Utils } from "@bsv/sdk";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import type {
 	ClientNotification,
 	ClientRequest,
@@ -19,10 +18,9 @@ import type {
 	PreMAP,
 } from "js-1sat-ord";
 import { createOrdinals } from "js-1sat-ord";
-import { Sigma } from "sigma-protocol";
 import { z } from "zod";
 import packageJson from "../../package.json";
-import { BsocialBroadcaster, V5Broadcaster } from "../../utils/broadcaster";
+import { V5Broadcaster } from "../../utils/broadcaster";
 import type { Wallet } from "./wallet";
 
 const { toArray, toBase64 } = Utils;
@@ -196,11 +194,8 @@ export function registerA2bPublishMcpTool(
 	server.tool(
 		"wallet_a2bPublishMcp",
 		"Publish an MCP tool configuration record on-chain via Ordinal inscription. This creates a permanent, immutable, and discoverable tool definition that can be accessed by other MCP servers. The tool is published as a JSON inscription with metadata and optional digital signatures for authenticity verification.",
-		{ args: a2bPublishMcpArgsSchema },
-		async (
-			{ args }: { args: A2bPublishMcpArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{ ...a2bPublishMcpArgsSchema.shape },
+		async ({ toolName, command, args, keywords, env, description, destinationAddress }) => {
 			try {
 				if (!identityPk) {
 					console.warn(
@@ -218,20 +213,20 @@ export function registerA2bPublishMcpTool(
 				const walletAddress = paymentPk.toAddress().toString();
 
 				// Fetch MCP metadata (tools, prompts, resources)
-				const metadata = await fetchMcpMetadata(args.command, args.args);
+				const metadata = await fetchMcpMetadata(command, args);
 				// console.log(`Discovered ${metadata.tools.length} tools, ${metadata.prompts.length} prompts, and ${metadata.resources.length} resources`);
 
 				// Assemble tool configuration
 				const toolConfig: McpConfig = {
-					command: args.command,
-					args: args.args,
+					command,
+					args,
 					tools: metadata.tools,
 					prompts: metadata.prompts,
 					resources: metadata.resources,
-					env: args.env
-						? args.env.reduce(
-								(acc, { key, description }) => {
-									acc[key] = description;
+					env: env
+						? env.reduce(
+								(acc, { key, description: desc }) => {
+									acc[key] = desc;
 									return acc;
 								},
 								{} as Record<string, string>,
@@ -245,9 +240,9 @@ export function registerA2bPublishMcpTool(
 				// Prepare the full configuration with metadata
 				const fullConfig = {
 					mcpServers: {
-						[args.toolName]: {
-							description: args.description || "",
-							keywords: args.keywords || [],
+						[toolName]: {
+							description: description || "",
+							keywords: keywords || [],
 							tools: metadata.tools || [],
 							prompts: metadata.prompts || [],
 							resources: metadata.resources || [],
@@ -266,7 +261,7 @@ export function registerA2bPublishMcpTool(
 				};
 
 				// Destination for the ordinal
-				const targetAddress = args.destinationAddress ?? walletAddress;
+				const targetAddress = destinationAddress ?? walletAddress;
 				const destinations: Destination[] = [
 					{ address: targetAddress, inscription },
 				];
@@ -335,12 +330,12 @@ export function registerA2bPublishMcpTool(
 										txid,
 										outpoint,
 										onchainUrl,
-										toolName: args.toolName,
+										toolName,
 										toolCount: metadata.tools.length,
 										promptCount: metadata.prompts.length,
 										resourceCount: metadata.resources.length,
 										description:
-											args.description || `MCP Tool: ${args.toolName}`,
+											description || `MCP Tool: ${toolName}`,
 										address: targetAddress,
 									},
 									null,

package/tools/wallet/createOrdinals.ts

@@ -1,11 +1,6 @@
 import { PrivateKey } from "@bsv/sdk";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	CallToolResult,
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type {
 	ChangeResult,
 	CreateOrdinalsCollectionItemMetadata,
@@ -16,10 +11,9 @@ import type {
 	LocalSigner,
 	PreMAP,
 } from "js-1sat-ord";
-import { createOrdinals, OneSatBroadcaster } from "js-1sat-ord";
-import { Sigma } from "sigma-protocol";
+import { createOrdinals } from "js-1sat-ord";
 import { z } from "zod";
-import { BsocialBroadcaster, V5Broadcaster } from "../../utils/broadcaster";
+import { V5Broadcaster } from "../../utils/broadcaster";
 import type { Wallet } from "./wallet";
 
 /**
@@ -53,11 +47,8 @@ export function registerCreateOrdinalsTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_createOrdinals",
 		"Creates and inscribes ordinals (NFTs) on the Bitcoin SV blockchain. This tool lets you mint new digital artifacts by encoding data directly into the blockchain. Supports various content types including images, text, JSON, and HTML. The tool handles transaction creation, fee calculation, and broadcasting.",
-		{ args: createOrdinalsArgsSchema },
-		async (
-			{ args }: { args: CreateOrdinalsArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		): Promise<CallToolResult> => {
+		{ ...createOrdinalsArgsSchema.shape },
+		async ({ dataB64, contentType, destinationAddress, metadata }): Promise<CallToolResult> => {
 			try {
 				// Load optional identity key for sigma signing
 				const identityKeyWif = process.env.IDENTITY_KEY_WIF;
@@ -92,14 +83,14 @@ export function registerCreateOrdinalsTool(server: McpServer, wallet: Wallet) {
 
 				// 4. Create the inscription object
 				const inscription: Inscription = {
-					dataB64: args.dataB64,
-					contentType: args.contentType,
+					dataB64: dataB64,
+					contentType: contentType,
 				};
 
 				// 5. Create the destination
 				const destinations: Destination[] = [
 					{
-						address: args.destinationAddress || walletAddress,
+						address: destinationAddress || walletAddress,
 						inscription,
 					},
 				];
@@ -109,7 +100,7 @@ export function registerCreateOrdinalsTool(server: McpServer, wallet: Wallet) {
 					destinations,
 					paymentPk,
 					changeAddress: walletAddress,
-					metaData: args.metadata as
+					metaData: metadata as
 						| PreMAP
 						| CreateOrdinalsCollectionMetadata
 						| CreateOrdinalsCollectionItemMetadata,
@@ -152,8 +143,8 @@ export function registerCreateOrdinalsTool(server: McpServer, wallet: Wallet) {
 									txid: changeResult.tx.id("hex"),
 									spentOutpoints: changeResult.spentOutpoints,
 									payChange: changeResult.payChange,
-									inscriptionAddress: args.destinationAddress || walletAddress,
-									contentType: args.contentType,
+									inscriptionAddress: destinationAddress || walletAddress,
+									contentType: contentType,
 								}),
 							},
 						],

package/tools/wallet/fetchPaymentUtxos.ts

@@ -104,7 +104,15 @@ export async function fetchPaymentUtxosFromV5(
 		const url = `${V5_API_URL}/own/${address}/utxos?refresh=true&txo=true&script=true&limit=250&tags=p2pkh`;
 		console.error(`Fetching UTXOs from V5: ${url}`);
 		const response = await fetch(url);
-		const data = (await response.json()) as V5Utxo[];
+		if (!response.ok) {
+			console.error(`V5 UTXO fetch failed: ${response.status} ${response.statusText}`);
+			return undefined;
+		}
+		const data = (await response.json()) as V5Utxo[] | null;
+		if (!Array.isArray(data)) {
+			console.error(`V5 UTXO response was not an array: ${typeof data}`);
+			return undefined;
+		}
 		const utxos: Utxo[] = [];
 		for (const utxo of data) {
 			if (!utxo.data.p2pkh) {

package/tools/wallet/gatherCollectionInfo.ts

@@ -133,15 +133,11 @@ export function registerGatherCollectionInfoTool(
 	server.tool(
 		"wallet_gatherCollectionInfo",
 		"Analyzes a folder of images and gathers all necessary information for minting an ordinals collection. This includes validating images, checking wallet balance, estimating costs, and suggesting metadata. Use this before minting to ensure everything is ready.",
-		{ args: gatherCollectionInfoArgsSchema },
-		async ({
-			args,
-		}: {
-			args: GatherCollectionInfoArgs;
-		}): Promise<CallToolResult> => {
+		{ ...gatherCollectionInfoArgsSchema.shape },
+		async ({ folderPath }): Promise<CallToolResult> => {
 			try {
 				const analysis: CollectionAnalysis = {
-					folderPath: args.folderPath,
+					folderPath,
 					totalImages: 0,
 					validImages: 0,
 					invalidImages: 0,
@@ -172,13 +168,13 @@ export function registerGatherCollectionInfoTool(
 
 				// Check if folder exists
 				try {
-					const folderStat = await fs.stat(args.folderPath);
+					const folderStat = await fs.stat(folderPath);
 					if (!folderStat.isDirectory()) {
-						throw new Error(`Path is not a directory: ${args.folderPath}`);
+						throw new Error(`Path is not a directory: ${folderPath}`);
 					}
 				} catch (error) {
 					analysis.errors.push(
-						`Folder not found or inaccessible: ${args.folderPath}`,
+						`Folder not found or inaccessible: ${folderPath}`,
 					);
 					return {
 						content: [
@@ -222,7 +218,7 @@ export function registerGatherCollectionInfoTool(
 				}
 
 				// Scan folder for images
-				const files = await fs.readdir(args.folderPath);
+				const files = await fs.readdir(folderPath);
 				const imageExtensions = [
 					".jpg",
 					".jpeg",
@@ -233,7 +229,7 @@ export function registerGatherCollectionInfoTool(
 				];
 
 				for (const file of files) {
-					const filePath = path.join(args.folderPath, file);
+					const filePath = path.join(folderPath, file);
 					const stat = await fs.stat(filePath);
 
 					if (stat.isFile()) {
@@ -280,7 +276,7 @@ export function registerGatherCollectionInfoTool(
 				}
 
 				// Suggest metadata based on folder name
-				const folderName = path.basename(args.folderPath);
+				const folderName = path.basename(folderPath);
 				analysis.suggestedMetadata = {
 					collectionName: folderName
 						.replace(/[-_]/g, " ")

package/tools/wallet/getAddress.ts

@@ -1,5 +1,4 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z } from "zod";
 import type { Wallet } from "./wallet";
 
 /**
@@ -14,14 +13,7 @@ export function registerGetAddressTool(
 	server.tool(
 		"wallet_getAddress",
 		"Retrieves the current wallet's Bitcoin SV address. This address can be used to receive BSV, ordinals, or tokens, and is derived from the wallet's private key.",
-		{
-			args: z
-				.object({})
-				.optional()
-				.describe(
-					"No parameters required - simply returns the current wallet address",
-				),
-		},
+		{},
 		async () => {
 			try {
 				const address = wallet.getAddress();

package/tools/wallet/getBalance.ts

@@ -1,16 +1,7 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
 import { toBitcoin } from "satoshi-token"; // For converting satoshis to BSV string
-import { z } from "zod";
 import type { Wallet } from "./wallet";
 
-export const walletGetBalanceArgsSchema = z.object({}).optional();
-export type WalletGetBalanceArgs = z.infer<typeof walletGetBalanceArgsSchema>;
-
 /**
  * Registers the wallet_getBalance tool
  */
@@ -21,11 +12,8 @@ export function registerWalletGetBalanceTool(
 	server.tool(
 		"wallet_getBalance",
 		"Retrieves the current BSV balance for the wallet based on its UTXOs.",
-		{ args: walletGetBalanceArgsSchema },
-		async (
-			args: WalletGetBalanceArgs, // Args are empty but present for schema consistency
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{},
+		async () => {
 			try {
 				const { paymentUtxos } = await wallet.getUtxos();
 

package/tools/wallet/getBalanceDroplet.ts

@@ -1,11 +1,5 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
 import type { DropletClient } from "../../utils/droplet";
-import { emptyArgsSchema } from "./schemas";
 
 /**
  * Register the getBalance tool for Droplet API mode
@@ -17,13 +11,8 @@ export function registerWalletGetBalanceDropletTool(
 	server.tool(
 		"wallet_getBalance",
 		"Gets the current balance of the wallet (Droplet mode)",
-		{
-			args: emptyArgsSchema,
-		},
-		async (
-			{ args }: { args: unknown },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{},
+		async () => {
 			try {
 				const status = await dropletClient.getFaucetStatus();
 

package/tools/wallet/getPublicKey.ts

@@ -1,16 +1,6 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
-import type { z } from "zod";
-import { getPublicKeyArgsSchema } from "./schemas";
 import type { Wallet } from "./wallet";
 
-// Use the schema imported from schemas.ts
-export type GetPublicKeyArgs = z.infer<typeof getPublicKeyArgsSchema>;
-
 /**
  * Register the getPublicKey tool
  */
@@ -18,13 +8,10 @@ export function registerGetPublicKeyTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_getPublicKey",
 		"Retrieves the current wallet's public key. This public key can be used for cryptographic operations like signature verification or encryption.",
-		{ args: getPublicKeyArgsSchema },
-		async (
-			{ args }: { args: GetPublicKeyArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{},
+		async () => {
 			try {
-				const result = await wallet.getPublicKey(args);
+				const result = await wallet.getPublicKey({});
 				return { content: [{ type: "text", text: JSON.stringify(result) }] };
 			} catch (err: unknown) {
 				const msg = err instanceof Error ? err.message : String(err);

package/tools/wallet/mintCollection.ts

@@ -2,12 +2,7 @@ import { promises as fs } from "node:fs";
 import path from "node:path";
 import { Utils } from "@bsv/sdk";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	CallToolResult,
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type {
 	ChangeResult,
 	CollectionItemSubTypeData,
@@ -125,8 +120,8 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_mintCollection",
 		"Mint a collection of ordinals from a folder of images with proper metadata. This tool creates a collection inscription first, then mints each image as a collection item with the appropriate metadata linking it to the collection.",
-		{ args: mintCollectionArgsSchema },
-		async ({ args }: { args: MintCollectionArgs }): Promise<CallToolResult> => {
+		{ ...mintCollectionArgsSchema.shape },
+		async ({ folderPath, collectionName, description, rarityLabels, traits, skipBroadcast }): Promise<CallToolResult> => {
 			try {
 				// Get keys from wallet
 				const paymentPk = wallet.getPaymentKey();
@@ -136,7 +131,7 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 				const identityPk = wallet.getIdentityKey();
 
 				// Get image files
-				const imageFiles = await getImageFiles(args.folderPath);
+				const imageFiles = await getImageFiles(folderPath);
 				if (imageFiles.length === 0) {
 					throw new Error("No image files found in the specified folder");
 				}
@@ -145,14 +140,14 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 
 				// Prepare collection metadata
 				const collectionSubTypeData: CollectionSubTypeData = {
-					description: args.description,
+					description: description,
 					quantity: imageFiles.length,
 					// Transform rarity labels to correct format
 					rarityLabels:
-						args.rarityLabels?.map((r) => ({ label: r.label })) || [],
+						rarityLabels?.map((r) => ({ label: r.label })) || [],
 					// Transform traits - need to match the CollectionTraits type
-					traits: args.traits
-						? Object.entries(args.traits).reduce((acc, [key, values]) => {
+					traits: traits
+						? Object.entries(traits).reduce((acc, [key, values]) => {
 								acc[key] = {
 									values,
 									occurancePercentages: values.map(() =>
@@ -168,14 +163,14 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 					app: "ord",
 					type: "ord",
 					subType: "collection",
-					name: args.collectionName,
+					name: collectionName,
 					subTypeData: collectionSubTypeData,
 				};
 
 				// Create collection icon
 				const svgString = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
             <rect width="100" height="100" fill="#f0f0f0"/>
-            <text x="50" y="55" text-anchor="middle" font-family="Arial" font-size="16">${args.collectionName}</text>
+            <text x="50" y="55" text-anchor="middle" font-family="Arial" font-size="16">${collectionName}</text>
           </svg>`;
 				const collectionIconData = Utils.toBase64(
 					Utils.toArray(svgString, "utf8"),
@@ -217,7 +212,7 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 
 				let collectionTxid = "";
 				const disableBroadcasting =
-					args.skipBroadcast || process.env.DISABLE_BROADCASTING === "true";
+					skipBroadcast || process.env.DISABLE_BROADCASTING === "true";
 
 				if (!disableBroadcasting) {
 					const broadcaster = new V5Broadcaster();
@@ -251,7 +246,7 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 					);
 
 					try {
-						const itemTraits = generateItemTraits(i, args.traits);
+						const itemTraits = generateItemTraits(i, traits);
 
 						const itemSubTypeData: CollectionItemSubTypeData = {
 							collectionId: collectionTxid,
@@ -260,13 +255,13 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 						};
 
 						// Assign rarity if labels provided
-						if (args.rarityLabels && args.rarityLabels.length > 0) {
+						if (rarityLabels && rarityLabels.length > 0) {
 							const rarityIndex = Math.floor(
-								(i / imageFiles.length) * args.rarityLabels.length,
+								(i / imageFiles.length) * rarityLabels.length,
 							);
 							const rarityItem =
-								args.rarityLabels[
-									Math.min(rarityIndex, args.rarityLabels.length - 1)
+								rarityLabels[
+									Math.min(rarityIndex, rarityLabels.length - 1)
 								];
 							if (rarityItem) {
 								itemSubTypeData.rarityLabel = [
@@ -352,7 +347,7 @@ export function registerMintCollectionTool(server: McpServer, wallet: Wallet) {
 									totalItems: imageFiles.length,
 									errors: results.errors,
 									totalCost: results.totalCost,
-									summary: `Collection "${args.collectionName}" created with ${results.itemTxids.length}/${imageFiles.length} items successfully minted.${results.errors.length > 0 ? ` ${results.errors.length} items failed.` : ""}`,
+									summary: `Collection "${collectionName}" created with ${results.itemTxids.length}/${imageFiles.length} items successfully minted.${results.errors.length > 0 ? ` ${results.errors.length} items failed.` : ""}`,
 								},
 								null,
 								2,

package/tools/wallet/purchaseListing.ts

@@ -1,11 +1,6 @@
 import { PrivateKey } from "@bsv/sdk";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	CallToolResult,
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import {
 	type ChangeResult,
 	type ExistingListing,
@@ -20,8 +15,6 @@ import {
 	type TokenUtxo,
 	type Utxo,
 } from "js-1sat-ord";
-import { Sigma } from "sigma-protocol";
-import type { z } from "zod";
 import {
 	MARKET_FEE_PERCENTAGE,
 	MARKET_WALLET_ADDRESS,
@@ -86,11 +79,8 @@ export function registerPurchaseListingTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_purchaseListing",
 		"Purchases a listing from the Bitcoin SV ordinals marketplace. Supports both NFT purchases (with royalty payments to original creators) and BSV-20/BSV-21 token purchases. The tool handles all aspects of the transaction - from fetching listing details, calculating fees, creating and broadcasting the transaction.",
-		{ args: purchaseListingArgsSchema },
-		async (
-			{ args }: { args: z.infer<typeof purchaseListingArgsSchema> },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		): Promise<CallToolResult> => {
+		{ ...purchaseListingArgsSchema.shape },
+		async ({ listingOutpoint, ordAddress, listingType, tokenProtocol, tokenID, description }): Promise<CallToolResult> => {
 			try {
 				// Load optional identity key for sigma signing
 				const identityKeyWif = process.env.IDENTITY_KEY_WIF;
@@ -108,7 +98,7 @@ export function registerPurchaseListingTool(server: McpServer, wallet: Wallet) {
 
 				// Fetch the listing info directly from the API
 				const response = await fetch(
-					`https://ordinals.gorillapool.io/api/txos/${args.listingOutpoint}?script=true`,
+					`https://ordinals.gorillapool.io/api/txos/${listingOutpoint}?script=true`,
 				);
 				if (!response.ok) {
 					throw new Error(
@@ -138,7 +128,7 @@ export function registerPurchaseListingTool(server: McpServer, wallet: Wallet) {
 				}
 
 				// Parse the listing outpoint to get txid and vout
-				const [txid, voutStr] = args.listingOutpoint.split("_");
+				const [txid, voutStr] = listingOutpoint.split("_");
 				if (!txid) {
 					throw new Error("Invalid outpoint format. Expected txid_vout");
 				}
@@ -182,12 +172,12 @@ Please fund this wallet address with enough BSV to cover the purchase price
 				// Create the purchase transaction based on listing type
 				let transaction: ChangeResult;
 
-				if (args.listingType === "token") {
-					if (!args.tokenProtocol) {
+				if (listingType === "token") {
+					if (!tokenProtocol) {
 						throw new Error("tokenProtocol is required for token listings");
 					}
 
-					if (!args.tokenID) {
+					if (!tokenID) {
 						throw new Error("tokenID is required for token listings");
 					}
 
@@ -203,7 +193,7 @@ Please fund this wallet address with enough BSV to cover the purchase price
 
 					// Convert the token protocol to the enum type expected by js-1sat-ord
 					const protocol =
-						args.tokenProtocol === "bsv-20" ? TokenType.BSV20 : TokenType.BSV21;
+						tokenProtocol === "bsv-20" ? TokenType.BSV20 : TokenType.BSV21;
 
 					// Create a TokenUtxo with the required fields
 					const listingUtxo: TokenUtxo = {
@@ -212,17 +202,17 @@ Please fund this wallet address with enough BSV to cover the purchase price
 						script: listingData.script,
 						satoshis: 1, // TokenUtxo's satoshis must be exactly 1
 						amt: listingData.data.bsv20.amt,
-						id: args.tokenID,
+						id: tokenID,
 						payout: listingData.data.list.payout,
 					};
 
 					transaction = await purchaseOrdTokenListing({
 						protocol,
-						tokenID: args.tokenID,
+						tokenID: tokenID,
 						utxos: paymentUtxos,
 						paymentPk,
 						listingUtxo,
-						ordAddress: args.ordAddress,
+						ordAddress: ordAddress,
 						additionalPayments,
 						metaData,
 					});
@@ -257,7 +247,7 @@ Please fund this wallet address with enough BSV to cover the purchase price
 					const purchaseOrdListingConfig: PurchaseOrdListingConfig = {
 						utxos: paymentUtxos,
 						paymentPk,
-						ordAddress: args.ordAddress,
+						ordAddress: ordAddress,
 						listing,
 						additionalPayments,
 						metaData,
@@ -301,16 +291,16 @@ Please fund this wallet address with enough BSV to cover the purchase price
 									status: resultStatus,
 									message: resultMessage,
 									txid: transaction.tx.id("hex"),
-									listingOutpoint: args.listingOutpoint,
-									destinationAddress: args.ordAddress,
-									listingType: args.listingType,
-									tokenProtocol: args.tokenID ? args.tokenProtocol : undefined,
-									tokenID: args.tokenID,
+									listingOutpoint: listingOutpoint,
+									destinationAddress: ordAddress,
+									listingType: listingType,
+									tokenProtocol: tokenID ? tokenProtocol : undefined,
+									tokenID: tokenID,
 									price: listingData.data.list.price,
 									marketFee,
 									marketFeeAddress: MARKET_WALLET_ADDRESS,
 									royaltiesPaid:
-										args.listingType === "nft" &&
+										listingType === "nft" &&
 										listingData.origin?.data?.map?.royalties
 											? JSON.parse(listingData.origin.data.map.royalties)
 											: undefined,

package/tools/wallet/refreshUtxos.ts

@@ -1,16 +1,7 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
-import type {
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
 import { toBitcoin } from "satoshi-token";
-import { z } from "zod";
 import type { Wallet } from "./wallet";
 
-const refreshUtxosArgsSchema = z.object({});
-type RefreshUtxosArgs = z.infer<typeof refreshUtxosArgsSchema>;
-
 /**
  * Registers the wallet_refreshUtxos tool that refreshes and returns the UTXOs for the wallet
  */
@@ -18,11 +9,8 @@ export function registerRefreshUtxosTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_refreshUtxos",
 		"Refreshes and returns the wallet's UTXOs. This is useful for debugging UTXO issues, ensuring the wallet has the latest transaction outputs, and for verifying available funds before making transactions.",
-		{ args: refreshUtxosArgsSchema },
-		async (
-			{ args }: { args: RefreshUtxosArgs },
-			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{},
+		async () => {
 			try {
 				// Force refresh the UTXOs
 				await wallet.refreshUtxos();