bsv-mcp 0.0.33 → 0.0.34

package/CHANGELOG.md

@@ -1,10 +1,18 @@
 # BSV MCP Server Changelog
 
+## v0.0.34 - Transaction Broadcast Control
+
+### Features
+- Added `DISABLE_BROADCASTING` environment variable to control transaction broadcasting behavior
+  - When set to "true", transactions are created but not broadcast to the network
+  - Returns raw transaction hex instead of broadcasting, useful for testing and review
+- Code cleanup and organization improvements
+
 ## v0.0.33 - Identity Key Sigma Signing
 
 ### Features
 - Added optional `IDENTITY_KEY_WIF` environment variable for sigma-protocol signing.
-- `wallet_a2bPublishMcp`, `wallet_createOrdinals`, and `wallet_purchaseListing` tools now support signing with an identity key.
+-  `wallet_createOrdinals`, and `wallet_purchaseListing` tools now support signing with an identity key.
 - Updated `README.md` to document `IDENTITY_KEY_WIF` usage and JSON configuration examples.
 
 ## v0.0.32 - Reliability Improvements

package/README.md

@@ -365,6 +365,7 @@ The BSV MCP server can be customized using environment variables to enable or di
 | `DISABLE_ORDINALS_TOOLS` | `false` | Set to `true` to disable Ordinals/NFT tools |
 | `DISABLE_UTILS_TOOLS` | `false` | Set to `true` to disable utility tools |
 | `IDENTITY_KEY_WIF`    | `not set` | Optional WIF for identity key; if set, ordinals inscriptions will be signed with sigma-protocol for authentication, curation, and web-of-trust. |
+| `DISABLE_BROADCASTING` | `false` | Set to `true` to disable transaction broadcasting; returns raw transaction hex instead - useful for testing and transaction review before broadcasting |
 
 ### Examples
 
