bsv-mcp 0.2.14 → 0.3.0

package/package.json

@@ -2,7 +2,7 @@
 	"name": "bsv-mcp",
 	"module": "dist/index.js",
 	"type": "module",
-	"version": "0.2.14",
+	"version": "0.3.0",
 	"license": "MIT",
 	"author": "satchmo",
 	"description": "A collection of Bitcoin SV (BSV) tools for the Model Context Protocol (MCP) framework",
@@ -62,6 +62,7 @@
 		"bun": "^1.3.10",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
+		"esbuild": "^0.28.1",
 		"lucide-react": "0.577.0",
 		"next": "^16.1.6",
 		"next-themes": "^0.4.6",
@@ -72,15 +73,28 @@
 		"tailwind-merge": "^3.5.0",
 		"tailwindcss": "^4.2.1",
 		"tailwindcss-animate": "^1.0.7",
-		"@1sat/actions": "0.0.27",
-		"@1sat/wallet-remote": "0.0.7",
-		"@bsv/sdk": "^2.0.6",
-		"@modelcontextprotocol/ext-apps": "^1.2.0",
-		"@modelcontextprotocol/sdk": "^1.27.1",
-		"bitcoin-auth": "^0.0.7",
-		"bitcoin-backup": "0.0.7",
+		"vite": "^7.3.1",
+		"vite-plugin-singlefile": "^2.3.0"
+	},
+	"peerDependencies": {
+		"typescript": "^5.9.3"
+	},
+	"overrides": {
+		"zod": "4.4.3"
+	},
+	"dependencies": {
+		"@1sat/actions": "^0.0.192",
+		"@1sat/wallet-node": "^0.0.64",
+		"@1sat/wallet-remote": "^0.0.55",
+		"@bsv/sdk": "^2.2.0",
+		"@bsv/wallet-toolbox": "^2.4.4",
+		"@gorillapool/js-junglebus": "^0.4.4",
+		"@modelcontextprotocol/ext-apps": "^1.7.5",
+		"@modelcontextprotocol/sdk": "^1.29.0",
+		"bitcoin-auth": "^0.0.8",
+		"bitcoin-backup": "^0.0.13",
 		"bmap-api-types": "0.0.9",
-		"bsv-bap": "0.1.23",
+		"bsv-bap": "^0.3.4",
 		"jose": "^6.2.0",
 		"js-1sat-ord": "^0.1.91",
 		"mcp-handler": "^1.0.7",
@@ -88,13 +102,8 @@
 		"satoshi-token": "^0.0.7",
 		"schema-dts": "^1.1.5",
 		"sigma-protocol": "^0.1.9",
-		"vite": "^7.3.1",
-		"vite-plugin-singlefile": "^2.3.0"
-	},
-	"peerDependencies": {
-		"typescript": "^5.9.3"
+		"zod": "4.4.3"
 	},
