@1sat/cli 0.0.102 → 0.0.103

package/src/config.ts

@@ -29,8 +29,7 @@ export type ServerStorageConfig =
  * Shared repricer engine (`server.repricer`). When enabled, a monitor task
  * fetches the BSV/USD rate on the interval and rewrites each service's sats
  * price toward its own `targetUsd` (`server.accounts.targetUsd` →
- * `satsPerUnit`, `server.hosting.targetUsd` → `priceSats`). Services with no
- * `targetUsd` set are left alone.
+ * `satsPerUnit`). Services with no `targetUsd` set are left alone.
  */
 export interface RepricerConfig {
 	/** Master toggle. Defaults to false. */
@@ -112,30 +111,13 @@ export interface ServerPaymailConfig {
 	 */
 	messageboxUrl?: string
 	/**
-	 * When true, open host wallet storage and require active HOSTING_BASKET
-	 * receipt for the bound identity. Default false until subscribe path ships.
+	 * Domain served from the host accounts table (e.g. "1sat.app").
+	 * Aliases on this domain resolve username→identity key via registered
+	 * accounts; every other domain (e.g. "1sat.name") keeps resolving through
+	 * on-chain OpNS binds. Unset = OpNS for all domains. Either way an alias
+	 * only resolves when its identity holds an account on this host.
 	 */
-	requireEntitlement?: boolean
-	/**
-	 * Wallet storage URL for entitlement listOutputs (and optional later
-	 * subscribe). Defaults to local wallet serve URL like messagebox.
-	 */
-	walletStorageUrl?: string
-}
-
-export interface ServerHostingConfig {
-	/** Master toggle. Defaults to false. */
-	enabled?: boolean
-	/** Sats per subscription period. */
-	priceSats?: number
-	/**
-	 * USD price per subscription period. Returned as `priceUsd` on the
-	 * pricing API for display, and maintained as the repricing target for
-	 * `priceSats` when `server.repricer` is enabled.
-	 */
-	targetUsd?: number
-	/** Period length in seconds (e.g. 2592000 ≈ 30 days). */
-	periodSeconds?: number
+	userDomain?: string
 }
 
 export interface ServerSessionStoreConfig {
@@ -167,11 +149,9 @@ export interface ServerConfig {
 	accounts?: ServerAccountsConfig
 	/** Messagebox subcommand settings. */
 	messagebox?: ServerMessageboxConfig
-	/** Paymail subcommand settings. */
+	/** Paymail settings for the unified host. */
 	paymail?: ServerPaymailConfig
-	/** Hosted paymail subscription (wallet serve /hosting/*). */
-	hosting?: ServerHostingConfig
-	/** Shared BSV/USD repricer engine for accounts + hosting prices. */
+	/** Shared BSV/USD repricer engine for the accounts storage price. */
 	repricer?: RepricerConfig
 	/**
 	 * Redis-shared BRC-104 sessions. Required when multiple serve instances

package/src/context.ts

@@ -10,8 +10,8 @@
 import { type OneSatContext, createContext } from '@1sat/actions'
 import { type NodeWalletResult, createNodeWallet } from '@1sat/wallet-node'
 import type { PrivateKey } from '@bsv/sdk'
-import { ensureDataDir, loadConfig } from './config'
-import { spawnDetachedMonitorOnce } from './monitor-once'
+import { ensureDataDir, loadConfig } from './config.js'
+import { spawnDetachedMonitorOnce } from './monitor-once.js'
 
 /** Extended context that includes cleanup */
 export interface CliContext {

package/src/help.ts

@@ -714,7 +714,7 @@ export const COMMANDS: CommandSpec[] = [
 		group: 'Server',
 		name: 'serve',
 		description:
-			'Run unified host server (storage + hosting + paymail + messagebox) and/or monitor (config under server.* in config.json)',
+			'Run unified host server (storage + accounts + paymail + messagebox) and/or monitor (config under server.* in config.json)',
 		subcommands: [
 			{
 				name: '(no subcommand)',
@@ -778,7 +778,7 @@ export const COMMANDS: CommandSpec[] = [
 			},
 		],
 		notes:
-			"Examples:\n  1sat authfetch GET https://wallet.1sat.app/hosting/status\n  1sat authfetch GET https://wallet.1sat.app/hosting/price\n  1sat authfetch POST https://wallet.1sat.app/hosting/subscribe --body '{}' --yes",
+			'Examples:\n  1sat authfetch GET https://wallet.1sat.app/account/status\n  1sat authfetch POST https://wallet.1sat.app/account/register --body \'{"username":"alice"}\' --yes\n  1sat authfetch PUT https://wallet.1sat.app/account/profile --body \'{"displayName":"Alice"}\' --yes',
 	},
 	{
 		group: 'Advanced',

package/src/keys.ts

@@ -17,7 +17,7 @@ import { join } from 'node:path'
 import { PrivateKey } from '@bsv/sdk'
 import { isCancel, password as promptPassword } from '@clack/prompts'
 import { type WifBackup, decryptBackup, encryptBackup } from 'bitcoin-backup'
-import { ensureConfigDir, getConfigDir } from './config'
+import { ensureConfigDir, getConfigDir } from './config.js'
 
 const KEYS_FILE = 'keys.bep'
 

package/src/main.ts

@@ -10,28 +10,33 @@
 import { existsSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { config as loadEnv } from 'dotenv'
-import { parseGlobalFlags } from './args'
-import { handleActionCommand } from './commands/action'
-import { handleAuthfetchCommand } from './commands/authfetch'
-import { handleConfigCommand } from './commands/config'
-import { handleIdentityCommand } from './commands/identity'
-import { handleInitCommand } from './commands/init'
-import { handleLocksCommand } from './commands/locks'
-import { handleMcpProxyCommand } from './commands/mcp-proxy'
-import { handleMessageboxCommand } from './commands/messagebox'
-import { handleOpnsCommand } from './commands/opns'
-import { handleOrdinalsCommand } from './commands/ordinals'
-import { handleRemoteCommand } from './commands/remote'
-import { handleServeCommand } from './commands/serve'
-import { handleSocialCommand } from './commands/social'
-import { handleStorageCommand } from './commands/storage'
-import { handleSweepCommand } from './commands/sweep'
-import { handleTokensCommand } from './commands/tokens'
-import { handleTxCommand } from './commands/tx'
-import { handleWalletCommand } from './commands/wallet'
-import { getCommand, printCommandHelp, printHelp, printVersion } from './help'
-import { runMonitorOnce } from './monitor-once'
-import { formatError } from './output'
+import { parseGlobalFlags } from './args.js'
+import { handleActionCommand } from './commands/action.js'
+import { handleAuthfetchCommand } from './commands/authfetch.js'
+import { handleConfigCommand } from './commands/config.js'
+import { handleIdentityCommand } from './commands/identity.js'
+import { handleInitCommand } from './commands/init.js'
+import { handleLocksCommand } from './commands/locks.js'
+import { handleMcpProxyCommand } from './commands/mcp-proxy.js'
+import { handleMessageboxCommand } from './commands/messagebox.js'
+import { handleOpnsCommand } from './commands/opns.js'
+import { handleOrdinalsCommand } from './commands/ordinals.js'
+import { handleRemoteCommand } from './commands/remote.js'
+import { handleServeCommand } from './commands/serve.js'
+import { handleSocialCommand } from './commands/social.js'
+import { handleStorageCommand } from './commands/storage.js'
+import { handleSweepCommand } from './commands/sweep.js'
+import { handleTokensCommand } from './commands/tokens.js'
+import { handleTxCommand } from './commands/tx.js'
+import { handleWalletCommand } from './commands/wallet.js'
+import {
+	getCommand,
+	printCommandHelp,
+	printHelp,
+	printVersion,
+} from './help.js'
+import { runMonitorOnce } from './monitor-once.js'
+import { formatError } from './output.js'
 
 const rawArgs = process.argv.slice(2)
 

package/src/monitor-lock.ts

@@ -29,10 +29,7 @@ export function writeMonitorPid(
  * contains that pid (avoids a short once-run clearing a serve owner that
  * started while the once-run was shutting down).
  */
-export function clearMonitorPid(
-	dataDir: string,
-	onlyPid?: number,
-): void {
+export function clearMonitorPid(dataDir: string, onlyPid?: number): void {
 	const path = monitorPidPath(dataDir)
 	try {
 		if (onlyPid !== undefined) {

package/src/monitor-once.ts

@@ -10,13 +10,13 @@ import { type SpawnOptions, spawn } from 'node:child_process'
 import { appendFileSync, closeSync, openSync } from 'node:fs'
 import { join } from 'node:path'
 import { createNodeWallet } from '@1sat/wallet-node'
-import { ensureDataDir, loadConfig } from './config'
-import { loadKey } from './keys'
+import { ensureDataDir, loadConfig } from './config.js'
+import { loadKey } from './keys.js'
 import {
 	clearMonitorPid,
 	readLiveMonitorPid,
 	writeMonitorPid,
-} from './monitor-lock'
+} from './monitor-lock.js'
 
 export const MONITOR_LOG_FILENAME = 'monitor.log'
 

package/src/repricer/buildPriceUpdateTask.ts

@@ -1,5 +1,5 @@
-import { computeReprice } from './computeReprice'
-import type { RateProvider, RepricerBounds } from './types'
+import { computeReprice } from './computeReprice.js'
+import type { RateProvider, RepricerBounds } from './types.js'
 
 /** One price the repricer maintains from the shared BSV/USD quote. */
 export interface RepriceTarget {

package/src/repricer/computeReprice.ts

@@ -1,4 +1,4 @@
-import type { ComputeRepriceInput, ComputeRepriceResult } from './types'
+import type { ComputeRepriceInput, ComputeRepriceResult } from './types.js'
 
 const SATS_PER_BSV = 100_000_000
 

package/src/repricer/index.ts

@@ -1,17 +1,17 @@
-export { buildPriceUpdateTask } from './buildPriceUpdateTask'
+export { buildPriceUpdateTask } from './buildPriceUpdateTask.js'
 export type {
 	PriceUpdateTaskOptions,
 	RepriceTarget,
-} from './buildPriceUpdateTask'
-export { computeReprice } from './computeReprice'
-export { createAccountsConfigLoader } from './configLoader'
-export type { AccountsConfigLoaderOptions } from './configLoader'
-export { resolveRateProvider } from './providers'
-export { createWhatsOnChainProvider } from './whatsOnChain'
+} from './buildPriceUpdateTask.js'
+export { computeReprice } from './computeReprice.js'
+export { createAccountsConfigLoader } from './configLoader.js'
+export type { AccountsConfigLoaderOptions } from './configLoader.js'
+export { resolveRateProvider } from './providers.js'
+export { createWhatsOnChainProvider } from './whatsOnChain.js'
 export type {
 	BsvUsdQuote,
 	ComputeRepriceInput,
 	ComputeRepriceResult,
 	RateProvider,
 	RepricerBounds,
-} from './types'
+} from './types.js'

package/src/repricer/providers.ts

@@ -1,5 +1,5 @@
-import type { RateProvider } from './types'
-import { createWhatsOnChainProvider } from './whatsOnChain'
+import type { RateProvider } from './types.js'
+import { createWhatsOnChainProvider } from './whatsOnChain.js'
 
 export interface ResolveProviderOptions {
 	chain: 'main' | 'test'

package/src/repricer/whatsOnChain.ts

@@ -1,4 +1,4 @@
-import type { BsvUsdQuote, RateProvider } from './types'
+import type { BsvUsdQuote, RateProvider } from './types.js'
 
 export interface WhatsOnChainOptions {
 	chain: 'main' | 'test'

package/scripts/check-bun.cjs

@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-const { spawnSync } = require('node:child_process')
-
-const result = spawnSync('bun', ['--version'], { stdio: 'ignore' })
-if (result.error || result.status !== 0) {
-	console.error('')
-	console.error('@1sat/cli requires the Bun runtime (https://bun.sh).')
-	console.error('')
-	console.error('Install Bun:')
-	console.error('  curl -fsSL https://bun.sh/install | bash')
-	console.error('')
-	console.error('Then retry:')
-	console.error('  bunx @1sat/cli            # run without installing')
-	console.error('  bun add -g @1sat/cli      # install globally')
-	console.error('')
-	process.exit(1)
-}

package/scripts/resubmit-bsv21-discovery.ts

@@ -1,33 +0,0 @@
-/**
- * One-off recovery script: re-submit a BSV21 deploy tx to the discovery
- * overlay topic (tm_bsv21).
- *
- * Use when a deploy was broadcast on-chain but didn't reach the overlay
- * (e.g. previous URL bug, network blip, server downtime).
- *
- * Usage: bun run scripts/resubmit-bsv21-discovery.ts <txid>
- */
-
-import { OneSatServices } from '@1sat/client'
-
-const txid = process.argv[2]
-if (!txid || !/^[0-9a-f]{64}$/i.test(txid)) {
-	console.error(
-		'Usage: bun run scripts/resubmit-bsv21-discovery.ts <txid>\n' +
-			'  txid must be a 64-char hex string',
-	)
-	process.exit(1)
-}
-
-const services = new OneSatServices('main')
-
-console.log(`Fetching BEEF for ${txid}...`)
-const beef = await services.getBeefForTxid(txid)
-console.log(`  beef has ${beef.txs.length} txs and ${beef.bumps.length} bumps`)
-
-const atomicBeef = beef.toBinaryAtomic(txid)
-console.log(`  atomic BEEF size: ${atomicBeef.length} bytes`)
-
-console.log('Submitting to tm_bsv21 discovery topic...')
-const result = await services.overlay.submitBsv21Discovery(atomicBeef)
-console.log('Result:', result)