@@ -386,6 +387,12 @@ Use all tools except wallet operations:
 DISABLE_WALLET_TOOLS=true bunx bsv-mcp@latest
 ```
 
+Create transactions without broadcasting them (dry-run mode):
+
+```bash
+DISABLE_BROADCASTING=true bunx bsv-mcp@latest
+```
+
 ## Troubleshooting
 
 If you're having issues with the BSV MCP server:
@@ -427,6 +434,7 @@ For Cursor, check the Cursor MCP logs in Settings → Extensions → Model Conte
 
 ## Recent Updates
 
+- **Transaction Broadcast Control**: Added `DISABLE_BROADCASTING` environment variable to prevent transactions from being broadcast to the network
 - **Blockchain Explorer**: Added `bsv_explore` tool for WhatsOnChain API access with mainnet/testnet support
 - **Unified Tools**: Merged `wallet_encrypt`/`wallet_decrypt` into single `wallet_encryption` tool
 - **Enhanced Marketplace**: Support for NFTs, BSV-20/21 tokens in listings, sales and purchases

package/index.ts

@@ -24,7 +24,10 @@ const CONFIG = {
 	loadBsvTools: process.env.DISABLE_BSV_TOOLS !== "true",
 	loadOrdinalsTools: process.env.DISABLE_ORDINALS_TOOLS !== "true",
 	loadUtilsTools: process.env.DISABLE_UTILS_TOOLS !== "true",
-	loadA2bTools: process.env.DISABLE_A2B_TOOLS !== "true",
+	loadA2bTools: process.env.ENABLE_A2B_TOOLS === "true",
+
+	// Transaction broadcasting control
+	disableBroadcasting: process.env.DISABLE_BROADCASTING === "true",
 };
 
 /**
@@ -70,7 +73,7 @@ function initializePrivateKey(): PrivateKey | undefined {
 const privKey = initializePrivateKey();
 
 const server = new McpServer(
-	{ name: "Bitcoin SV", version: "0.0.33" },
+	{ name: "Bitcoin SV", version: "0.0.34" },
 	// {
 	// 	// Advertise only what you actually implement
 	// 	capabilities: {
@@ -102,7 +105,10 @@ if (CONFIG.loadTools) {
 		// Initialize wallet with the private key if wallet tools are enabled
 		if (CONFIG.loadWalletTools) {
 			wallet = new Wallet(privKey);
-			registerWalletTools(server, wallet);
+			registerWalletTools(server, wallet, {
+				disableBroadcasting: CONFIG.disableBroadcasting,
+				enableA2bTools: CONFIG.loadA2bTools,
+			});
 		}
 	}
 

package/package.json

@@ -2,7 +2,7 @@
 	"name": "bsv-mcp",
 	"module": "index.ts",
 	"type": "module",
-	"version": "0.0.33",
+	"version": "0.0.34",
 	"license": "MIT",
 	"author": "satchmo",
 	"description": "A collection of Bitcoin SV (BSV) tools for the Model Context Protocol (MCP) framework",

package/tools/index.ts

@@ -32,14 +32,14 @@ export function registerAllTools(
 		enableBsvTools: true,
 		enableOrdinalsTools: true,
 		enableUtilsTools: true,
-		enableA2bTools: true,
+		enableA2bTools: false,
 	},
 ): void {
 	const {
 		enableBsvTools = true,
 		enableOrdinalsTools = true,
 		enableUtilsTools = true,
-		enableA2bTools = true,
+		enableA2bTools = false,
 	} = config;
 
 	// Register BSV-related tools

package/tools/wallet/a2bPublishAgent.ts

@@ -1,4 +1,4 @@
-import { Utils } from "@bsv/sdk";
+import { PrivateKey, Utils } from "@bsv/sdk";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import type {
@@ -8,10 +8,13 @@ import type {
 import { createOrdinals } from "js-1sat-ord";
 import type {
 	ChangeResult,
+	CreateOrdinalsConfig,
 	Destination,
 	Inscription,
+	LocalSigner,
 	PreMAP,
 } from "js-1sat-ord";
+import { Sigma } from "sigma-protocol";
 import { z } from "zod";
 import type { Wallet } from "./wallet";
 const { toArray, toBase64 } = Utils;
@@ -246,32 +249,57 @@ export function registerA2bPublishAgentTool(server: McpServer, wallet: Wallet) {
 				// Default MAP metadata: file path, content type, encoding
 				const metaData: PreMAP = { app: "bsv-mcp", type: "a2b" };
 
-				// Inscribe the ordinal on-chain via js-1sat-ord
-				const result = await createOrdinals({
+				const createOrdinalsConfig: CreateOrdinalsConfig = {
 					utxos: paymentUtxos,
 					destinations,
 					paymentPk,
 					changeAddress: walletAddress,
 					metaData,
-				});
+				};
+
+				const identityPk = process.env.IDENTITY_KEY_WIF
+					? PrivateKey.fromWif(process.env.IDENTITY_KEY_WIF)
+					: undefined;
+				if (identityPk) {
+					createOrdinalsConfig.signer = {
+						idKey: identityPk,
+					} as LocalSigner;
+				}
+
+				// Inscribe the ordinal on-chain via js-1sat-ord
+				const result = await createOrdinals(createOrdinalsConfig);
 				const changeResult = result as ChangeResult;
-				await changeResult.tx.broadcast();
-				// Refresh UTXOs
-				try {
-					await wallet.refreshUtxos();
-				} catch {}
-				// Return transaction details
+
+				const disableBroadcasting = process.env.DISABLE_BROADCASTING === "true";
+				if (!disableBroadcasting) {
+					await changeResult.tx.broadcast();
+
+					// Refresh UTXOs
+					try {
+						await wallet.refreshUtxos();
+					} catch {}
+					// Return transaction details
+					return {
+						content: [
+							{
+								type: "text",
+								text: JSON.stringify({
+									txid: changeResult.tx.id("hex"),
+									spentOutpoints: changeResult.spentOutpoints,
+									payChange: changeResult.payChange,
+									inscriptionAddress: targetAddress,
+									agentCard,
+								}),
+							},
+						],
+					};
+				}
+
 				return {
 					content: [
 						{
 							type: "text",
-							text: JSON.stringify({
-								txid: changeResult.tx.id("hex"),
-								spentOutpoints: changeResult.spentOutpoints,
-								payChange: changeResult.payChange,
-								inscriptionAddress: targetAddress,
-								agentCard,
-							}),
+							text: changeResult.tx.toHex(),
 						},
 					],
 				};

package/tools/wallet/a2bPublishMcp.ts

@@ -32,9 +32,16 @@ export const a2bPublishMcpArgsSchema = z.object({
 	command: z.string().describe("The command to execute the tool"),
 	args: z.array(z.string()).describe("Arguments to pass to the command"),
 	env: z
-		.record(z.string())
+		.array(
+			z.object({
+				key: z.string().describe("Environment variable name"),
+				description: z
+					.string()
+					.describe("Description of the environment variable"),
+			}),
+		)
 		.optional()
-		.describe("Optional environment variables"),
+		.describe("Optional environment variables with descriptions"),
 	description: z.string().optional().describe("Optional tool description"),
 	destinationAddress: z
 		.string()
@@ -47,7 +54,11 @@ export type A2bPublishMcpArgs = z.infer<typeof a2bPublishMcpArgsSchema>;
 /**
  * Registers the wallet_a2bPublishMcp for publishing an MCP tool configuration on-chain
  */
-export function registerA2bPublishMcpTool(server: McpServer, wallet: Wallet) {
+export function registerA2bPublishMcpTool(
+	server: McpServer,
+	wallet: Wallet,
+	config: { disableBroadcasting: boolean },
+) {
 	server.tool(
 		"wallet_a2bPublishMcp",
 		"Publish an MCP tool configuration record on-chain via Ordinal inscription",
@@ -84,7 +95,15 @@ export function registerA2bPublishMcpTool(server: McpServer, wallet: Wallet) {
 				const toolConfig: McpConfig = {
 					command: args.command,
 					args: args.args,
-					env: args.env,
+					env: args.env
+						? args.env.reduce(
+								(acc, { key, description }) => {
+									acc[key] = description;
+									return acc;
+								},
+								{} as Record<string, string>,
+							)
+						: undefined,
 				};
 
 				// Validate compliance
@@ -94,7 +113,7 @@ export function registerA2bPublishMcpTool(server: McpServer, wallet: Wallet) {
 				const fullConfig = {
 					mcpServers: {
 						[args.toolName]: {
-							description: args.description || `MCP Tool: ${args.toolName}`,
+							description: args.description || "",
 							type: "mcp-tool",
 							...toolConfig,
 						},
@@ -137,42 +156,53 @@ export function registerA2bPublishMcpTool(server: McpServer, wallet: Wallet) {
 					finalTx = signResponse.signedTx;
 				}
 				// Broadcast the transaction
-				await finalTx.broadcast();
-
-				// Refresh UTXOs after spending
-				try {
-					await wallet.refreshUtxos();
-				} catch (refreshError) {
-					console.warn(
-						"Failed to refresh UTXOs after transaction:",
-						refreshError,
-					);
-				}
-
-				// Build a nicely formatted result
-				const outpointIndex = 0; // First output with the inscription
-				const outpoint = `${changeResult.tx.id("hex")}_${outpointIndex}`;
+				if (!config.disableBroadcasting) {
+					await finalTx.broadcast();
 
-				// Tool URL for discovery is the outpoint
-				const onchainUrl = `ord://${outpoint}`;
+					// Refresh UTXOs after spending
+					try {
+						await wallet.refreshUtxos();
+					} catch (refreshError) {
+						console.warn(
+							"Failed to refresh UTXOs after transaction:",
+							refreshError,
+						);
+					}
 
