@1sat/cli 0.0.80 → 0.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@1sat/cli",
-	"version": "0.0.80",
+	"version": "0.0.81",
 	"description": "CLI for 1Sat Ordinals SDK",
 	"type": "module",
 	"main": "./src/cli.ts",
@@ -26,11 +26,11 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@1sat/actions": "0.0.186",
+		"@1sat/actions": "0.0.187",
 		"@1sat/client": "0.0.43",
 		"@1sat/types": "0.0.34",
-		"@1sat/wallet-node": "0.0.59",
-		"@1sat/wallet-server": "0.0.28",
+		"@1sat/wallet-node": "0.0.60",
+		"@1sat/wallet-server": "0.0.29",
 		"@bsv/sdk": "^2.1.6",
 		"@bsv/wallet-toolbox": "2.1.24",
 		"chalk": "^5.0.0",

package/src/commands/storage.ts

@@ -0,0 +1,117 @@
+/**
+ * Storage maintenance commands — operate directly on the serve wallet's
+ * storage database (config under server.storage in config.json).
+ */
+
+import { nominateInvalidReqs, StorageBunSqlite } from '@1sat/wallet-node'
+import { StorageProvider } from '@bsv/wallet-toolbox'
+import { join } from 'node:path'
+import type { GlobalFlags } from '../args'
+import { extractFlag } from '../args'
+import { ensureDataDir, loadConfig } from '../config'
+import { printCommandHelp } from '../help'
+import { fatal, output } from '../output'
+
+export async function handleStorageCommand(
+	args: string[],
+	opts: GlobalFlags,
+): Promise<void> {
+	const [subcommand, ...rest] = args
+
+	switch (subcommand) {
+		case 'unfail':
+			return storageUnfail(rest, opts)
+		default:
+			printCommandHelp('storage', opts.json)
+			if (subcommand && subcommand !== 'help') {
+				process.exit(1)
+			}
+	}
+}
+
+/**
+ * Nominate invalid proven_tx_reqs for recovery. Writes only the `unfail`
+ * status; the running monitor's TaskUnFail verifies each txid against
+ * the chain, restores the ones that actually mined, and returns the rest
+ * to `invalid`. Safe to run against a live serve instance — same
+ * single-field status update the monitor's own review tasks perform.
+ */
+async function storageUnfail(
+	args: string[],
+	opts: GlobalFlags,
+): Promise<void> {
+	const rawWindow = extractFlag(args, '--window')
+	if (!rawWindow) {
+		fatal(
+			"--window is required: 'all' for every invalid record (one-time cleanup), or a duration like 30d / 12h / 90m",
+		)
+	}
+	const windowMsecs = parseWindow(rawWindow)
+
+	const storage = await openServeStorage(opts)
+	try {
+		const { nominated } = await nominateInvalidReqs(storage, windowMsecs)
+
+		if (opts.json) {
+			output({ nominated }, opts)
+			return
+		}
+
+		if (nominated.length === 0) {
+			console.log('No invalid reqs in window — nothing nominated.')
+			return
+		}
+		console.log(`Nominated ${nominated.length} invalid req(s) for unfail review:`)
+		for (const n of nominated) {
+			console.log(`  ${n.provenTxReqId}  ${n.txid}`)
+		}
+		console.log(
+			'The running monitor (1sat serve / serve monitor) processes these on its next TaskUnFail tick: mined transactions are restored, the rest return to invalid.',
+		)
+	} finally {
+		await storage.destroy()
+	}
+}
+
+function parseWindow(raw: string): number | undefined {
+	if (raw === 'all') return undefined
+	const m = raw.match(/^(\d+)([dhm])$/)
+	if (!m) {
+		fatal(
+			`--window must be 'all' or a duration like 30d, 12h, 90m — got: ${raw}`,
+		)
+	}
+	const units: Record<string, number> = {
+		d: 24 * 60 * 60 * 1000,
+		h: 60 * 60 * 1000,
+		m: 60 * 1000,
+	}
+	return Number(m[1]) * units[m[2]]
+}
+
+/** Open the serve wallet's storage exactly as `1sat serve` resolves it. */
+async function openServeStorage(opts: GlobalFlags): Promise<StorageProvider> {
+	const config = loadConfig()
+	const chain = opts.chain ?? config.chain ?? 'main'
+	const storageConfig = config.server?.storage ?? { provider: 'bun-sqlite' }
+	const baseOptions = StorageProvider.createStorageBaseOptions(chain)
+
+	let storage: StorageProvider
+	if (storageConfig.provider === 'pg') {
+		if (!storageConfig.dbUrl) {
+			fatal(
+				'server.storage.provider is pg but server.storage.dbUrl is not set.',
+			)
+		}
+		const { StoragePg } = await import('@1sat/wallet-node')
+		storage = new StoragePg({ ...baseOptions, dbUrl: storageConfig.dbUrl })
+	} else {
+		storage = new StorageBunSqlite({
+			...baseOptions,
+			filename: join(ensureDataDir(), `wallet-${chain}.db`),
+		})
+	}
+
+	await storage.makeAvailable()
+	return storage
+}

package/src/help.ts

@@ -552,6 +552,28 @@ export const COMMANDS: CommandSpec[] = [
 			},
 		],
 	},
+	{
+		group: 'Server',
+		name: 'storage',
+		description:
+			'Serve-wallet storage maintenance (config under server.storage in config.json)',
+		subcommands: [
+			{
+				name: 'unfail',
+				description:
+					'Nominate invalid proven_tx_reqs for chain re-check; the running monitor restores any that actually mined',
+				args: [
+					{
+						flag: '--window',
+						values: "<all|30d|12h|90m>",
+						required: true,
+						description:
+							"Only reqs created within the window; 'all' for every invalid record",
+					},
+				],
+			},
+		],
+	},
 
 	// MCP
 	{

package/src/main.ts

@@ -21,6 +21,7 @@ import { handleOpnsCommand } from './commands/opns'
 import { handleOrdinalsCommand } from './commands/ordinals'
 import { handleRemoteCommand } from './commands/remote'
 import { handleServeCommand } from './commands/serve'
+import { handleStorageCommand } from './commands/storage'
 import { handleSocialCommand } from './commands/social'
 import { handleSweepCommand } from './commands/sweep'
 import { handleTokensCommand } from './commands/tokens'
@@ -134,6 +135,10 @@ async function main(): Promise<void> {
 			await handleServeCommand(rest, flags)
 			break
 
+		case 'storage':
+			await handleStorageCommand(rest, flags)
+			break
+
 		// Hidden: parent CLI spawns this after wallet destroy so monitor
 		// stdout/stderr go to ~/.1sat/cli/monitor.log instead of the TTY.
 		case '__monitor-once':