-	"dependencies": {},
 	"scripts": {
 		"build": "bun run ./scripts/build.ts",
 		"build:view": "vite build",

package/prompts/bsvSdk/auth.ts

@@ -44,7 +44,7 @@ export function registerAuthPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_auth",
 		"Detailed information about the authentication functionality in the BSV SDK, including identity protocols, certificates, and session management.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/bsvSdk/cryptography.ts

@@ -45,7 +45,7 @@ export function registerCryptographyPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_cryptography",
 		"Detailed information about the cryptographic functionality in the BSV SDK, including key generation, signing, encryption, and hashing.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/bsvSdk/overview.ts

@@ -88,7 +88,7 @@ export function registerOverviewPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_overview",
 		"General overview of the Bitcoin SV SDK, including its purpose and main components.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/bsvSdk/primitives.ts

@@ -52,7 +52,7 @@ export function registerPrimitivesPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_primitives",
 		"Detailed information about the primitive data types and structures in the BSV SDK, including Binary, Hex, Points, and other fundamental types.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/bsvSdk/script.ts

@@ -53,7 +53,7 @@ export function registerScriptPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_script",
 		"Detailed information about the script functionality in the BSV SDK, including Bitcoin Script operations, locking and unlocking scripts, and OP_CODES.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/bsvSdk/transaction.ts

@@ -232,7 +232,7 @@ export function registerTransactionPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_transaction",
 		"Detailed information about transaction building and management in the BSV SDK, including input/output handling, script integration, and transaction signing.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/bsvSdk/wallet.ts

@@ -171,7 +171,7 @@ export function registerWalletPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_sdk_wallet",
 		"Detailed information about the wallet functionality in the BSV SDK, including key management, address handling, and UTXO management.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/prompts/ordinals.ts

@@ -86,7 +86,7 @@ export function registerOrdinalsPrompt(server: McpServer): void {
 	server.prompt(
 		"bitcoin_sv_ordinals",
 		"Comprehensive information about Bitcoin SV ordinals, including what they are, how they work, and how to use them.",
-		async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+		async (_extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
 			return {
 				messages: [
 					{

package/test-mcp-server.ts

@@ -2,6 +2,28 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 
+/**
+ * Read the first text block out of a callTool result. The client return type
+ * is a union that also covers the legacy `toolResult` shape, so the content
+ * array has to be checked rather than assumed.
+ */
+function firstText(result: { [key: string]: unknown }): string {
+	const content = result.content;
+	if (!Array.isArray(content) || content.length === 0) {
+		throw new Error("Tool result carried no content blocks");
+	}
+	const block: unknown = content[0];
+	if (
+		typeof block !== "object" ||
+		block === null ||
+		!("text" in block) ||
+		typeof block.text !== "string"
+	) {
+		throw new Error("First content block was not text");
+	}
+	return block.text;
+}
+
 async function testMCPServer() {
 	console.log("🧪 Testing BSV MCP Server...\n");
 
@@ -67,7 +89,7 @@ async function testMCPServer() {
 				name: "bsv_getPrice",
 				arguments: {},
 			});
-			const content = priceResult.content[0] as { text: string };
+			const content = { text: firstText(priceResult) };
 			console.log("✅", content.text);
 		} catch (error) {
 			console.log("❌ Error:", error);
@@ -86,7 +108,7 @@ async function testMCPServer() {
 					},
 				},
 			});
-			const content = convertResult.content[0] as { text: string };
+			const content = { text: firstText(convertResult) };
 			console.log("✅ Converted:", content.text);
 		} catch (error) {
 			console.log("❌ Error:", error);
@@ -103,7 +125,7 @@ async function testMCPServer() {
 					},
 				},
 			});
-			const content = postsResult.content[0] as { text: string };
+			const content = { text: firstText(postsResult) };
 			console.log("✅ Read posts (showing first 200 chars):");
 			console.log(`${content.text.substring(0, 200)}...`);
 		} catch (error) {
@@ -122,7 +144,7 @@ async function testMCPServer() {
 					},
 				},
 			});