+					// Build a nicely formatted result
+					const outpointIndex = 0; // First output with the inscription
+					const outpoint = `${finalTx.id("hex")}_${outpointIndex}`;
+
+					// Tool URL for discovery is the outpoint
+					const onchainUrl = `ord://${outpoint}`;
+
+					return {
+						content: [
+							{
+								type: "text",
+								text: JSON.stringify(
+									{
+										status: "success",
+										txid: finalTx.id("hex"),
+										outpoint,
+										onchainUrl,
+										toolName: args.toolName,
+										description:
+											args.description || `MCP Tool: ${args.toolName}`,
+										address: targetAddress,
+									},
+									null,
+									2,
+								),
+							},
+						],
+					};
+				}
 				return {
 					content: [
 						{
 							type: "text",
-							text: JSON.stringify(
-								{
-									status: "success",
-									txid: changeResult.tx.id("hex"),
-									outpoint,
-									onchainUrl,
-									toolName: args.toolName,
-									description: args.description || `MCP Tool: ${args.toolName}`,
-									address: targetAddress,
-								},
-								null,
-								2,
-							),
+							text: finalTx.toHex(),
 						},
 					],
 				};

package/tools/wallet/createOrdinals.ts

@@ -11,8 +11,10 @@ import type {
 	ChangeResult,
 	CreateOrdinalsCollectionItemMetadata,
 	CreateOrdinalsCollectionMetadata,
+	CreateOrdinalsConfig,
 	Destination,
 	Inscription,
+	LocalSigner,
 	PreMAP,
 } from "js-1sat-ord";
 import { Sigma } from "sigma-protocol";
