bsv-mcp 0.2.15 → 0.3.1

package/tools/utils/toolRegistration.ts

@@ -2,6 +2,7 @@
  * Common tool registration utilities for the BSV MCP server
  */
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type { z } from "zod";
 
 export interface ToolConfig<TArgs = Record<string, unknown>> {
@@ -11,13 +12,7 @@ export interface ToolConfig<TArgs = Record<string, unknown>> {
 	handler: (args: TArgs) => Promise<ToolResponse>;
 }
 
-export interface ToolResponse {
-	content: Array<{
-		type: "text";
-		text: string;
-	}>;
-	isError?: boolean;
-}
+export type ToolResponse = CallToolResult;
 
 /**
  * Register a tool with standard error handling and response formatting
@@ -26,21 +21,25 @@ export function registerTool<TArgs = Record<string, unknown>>(
 	server: McpServer,
 	config: ToolConfig<TArgs>,
 ): void {
-	server.tool(config.name, config.schema, async (args: TArgs) => {
-		try {
-			return await config.handler(args);
-		} catch (error) {
-			return {
-				content: [
-					{
-						type: "text" as const,
-						text: `Error: ${error instanceof Error ? error.message : String(error)}`,
-					},
-				],
-				isError: true,
-			};
-		}
-	});
+	server.registerTool(
+		config.name,
+		{ description: config.description, inputSchema: config.schema },
+		async (args) => {
+			try {
+				return await config.handler(args as TArgs);
+			} catch (error) {
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `Error: ${error instanceof Error ? error.message : String(error)}`,
+						},
+					],
+					isError: true,
+				};
+			}
+		},
+	);
 }
 
 /**

package/tools/utils/transactionBuilder.ts

@@ -1,14 +1,15 @@
 import {
+	fromUtxo,
 	isBroadcastFailure,
 	isBroadcastResponse,
+	OP,
 	P2PKH,
 	type PrivateKey,
 	Script,
 	Transaction,
-	Utils,
 } from "@bsv/sdk";
+import type { Utxo } from "js-1sat-ord";
 import { V5Broadcaster } from "../../utils/broadcaster";
-import type { Utxo } from "../wallet/utxo";
 
 const DEFAULT_SAT_PER_BYTE = 0.05;
 const DUST_LIMIT = 546;
@@ -90,12 +91,18 @@ export async function buildAndSendTransaction(
 		selectedUtxos.push(utxo);
 		totalInputSatoshis += utxo.satoshis;
 
-		const input = {
-			sourceTransaction: utxo.tx,
-			sourceOutputIndex: utxo.vout,
-			unlockingScriptTemplate: p2pkh.unlock(paymentKey),
-		};
-		tx.addInput(input);
+		tx.addInput(
+			fromUtxo(
+				utxo,
+				p2pkh.unlock(
+					paymentKey,
+					"all",
+					false,
+					utxo.satoshis,
+					Script.fromHex(utxo.script),
+				),
+			),
+		);
 
 		// Estimate fee with current inputs
 		const estimatedSize = tx.toHex().length / 2 + 150; // rough estimate for unsigned tx
@@ -187,10 +194,10 @@ export async function buildAndSendTransaction(
 /**
  * Build OP_RETURN script from data arrays
  */
-export function buildOpReturnScript(dataArrays: Uint8Array[]): Script {
-	return new Script([
-		{ op: 0 }, // OP_0
-		{ op: 106 }, // OP_RETURN
-		...dataArrays.map((data) => ({ data })),
-	]);
+export function buildOpReturnScript(dataArrays: number[][]): Script {
+	const script = new Script([{ op: OP.OP_FALSE }, { op: OP.OP_RETURN }]);
+	for (const data of dataArrays) {
+		script.writeBin(data);
+	}
+	return script;
 }

package/tools/wallet/a2bPublishMcp.ts

@@ -35,7 +35,10 @@ export const McpConfigSchema = z.object({
 	tools: z.array(z.string()).optional().describe("Available tool names"),
 	prompts: z.array(z.string()).optional().describe("Available prompt names"),
 	resources: z.array(z.string()).optional().describe("Available resource URIs"),
-	env: z.record(z.string()).optional().describe("Environment variables"),
+	env: z
+		.record(z.string(), z.string())
+		.optional()
+		.describe("Environment variables"),
 });
 
 export type McpConfig = z.infer<typeof McpConfigSchema>;
@@ -89,7 +92,7 @@ async function callIngestEndpoint(txid: string): Promise<boolean> {
 			return false;
 		}
 
-		const result = await response.json();
+		const _result = await response.json();
 		// console.log('Ingest result:', result);
 		return true;
 	} catch (error) {
@@ -195,7 +198,15 @@ export function registerA2bPublishMcpTool(
 		"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.",
 		{ ...a2bPublishMcpArgsSchema.shape },
-		async ({ toolName, command, args, keywords, env, description, destinationAddress }) => {
+		async ({
+			toolName,
+			command,
+			args,
+			keywords,
+			env,
+			description,
+			destinationAddress,
+		}) => {
 			try {
 				if (!identityPk) {
 					console.warn(
@@ -334,8 +345,7 @@ export function registerA2bPublishMcpTool(
 										toolCount: metadata.tools.length,
 										promptCount: metadata.prompts.length,
 										resourceCount: metadata.resources.length,
-										description:
-											description || `MCP Tool: ${toolName}`,
+										description: description || `MCP Tool: ${toolName}`,
 										address: targetAddress,
 									},
 									null,