bsv-mcp 0.2.15 → 0.3.0

package/tools/bap/getCurrentAddress.ts

@@ -1,7 +1,5 @@
 import { PrivateKey } from "@bsv/sdk";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z } from "zod";
-import type { Wallet } from "../wallet/wallet";
 
 /**
  * Register the tool to get the BAP identity address
@@ -26,7 +24,7 @@ export function registerBapGetCurrentAddressTool(
 					if (identityKeyWifEnv) {
 						try {
 							pkToUse = PrivateKey.fromWif(identityKeyWifEnv);
-						} catch (e) {
+						} catch {
 							// Let the final check handle the error
 						}
 					}

package/tools/bap/getId.test.ts

@@ -1,9 +1,10 @@
 import { afterEach, beforeEach, describe, expect, it, spyOn } from "bun:test";
 import { fetchProfile } from "./getId";
 import type { IdentityData, SigmaIdentityProfile } from "./types";
+import { SchemaType } from "./types";
 
 // Store the original fetch function
-const originalFetch = global.fetch;
+const _originalFetch = global.fetch;
 let fetchMock: ReturnType<typeof spyOn>;
 
 describe("BAP getId - fetchProfile", () => {
@@ -21,18 +22,25 @@ describe("BAP getId - fetchProfile", () => {
 	it("should return identity data for a valid idKey", async () => {
 		const mockIdKey = "testIdKey";
 		const mockIdentityData: IdentityData = {
-			"@context": ["https://w3id.org/did/v0.11", "https://w3id.org/bap/v1"],
-			id: `did:bap:id:${mockIdKey}`,
-			publicKey: [
+			idKey: mockIdKey,
+			rootAddress: "1SomeRootAddress",
+			currentAddress: "1SomeCurrentAddress",
+			addresses: [
 				{
-					id: `did:bap:id:${mockIdKey}#root`,
-					controller: `did:bap:id:${mockIdKey}`,
-					type: "EcdsaSecp256k1VerificationKey2019",
-					bitcoinAddress: "1SomeBitcoinAddress",
+					address: "1SomeCurrentAddress",
+					txId: "a1b2c3d4".repeat(8),
+					block: 800000,
 				},
 			],
-			authentication: ["#root"],
-			assertionMethod: ["#root"],
+			block: 800000,
+			firstSeen: 799999,
+			timestamp: 1700000000,
+			valid: true,
+			identity: {
+				"@context": "https://schema.org",
+				"@type": SchemaType.Person,
+				alternateName: "Test User",
+			},
 		};
 		const mockApiResponse: SigmaIdentityProfile = { result: mockIdentityData };
 

package/tools/bap/getId.ts

@@ -82,14 +82,16 @@ export function registerBapGetIdTool(
 
 			if (!targetIdKey) {
 				// First priority: Use authenticated user's BAP ID from OAuth session
-				const authInfo = (extra as any).authInfo;
-				if (authInfo?.metadata?.bapId) {
-					targetIdKey = authInfo.metadata.bapId;
+				const authExtra = extra.authInfo?.extra;
+				const authBapId = authExtra?.bapId;
+				const authPubkey = authExtra?.pubkey;
+				if (typeof authBapId === "string") {
+					targetIdKey = authBapId;
 					console.error(`Using authenticated user's BAP ID: ${targetIdKey}`);
 				}
 				// Second priority: Use authenticated user's pubkey
-				else if (authInfo?.metadata?.pubkey) {
-					targetIdKey = authInfo.metadata.pubkey;
+				else if (typeof authPubkey === "string") {
+					targetIdKey = authPubkey;
 					console.error(`Using authenticated user's pubkey: ${targetIdKey}`);
 				}
 				// Fallback: Attempt to get idKey from the passed identityPk or environment variable
@@ -101,7 +103,7 @@ export function registerBapGetIdTool(
 						if (identityKeyWifEnv) {
 							try {
 								pkToUse = PrivateKey.fromWif(identityKeyWifEnv);
-							} catch (e) {
+							} catch {
 								// Don't error here, let it be handled by the final check
 							}
 						}

package/tools/bap/utils.ts

@@ -1,4 +1,4 @@
-import type { Identity, IdentityData, SchemaType } from "./types";
+import type { Identity, SchemaType } from "./types";
 
 type AllFields = {
 	schemaType: SchemaType;

package/tools/bsocial/bmapReadPosts.ts

@@ -111,9 +111,23 @@ export function registerBmapReadPostsTool(server: McpServer) {
 		"bmap_readPosts",
 		"Read social posts from the BMAP API (query layer). Can fetch posts by author (BAP ID), specific post by transaction ID, or recent posts from all users. Supports pagination and feed functionality.",
 		{ ...bmapReadPostsArgsSchema.shape },
-		async ({ bapId, txid, limit, page, feed, address }): Promise<CallToolResult> => {
+		async ({
+			bapId,
+			txid,
+			limit,
+			page,
+			feed,
+			address,
+		}): Promise<CallToolResult> => {
 			try {
-				const result = await readBmapPosts({ bapId, txid, limit, page, feed, address });
+				const result = await readBmapPosts({
+					bapId,
+					txid,
+					limit,
+					page,
+					feed,
+					address,
+				});
 
 				if (result.success) {
 					return {

package/tools/bsocial/createPost.ts

@@ -27,7 +27,9 @@ const createPostArgsSchema = z.object({
 	additionalMapData: z
 		.string()
 		.optional()
-		.describe("Additional MAP protocol key-value pairs as a JSON object string, e.g. '{\"key\": \"value\"}'"),
+		.describe(
+			'Additional MAP protocol key-value pairs as a JSON object string, e.g. \'{"key": "value"}\'',
+		),
 });
 
 type CreatePostArgs = z.infer<typeof createPostArgsSchema>;
@@ -48,7 +50,6 @@ export async function createSocialPost(
 		const { content, contentType, app, additionalMapData } = args;
 
 		// Get wallet info
-		const address = await wallet.getAddress();
 		const paymentKey = wallet.getPaymentKey();
 		if (!paymentKey) {
 			return {
@@ -56,6 +57,7 @@ export async function createSocialPost(
 				error: "Payment key not available in wallet",
 			};
 		}
+		const address = paymentKey.toAddress();
 
 		// Prepare file extension based on content type
 		const fileExtension = contentType === "text/markdown" ? "md" : "txt";
@@ -71,7 +73,7 @@ export async function createSocialPost(
 		];
 
 		// Build MAP protocol data
-		const mapData: Uint8Array[] = [
+		const mapData: number[][] = [
 			toArray(MAP_PREFIX, "utf8"),
 			toArray("SET", "utf8"),
 			toArray("app", "utf8"),
@@ -82,7 +84,8 @@ export async function createSocialPost(
 
 		// Add any additional MAP data (parse JSON string if provided)
 		if (additionalMapData) {
-			const parsedMapData: Record<string, string> = JSON.parse(additionalMapData);
+			const parsedMapData: Record<string, string> =
+				JSON.parse(additionalMapData);
 			for (const [key, value] of Object.entries(parsedMapData)) {
 				mapData.push(toArray(key, "utf8"), toArray(value, "utf8"));
 			}
@@ -96,20 +99,20 @@ export async function createSocialPost(
 		const { signedData } = await signOpReturnWithAIP(
 			dataToSign,
 			paymentKey,
-			address.toString(),
+			address,
 		);
 
 		// Create OP_RETURN script
 		const script = buildOpReturnScript(signedData);
 
 		// Get UTXOs
-		const utxos = await wallet.getPaymentUtxos();
+		const { paymentUtxos } = await wallet.getUtxos();
 
 		// Build and send transaction using the new utility
 		return await buildAndSendTransaction({
 			outputs: [{ script, satoshis: 0 }],
-			utxos,
-			changeAddress: address.toString(),
+			utxos: paymentUtxos,
+			changeAddress: address,
 			paymentKey,
 		});
 	} catch (error) {
@@ -129,8 +132,16 @@ export function registerCreatePostTool(server: McpServer, wallet: Wallet) {
 		"bsocial_createPost",
 		"Create a social post on the BSV blockchain using B:// and MAP protocols. Posts are stored permanently on-chain and can include plain text or markdown content.",
 		{ ...createPostArgsSchema.shape },
-		async ({ content, contentType, app, additionalMapData }): Promise<CallToolResult> => {
-			const result = await createSocialPost({ content, contentType, app, additionalMapData }, wallet);
+		async ({
+			content,
+			contentType,
+			app,
+			additionalMapData,
+		}): Promise<CallToolResult> => {
+			const result = await createSocialPost(
+				{ content, contentType, app, additionalMapData },
+				wallet,
+			);
 			return createResponse(result);
 		},
 	);

package/tools/bsocial/readPosts.ts

@@ -83,9 +83,9 @@ export async function readSocialPosts(args: ReadPostsArgs): Promise<{
 
 			return {
 				success: true,
-				posts: [data.result.post],
-				signers: data.result.signers,
-				meta: [data.result.meta],
+				posts: [data.data.post],
+				signers: data.data.signers,
+				meta: [data.data.meta],
 			};
 		}
 
@@ -201,7 +201,13 @@ export function registerReadPostsTool(server: McpServer) {
 		{ ...readPostsArgsSchema.shape },
 		async ({ bapId, txid, limit, page, feed }): Promise<CallToolResult> => {
 			try {
-				const result = await readSocialPosts({ bapId, txid, limit, page, feed });
+				const result = await readSocialPosts({
+					bapId,
+					txid,
+					limit,
+					page,
+					feed,
+				});
 
 				if (result.success && result.posts) {
 					// Format posts for display

package/tools/bsv/decodeTransaction.ts

@@ -126,7 +126,7 @@ export function registerDecodeTransactionTool(server: McpServer): void {
 		decodeTransactionArgsSchema.shape,
 		async (
 			{ tx, encoding },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		) => {
 			try {
 				let transaction: Transaction;

package/tools/bsv/explore.ts

@@ -94,9 +94,6 @@ const exploreArgsSchema = z.object({
 		.describe("Number of days for miner stats endpoints (defaults to 7)"),
 });
 
-// Type for the tool arguments
-type ExploreArgs = z.infer<typeof exploreArgsSchema>;
-
 /**
  * Register the bsv_explore tool with the MCP server
  * @param server The MCP server instance
@@ -134,7 +131,6 @@ export function registerExploreTool(server: McpServer): void {
 		exploreArgsSchema.shape,
 		async (params) => {
 			try {
-
 				// Validate required parameters for specific endpoints
 				if (
 					params.endpoint === ExploreEndpoint.BLOCK_BY_HASH &&

package/tools/bsv/getPrice.ts

@@ -64,7 +64,7 @@ export function registerGetPriceTool(server: McpServer): void {
 						},
 					],
 				};
-			} catch (err) {
+			} catch {
 				return {
 					content: [{ type: "text", text: "Error fetching BSV price." }],
 					isError: true,

package/tools/bsv/token.ts

@@ -17,7 +17,9 @@ export function registerTokenTools(server: McpServer): void {
 	server.tool(
 		"bsv_toSatoshi",
 		{
-			bitcoin: z.string().describe("Bitcoin amount (accepts numeric strings like '1.5')"),
+			bitcoin: z
+				.string()
+				.describe("Bitcoin amount (accepts numeric strings like '1.5')"),
 			returnType: z.enum(["number", "string", "bigint"]).optional(),
 		},
 		async ({ bitcoin, returnType }) => {
@@ -46,7 +48,9 @@ export function registerTokenTools(server: McpServer): void {
 	server.tool(
 		"bsv_toBitcoin",
 		{
-			satoshis: z.string().describe("Satoshi amount (accepts numeric strings like '100000000')"),
+			satoshis: z
+				.string()
+				.describe("Satoshi amount (accepts numeric strings like '100000000')"),
 			returnType: z.enum(["number", "string", "bigint"]).optional(),
 		},
 		async ({ satoshis, returnType }) => {
@@ -58,7 +62,7 @@ export function registerTokenTools(server: McpServer): void {
 						try {
 							result = toBitcoin(satoshis, ReturnTypes.BigInt);
 							return { content: [{ type: "text", text: result.toString() }] };
-						} catch (e) {
+						} catch {
 							return {
 								content: [
 									{
@@ -87,7 +91,9 @@ export function registerTokenTools(server: McpServer): void {
 	server.tool(
 		"bsv_toTokenSatoshi",
 		{
-			token: z.string().describe("Token amount (accepts numeric strings like '1.5')"),
+			token: z
+				.string()
+				.describe("Token amount (accepts numeric strings like '1.5')"),
 			decimals: z.number().int().min(0),
 			returnType: z.enum(["number", "string", "bigint"]).optional(),
 		},
@@ -117,7 +123,9 @@ export function registerTokenTools(server: McpServer): void {
 	server.tool(
 		"bsv_toToken",
 		{
-			tokenSatoshi: z.string().describe("Token satoshi amount (accepts numeric strings)"),
+			tokenSatoshi: z
+				.string()
+				.describe("Token satoshi amount (accepts numeric strings)"),
 			decimals: z.number().int().min(0),
 			returnType: z.enum(["number", "string", "bigint"]).optional(),
 		},
@@ -130,7 +138,7 @@ export function registerTokenTools(server: McpServer): void {
 						try {
 							result = toToken(tokenSatoshi, decimals, ReturnTypes.BigInt);
 							return { content: [{ type: "text", text: result.toString() }] };
-						} catch (e) {
+						} catch {
 							return {
 								content: [
 									{

package/tools/constants.ts

@@ -2,6 +2,8 @@
  * Constants for BSV MCP Tools
  */
 
