@1sat/cli 0.0.99 → 0.0.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.99",
+  "version": "0.0.101",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./src/cli.ts",
@@ -26,13 +26,13 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.197",
-    "@1sat/client": "0.0.49",
-    "@1sat/types": "0.0.39",
-    "@1sat/wallet-node": "0.0.69",
-    "@1sat/wallet-server": "0.0.45",
+    "@1sat/actions": "0.0.199",
+    "@1sat/client": "0.0.50",
+    "@1sat/types": "0.0.40",
+    "@1sat/wallet-node": "0.0.70",
+    "@1sat/wallet-server": "0.0.46",
     "@bsv/sdk": "^2.1.9",
-    "@bsv/wallet-toolbox": "2.4.4",
+    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@2.6.2-brc153.5",
     "chalk": "^5.0.0",
     "@clack/prompts": "^0.8.0",
     "bitcoin-backup": "^0.0.11",

package/src/commands/wallet.ts

@@ -5,10 +5,13 @@
 
 import {
 	deriveDepositAddresses,
+	migrateLegacyP1SatBaskets,
+	moveBasketOutputs,
 	sendAllBsv,
 	sendBsv,
 	syncAddresses,
 } from '@1sat/actions'
+import type { WalletInterface } from '@bsv/sdk'
 import { confirm, isCancel } from '@clack/prompts'
 import type { GlobalFlags } from '../args'
 import { extractFlag, extractFlags } from '../args'
@@ -17,6 +20,31 @@ import { printCommandHelp } from '../help'
 import { loadKey } from '../keys'
 import { fatal, formatValue, output, printKeyValue } from '../output'
 
+/**
+ * BRC-100 methods reached by passing the method's own args as one JSON
+ * argument. The commands above wrap the handful that benefit from flags and
+ * formatting; these keep the rest of the interface reachable rather than
+ * leaving it to one-off scripts.
+ */
+const PASSTHROUGH_METHODS = {
+	'get-public-key': 'getPublicKey',
+	encrypt: 'encrypt',
+	decrypt: 'decrypt',
+	'create-hmac': 'createHmac',
+	'verify-hmac': 'verifyHmac',
+	'create-signature': 'createSignature',
+	'verify-signature': 'verifySignature',
+	'internalize-action': 'internalizeAction',
+	'acquire-certificate': 'acquireCertificate',
+	'prove-certificate': 'proveCertificate',
+	'discover-by-identity-key': 'discoverByIdentityKey',
+	'discover-by-attributes': 'discoverByAttributes',
+	'get-height': 'getHeight',
+	'get-header-for-height': 'getHeaderForHeight',
+	'get-network': 'getNetwork',
+	'get-version': 'getVersion',
+} as const satisfies Record<string, keyof WalletInterface>
+
 export async function handleWalletCommand(
 	args: string[],
 	opts: GlobalFlags,
@@ -40,6 +68,10 @@ export async function handleWalletCommand(
 			return walletListOutputs(rest, opts)
 		case 'relinquish-output':
 			return walletRelinquishOutput(rest, opts)
+		case 'move-basket':
+			return walletMoveBasket(rest, opts)
+		case 'migrate-baskets':
+			return walletMigrateBaskets(rest, opts)
 		case 'list-actions':
 			return walletListActions(rest, opts)
 		case 'create-action':
@@ -52,11 +84,44 @@ export async function handleWalletCommand(
 			return walletListCertificates(rest, opts)
 		case 'relinquish-certificate':
 			return walletRelinquishCertificate(rest, opts)
-		default:
+		default: {
+			const method =
+				PASSTHROUGH_METHODS[subcommand as keyof typeof PASSTHROUGH_METHODS]
+			if (method) return walletPassthrough(method, rest, opts)
 			printCommandHelp('wallet', opts.json)
 			if (subcommand && subcommand !== 'help') {
 				process.exit(1)
 			}
+		}
+	}
+}
+
+/** Calls a BRC-100 method with parsed JSON args; no args means `{}`. */
+async function walletPassthrough(
+	method: keyof WalletInterface,
+	args: string[],
+	opts: GlobalFlags,
+): Promise<void> {
+	const jsonInput = args[0]
+	let methodArgs: unknown = {}
+	if (jsonInput) {
+		try {
+			methodArgs = JSON.parse(jsonInput)
+		} catch {
+			fatal(`Invalid JSON: ${jsonInput}`)
+		}
+	}
+
+	const privateKey = await loadKey()
+	const { ctx, destroy } = await loadContext(privateKey, {
+		chain: opts.chain,
+	})
+
+	try {
+		const call = ctx.wallet[method] as (a: unknown) => Promise<unknown>
+		output(await call.call(ctx.wallet, methodArgs), opts)
+	} finally {
+		await destroy()
 	}
 }
 
@@ -426,6 +491,58 @@ async function walletRelinquishOutput(
 	}
 }
 
