@1sat/cli 0.0.41 → 0.0.43

package/README.md

@@ -4,6 +4,14 @@
 
 Command-line interface for 1Sat Ordinals on BSV.
 
+Requires the [Bun](https://bun.sh) runtime. Install Bun first:
+
+```
+curl -fsSL https://bun.sh/install | bash
+```
+
+Then:
+
 ```
 bun add -g @1sat/cli
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./src/cli.ts",
@@ -8,9 +8,11 @@
     "1sat": "./src/cli.ts"
   },
   "files": [
-    "src"
+    "src",
+    "scripts"
   ],
   "scripts": {
+    "preinstall": "node scripts/check-bun.cjs",
     "build": "bun build ./src/cli.ts --compile --outfile=bin/1sat --external pg --external pg-native --external pg-query-stream --external tedious --external oracledb --external mysql",
     "dev": "bun run src/cli.ts",
     "lint": "biome check src"
@@ -23,10 +25,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.107",
+    "@1sat/actions": "0.0.109",
     "@1sat/client": "0.0.24",
     "@1sat/types": "0.0.18",
-    "@1sat/wallet-node": "0.0.38",
+    "@1sat/wallet-node": "0.0.39",
     "@1sat/wallet-server": "0.0.9",
     "@bsv/sdk": "^2.0.13",
     "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@2.1.21-parity-fix.1",

package/scripts/check-bun.cjs

@@ -0,0 +1,17 @@
+#!/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/src/commands/config.ts

@@ -133,8 +133,8 @@ function validateKnownPath(key: string, value: unknown): void {
 			}
 			break
 		case 'server.storage.provider':
-			if (value !== 'bun-sqlite' && value !== 'knex-pg') {
-				fatal("server.storage.provider must be 'bun-sqlite' | 'knex-pg'")
+			if (value !== 'bun-sqlite' && value !== 'pg') {
+				fatal("server.storage.provider must be 'bun-sqlite' | 'pg'")
 			}
 			break
 		case 'server.port':

package/src/commands/remote.ts

@@ -436,7 +436,7 @@ async function remoteTopup(args: string[], opts: GlobalFlags): Promise<void> {
 	})
 
 	try {
-		const result = await topUpStorage(walletResult.wallet, url, { units })
+		const result = await topUpStorage(walletResult.wallet, url)
 
 		if (opts.json) {
 			output(result, opts)
@@ -445,9 +445,7 @@ async function remoteTopup(args: string[], opts: GlobalFlags): Promise<void> {
 
 		console.log()
 		console.log(`  ${bold('Remote:')} ${url}`)
-		console.log(`  ${bold('Units bought:')} ${result.unitsBought}`)
 		console.log(`  ${bold('Sats paid:')} ${result.satsPaid}`)
-		console.log(`  ${bold('Payment txid:')} ${result.txid}`)
 		if (result.status.accountsEnabled) {
 			console.log()
 			console.log(

package/src/commands/serve.ts

@@ -126,9 +126,9 @@ async function resolveServe(opts: GlobalFlags): Promise<ResolvedServe> {
 	const storage: ServerStorageConfig = server.storage ?? {
 		provider: 'bun-sqlite',
 	}
-	if (storage.provider === 'knex-pg' && !storage.dbUrl) {
+	if (storage.provider === 'pg' && !storage.dbUrl) {
 		fatal(
-			'server.storage.provider is knex-pg but server.storage.dbUrl is not set. ' +
+			'server.storage.provider is pg but server.storage.dbUrl is not set. ' +
 				'Set it with: 1sat config set server.storage.dbUrl postgres://…',
 		)
 	}
@@ -171,11 +171,11 @@ function resolveWalletStorageConfig(
 	if (storage.provider === 'bun-sqlite') {
 		return { provider: 'bun-sqlite', filename: resolved.sqliteFilename }
 	}
-	if (storage.provider === 'knex-pg') {
-		return { provider: 'knex-pg', dbUrl: storage.dbUrl }
+	if (storage.provider === 'pg') {
+		return { provider: 'pg', dbUrl: storage.dbUrl }
 	}
 	fatal(
-		`server.storage.provider '${storage.provider}' is not supported. Use 'bun-sqlite' or 'knex-pg'.`,
+		`server.storage.provider '${storage.provider}' is not supported. Use 'bun-sqlite' or 'pg'.`,
 	)
 }
 
@@ -197,7 +197,7 @@ interface Stoppable {
 
 /**
  * Construct the wallet via the same `createNodeWallet` factory the CLI
- * uses, with storage provider (bun-sqlite / knex-pg) chosen from config.
+ * uses, with storage provider (bun-sqlite / pg) chosen from config.
  * Server + monitor operate on that single wallet instance, so
  * `activeRemote`, `backups`, and `storageIdentityKey` behave identically
  * to `1sat wallet <command>`.

package/src/commands/wallet.ts

@@ -353,7 +353,7 @@ async function walletListActions(
 
 	try {
 		const listArgs: Parameters<typeof ctx.wallet.listActions>[0] = {
-			labels: labels.length > 0 ? labels : ['*'], // Default to all labels if none specified
+			labels: labels.length > 0 ? labels : [],
 			limit,
 		}
 

package/src/config.ts

@@ -15,15 +15,15 @@ export interface ServerStorageBunSqliteConfig {
 	provider: 'bun-sqlite'
 }
 
-export interface ServerStorageKnexPgConfig {
-	provider: 'knex-pg'
-	/** Postgres connection URL (required for knex-pg). */
+export interface ServerStoragePgConfig {
+	provider: 'pg'
+	/** Postgres connection URL (required for pg). */
 	dbUrl: string
 }
 
 export type ServerStorageConfig =
 	| ServerStorageBunSqliteConfig
-	| ServerStorageKnexPgConfig
+	| ServerStoragePgConfig
 
 export interface ServerAccountsConfig {
 	/** Master toggle. Defaults to false when omitted. */