@1sat/cli 0.0.85 → 0.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./src/cli.ts",
@@ -30,7 +30,7 @@
     "@1sat/client": "0.0.45",
     "@1sat/types": "0.0.36",
     "@1sat/wallet-node": "0.0.62",
-    "@1sat/wallet-server": "0.0.31",
+    "@1sat/wallet-server": "0.0.32",
     "@bsv/sdk": "^2.1.6",
     "@bsv/wallet-toolbox": "2.1.24",
     "chalk": "^5.0.0",

package/src/commands/serve.ts

@@ -34,6 +34,7 @@ import { initLogger } from 'evlog'
 import knexLib from 'knex'
 import type { GlobalFlags } from '../args'
 import {
+	type RepricerConfig,
 	type ServerAccountsConfig,
 	type ServerMessageboxConfig,
 	type ServerStorageConfig,
@@ -46,6 +47,7 @@ import { loadKey } from '../keys'
 import { clearMonitorPid, writeMonitorPid } from '../monitor-lock'
 import { fatal } from '../output'
 import {
+	type RepriceTarget,
 	buildPriceUpdateTask,
 	createAccountsConfigLoader,
 	resolveRateProvider,
@@ -57,6 +59,7 @@ const DEFAULT_ONESAT_URL = 'https://api.1sat.app/1sat'
 const DEFAULT_BASELINE_BYTES = 1024 * 1024 * 1024 // 1 GB
 const DEFAULT_PURCHASE_UNIT_BYTES = 1_073_741_824 // 1 GB chunks for production
 const DEFAULT_SATS_PER_UNIT = 1_000_000
+const DEFAULT_HOSTING_PRICE_SATS = 10_000
 const DEFAULT_DURATION_BLOCKS = 4383
 const DEFAULT_STORAGE_IDENTITY_KEY = '1sat-cli-default'
 
@@ -74,6 +77,7 @@ interface ResolvedServe {
 	activeRemote?: string
 	backups?: string[]
 	accounts: ResolvedAccounts
+	repricer?: RepricerConfig
 	monitorEnabled: boolean
 	privateKey: PrivateKey
 }
@@ -85,14 +89,7 @@ interface ResolvedAccounts {
 	satsPerUnit: number
 	durationBlocks: number
 	freeIdentityKeys: string[]
-	repricer?: {
-		enabled?: boolean
-		targetUsd?: number
-		intervalMs?: number
-		provider?: string
-		maxMovePct?: number
-		minSats?: number
-	}
+	targetUsd?: number
 }
 
 export async function handleServeCommand(
@@ -179,7 +176,8 @@ async function resolveServe(opts: GlobalFlags): Promise<ResolvedServe> {
 		activeRemote: config.activeRemote,
 		backups: config.backups,
 		accounts: resolveAccounts(server.accounts),
-		monitorEnabled: server.monitor?.enabled !== false,
+		repricer: server.repricer,
+		monitorEnabled: resolveMonitorEnabled(server.monitor?.enabled),
 		privateKey,
 	}
 }
@@ -188,6 +186,19 @@ function deriveSqliteFilename(dataDir: string, chain: string): string {
 	return join(dataDir, `wallet-${chain}.db`)
 }
 
+/**
+ * Env beats config, default on. ONESAT_MONITOR=false is set per-process by
+ * clustered deployments (PM2 ecosystem) that run a dedicated `serve monitor`;
+ * a plain `1sat serve` runs all-in-one.
+ */
+function resolveMonitorEnabled(configured: boolean | undefined): boolean {
+	const fromEnv = process.env.ONESAT_MONITOR
+	if (fromEnv && fromEnv.trim() !== '') {
+		return !['false', '0', 'off'].includes(fromEnv.trim().toLowerCase())
+	}
+	return configured !== false
+}
+
 function resolvePort(configured: number | undefined): number {
 	const fromEnv = process.env.ONESAT_PORT
 	if (fromEnv && fromEnv.trim() !== '') {
@@ -224,7 +235,7 @@ function resolveAccounts(accounts?: ServerAccountsConfig): ResolvedAccounts {
 		satsPerUnit: accounts?.satsPerUnit ?? DEFAULT_SATS_PER_UNIT,
 		durationBlocks: accounts?.durationBlocks ?? DEFAULT_DURATION_BLOCKS,
 		freeIdentityKeys: accounts?.freeIdentityKeys ?? [],
-		repricer: accounts?.repricer,
+		targetUsd: accounts?.targetUsd,
 	}
 }
 
@@ -273,14 +284,32 @@ async function runWithStorage(
 			: await startWalletServer(resolved, walletResult, accounts, mode)
 
 	if (runMonitor) {
-		const accountsCfg = resolved.accounts
-		const r = accountsCfg.repricer
-		if (
-			accountsCfg.enabled &&
-			r?.enabled &&
-			typeof r.targetUsd === 'number' &&
-			r.targetUsd > 0
-		) {
+		const r = resolved.repricer
+		const targets: RepriceTarget[] = []
+		if (resolved.accounts.enabled && (resolved.accounts.targetUsd ?? 0) > 0) {
+			targets.push({
+				name: 'accounts',
+				targetUsd: resolved.accounts.targetUsd!,
+				readCurrentSats: () =>
+					loadConfig().server?.accounts?.satsPerUnit ?? DEFAULT_SATS_PER_UNIT,
+				onPersist: async (sats) => {
+					setConfigPath('server.accounts.satsPerUnit', sats)
+				},
+			})
+		}
+		const hostingCfg = loadConfig().server?.hosting
+		if (hostingCfg?.enabled === true && (hostingCfg.targetUsd ?? 0) > 0) {
+			targets.push({
+				name: 'hosting',
+				targetUsd: hostingCfg.targetUsd!,
+				readCurrentSats: () =>
+					loadConfig().server?.hosting?.priceSats ?? DEFAULT_HOSTING_PRICE_SATS,
+				onPersist: async (sats) => {
+					setConfigPath('server.hosting.priceSats', sats)
+				},
+			})
+		}
+		if (r?.enabled && targets.length > 0) {
 			walletResult.monitor.addTask(
 				buildPriceUpdateTask({
 					monitor: walletResult.monitor,
@@ -288,20 +317,17 @@ async function runWithStorage(
 						chain: resolved.chain,
 					}),
 					intervalMs: r.intervalMs ?? 15 * 60 * 1000,
-					targetUsd: r.targetUsd,
 					bounds: {
 						maxMovePct: r.maxMovePct ?? 25,
 						minSats: r.minSats ?? 1,
 					},
-					readCurrentSats: () =>
-						loadConfig().server?.accounts?.satsPerUnit ?? DEFAULT_SATS_PER_UNIT,
-					onPersist: async (sats) => {
-						setConfigPath('server.accounts.satsPerUnit', sats)
-					},
+					targets,
 				}),
 			)
 			console.log(
-				`[repricer] enabled — $${r.targetUsd}/unit every ${Math.round(
+				`[repricer] enabled — ${targets
+					.map((t) => `${t.name} $${t.targetUsd}`)
+					.join(', ')} every ${Math.round(
 					(r.intervalMs ?? 900_000) / 1000,
 				)}s via ${r.provider ?? 'whatsonchain'}`,
 			)
@@ -348,7 +374,8 @@ async function startWalletServer(
 					const h = loadConfig().server?.hosting
 					return {
 						enabled: h?.enabled === true,
-						priceSats: h?.priceSats ?? 10_000,
+						priceSats: h?.priceSats ?? DEFAULT_HOSTING_PRICE_SATS,
+						priceUsd: h?.targetUsd,
 						periodSeconds: h?.periodSeconds ?? 2_592_000,
 					}
 				},
@@ -400,12 +427,13 @@ async function startWalletServer(
 		accounts: accounts?.walletServerAccounts,
 		hosting,
 		paymail: {
-			baseUrl: paymailCfg?.baseUrl ?? `http://${resolved.host}:${resolved.port}`,
+			baseUrl:
+				paymailCfg?.baseUrl ?? `http://${resolved.host}:${resolved.port}`,
 			stackUrl: paymailCfg?.stackUrl ?? 'https://api.1sat.app',
 			pendingStore,
 			hostWallet: hostingEnabled ? walletResult.wallet : undefined,
 			requireEntitlement: hostingEnabled,
-			messageboxUrl: `http://127.0.0.1:${resolved.port}/`,
+			messageboxUrl: `http://127.0.0.1:${resolved.port}/messagebox`,
 			hostPrivateKey: resolved.privateKey,
 		},
 		messagebox: {
@@ -440,7 +468,8 @@ function createMessageboxKnex(
 ) {
 	if (storage.provider === 'bun-sqlite') {
 		const filename =
-			messagebox?.dbPath ?? join(resolved.dataDir, `messagebox-${resolved.chain}.db`)
+			messagebox?.dbPath ??
+			join(resolved.dataDir, `messagebox-${resolved.chain}.db`)
 		return (knexLib as any)({
 			client: 'sqlite3',
 			connection: { filename },

package/src/config.ts

@@ -25,18 +25,23 @@ export type ServerStorageConfig =
 	| ServerStorageBunSqliteConfig
 	| ServerStoragePgConfig
 
+/**
+ * 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.
+ */
 export interface RepricerConfig {
 	/** Master toggle. Defaults to false. */
 	enabled?: boolean
-	/** Target price per `purchaseUnitBytes` chunk, in USD. */
-	targetUsd?: number
 	/** Interval between rate checks in ms. Defaults to 900000 (15 min). */
 	intervalMs?: number
 	/** Rate provider name. Defaults to "whatsonchain". */
 	provider?: string
 	/** Max percent change allowed per update. Larger moves are skipped. Defaults to 25. */
 	maxMovePct?: number
-	/** Lower bound for `satsPerUnit`. Defaults to 1. */
+	/** Lower bound for repriced sats values. Defaults to 1. */
 	minSats?: number
 }
 
@@ -49,12 +54,12 @@ export interface ServerAccountsConfig {
 	purchaseUnitBytes?: number
 	/** Sats charged per purchase unit. */
 	satsPerUnit?: number
+	/** USD target per purchase unit, maintained by `server.repricer`. */
+	targetUsd?: number
 	/** Block window a payment remains valid for. */
 	durationBlocks?: number
 	/** Identity keys that bypass metering (server's own key is auto-added). */
 	freeIdentityKeys?: string[]
-	/** Optional auto-repricer. When enabled, updates `satsPerUnit` from a live BSV/USD rate. */
-	repricer?: RepricerConfig
 }
 
 export interface ServerMessageboxConfig {
@@ -123,6 +128,12 @@ export interface ServerHostingConfig {
 	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
 }
@@ -153,6 +164,8 @@ export interface ServerConfig {
 	paymail?: ServerPaymailConfig
 	/** Hosted paymail subscription (wallet serve /hosting/*). */
 	hosting?: ServerHostingConfig
+	/** Shared BSV/USD repricer engine for accounts + hosting prices. */
+	repricer?: RepricerConfig
 	/** Background monitor task loop. Defaults to enabled. */
 	monitor?: ServerMonitorConfig
 }

package/src/repricer/buildPriceUpdateTask.ts

@@ -1,18 +1,25 @@
 import { computeReprice } from './computeReprice'
 import type { RateProvider, RepricerBounds } from './types'
 
+/** One price the repricer maintains from the shared BSV/USD quote. */
+export interface RepriceTarget {
+	/** Label for task result logs, e.g. 'accounts' or 'hosting'. */
+	name: string
+	/** USD target for this price. Targets with 0 or negative are ignored. */
+	targetUsd: number
+	/** Read the current sats value (typically from disk via the same loader the servers use). */
+	readCurrentSats: () => number
+	/** Persist the new sats value (wraps `setConfigPath`). */
+	onPersist: (newSats: number) => Promise<void>
+}
+
 export interface PriceUpdateTaskOptions {
 	monitor: unknown
 	rateProvider: RateProvider
 	/** Interval between successful tick attempts. */
 	intervalMs: number
-	/** USD target per purchase unit. Task no-ops when this is 0. */
-	targetUsd: number
 	bounds: RepricerBounds
-	/** Read current `satsPerUnit` (typically from disk via the same loader the servers use). */
-	readCurrentSats: () => number
-	/** Persist the new `satsPerUnit` value. Wraps `setConfigPath('server.accounts.satsPerUnit', sats)`. */
-	onPersist: (newSats: number) => Promise<void>
+	targets: RepriceTarget[]
 }
 
 export interface PriceUpdateTask {
@@ -28,15 +35,8 @@ export interface PriceUpdateTask {
 export function buildPriceUpdateTask(
 	options: PriceUpdateTaskOptions,
 ): PriceUpdateTask {
-	const {
-		monitor,
-		rateProvider,
-		intervalMs,
-		targetUsd,
-		bounds,
-		readCurrentSats,
-		onPersist,
-	} = options
+	const { monitor, rateProvider, intervalMs, bounds } = options
+	const targets = options.targets.filter((t) => t.targetUsd > 0)
 
 	const storage = (monitor as { storage?: unknown } | null | undefined)?.storage
 
@@ -47,7 +47,7 @@ export function buildPriceUpdateTask(
 		lastRunMsecsSinceEpoch: 0,
 		async asyncSetup() {},
 		trigger(now: number): { run: boolean } {
-			if (!(targetUsd > 0)) return { run: false }
+			if (targets.length === 0) return { run: false }
 			if (now - this.lastRunMsecsSinceEpoch < intervalMs) return { run: false }
 			return { run: true }
 		},
@@ -59,22 +59,32 @@ export function buildPriceUpdateTask(
 				return `rate fetch failed: ${(err as Error).message}`
 			}
 
-			const currentSats = readCurrentSats()
-			const result = computeReprice({
-				targetUsd,
-				bsvUsd: quote.bsvUsd,
-				currentSats,
-				bounds,
-			})
+			const parts: string[] = []
+			for (const target of targets) {
+				const currentSats = target.readCurrentSats()
+				const result = computeReprice({
+					targetUsd: target.targetUsd,
+					bsvUsd: quote.bsvUsd,
+					currentSats,
+					bounds,
+				})
 
-			if (result.status === 'skipped') return `skipped: ${result.reason}`
+				if (result.status === 'skipped') {
+					parts.push(`${target.name}: skipped: ${result.reason}`)
+					continue
+				}
 
-			try {
-				await onPersist(result.newSats)
-			} catch (err) {
-				return `persist failed: ${(err as Error).message}`
+				try {
+					await target.onPersist(result.newSats)
+				} catch (err) {
+					parts.push(
+						`${target.name}: persist failed: ${(err as Error).message}`,
+					)
+					continue
+				}
+				parts.push(`${target.name}: ${currentSats} → ${result.newSats} sats`)
 			}
-			return `${currentSats} → ${result.newSats} sats/unit @ $${quote.bsvUsd}/BSV`
+			return `${parts.join('; ')} @ $${quote.bsvUsd}/BSV`
 		},
 	}
 }

package/src/repricer/index.ts

@@ -1,5 +1,8 @@
 export { buildPriceUpdateTask } from './buildPriceUpdateTask'
-export type { PriceUpdateTaskOptions } from './buildPriceUpdateTask'
+export type {
+	PriceUpdateTaskOptions,
+	RepriceTarget,
+} from './buildPriceUpdateTask'
 export { computeReprice } from './computeReprice'
 export { createAccountsConfigLoader } from './configLoader'
 export type { AccountsConfigLoaderOptions } from './configLoader'