+async function walletMoveBasket(
+	args: string[],
+	opts: GlobalFlags,
+): Promise<void> {
+	const from = extractFlag(args, '--from')
+	const to = extractFlag(args, '--to')
+	if (!from) fatal('Missing required --from <basket>')
+	if (!to) fatal('Missing required --to <basket>')
+
+	const privateKey = await loadKey()
+	const { ctx, destroy } = await loadContext(privateKey, {
+		chain: opts.chain,
+	})
+	try {
+		const result = await moveBasketOutputs(ctx.wallet, from, to)
+		output(result, opts)
+	} finally {
+		await destroy()
+	}
+}
+
+async function walletMigrateBaskets(
+	args: string[],
+	opts: GlobalFlags,
+): Promise<void> {
+	void args
+	const privateKey = await loadKey()
+	const { ctx, destroy } = await loadContext(privateKey, {
+		chain: opts.chain,
+	})
+	try {
+		const result = await migrateLegacyP1SatBaskets(ctx.wallet)
+		if (opts.json) {
+			output(result, opts)
+		} else {
+			console.log(`Moved ${result.totalMoved} output(s) across legacy baskets\n`)
+			for (const r of result.results) {
+				if (r.moved === 0 && r.errors.length === 0) continue
+				console.log(
+					`  ${r.from} → ${r.to}: moved ${r.moved}` +
+						(r.skipped ? `, skipped ${r.skipped}` : ''),
+				)
+				for (const e of r.errors) {
+					console.log(`    ! ${e.outpoint}: ${e.error}`)
+				}
+			}
+		}
+	} finally {
+		await destroy()
+	}
+}
+
 async function walletListActions(
 	args: string[],
 	opts: GlobalFlags,

package/src/help.ts

@@ -267,6 +267,75 @@ export const COMMANDS: CommandSpec[] = [
 					{ flag: '--certifier', values: '<c>', required: true },
 				],
 			},
+			{
+				name: 'get-public-key',
+				description: 'Derive a public key (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'encrypt',
+				description: 'Encrypt to a counterparty (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'decrypt',
+				description: 'Decrypt from a counterparty (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'create-hmac',
+				description: 'Create an HMAC (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'verify-hmac',
+				description: 'Verify an HMAC (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'create-signature',
+				description: 'Create a signature (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'verify-signature',
+				description: 'Verify a signature (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'internalize-action',
+				description:
+					'Take ownership of an output — wallet payment or basket insertion (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'acquire-certificate',
+				description: 'Acquire a certificate (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'prove-certificate',
+				description: 'Prove fields of a certificate (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'discover-by-identity-key',
+				description: 'Discover certificates by identity key (BRC-100)',
+				positional: "'<json>'",
+			},
+			{
+				name: 'discover-by-attributes',
+				description: 'Discover certificates by attributes (BRC-100)',
+				positional: "'<json>'",
+			},
+			{ name: 'get-height', description: 'Current block height (BRC-100)' },
+			{
+				name: 'get-header-for-height',
+				description: 'Block header at a height (BRC-100)',
+				positional: "'<json>'",
+			},
+			{ name: 'get-network', description: 'Wallet network (BRC-100)' },
+			{ name: 'get-version', description: 'Wallet version (BRC-100)' },
 		],
 	},