+import { AIP_BITCOM_ADDRESS } from "bsv-bap";
+
 /**
  * Market fee percentage applied to all marketplace purchases
  * Expressed as a decimal (e.g., 0.03 = 3%)
@@ -23,7 +25,9 @@ export const MINIMUM_MARKET_FEE_SATOSHIS = 10000; // 10000 satoshis = 0.0001 BSV
 export const BAP_PREFIX = "1BAPSuaPnfGnSBM3GLV9yhxUdYe4vGbdMT";
 export const B_PREFIX = "19HxigV4QyBv3tHpQVcUEQyq1pzZVdoAut";
 export const MAP_PREFIX = "1PuQa7K62MiKCtssSLKy1kh56WWU7MtUR5";
-export const AIP_PREFIX = "1HPcP7a4kQjpJzyV4HWHKagon76KC3BsZA";
+// Sourced from bsv-bap so it stays in step with the verifiers (bsv-bap,
+// @1sat/templates, go-templates) rather than drifting from them.
+export const AIP_PREFIX: string = AIP_BITCOM_ADDRESS;
 export const STORAGE_MNEMONIC_KEY = "id_mnemonic";
 export const PUBLIC_URL = process.env.PUBLIC_URL || "";
 export const BMAP_URL =
@@ -38,5 +42,5 @@ export const YOURS_INSTALL_URL =
 // 	process.env.PUBLIC_BSOCIAL_API_URL ||
 // 	"https://bsocial-overlay-production.up.railway.app/api/v1";
 
-export const BSOCIAL_API_URL = "https://api.sigmaidentity.com/v1";
+export const BSOCIAL_API_URL = "https://sigma.1sat.app/1sat/bap";
 export const V5_API_URL = "https://ordinals.1sat.app/v5";

package/tools/index.ts

@@ -9,9 +9,9 @@ import { registerBsvTools } from "./bsv";
 import { registerMneeTools } from "./mnee";
 import { registerOrdinalsTools } from "./ordinals";
 import { registerUtilsTools } from "./utils";
-import { registerWalletGetBalanceDropletTool } from "./wallet/getBalanceDroplet";
+import { registerWalletGetBalanceDroplitTool } from "./wallet/getBalanceDroplit";
 import type { IntegratedWallet } from "./wallet/integratedWallet";
-import { registerSetupDropletTool } from "./wallet/setupDroplet";
+import { registerSetupDroplitTools } from "./wallet/setupDroplit";
 import { registerWalletTools } from "./wallet/tools";
 import type { Wallet } from "./wallet/wallet";
 
@@ -116,16 +116,16 @@ export function registerAllTools(
 
 	// Register Wallet tools themselves
 	if (enableWalletTools) {
-		if (config.integratedWallet?.isDropletMode) {
-			// Register Droplet-mode wallet tools
-			const dropletClient = config.integratedWallet.getDropletClient();
-			if (dropletClient) {
-				// Register Droplet-specific tools
-				registerWalletGetBalanceDropletTool(server, dropletClient);
+		if (config.integratedWallet?.isDroplitMode) {
+			// Register Droplit-mode wallet tools
+			const droplitClient = config.integratedWallet.getDroplitClient();
+			if (droplitClient) {
+				// Register Droplit-specific tools
+				registerWalletGetBalanceDroplitTool(server, droplitClient);
 				if (config.integratedWallet) {
-					registerSetupDropletTool(server, config.integratedWallet);
+					registerSetupDroplitTools(server, config.integratedWallet);
 				}
-				console.error("Registered Droplet mode wallet tools");
+				console.error("Registered Droplit mode wallet tools");
 			}
 		} else if (config.wallet) {
 			// Register normal wallet tools

package/tools/mnee/getBalance.ts

@@ -22,7 +22,7 @@ export function registerGetBalanceTool(
 		{},
 		async (
 			_params,
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		) => {
 			try {
 				// Get private key from wallet

package/tools/mnee/parseTx.ts

@@ -27,7 +27,7 @@ export function registerParseTxTool(
 		{ ...parseTxArgsSchema.shape },
 		async (
 			{ txid },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		): Promise<CallToolResult> => {
 			try {
 				const result: ParseTxResponse = await mnee.parseTx(txid);

package/tools/mnee/sendMnee.ts

@@ -8,13 +8,18 @@ import type {
 import type Mnee from "mnee";
 import type { SendMNEE, TransferResponse } from "mnee";
 import { z } from "zod";
+import { assertBroadcastAllowed } from "../../utils/broadcastGuard";
 
 /**
  * Schema for the sendMnee tool arguments.
  */
 export const sendMneeArgsSchema = z.object({
-	address: z.string().describe("The recipient's address"),
-	amount: z.number().describe("Amount to send"),
+	address: z.string().min(1).describe("The recipient's address"),
+	amount: z
+		.number()
+		.positive()
+		.finite()
+		.describe("Amount to send; must be greater than zero"),
 	currency: z
 		.enum(["MNEE", "USD"])
 		.default("MNEE")
@@ -45,10 +50,13 @@ export function registerSendMneeTool(server: McpServer, mnee: Mnee): void {
 		{ ...sendMneeArgsSchema.shape },
 		async (
 			{ address, amount, currency },
-			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+			_extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		): Promise<CallToolResult> => {
 			try {
-				// Since 1 MNEE = $1, the amount is the same in both currencies
+				assertBroadcastAllowed("mnee_sendMnee");
+				// MNEE is dollar-pegged, so a USD amount transfers one-for-one. The
+				// currency the caller named is echoed in the response rather than
+				// dropped, so the interpretation is visible to whoever called.
 				const mneeAmount = amount;
 
 				const transferRequest: SendMNEE[] = [
@@ -81,13 +89,25 @@ export function registerSendMneeTool(server: McpServer, mnee: Mnee): void {
 					};
 				}
 
+				// transfer() throws on failure. On success it returns the cosigner's
+				// broadcast ticket id — the txid is only known once the ticket
+				// resolves, so it is read back via getTxStatus.
 				const result: TransferResponse = await mnee.transfer(
 					transferRequest,
 					wif,
 				);
 
-				if (result.error) {
-					throw new Error(result.error);
+				if (!result.ticketId) {
+					throw new Error(
+						"MNEE transfer returned no ticket id; the transaction was not submitted for broadcast.",
+					);
+				}
+
+				const status = await mnee.getTxStatus(result.ticketId);
+				if (status.status === "FAILED") {
+					throw new Error(
+						`MNEE transfer ${result.ticketId} failed: ${status.errors ?? "no error detail returned"}`,
+					);
 				}
 
 				return {
@@ -97,8 +117,10 @@ export function registerSendMneeTool(server: McpServer, mnee: Mnee): void {
 							text: JSON.stringify(
 								{
 									success: true,
-									txid: result.txid,
-									rawtx: result.rawtx,
+									ticketId: result.ticketId,
+									txid: status.tx_id,
+									status: status.status,
+									requestedCurrency: currency,
 									mneeAmount: mneeAmount,
 									usdAmount: formatUSD(mneeAmount),
 									recipient: address,

package/tools/ordinals/getInscription.ts

@@ -13,9 +13,7 @@ export function registerGetInscriptionTool(
 		"ordinals_getInscription",
 		"Retrieves metadata for an inscription by its outpoint. Returns content type, file info, origin, MAP data, and sequence info.",
 		{
-			outpoint: z
-				.string()
-				.describe("Outpoint in format 'txid_vout'"),
+			outpoint: z.string().describe("Outpoint in format 'txid_vout'"),
 		},
 		async ({ outpoint }) => {
 			try {

package/tools/ordinals/getTokenByIdOrTicker.ts

@@ -13,9 +13,7 @@ export function registerGetTokenByIdOrTickerTool(
 		"ordinals_getTokenByIdOrTicker",
 		"Retrieves detailed information about a BSV21 token by its ID (txid_vout format). Returns token data including symbol, supply, decimals, funding status, and current state.",
 		{
-			id: z
-				.string()
-				.describe("BSV21 token ID in outpoint format (txid_vout)"),
+			id: z.string().describe("BSV21 token ID in outpoint format (txid_vout)"),
 		},
 		async ({ id }) => {
 			try {

package/tools/ordinals/index.ts

@@ -11,7 +11,10 @@ import { registerSearchInscriptionsTool } from "./searchInscriptions";
  * @param server The MCP server instance
  * @param ctx OneSat context for SDK service access
  */
-export function registerOrdinalsTools(server: McpServer, ctx?: OneSatContext): void {
+export function registerOrdinalsTools(
+	server: McpServer,
+	ctx?: OneSatContext,
+): void {
 	registerGetInscriptionTool(server, ctx);
 	registerSearchInscriptionsTool(server, ctx);
 	registerMarketListingsTool(server, ctx);

package/tools/ordinals/marketListings.ts

@@ -6,7 +6,7 @@ import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
  */
 export function registerMarketListingsTool(
 	server: McpServer,
-	ctx?: OneSatContext,
+	_ctx?: OneSatContext,
 ): void {
 	server.tool(
 		"ordinals_marketListings",

package/tools/ordinals/marketSales.ts

@@ -6,7 +6,7 @@ import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
  */
 export function registerMarketSalesTool(
 	server: McpServer,
-	ctx?: OneSatContext,
+	_ctx?: OneSatContext,
 ): void {
 	server.tool(
 		"ordinals_marketSales",

package/tools/ordinals/searchInscriptions.ts

@@ -6,7 +6,7 @@ import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
  */
 export function registerSearchInscriptionsTool(
 	server: McpServer,
-	ctx?: OneSatContext,
+	_ctx?: OneSatContext,
 ): void {
 	server.tool(
 		"ordinals_searchInscriptions",

package/tools/utils/aip.ts

@@ -1,45 +1,54 @@
-import { BSM, type PrivateKey, Utils } from "@bsv/sdk";
+import { BigNumber, BSM, OP, type PrivateKey, Utils } from "@bsv/sdk";
 import { AIP_PREFIX } from "../constants";
 
-const { toArray, toBase64, toUTF8 } = Utils;
+const { toArray } = Utils;
+
+const PIPE = 0x7c;
 
 /**
  * Sign OP_RETURN data with AIP (Author Identity Protocol)
- * @param dataArrays - Array of data arrays to sign
+ *
+ * The signed message is the OP_RETURN opcode, then every push payload, then
+ * the `|` protocol separator — the reconstruction every AIP verifier performs
+ * (bsv-bap `verifyAttestationWithAIP`, `@1sat/templates` `AIP.validateAIP`,
+ * go-templates). The signature is written as raw compact bytes, not as base64
+ * text; verifiers base64-encode the pushdata themselves.
+ *
+ * @param dataArrays - Push payloads that follow OP_RETURN
  * @param signingKey - Private key to sign with
  * @param signingAddress - Address associated with the signing key
- * @returns Object containing signed data array
+ * @returns Object containing the payloads with the AIP fields appended
  */
 export async function signOpReturnWithAIP(
-	dataArrays: Uint8Array[],
+	dataArrays: number[][],
 	signingKey: PrivateKey,
 	signingAddress: string,
-): Promise<{ signedData: Uint8Array[] }> {
-	// Concatenate all data arrays to create message to sign
-	let messageToSign = new Uint8Array();
-	for (const data of dataArrays) {
-		const temp = new Uint8Array(messageToSign.length + data.length);
-		temp.set(messageToSign);
-		temp.set(data, messageToSign.length);
-		messageToSign = temp;
-	}
+): Promise<{ signedData: number[][] }> {
+	const messageToSign = [OP.OP_RETURN, ...dataArrays.flat(), PIPE];
 
-	// Create BSM signature
-	const signature = BSM.sign(messageToSign, signingKey);
+	const signature = BSM.sign(messageToSign, signingKey, "raw");
+	if (typeof signature === "string") {
+		throw new Error("BSM.sign returned a string in raw mode");
+	}
 
-	// Convert signature to base64
-	const signatureBase64 = toBase64(signature.toCompact());
+	const magicHash = new BigNumber(BSM.magicHash(messageToSign));
+	const recovery = signature.CalculateRecoveryFactor(
+		signingKey.toPublicKey(),
+		magicHash,
+	);
+	const compactSignature = signature.toCompact(recovery, true);
+	if (!Array.isArray(compactSignature)) {
+		throw new Error("Signature.toCompact returned a string without encoding");
+	}
 
-	// Add AIP data to the arrays
-	const aipData: Uint8Array[] = [
+	const aipData: number[][] = [
 		toArray("|", "utf8"), // Separator
 		toArray(AIP_PREFIX, "utf8"),
 		toArray("BITCOIN_ECDSA", "utf8"),
 		toArray(signingAddress, "utf8"),
-		toArray(signatureBase64, "utf8"),
+		compactSignature,
 	];
 
-	// Return combined data
 	return {
 		signedData: [...dataArrays, ...aipData],
 	};