-			const content = ordinalsResult.content[0] as { text: string };
+			const content = { text: firstText(ordinalsResult) };
 			const response = JSON.parse(content.text);
 			console.log(`✅ Found ${response.total || 0} inscriptions`);
 		} catch (error) {

package/tools/a2b/discover.ts

@@ -50,7 +50,7 @@ export type A2bDiscoverArgs = z.infer<typeof a2bDiscoverArgsSchema>;
 /**
  * Format the response in a user-friendly way
  */
-function formatSearchResults(data: unknown, queryType: string): string {
+function _formatSearchResults(data: unknown, queryType: string): string {
 	// console.log(`Received data: ${JSON.stringify(data).substring(0, 200)}...`); // Debug log
 
 	// Check if data is an object with items property
@@ -124,7 +124,7 @@ export function registerA2bDiscoverTool(server: McpServer) {
 		{ ...a2bDiscoverArgsSchema.shape },
 		async (
 			{ queryType, query, limit, offset, fromBlock, toBlock },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		) => {
 			try {
 				const params = new URLSearchParams();

package/tools/bap/friend.ts

@@ -5,7 +5,6 @@ import {
 	isBroadcastFailure,
 	isBroadcastResponse,
 	P2PKH,
-	PrivateKey,
 	SatoshisPerKilobyte,
 	Script,
 	Transaction,
@@ -18,21 +17,17 @@ import type {
 	ServerNotification,
 	ServerRequest,
 } from "@modelcontextprotocol/sdk/types.js";
-import { BAP, MemberID } from "bsv-bap";
+import { BAP } from "bsv-bap";
 import { z } from "zod";
 import { BsocialBroadcaster } from "../../utils/broadcaster";
-import {
-	friendPrivateKeyFromMemberIdKey,
-	friendPublicKeyFromSeedString,
-} from "../../utils/keys";
+import { friendPrivateKeyFromMemberIdKey } from "../../utils/keys";
 import { MAP_PREFIX } from "../constants";
-import {
-	fetchPaymentUtxos,
-	fetchPaymentUtxosFromV5,
-} from "../wallet/fetchPaymentUtxos";
+import { signOpReturnWithAIP } from "../utils/aip";
+import { buildOpReturnScript } from "../utils/transactionBuilder";
+import { fetchPaymentUtxosFromV5 } from "../wallet/fetchPaymentUtxos";
 import type { Wallet } from "../wallet/wallet";
 
-const { toArray, toHex } = Utils;
+const { toArray } = Utils;
 
 const APP_DOMAIN = "bsv-mcp";
 
@@ -58,9 +53,9 @@ export function registerBapFriendTool(
 		{ ...bapFriendArgsSchema.shape },
 		async (
 			{ targetBapId },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		): Promise<CallToolResult> => {
-			const logFunc = console.error;
+			const _logFunc = console.error;
 
 			try {
 				// --- Preconditions ---
@@ -95,10 +90,7 @@ export function registerBapFriendTool(
 
 				// 3. Derive Initial Identity
 				const bap = new BAP(xprv);
-				const idpk = PrivateKey.fromWif(
-					bap.newId().exportMemberBackup().derivedPrivateKey,
-				);
-				const identityInstance = new MemberID(idpk);
+				const idpk = bap.newId().getAccountKey();
 				const paymentAddress = payPk.toAddress();
 
 				// --- Derive friend public key ---
@@ -123,15 +115,16 @@ export function registerBapFriendTool(
 					friendPubKey,
 				];
 
-				const payloadBuffers = payloadParts.map(
-					(part) => toArray(part) as number[],
+				const payloadBuffers: number[][] = payloadParts.map((part) =>
+					toArray(part),
 				);
 
-				const signedBuffers =
-					identityInstance.signOpReturnWithAIP(payloadBuffers);
-				const payloadHex = signedBuffers.map((b) => toHex(b));
-				const asmPayload = `OP_0 ${payloadHex.join(" ")}`;
-				const opReturnScript = Script.fromASM(asmPayload);
+				const { signedData } = await signOpReturnWithAIP(
+					payloadBuffers,
+					idpk,
+					idpk.toAddress(),
+				);
+				const opReturnScript = buildOpReturnScript(signedData);
 
 				// --- Build Transaction ---
 				const tx = new Transaction();

package/tools/bap/generate.test.ts

@@ -1,12 +1,4 @@
-import {
-	afterEach,
-	beforeEach,
-	describe,
-	expect,
-	it,
-	mock,
-	spyOn,
-} from "bun:test";
+import { afterEach, beforeEach, describe, expect, it, spyOn } from "bun:test";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -24,18 +16,29 @@ import { type BapGenerateArgs, registerBapGenerateTool } from "./generate";
 
 type GenericToolHandler = (
 	params: BapGenerateArgs,
-	extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+	_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 ) => CallToolResult | Promise<CallToolResult>;
 
+/** Narrow the first content block of a tool result to its text payload. */
+function firstText(result: CallToolResult): string {
+	const block = result.content?.[0];
+	if (block?.type !== "text") {
+		throw new Error(
+			`Expected a text content block, got ${block?.type ?? "none"}`,
+		);
+	}
+	return block.text;
+}
+
 const mockMcpServerInstance = {
 	tool: (..._args: Parameters<McpServer["tool"]>): void => undefined,
 };
 
 const KEY_DIR = path.join(os.homedir(), ".bsv-mcp");
-const KEY_FILE_PATH = path.join(KEY_DIR, "keys.json");
+const _KEY_FILE_PATH = path.join(KEY_DIR, "keys.json");
 
 const MOCK_PAY_PK_WIF = "L3tg5yk23vBrSGZT8pfrDFQBK8n46eeot2Sf91ezNt7rhyReCA53";
-const MOCK_PAY_ADDRESS = PrivateKey.fromWif(MOCK_PAY_PK_WIF).toAddress();
+const _MOCK_PAY_ADDRESS = PrivateKey.fromWif(MOCK_PAY_PK_WIF).toAddress();
 const MOCK_KEYS_WITH_PAYPK = { payPk: MOCK_PAY_PK_WIF };
 const MOCK_UTXO_SCRIPT_HASH_PLACEHOLDER =
 	"1a2b3c4d5e6f7081920a1b2c3d4e5f607081920a";
@@ -45,6 +48,7 @@ const MOCK_UTXO = {
 	satoshis: 100000,
 	script: `76a914${MOCK_UTXO_SCRIPT_HASH_PLACEHOLDER}88ac`,
 };
+const MOCK_BROADCAST_TXID = "b1c2d3e4".repeat(8);
 
 describe("BAP Generate Tool", () => {
 	let readFileSyncSpy: ReturnType<typeof spyOn<typeof fs, "readFileSync">>;
@@ -58,7 +62,7 @@ describe("BAP Generate Tool", () => {
 		typeof spyOn<typeof utxoUtils, "fetchPaymentUtxos">
 	>;
 	let transactionBroadcastSpy: ReturnType<
-		typeof spyOn<Transaction.prototype, "broadcast">
+		typeof spyOn<Transaction, "broadcast">
 	>;
 	let passphrasePromptSpy: ReturnType<
 		typeof spyOn<
@@ -96,9 +100,11 @@ describe("BAP Generate Tool", () => {
 		mkdirSyncSpy.mockImplementation(() => undefined);
 		writeFileSyncSpy.mockImplementation(() => undefined);
 		fetchPaymentUtxosSpy.mockResolvedValue([MOCK_UTXO]);
-		transactionBroadcastSpy.mockResolvedValue(
-			`mock_txid_broadcasted_${"a".repeat(40)}`,
-		);
+		transactionBroadcastSpy.mockResolvedValue({
+			status: "success",
+			txid: MOCK_BROADCAST_TXID,
+			message: "broadcast accepted",
+		});
 	});
 
 	afterEach(() => {
@@ -159,10 +165,10 @@ describe("BAP Generate Tool", () => {
 		expect(writtenData.xprv?.startsWith("xprv")).toBe(true);
 		expect(writtenData.identityPk).toBeString();
 
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"BAP HD Key and Initial Identity Generated & Saved",
 		);
-		expect(result.content?.[0]?.text).toContain("Registration TXID:");
+		expect(firstText(result)).toContain("Registration TXID:");
 		expect(transactionBroadcastSpy).toHaveBeenCalled();
 	});
 
@@ -178,7 +184,7 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(true);
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"keys.json not found. Payment Private Key (payPk) is required.",
 		);
 		expect(writeFileSyncSpy).not.toHaveBeenCalled();
@@ -196,7 +202,7 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(true);
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"Payment Private Key (payPk) does not exist in keys.json.",
 		);
 		expect(writeFileSyncSpy).not.toHaveBeenCalled();
@@ -218,7 +224,7 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(true);
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"BAP Master Key (xprv) already exists in keys.json.",
 		);
 		expect(writeFileSyncSpy).not.toHaveBeenCalled();
@@ -240,7 +246,7 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(true);
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"BAP Identity Key (identityPk) already exists in keys.json.",
 		);
 		expect(writeFileSyncSpy).not.toHaveBeenCalled();
@@ -264,7 +270,7 @@ describe("BAP Generate Tool", () => {
 			const result = (await handler({}, mockExtra)) as CallToolResult;
 
 			expect(result.isError).toBe(true);
-			expect(result.content?.[0]?.text).toContain(
+			expect(firstText(result)).toContain(
 				"Failed during BAP key generation/saving or transaction construction: Test HD generation error",
 			);
 			expect(writeFileSyncSpy).not.toHaveBeenCalled();
@@ -287,7 +293,7 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(true);
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"Could not read or parse keys.json: JSON Parse error",
 		);
 		expect(writeFileSyncSpy).not.toHaveBeenCalled();
@@ -306,12 +312,8 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(false);
-		expect(result.content?.[0]?.text).toContain(
-			"No UTXOs found for payment address",
-		);
-		expect(result.content?.[0]?.text).toContain(
-			"Cannot fund BAP registration.",
-		);
+		expect(firstText(result)).toContain("No UTXOs found for payment address");
+		expect(firstText(result)).toContain("Cannot fund BAP registration.");
 		expect(writeFileSyncSpy).toHaveBeenCalledTimes(1);
 		const writtenData = JSON.parse(
 			writeFileSyncSpy.mock.calls[0][1] as string,
@@ -337,10 +339,10 @@ describe("BAP Generate Tool", () => {
 		const result = (await handler({}, mockExtra)) as CallToolResult;
 
 		expect(result.isError).toBe(false);
-		expect(result.content?.[0]?.text).toContain(
+		expect(firstText(result)).toContain(
 			"Keys generated and saved, but failed to broadcast BAP registration transaction",
 		);
-		expect(result.content?.[0]?.text).toContain("Broadcast network error");
+		expect(firstText(result)).toContain("Broadcast network error");
 		expect(writeFileSyncSpy).toHaveBeenCalledTimes(1);
 		const writtenData = JSON.parse(
 			writeFileSyncSpy.mock.calls[0][1] as string,

package/tools/bap/generate.ts

@@ -1,13 +1,14 @@
 import os from "node:os";
 import path from "node:path";
+import { BAP_KEY_ID, BAP_PROTOCOL_ID } from "@1sat/actions";
 import {
 	Utils as BSVUtils,
 	fromUtxo,
 	HD,
 	isBroadcastFailure,
+	KeyDeriver,
 	P2PKH,
-	PrivateKey,
-	Script,
+	type PrivateKey,
 	Transaction,
 } from "@bsv/sdk";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -17,6 +18,8 @@ import { z } from "zod";
 import { V5Broadcaster } from "../../utils/broadcaster";
 import { SecureKeyManager } from "../../utils/keyManager";
 import { BAP_PREFIX } from "../constants";
+import { signOpReturnWithAIP } from "../utils/aip";
+import { buildOpReturnScript } from "../utils/transactionBuilder";
 import { fetchPaymentUtxos } from "../wallet/fetchPaymentUtxos";
 
 // Get toArray from BSV SDK Utils
@@ -26,8 +29,14 @@ const KEY_DIR = path.join(os.homedir(), ".bsv-mcp");
 const KEY_FILE_PATH = path.join(KEY_DIR, "keys.json");
 
 const bapGenerateArgsSchema = z.object({
-	alternateName: z.string().optional().describe("Alternate name for the BAP identity profile"),
-	description: z.string().optional().describe("Description for the BAP identity profile"),
+	alternateName: z
+		.string()
+		.optional()
+		.describe("Alternate name for the BAP identity profile"),
+	description: z
+		.string()
+		.optional()
+		.describe("Description for the BAP identity profile"),
 });
 
 export type BapGenerateArgs = z.infer<typeof bapGenerateArgsSchema>;
@@ -51,7 +60,7 @@ async function generateBapKeys(
 }> {
 	const keyManager = new SecureKeyManager({ keyDir: KEY_DIR });
 	let tempXprv = "";
-	let identityPk: string;
+	let _identityPk: string;
 	let payPkToPreserve: PrivateKey | undefined;
 
 	// 1. Load existing keys and check preconditions
@@ -150,29 +159,22 @@ async function generateBapKeys(
 
 		// 3. Create BAP instance and generate identity
 		const bapInstance = new BAP(tempXprv);
-
-		// Create identity attributes
-		const identityAttributes = {
-			name: {
-				value: args?.alternateName || "Anonymous User",
-				nonce: BSVUtils.toHex(BSVUtils.toArray(Math.random().toString())),
-			},
-			description: {
-				value: args?.description || "A BAP identity managed by BSV-MCP.",
-				nonce: BSVUtils.toHex(BSVUtils.toArray(Math.random().toString())),
-			},
-		};
-
-		// Create new ID with the BAP instance
-		const bapId = bapInstance.newId(undefined, identityAttributes);
+		const bapId = bapInstance.newId();
 
 		// Get the generated identity information
-		const generatedIdentityKey = bapId.getIdentityKey();
+		const generatedIdentityKey = bapId.bapId;
 		const generatedIdentityAddress = bapId.rootAddress;
 
-		// Export member backup to get the private key
-		const memberBackup = bapId.exportMemberBackup();
-		identityPk = memberBackup.derivedPrivateKey;
+		// rootAddress is the identity-0 key derived from the account key at
+		// protocolID [1,"sigma"], keyID "identity-0", counterparty "self".
+		// That is the key the BAP ID record declares, so it must also be the
+		// key that signs it.
+		const identityKey = new KeyDeriver(bapId.getAccountKey()).derivePrivateKey(
+			BAP_PROTOCOL_ID,
+			`${BAP_KEY_ID}-0`,
+			"self",
+		);
+		_identityPk = identityKey.toWif();
 
 		console.error(`INFO: Generated BAP identity key: ${generatedIdentityKey}`);
 		console.error(
@@ -182,7 +184,7 @@ async function generateBapKeys(
 		// 5. Save Keys to secure storage
 		const updatedKeys = {
 			payPk: payPkToPreserve,
-			identityPk: PrivateKey.fromWif(identityPk),
+			identityPk: identityKey,
 			xprv: tempXprv,
 		};
 
@@ -201,7 +203,7 @@ async function generateBapKeys(
 
 		// Create the ID registration transaction output
 		// BAP ID format: OP_0 OP_RETURN <BAP_PREFIX> "ID" <identity_key> <root_address> <current_address>
-		const idPayload = [
+		const idPayload: number[][] = [
 			toArray(BAP_PREFIX, "utf8"),
 			toArray("ID"),
 			toArray(generatedIdentityKey),
@@ -210,14 +212,12 @@ async function generateBapKeys(
 		];
 
 		// Sign the ID payload with AIP
-		const signedIdPayload = bapId.signOpReturnWithAIP(idPayload);
-
-		// Convert to hex strings for Script
-		const idHexStrings = signedIdPayload.map((bytes) =>
-			BSVUtils.toHex(bytes as number[]),
+		const { signedData: signedIdPayload } = await signOpReturnWithAIP(
+			idPayload,
+			identityKey,
+			bapId.rootAddress,
 		);
-		const idAsmString = `OP_0 OP_RETURN ${idHexStrings.join(" ")}`;
-		const idScript = Script.fromASM(idAsmString);
+		const idScript = buildOpReturnScript(signedIdPayload);
 
 		// Create the ALIAS transaction output
 		// First create the structured data object for the alias
@@ -229,7 +229,7 @@ async function generateBapKeys(
 			url: `bitcoin:${paymentAddress}`,
 		};
 
-		const aliasPayload = [
+		const aliasPayload: number[][] = [
 			toArray(BAP_PREFIX, "utf8"),
 			toArray("ALIAS"),
 			toArray(generatedIdentityKey),
@@ -237,14 +237,12 @@ async function generateBapKeys(
 		];
 
 		// Sign the ALIAS payload with AIP
-		const signedAliasPayload = bapId.signOpReturnWithAIP(aliasPayload);
-
-		// Convert to hex strings for Script
-		const aliasHexStrings = signedAliasPayload.map((bytes) =>
-			BSVUtils.toHex(bytes as number[]),
+		const { signedData: signedAliasPayload } = await signOpReturnWithAIP(
+			aliasPayload,
+			identityKey,
+			bapId.rootAddress,
 		);
-		const aliasAsmString = `OP_0 OP_RETURN ${aliasHexStrings.join(" ")}`;
-		const aliasScript = Script.fromASM(aliasAsmString);
+		const aliasScript = buildOpReturnScript(signedAliasPayload);
 
 		// 6. Build Transaction
 		const tx = new Transaction();
@@ -409,14 +407,21 @@ async function generateBapKeys(
 /**
  * Registers the bap_generate tool
  */
-export function registerBapGenerateTool(server: McpServer) {
+export function registerBapGenerateTool(
+	server: McpServer,
+	config?: { disableBroadcasting?: boolean },
+) {
 	server.tool(
 		"bap_generate",
 		"Generates a BAP HD master key AND derives the first identity key if no BAP keys (xprv or identityPk) exist. Saves keys to secure storage. Attempts on-chain registration using payPk (honors DISABLE_BROADCASTING). Optionally takes alternateName and description for the profile.",
 		{ ...bapGenerateArgsSchema.shape },
 		async ({ alternateName, description }): Promise<CallToolResult> => {
 			try {
-				const result = await generateBapKeys({ alternateName, description });
+				const result = await generateBapKeys({
+					alternateName,
+					description,
+					disableBroadcasting: config?.disableBroadcasting,
+				});
 				// Format result as JSON
 				return {
 					content: [{ type: "text", text: JSON.stringify(result, null, 2) }],