@@ -101,8 +103,7 @@ export function registerCreateOrdinalsTool(server: McpServer, wallet: Wallet) {
 					},
 				];
 
-				// 6. Create and broadcast the transaction
-				const result = await createOrdinals({
+				const createOrdinalsConfig: CreateOrdinalsConfig = {
 					utxos: paymentUtxos,
 					destinations,
 					paymentPk,
@@ -111,41 +112,57 @@ export function registerCreateOrdinalsTool(server: McpServer, wallet: Wallet) {
 						| PreMAP
 						| CreateOrdinalsCollectionMetadata
 						| CreateOrdinalsCollectionItemMetadata,
-				});
+				};
+
+				if (identityPk) {
+					createOrdinalsConfig.signer = {
+						idKey: identityPk,
+					} as LocalSigner;
+				}
+
+				// 6. Create and broadcast the transaction
+				const result = await createOrdinals(createOrdinalsConfig);
 
 				const changeResult = result as ChangeResult;
 
 				// 7. Optionally sign with identity key and broadcast the transaction
-				let finalTx = changeResult.tx;
-				if (identityPk) {
-					const sigma = new Sigma(changeResult.tx);
-					const signResponse = sigma.sign(identityPk);
-					finalTx = signResponse.signedTx;
-				}
-				await finalTx.broadcast();
-
-				// 8. Refresh the wallet's UTXOs after spending
-				try {
-					await wallet.refreshUtxos();
-				} catch (refreshError) {
-					console.warn(
-						"Failed to refresh UTXOs after transaction:",
-						refreshError,
-					);
+
+				const disableBroadcasting = process.env.DISABLE_BROADCASTING === "true";
+				if (!disableBroadcasting) {
+					await changeResult.tx.broadcast();
+
+					// 8. Refresh the wallet's UTXOs after spending
+					try {
+						await wallet.refreshUtxos();
+					} catch (refreshError) {
+						console.warn(
+							"Failed to refresh UTXOs after transaction:",
+							refreshError,
+						);
+					}
+
+					// 9. Return transaction details
+					return {
+						content: [
+							{
+								type: "text",
+								text: JSON.stringify({
+									txid: changeResult.tx.id("hex"),
+									spentOutpoints: changeResult.spentOutpoints,
+									payChange: changeResult.payChange,
+									inscriptionAddress: args.destinationAddress || walletAddress,
+									contentType: args.contentType,
+								}),
+							},
+						],
+					};
 				}
 
-				// 9. Return transaction details
 				return {
 					content: [
 						{
 							type: "text",
-							text: JSON.stringify({
-								txid: changeResult.tx.id("hex"),
-								spentOutpoints: changeResult.spentOutpoints,
-								payChange: changeResult.payChange,
-								inscriptionAddress: args.destinationAddress || walletAddress,
-								contentType: args.contentType,
-							}),
+							text: changeResult.tx.toHex(),
 						},
 					],
 				};

package/tools/wallet/purchaseListing.ts

@@ -9,7 +9,9 @@ import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import {
 	type ChangeResult,
 	type ExistingListing,
+	type LocalSigner,
 	type Payment,
+	type PurchaseOrdListingConfig,
 	type Royalty,
 	TokenType,
 	type TokenUtxo,
@@ -252,7 +254,7 @@ Please fund this wallet address with enough BSV to cover the purchase price
 						}
 					}
 
-					transaction = await purchaseOrdListing({
+					const purchaseOrdListingConfig: PurchaseOrdListingConfig = {
 						utxos: paymentUtxos,
 						paymentPk,
 						ordAddress: args.ordAddress,
@@ -260,7 +262,9 @@ Please fund this wallet address with enough BSV to cover the purchase price
 						additionalPayments,
 						metaData,
 						royalties,
-					});
+					};
+
+					transaction = await purchaseOrdListing(purchaseOrdListingConfig);
 				}
 
 				// After successful transaction creation, refresh the wallet's UTXOs
@@ -272,47 +276,54 @@ Please fund this wallet address with enough BSV to cover the purchase price
 				}
 
 				// Optionally sign with identity key then broadcast the transaction
-				let finalTx = transaction.tx;
-				if (identityPk) {
-					const sigma = new Sigma(finalTx);
-					const signResponse = sigma.sign(identityPk);
-					finalTx = signResponse.signedTx;
-				}
-				const broadcastResult = await finalTx.broadcast(oneSatBroadcaster());
 
