@1sat/cli 0.0.116 → 0.0.118

package/dist/cli.js

@@ -1,7 +1,15 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __esm = (fn, res, err) => () => {
+  if (fn)
+    try {
+      res = fn(fn = 0);
+    } catch (e) {
+      err = [e];
+    }
+  if (err)
+    throw err[0];
+  return res;
+};
 
 // src/args.ts
 function parseGlobalFlags(args) {
@@ -505,11 +513,11 @@ async function handleActionCommand(args, opts) {
 Registered actions:
 `);
     const grouped = new Map;
-    for (const action2 of actions) {
-      const cat = action2.meta.category;
+    for (const action of actions) {
+      const cat = action.meta.category;
       if (!grouped.has(cat))
         grouped.set(cat, []);
-      grouped.get(cat).push(action2);
+      grouped.get(cat).push(action);
     }
     for (const [category, categoryActions] of grouped) {
       console.log(`  ${category}:`);
@@ -817,12 +825,12 @@ var init_help = __esm(() => {
         { name: "balance", description: "Show wallet balance in satoshis" },
         {
           name: "address",
-          description: "Show BRC-29 deposit address(es)",
+          description: "Show P1SAT deposit address(es)",
           args: [
             {
               flag: "--prefix",
               values: "<p>",
-              description: "BRC-29 prefix (default: 1sat)"
+              description: "Deposit keyID prefix (default: 1sat)"
             },
             { flag: "--start-index", values: "<n>" },
             { flag: "--count", values: "<n>" }
@@ -849,7 +857,7 @@ var init_help = __esm(() => {
         },
         {
           name: "sync",
-          description: "Sync inbound payments at BRC-29 deposit addresses",
+          description: "Sync inbound payments at P1SAT deposit addresses",
           args: [
             { flag: "--prefix", values: "<p>" },
             { flag: "--start-index", values: "<n>" },
@@ -1464,7 +1472,7 @@ function createApprovalAuth(wallet) {
     get(target, property) {
       if (property === "createAction")
         return async (...args) => {
-          const satoshis = args[0].outputs?.reduce((sum, output2) => sum + output2.satoshis, 0) ?? 0;
+          const satoshis = args[0].outputs?.reduce((sum, output) => sum + output.satoshis, 0) ?? 0;
           if (!Number.isSafeInteger(satoshis) || satoshis <= 0)
             throw new Error("Invalid HTTP payment amount");
           if (approved === false)
@@ -1988,15 +1996,15 @@ async function handleInitCommand(_args, opts) {
   }
   let wif;
   if (keySource === "generate") {
-    const pk2 = PrivateKey2.fromRandom();
-    wif = pk2.toWif();
-    const address2 = pk2.toPublicKey().toAddress();
+    const pk = PrivateKey2.fromRandom();
+    wif = pk.toWif();
+    const address = pk.toPublicKey().toAddress();
     console.log();
     console.log(formatWarning("  IMPORTANT: Back up your private key!"));
     console.log(formatWarning("  If you lose it, your funds are gone forever."));
     console.log();
     console.log(`  ${formatValue("WIF:")}    ${wif}`);
-    console.log(`  ${formatValue("Address:")} ${address2}`);
+    console.log(`  ${formatValue("Address:")} ${address}`);
     console.log();
     const confirmed = await confirm2({
       message: "Have you saved your private key somewhere safe?"
@@ -3531,7 +3539,8 @@ import {
   KnexHandleCertStore,
   KnexPendingStore,
   createHostServer,
-  createWalletServer
+  createWalletServer,
+  startBRC100Server
 } from "@1sat/wallet-server";
 import { initLogger as initLogger2 } from "evlog";
 import knexLib from "knex";
@@ -3566,6 +3575,7 @@ function resolveMode(subcommand) {
   switch (subcommand) {
     case "wallet":
     case "monitor":
+    case "wallet-api":
       return subcommand;
     default:
       return null;
@@ -3659,6 +3669,15 @@ async function runWithStorage(resolved, mode) {
     backups: resolved.backups,
     skipInitialMonitor: true
   });
+  if (mode === "wallet-api") {
+    const dapp = await startDappEndpoint(walletResult);
+    return {
+      stop: async () => {
+        await dapp.close();
+        await walletResult.destroy();
+      }
+    };
+  }
   const runMonitor = mode === "monitor" || mode === "all" && resolved.monitorEnabled;
   const accounts = mode === "monitor" ? undefined : await buildAccountsForServer(resolved, walletResult);
   const serverHandle = mode === "monitor" ? undefined : await startWalletServer(resolved, walletResult, accounts, mode);
@@ -3722,7 +3741,7 @@ async function startWalletServer(resolved, walletResult, accounts, mode) {
     ttlSeconds: sessionStoreCfg.ttlSeconds
   } : undefined;
   if (mode === "wallet") {
-    const handle2 = createWalletServer({
+    const handle = createWalletServer({
       wallet: walletResult.wallet,
       storage: walletResult.getActiveStorage(),
       serverIdentityKey: walletResult.wallet.identityKey,
@@ -3732,10 +3751,10 @@ async function startWalletServer(resolved, walletResult, accounts, mode) {
       accounts: accounts?.walletServerAccounts,
       sessionStore
     });
-    const port2 = await handle2.start();
-    const notes2 = [resolved.accounts.enabled ? "accounts: on" : ""].filter(Boolean).join(", ");
-    console.log(`[wallet] listening on ${resolved.host}:${port2}${notes2 ? ` (${notes2})` : ""}`);
-    return { stop: () => handle2.stop() };
+    const port = await handle.start();
+    const notes = [resolved.accounts.enabled ? "accounts: on" : ""].filter(Boolean).join(", ");
+    console.log(`[wallet] listening on ${resolved.host}:${port}${notes ? ` (${notes})` : ""}`);
+    return { stop: () => handle.stop() };
   }
   const serverCfg = config.server ?? {};
   const paymailCfg = serverCfg.paymail;
@@ -3847,7 +3866,52 @@ function waitForShutdown() {
     process.once("SIGTERM", () => handler("SIGTERM"));
   });
 }
-var DEFAULT_HOST = "127.0.0.1", DEFAULT_PORT = 8100, DEFAULT_STACK_URL = "https://api.1sat.app", DEFAULT_BASELINE_BYTES, DEFAULT_PURCHASE_UNIT_BYTES = 1073741824, DEFAULT_SATS_PER_UNIT = 1e6, DEFAULT_DURATION_BLOCKS = 4383, DEFAULT_STORAGE_IDENTITY_KEY = "1sat-cli-default", DEFAULT_PG_SCHEMA = "messagebox";
+function walletApiHandle(wallet) {
+  return {
+    async call(method, args, origin) {
+      const iface = wallet;
+      const fn = iface[method];
+      if (typeof fn !== "function") {
+        throw new Error(`Method not available: ${method}`);
+      }
+      return await fn.call(iface, args, origin);
+    }
+  };
+}
+async function startDappEndpoint(walletResult) {
+  const config = loadConfig();
+  const dapp = config.server?.dapp ?? {};
+  const host = dapp.host ?? DEFAULT_DAPP_HOST;
+  const port = dapp.port ?? (process.env.ONESAT_DAPP_PORT ? Number(process.env.ONESAT_DAPP_PORT) : DEFAULT_DAPP_PORT);
+  const approve = dapp.approve === true;
+  const handle = await startBRC100Server({
+    host,
+    port,
+    wallet: walletApiHandle(walletResult.wallet),
+    approvalPolicy: approve ? async ({ method, origin, args }) => {
+      const { confirm, isCancel } = await import("@clack/prompts");
+      console.log(`
+[brc-100] ${method} requested by ${origin}`);
+      console.log(`          ${JSON.stringify(args).slice(0, 400)}`);
+      const ok = await confirm({
+        message: `Approve ${method}?`
+      });
+      if (isCancel(ok) || !ok) {
+        throw new Error("User denied permission");
+      }
+    } : undefined,
+    onEvent: (event) => {
+      if (event.event === "brc100_sensitive") {
+        const trustNote = event.trusted ? " (trusted)" : approve ? "" : " (auto-approved)";
+        console.log(`[brc-100] sensitive ${event.method} from ${event.origin}${trustNote}`);
+      }
+    }
+  });
+  console.log(`[wallet-api] BRC-100 app endpoint on http://${host}:${port}`);
+  console.log(approve ? "[wallet-api] sensitive methods require TTY confirmation" : "[wallet-api] sensitive methods are AUTO-APPROVED (headless). " + "Set server.dapp.approve=true to require confirmation.");
+  return { close: async () => await handle.close() };
+}
+var DEFAULT_HOST = "127.0.0.1", DEFAULT_PORT = 8100, DEFAULT_STACK_URL = "https://api.1sat.app", DEFAULT_BASELINE_BYTES, DEFAULT_PURCHASE_UNIT_BYTES = 1073741824, DEFAULT_SATS_PER_UNIT = 1e6, DEFAULT_DURATION_BLOCKS = 4383, DEFAULT_STORAGE_IDENTITY_KEY = "1sat-cli-default", DEFAULT_PG_SCHEMA = "messagebox", DEFAULT_DAPP_HOST = "127.0.0.1", DEFAULT_DAPP_PORT = 3321;
 var init_serve = __esm(() => {
   init_config();
   init_config();
@@ -4013,11 +4077,11 @@ function selectedSweepClasses(only, skip) {
     throw new Error("--only and --skip are mutually exclusive");
   }
   if (only) {
-    const selected2 = parseSweepClasses(only, "--only");
-    if (selected2.size === 0) {
+    const selected = parseSweepClasses(only, "--only");
+    if (selected.size === 0) {
       throw new Error("--only requires at least one class");
     }
-    return selected2;
+    return selected;
   }
   const selected = new Set(SWEEP_CLASSES);
   if (skip) {
@@ -5120,8 +5184,8 @@ async function walletListOutputs(args, opts) {
 ${result.totalOutputs} total outputs in basket '${basket}':
 `);
       for (const out of result.outputs) {
-        const tags2 = out.tags?.join(", ") || "none";
-        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags2}`);
+        const tags = out.tags?.join(", ") || "none";
+        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags}`);
       }
       console.log();
     }
@@ -5379,7 +5443,6 @@ var init_wallet = __esm(() => {
 });
 
 // src/main.ts
-var exports_main = {};
 import { existsSync as existsSync4 } from "node:fs";
 import { resolve } from "node:path";
 import { config as loadEnv } from "dotenv";
@@ -5519,4 +5582,4 @@ var init_main = __esm(() => {
 
 // src/cli.ts
 process.env.DOTENV_CONFIG_QUIET = "true";
-await Promise.resolve().then(() => (init_main(), exports_main));
+await Promise.resolve().then(() => (init_main(), {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.116",
+  "version": "0.0.118",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./dist/cli.js",
@@ -27,11 +27,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.220",
-    "@1sat/client": "0.0.54",
-    "@1sat/types": "0.0.47",
-    "@1sat/wallet-node": "0.0.76",
-    "@1sat/wallet-server": "0.0.52",
+    "@1sat/actions": "0.0.222",
+    "@1sat/client": "0.0.55",
+    "@1sat/types": "0.0.48",
+    "@1sat/wallet-node": "0.0.77",
+    "@1sat/wallet-server": "0.0.54",
     "@bopen-io/messagebox-server": "^1.3.2",
     "@bsv/sdk": "^2.6.0",
     "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@2.6.2-brc153.5",

package/src/commands/serve.ts

@@ -25,12 +25,15 @@ import {
 	createNodeWallet,
 } from '@1sat/wallet-node'
 import {
+	type BRC100WalletHandle,
 	KnexAccountStore,
 	KnexHandleCertStore,
 	KnexPendingStore,
 	createHostServer,
 	createWalletServer,
+	startBRC100Server,
 } from '@1sat/wallet-server'
+import type { Wallet, WalletInterface } from '@bsv/sdk'
 import type { PrivateKey } from '@bsv/sdk'
 import { initLogger } from 'evlog'
 import knexLib from 'knex'
@@ -64,7 +67,7 @@ const DEFAULT_SATS_PER_UNIT = 1_000_000
 const DEFAULT_DURATION_BLOCKS = 4383
 const DEFAULT_STORAGE_IDENTITY_KEY = '1sat-cli-default'
 
-type ServeMode = 'all' | 'wallet' | 'monitor'
+type ServeMode = 'all' | 'wallet' | 'monitor' | 'wallet-api'
 
 interface ResolvedServe {
 	chain: 'main' | 'test'
@@ -130,6 +133,7 @@ function resolveMode(subcommand: string | undefined): ServeMode | null {
 	switch (subcommand) {
 		case 'wallet':
 		case 'monitor':
+		case 'wallet-api':
 			return subcommand
 		default:
 			return null
@@ -269,6 +273,18 @@ async function runWithStorage(
 		skipInitialMonitor: true,
 	})
 
+	// wallet-api serves only the app-facing BRC-100 endpoint: no storage
+	// server, no accounts, no monitor.
+	if (mode === 'wallet-api') {
+		const dapp = await startDappEndpoint(walletResult)
+		return {
+			stop: async () => {
+				await dapp.close()
+				await walletResult.destroy()
+			},
+		}
+	}
+
 	// One active monitor per deployment: wallet mode never runs it, monitor
 	// mode always does, all mode runs it unless server.monitor.enabled=false
 	// (set on redundant host instances that share a dedicated serve monitor).
@@ -538,3 +554,94 @@ function waitForShutdown(): Promise<void> {
 		process.once('SIGTERM', () => handler('SIGTERM'))
 	})
 }
+
+// ---------------------------------------------------------------------------
+// wallet-api: application-facing BRC-100 endpoint (dApp connectivity)
+// ---------------------------------------------------------------------------
+
+const DEFAULT_DAPP_HOST = '127.0.0.1'
+const DEFAULT_DAPP_PORT = 3321
+
+/**
+ * Wrap the CLI's wallet (wallet-toolbox client) as a BRC100WalletHandle.
+ * The toolbox Wallet already implements the 28 BRC-100 methods with the
+ * `(args, originator)` signature the dApps send.
+ */
+function walletApiHandle(wallet: Wallet): BRC100WalletHandle {
+	return {
+		async call(method, args, origin) {
+			const iface = wallet as unknown as WalletInterface
+			const fn = (iface as unknown as Record<string, unknown>)[method] as (
+				a: unknown,
+				o: string,
+			) => Promise<unknown>
+			if (typeof fn !== 'function') {
+				throw new Error(`Method not available: ${method}`)
+			}
+			return await fn.call(iface, args, origin)
+		},
+	}
+}
+
+/**
+ * Start the app-facing BRC-100 HTTP endpoint (the interface dApps like
+ * wallet-desktop's :3321 server speak; see bitplan and other BRC-100
+ * clients). Headless by design: sensitive methods are auto-approved with a
+ * console line unless `server.dapp.approve` is set, in which case each one
+ * must be confirmed on the TTY.
+ */
+async function startDappEndpoint(
+	walletResult: NodeWalletResult,
+): Promise<{ close: () => Promise<void> }> {
+	const config = loadConfig()
+	const dapp = config.server?.dapp ?? {}
+	const host = dapp.host ?? DEFAULT_DAPP_HOST
+	const port =
+		dapp.port ??
+		(process.env.ONESAT_DAPP_PORT
+			? Number(process.env.ONESAT_DAPP_PORT)
+			: DEFAULT_DAPP_PORT)
+
+	const approve = dapp.approve === true
+
+	const handle = await startBRC100Server({
+		host,
+		port,
+		wallet: walletApiHandle(walletResult.wallet),
+		approvalPolicy: approve
+			? async ({ method, origin, args }) => {
+					const { confirm, isCancel } = await import('@clack/prompts')
+					console.log(`\n[brc-100] ${method} requested by ${origin}`)
+					console.log(`          ${JSON.stringify(args).slice(0, 400)}`)
+					const ok = await confirm({
+						message: `Approve ${method}?`,
+					})
+					if (isCancel(ok) || !ok) {
+						throw new Error('User denied permission')
+					}
+				}
+			: undefined,
+		onEvent: (event) => {
+			if (event.event === 'brc100_sensitive') {
+				const trustNote = event.trusted
+					? ' (trusted)'
+					: approve
+						? ''
+						: ' (auto-approved)'
+				console.log(
+					`[brc-100] sensitive ${event.method} from ${event.origin}${trustNote}`,
+				)
+			}
+		},
+	})
+
+	console.log(`[wallet-api] BRC-100 app endpoint on http://${host}:${port}`)
+	console.log(
+		approve
+			? '[wallet-api] sensitive methods require TTY confirmation'
+			: '[wallet-api] sensitive methods are AUTO-APPROVED (headless). ' +
+					'Set server.dapp.approve=true to require confirmation.',
+	)
+
+	return { close: async () => await handle.close() }
+}

package/src/config.ts

@@ -154,6 +154,17 @@ export interface ServerConfig {
 	accounts?: ServerAccountsConfig
 	/** Messagebox subcommand settings. */
 	messagebox?: ServerMessageboxConfig
+	/**
+	 * Application-facing BRC-100 endpoint (`1sat serve wallet-api`):
+	 * dApp connectivity for the CLI wallet (encrypt/decrypt/sign/create-action).
+	 * Defaults: 127.0.0.1:3321, headless auto-approval of sensitive methods.
+	 */
+	dapp?: {
+		host?: string
+		port?: number
+		/** Require TTY confirmation for sensitive methods. Default false. */
+		approve?: boolean
+	}
 	/** Paymail settings for the unified host. */
 	paymail?: ServerPaymailConfig
 	/** Shared BSV/USD repricer engine for the accounts storage price. */

package/src/help.ts

@@ -163,12 +163,12 @@ export const COMMANDS: CommandSpec[] = [
 			{ name: 'balance', description: 'Show wallet balance in satoshis' },
 			{
 				name: 'address',
-				description: 'Show BRC-29 deposit address(es)',
+				description: 'Show P1SAT deposit address(es)',
 				args: [
 					{
 						flag: '--prefix',
 						values: '<p>',
-						description: 'BRC-29 prefix (default: 1sat)',
+						description: 'Deposit keyID prefix (default: 1sat)',
 					},
 					{ flag: '--start-index', values: '<n>' },
 					{ flag: '--count', values: '<n>' },
@@ -196,7 +196,7 @@ export const COMMANDS: CommandSpec[] = [
 			},
 			{
 				name: 'sync',
-				description: 'Sync inbound payments at BRC-29 deposit addresses',
+				description: 'Sync inbound payments at P1SAT deposit addresses',
 				args: [
 					{ flag: '--prefix', values: '<p>' },
 					{ flag: '--start-index', values: '<n>' },