bsv-mcp 0.2.0 → 0.2.8

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();

package/tools/wallet/sendOrdinals.ts

@@ -1,18 +1,12 @@
 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,
 	LocalSigner,
 	SendOrdinalsConfig,
 } from "js-1sat-ord";
-import { OneSatBroadcaster, sendOrdinals } from "js-1sat-ord";
-import { Sigma } from "sigma-protocol";
+import { sendOrdinals } from "js-1sat-ord";
 import { z } from "zod";
 import { V5Broadcaster } from "../../utils/broadcaster";
 import type { Wallet } from "./wallet";
@@ -45,11 +39,8 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_sendOrdinals",
 		"Transfers ordinals (NFTs) from your wallet to another address on the Bitcoin SV blockchain. This tool enables sending inscriptions you own to any valid BSV address. The transaction is created, signed, and broadcast automatically, with appropriate fee calculation and change handling.",
-		{ args: sendOrdinalsArgsSchema },
-		async (
-			{ args }: { args: SendOrdinalsArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		): Promise<CallToolResult> => {
+		{ ...sendOrdinalsArgsSchema.shape },
+		async ({ inscriptionOutpoint, destinationAddress, metadata }): Promise<CallToolResult> => {
 			try {
 				// 1. Get private key from wallet
 				const paymentPk = wallet.getPrivateKey();
@@ -69,7 +60,7 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 				const walletAddress = paymentPk.toAddress().toString();
 
 				// 4. Parse the inscription outpoint
-				const [txid, voutStr] = args.inscriptionOutpoint.split("_");
+				const [txid, voutStr] = inscriptionOutpoint.split("_");
 				if (!txid || !voutStr) {
 					throw new Error(
 						"Invalid inscription outpoint format. Expected txid_vout",
@@ -84,7 +75,7 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 
 				if (!inscription) {
 					throw new Error(
-						`Inscription ${args.inscriptionOutpoint} not found in your wallet`,
+						`Inscription ${inscriptionOutpoint} not found in your wallet`,
 					);
 				}
 
@@ -93,7 +84,7 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 					paymentPk,
 					paymentUtxos,
 					ordinals: [inscription],
-					destinations: [{ address: args.destinationAddress }],
+					destinations: [{ address: destinationAddress }],
 					changeAddress: walletAddress,
 				};
 
@@ -108,8 +99,8 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 				}
 
 				// Add metadata if provided
-				if (args.metadata) {
-					sendOrdinalsConfig.metaData = args.metadata;
+				if (metadata) {
+					sendOrdinalsConfig.metaData = metadata;
 				}
 
 				// Using the wallet's key for both payment and ordinals
@@ -144,8 +135,8 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 									txid: changeResult.tx.id("hex"),
 									spentOutpoints: changeResult.spentOutpoints,
 									payChange: changeResult.payChange,
-									inscriptionOutpoint: args.inscriptionOutpoint,
-									destinationAddress: args.destinationAddress,
+									inscriptionOutpoint: inscriptionOutpoint,
+									destinationAddress: destinationAddress,
 								}),
 							},
 						],

package/tools/wallet/sendToAddress.ts

@@ -1,19 +1,10 @@
 import { P2PKH } from "@bsv/sdk";
 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 { toSatoshi } from "satoshi-token";
-import type { z } from "zod";
 import { getBsvPriceWithCache } from "../bsv/getPrice";
 import { sendToAddressArgsSchema } from "./schemas";
 import type { Wallet } from "./wallet";
 
-// Use the schema imported from schemas.ts
-export type SendToAddressArgs = z.infer<typeof sendToAddressArgsSchema>;
-
 /**
  * Register the sendToAddress tool
  */
@@ -21,20 +12,9 @@ export function registerSendToAddressTool(server: McpServer, wallet: Wallet) {
 	server.tool(
 		"wallet_sendToAddress",
 		"Sends Bitcoin SV (BSV) to a specified address. This tool supports payments in both BSV and USD amounts (with automatic conversion using current exchange rates). Transaction fees are automatically calculated and a confirmation with transaction ID is returned upon success.",
-		{
-			args: sendToAddressArgsSchema,
-		},
-		async (
-			{ args }: { args: SendToAddressArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{ ...sendToAddressArgsSchema.shape },
+		async ({ address, amount, currency = "BSV", description = "Send to address" }) => {
 			try {
-				const {
-					address,
-					amount,
-					currency = "BSV",
-					description = "Send to address",
-				} = args;
 
 				// Convert to satoshis
 				let satoshis: number;

package/tools/wallet/setupDroplet.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 { z } from "zod";
-import { DropletClient } from "../../utils/droplet";
 import type { IntegratedWallet } from "./integratedWallet";
 
 const setupDropletArgsSchema = z.object({
@@ -26,13 +20,8 @@ export function registerSetupDropletTool(
 	server.tool(
 		"wallet_setupDroplet",
 		"Setup and manage Droplet API integration. Actions: register_key (registers your public key), create_faucet (creates a new faucet), check_status (checks faucet status)",
-		{
-			args: setupDropletArgsSchema,
-		},
-		async (
-			{ args }: { args: SetupDropletArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{ ...setupDropletArgsSchema.shape },
+		async ({ action, faucetName, fixedDropSats }) => {
 			try {
 				const dropletClient = integratedWallet.getDropletClient();
 				if (!dropletClient) {
@@ -43,7 +32,7 @@ export function registerSetupDropletTool(
 				const apiUrl = config.apiUrl;
 				const authKey = config.authKey;
 
-				switch (args.action) {
+				switch (action) {
 					case "register_key": {
 						if (!authKey) {
 							throw new Error("No auth key configured");
@@ -80,7 +69,7 @@ export function registerSetupDropletTool(
 					}
 
 					case "create_faucet": {
-						if (!args.faucetName) {
+						if (!faucetName) {
 							throw new Error(
 								"faucetName is required for create_faucet action",
 							);
@@ -100,8 +89,8 @@ export function registerSetupDropletTool(
 
 						// Create the faucet
 						const body = {
-							name: args.faucetName,
-							fixed_drop_sats: args.fixedDropSats || 1000,
+							name: faucetName,
+							fixed_drop_sats: fixedDropSats || 1000,
 							max_consolidation_inputs: 20,
 						};
 
@@ -154,7 +143,7 @@ export function registerSetupDropletTool(
 					}
 
 					default:
-						throw new Error(`Unknown action: ${args.action}`);
+						throw new Error(`Unknown action: ${action}`);
 				}
 			} catch (error) {
 				return {

package/tools/wallet/tools.ts

@@ -1,23 +1,7 @@
 import { type PrivateKey, Utils } from "@bsv/sdk";
-import type {
-	McpServer,
-	ToolCallback,
-} 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 { z } from "zod";
-import {
-	type a2bPublishMcpArgsSchema,
-	registerA2bPublishMcpTool,
-} from "./a2bPublishMcp";
-import {
-	type createOrdinalsArgsSchema,
-	registerCreateOrdinalsTool,
-} from "./createOrdinals";
+import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { registerA2bPublishMcpTool } from "./a2bPublishMcp";
+import { registerCreateOrdinalsTool } from "./createOrdinals";
 import { registerGatherCollectionInfoTool } from "./gatherCollectionInfo";
 import { registerGetAddressTool } from "./getAddress";
 import { registerWalletGetBalanceTool } from "./getBalance";
@@ -25,46 +9,11 @@ import { registerGetPublicKeyTool } from "./getPublicKey";
 import { registerMintCollectionTool } from "./mintCollection";
 import { registerPurchaseListingTool } from "./purchaseListing";
 import { registerRefreshUtxosTool } from "./refreshUtxos";
-import {
-	type emptyArgsSchema,
-	type getAddressArgsSchema,
-	type getPublicKeyArgsSchema,
-	type purchaseListingArgsSchema,
-	type sendToAddressArgsSchema,
-	walletEncryptionArgsSchema,
-} from "./schemas";
+import { walletEncryptionArgsSchema } from "./schemas";
 import { registerSendToAddressTool } from "./sendToAddress";
-import {
-	registerTransferOrdTokenTool,
-	type transferOrdTokenArgsSchema,
-} from "./transferOrdToken";
+import { registerTransferOrdTokenTool } from "./transferOrdToken";
 import type { Wallet } from "./wallet";
 
-// Define mapping from tool names to argument schemas
-type ToolArgSchemas = {
-	wallet_getPublicKey: typeof getPublicKeyArgsSchema;
-	wallet_encryption: typeof walletEncryptionArgsSchema;
-	wallet_getAddress: typeof getAddressArgsSchema;
-	wallet_sendToAddress: typeof sendToAddressArgsSchema;
-	wallet_purchaseListing: typeof purchaseListingArgsSchema;
-	wallet_transferOrdToken: typeof transferOrdTokenArgsSchema;
-	wallet_a2bPublish: typeof a2bPublishMcpArgsSchema;
-	wallet_createOrdinals: typeof createOrdinalsArgsSchema;
-	wallet_refreshUtxos: typeof emptyArgsSchema;
-	wallet_getBalance: typeof emptyArgsSchema;
-};
-
-// Define a type for the handler function with proper argument types
-type ToolHandler = (
-	params: { args: unknown },
-	extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-) => Promise<CallToolResult>;
-
-// Define a map type for tool name to handler functions
-type ToolHandlerMap = {
-	[K in keyof ToolArgSchemas]: ToolHandler;
-};
-
 export function registerWalletTools(
 	server: McpServer,
 	wallet: Wallet,
@@ -73,21 +22,7 @@ export function registerWalletTools(
 		enableA2bTools: boolean;
 		identityPk?: PrivateKey;
 	},
-): ToolHandlerMap {
-	const handlers = {} as ToolHandlerMap;
-
-	// Handle tools registration with properly typed parameters
-	function registerTool<T extends z.ZodType>(
-		name: keyof ToolArgSchemas,
-		description: string,
-		schema: { args: T },
-		handler: ToolCallback<{ args: T }>,
-	): void {
-		// Register all tools normally
-		server.tool(name, description, schema, handler);
-		handlers[name] = handler as ToolHandler;
-	}
-
+): void {
 	// Register the wallet_sendToAddress tool
 	registerSendToAddressTool(server, wallet);
 
@@ -118,7 +53,7 @@ export function registerWalletTools(
 	}
 
 	// Register combined wallet_encryption tool
-	registerTool(
+	server.tool(
 		"wallet_encryption",
 		"Combined tool for encrypting and decrypting data using the wallet's cryptographic keys.\n\n" +
 			"PARAMETERS:\n" +
@@ -139,13 +74,9 @@ export function registerWalletTools(
 			'     "mode": "decrypt",\n' +
 			'     "data": [encrypted bytes from previous response]\n' +
 			"   }",
-		{ args: walletEncryptionArgsSchema },
-		async (
-			{ args }: { args: z.infer<typeof walletEncryptionArgsSchema> },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{ ...walletEncryptionArgsSchema.shape },
+		async ({ mode, data, encoding, recipientPublicKeyHex }) => {
 			try {
-				const { mode, data, encoding, recipientPublicKeyHex } = args;
 
 				let inputData: number[];
 				if (typeof data === "string") {
@@ -187,7 +118,7 @@ export function registerWalletTools(
 					content: [
 						{
 							type: "text",
-							text: `Error during ${args.mode}: ${errorMessage}`,
+							text: `Error during ${mode}: ${errorMessage}`,
 						},
 					],
 					isError: true,
@@ -203,5 +134,4 @@ export function registerWalletTools(
 	registerGatherCollectionInfoTool(server, wallet);
 	registerMintCollectionTool(server, wallet);
 
-	return handlers;
 }

package/tools/wallet/transferOrdToken.ts

@@ -1,10 +1,5 @@
 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 {
-	ServerNotification,
-	ServerRequest,
-} from "@modelcontextprotocol/sdk/types.js";
 import {
 	type Distribution,
 	type LocalSigner,
@@ -65,11 +60,8 @@ export function registerTransferOrdTokenTool(
 	server.tool(
 		"wallet_transferOrdToken",
 		"Transfers BSV-20 or BSV-21 tokens from your wallet via js-1sat-ord transferOrdTokens.",
-		{ args: transferOrdTokenArgsSchema },
-		async (
-			{ args }: { args: TransferOrdTokenArgs },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-		) => {
+		{ ...transferOrdTokenArgsSchema.shape },
+		async ({ protocol, tokenID, sendAmount, paymentUtxos, tokenUtxos, distributions, decimals, additionalPayments }) => {
 			try {
 				// fetch keys
 				const paymentPk = wallet.getPaymentKey();
@@ -80,9 +72,9 @@ export function registerTransferOrdTokenTool(
 
 				// select token UTXOs
 				const { selectedUtxos: inputTokens } = selectTokenUtxos(
-					args.tokenUtxos as TokenUtxo[],
-					args.sendAmount,
-					args.decimals,
+					tokenUtxos as TokenUtxo[],
+					sendAmount,
+					decimals,
 					{
 						inputStrategy: TokenSelectionStrategy.SmallestFirst,
 						outputStrategy: TokenSelectionStrategy.LargestFirst,
@@ -92,21 +84,21 @@ export function registerTransferOrdTokenTool(
 				// build config
 				const config: TransferOrdTokensConfig = {
 					protocol:
-						args.protocol === "bsv-20" ? TokenType.BSV20 : TokenType.BSV21,
-					tokenID: args.tokenID,
-					utxos: args.paymentUtxos as Utxo[],
+						protocol === "bsv-20" ? TokenType.BSV20 : TokenType.BSV21,
+					tokenID,
+					utxos: paymentUtxos as Utxo[],
 					inputTokens,
-					distributions: args.distributions as Distribution[],
+					distributions: distributions as Distribution[],
 					tokenChangeAddress: ordAddress,
 					changeAddress,
 					paymentPk,
 					ordPk,
-					additionalPayments: (args.additionalPayments as Payment[]) || [],
-					decimals: args.decimals,
+					additionalPayments: (additionalPayments as Payment[]) || [],
+					decimals,
 					inputMode: TokenInputMode.Needed,
 					splitConfig: {
 						outputs: inputTokens.length === 1 ? 2 : 1,
-						threshold: args.sendAmount,
+						threshold: sendAmount,
 					},
 				};
 

package/vite.config.ts

@@ -0,0 +1,15 @@
+import { resolve } from "node:path";
+import { defineConfig } from "vite";
+import { viteSingleFile } from "vite-plugin-singlefile";
+
+export default defineConfig({
+	root: resolve(__dirname, "src/views"),
+	plugins: [viteSingleFile()],
+	build: {
+		rollupOptions: {
+			input: resolve(__dirname, "src/views/app.html"),
+		},
+		outDir: resolve(__dirname, "dist"),
+		emptyOutDir: false,
+	},
+});