-				// Handle broadcast response
-				const resultStatus =
-					typeof broadcastResult === "object" && "status" in broadcastResult
-						? broadcastResult.status
-						: "unknown";
+				const disableBroadcasting = process.env.DISABLE_BROADCASTING === "true";
+				if (!disableBroadcasting) {
+					const broadcastResult = await transaction.tx.broadcast(
+						oneSatBroadcaster(),
+					);
+					// Handle broadcast response
+					const resultStatus =
+						typeof broadcastResult === "object" && "status" in broadcastResult
+							? broadcastResult.status
+							: "unknown";
 
-				const resultMessage =
-					typeof broadcastResult === "object" && "error" in broadcastResult
-						? broadcastResult.error
-						: "Transaction broadcast successful";
+					const resultMessage =
+						typeof broadcastResult === "object" && "error" in broadcastResult
+							? broadcastResult.error
+							: "Transaction broadcast successful";
 
+					return {
+						content: [
+							{
+								type: "text",
+								text: JSON.stringify({
+									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,
+									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,
+								}),
+							},
+						],
+					};
+				}
 				return {
 					content: [
 						{
 							type: "text",
-							text: JSON.stringify({
-								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,
-								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,
-							}),
+							text: transaction.tx.toHex(),
 						},
 					],
 				};

package/tools/wallet/sendOrdinals.ts

@@ -7,7 +7,12 @@ import type {
 	ServerRequest,
 } from "@modelcontextprotocol/sdk/types.js";
 import { sendOrdinals } from "js-1sat-ord";
-import type { ChangeResult, SendOrdinalsConfig } from "js-1sat-ord";
+import type {
+	ChangeResult,
+	LocalSigner,
+	SendOrdinalsConfig,
+} from "js-1sat-ord";
+import { Sigma } from "sigma-protocol";
 import { z } from "zod";
 import type { Wallet } from "./wallet";
 
@@ -92,17 +97,15 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 				};
 
 				const identityKeyWif = process.env.IDENTITY_KEY_WIF;
-				let identityPk: PrivateKey | undefined;
-				if (identityKeyWif) {
-					try {
-						identityPk = PrivateKey.fromWif(identityKeyWif);
-					} catch (e) {
-						console.warn(
-							"Warning: Invalid IDENTITY_KEY_WIF environment variable; sigma signing disabled",
-							e,
-						);
-					}
+				const identityPk = identityKeyWif
+					? PrivateKey.fromWif(identityKeyWif)
+					: undefined;
+				if (identityPk) {
+					sendOrdinalsConfig.signer = {
+						idKey: identityPk,
+					} as LocalSigner;
 				}
+
 				// Add metadata if provided
 				if (args.metadata) {
 					sendOrdinalsConfig.metaData = args.metadata;
@@ -113,32 +116,45 @@ export function registerSendOrdinalsTool(server: McpServer, wallet: Wallet) {
 
 				const result = await sendOrdinals(sendOrdinalsConfig);
 				const changeResult = result as ChangeResult;
+				// no signing when you send since we don't emit an inscription
 
 				// 7. Broadcast the transaction
-				await changeResult.tx.broadcast();
-
-				// 8. Refresh the wallet's UTXOs after spending
-				try {
-					await wallet.refreshUtxos();
-				} catch (refreshError) {
-					console.warn(
-						"Failed to refresh UTXOs after transaction:",
-						refreshError,
-					);
+				const disableBroadcasting = process.env.DISABLE_BROADCASTING === "true";
+				if (!disableBroadcasting) {
+					await changeResult.tx.broadcast();
+
+					// 8. Refresh the wallet's UTXOs after spending
+					try {
+						await wallet.refreshUtxos();
+					} catch (refreshError) {
+						console.warn(
+							"Failed to refresh UTXOs after transaction:",
+							refreshError,
+						);
+					}
+
+					// 9. Return transaction details
+					return {
+						content: [
+							{
+								type: "text",
+								text: JSON.stringify({
+									txid: changeResult.tx.id("hex"),
+									spentOutpoints: changeResult.spentOutpoints,
+									payChange: changeResult.payChange,
+									inscriptionOutpoint: args.inscriptionOutpoint,
+									destinationAddress: args.destinationAddress,
+								}),
+							},
+						],
+					};
 				}
 
-				// 9. Return transaction details
 				return {
 					content: [
 						{
 							type: "text",
-							text: JSON.stringify({
-								txid: changeResult.tx.id("hex"),
-								spentOutpoints: changeResult.spentOutpoints,
-								payChange: changeResult.payChange,
-								inscriptionOutpoint: args.inscriptionOutpoint,
-								destinationAddress: args.destinationAddress,
-							}),
+							text: changeResult.tx.toHex(),
 						},
 					],
 				};

package/tools/wallet/tools.ts

@@ -99,6 +99,10 @@ type ToolHandlerMap = {
 export function registerWalletTools(
 	server: McpServer,
 	wallet: Wallet,
+	config: {
+		disableBroadcasting: boolean;
+		enableA2bTools: boolean;
+	},
 ): ToolHandlerMap {
 	const handlers = {} as ToolHandlerMap;
 
@@ -129,11 +133,16 @@ export function registerWalletTools(
 	// Register the wallet_transferOrdToken tool
 	registerTransferOrdTokenTool(server, wallet);
 
-	// Register the wallet_a2bPublishAgent tool
-	// registerA2bPublishAgentTool(server, wallet);
+	// A2B tools have to be explicitly enabled
+	if (config.enableA2bTools) {
+		// Register the wallet_a2bPublishAgent tool
+		// registerA2bPublishAgentTool(server, wallet);
 
-	// Register the wallet_a2bPublishMcp tool
-	registerA2bPublishMcpTool(server, wallet);
+		// Register the wallet_a2bPublishMcp tool
+		registerA2bPublishMcpTool(server, wallet, {
+			disableBroadcasting: config.disableBroadcasting,
+		});
+	}
 
 	// Register only the minimal public-facing tools
 	// wallet_createAction, wallet_signAction and wallet_getHeight have been removed

package/tools/wallet/transferOrdToken.ts

@@ -1,3 +1,4 @@
+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 {
@@ -6,6 +7,7 @@ import type {
 } from "@modelcontextprotocol/sdk/types.js";
 import {
 	type Distribution,
+	type LocalSigner,
 	type Payment,
 	type TokenChangeResult,
 	TokenInputMode,
@@ -106,26 +108,47 @@ export function registerTransferOrdTokenTool(
 					},
 				};
 
+				const identityPk = process.env.IDENTITY_KEY_WIF
+					? PrivateKey.fromWif(process.env.IDENTITY_KEY_WIF)
+					: undefined;
+
+				if (identityPk) {
+					config.signer = {
+						idKey: identityPk,
+					} as LocalSigner;
+				}
+
 				// execute transfer
 				const result: TokenChangeResult = await transferOrdTokens(config);
-				await result.tx.broadcast();
+				const disableBroadcasting = process.env.DISABLE_BROADCASTING === "true";
+				if (!disableBroadcasting) {
+					await result.tx.broadcast();
 
-				// refresh UTXOs
-				try {
-					await wallet.refreshUtxos();
-				} catch {}
+					// refresh UTXOs
+					try {
+						await wallet.refreshUtxos();
+					} catch {}
 
-				// respond
+					// respond
+					return {
+						content: [
+							{
+								type: "text",
+								text: JSON.stringify({
+									txid: result.tx.id("hex"),
+									spentOutpoints: result.spentOutpoints,
+									payChange: result.payChange,
+									tokenChange: result.tokenChange,
+								}),
+							},
+						],
+					};
+				}
 				return {
 					content: [
 						{
 							type: "text",
-							text: JSON.stringify({
-								txid: result.tx.id("hex"),
-								spentOutpoints: result.spentOutpoints,
-								payChange: result.payChange,
-								tokenChange: result.tokenChange,
-							}),
+							text: result.tx.toHex(),
 						},
 					],
 				};

package/tools/wallet/wallet.ts

@@ -82,12 +82,20 @@ export class Wallet extends ProtoWallet implements WalletInterface {
 			}
 
 			const address = privateKey.toAddress();
-
-			const utxos = await fetchPayUtxos(address);
-			const nftUtxos = await fetchNftUtxos(address);
-			this.paymentUtxos = utxos;
-			this.nftUtxos = nftUtxos;
 			this.lastUtxoFetch = Date.now();
+
+			try {
+				const utxos = await fetchPayUtxos(address);
+				this.paymentUtxos = utxos;
+			} catch (error) {
+				console.error("Error fetching payment UTXOs:", error);
+			}
+			try {
+				const nftUtxos = await fetchNftUtxos(address);
+				this.nftUtxos = nftUtxos;
+			} catch (error) {
+				console.error("Error fetching NFT UTXOs:", error);
+			}
 		} catch (error) {
 			console.error("Error refreshing UTXOs:", error);
 			throw error;