@1sat/cli 0.0.131 → 0.0.133

package/dist/cli.js

@@ -1,22 +1,14 @@
 #!/usr/bin/env node
-var __esm = (fn, res, err) => () => {
-  if (fn)
-    try {
-      res = fn(fn = 0);
-    } catch (e) {
-      err = [e];
-    }
-  if (err)
-    throw err[0];
-  return res;
-};
+import { createRequire } from "node:module";
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/args.ts
-function parseGlobalFlags(args) {
+function parseGlobalFlags(args, defaultChain = "main") {
   let json = false;
   let quiet = false;
   let yes = false;
-  let chain = "main";
+  let chain = defaultChain;
   let help = false;
   let version = false;
   const envFiles = [];
@@ -630,11 +622,11 @@ async function handleActionCommand(args, opts) {
 Registered actions:
 `);
     const grouped = new Map;
-    for (const action of actions) {
-      const cat = action.meta.category;
+    for (const action2 of actions) {
+      const cat = action2.meta.category;
       if (!grouped.has(cat))
         grouped.set(cat, []);
-      grouped.get(cat).push(action);
+      grouped.get(cat).push(action2);
     }
     for (const [category, categoryActions] of grouped) {
       console.log(`  ${category}:`);
@@ -1673,7 +1665,7 @@ function createApprovalAuth(wallet) {
     get(target, property) {
       if (property === "createAction")
         return async (...args) => {
-          const satoshis = args[0].outputs?.reduce((sum, output) => sum + output.satoshis, 0) ?? 0;
+          const satoshis = args[0].outputs?.reduce((sum, output2) => sum + output2.satoshis, 0) ?? 0;
           if (!Number.isSafeInteger(satoshis) || satoshis <= 0)
             throw new Error("Invalid HTTP payment amount");
           if (approved === false)
@@ -2197,15 +2189,15 @@ async function handleInitCommand(_args, opts) {
   }
   let wif;
   if (keySource === "generate") {
-    const pk = PrivateKey2.fromRandom();
-    wif = pk.toWif();
-    const address = pk.toPublicKey().toAddress();
+    const pk2 = PrivateKey2.fromRandom();
+    wif = pk2.toWif();
+    const address2 = pk2.toPublicKey().toAddress(chain === "test" ? "test" : "main");
     console.log();
     console.log(formatWarning("  IMPORTANT: Back up your private key!"));
     console.log(formatWarning("  If you lose it, your funds are gone forever."));
     console.log();
     console.log(`  ${formatValue("WIF:")}    ${wif}`);
-    console.log(`  ${formatValue("Address:")} ${address}`);
+    console.log(`  ${formatValue("Address:")} ${address2}`);
     console.log();
     const confirmed = await confirm2({
       message: "Have you saved your private key somewhere safe?"
@@ -2261,7 +2253,7 @@ async function handleInitCommand(_args, opts) {
     storageIdentityKey: storageId
   });
   const pk = PrivateKey2.fromWif(wif);
-  const address = pk.toPublicKey().toAddress();
+  const address = pk.toPublicKey().toAddress(chain === "test" ? "test" : "main");
   outro(formatSuccess(`Wallet configured! Address: ${address}`));
   console.log();
   console.log(`  Want hosted storage? Run ${formatValue("1sat remote add <url>")} to attach a backup remote,`);
@@ -3538,12 +3530,12 @@ async function permissionsRevoke(args, opts) {
   const originator = normalizeOriginator2(origin);
   const { store, path } = openStore(opts);
   if (hasFlag(args, "--all")) {
-    const removed = await store.deleteAllForOriginator(originator);
+    const removed2 = await store.deleteAllForOriginator(originator);
     if (opts.json) {
-      output({ originator, removed, store: path }, opts);
+      output({ originator, removed: removed2, store: path }, opts);
       return;
     }
-    output(`revoked ${removed} grant(s) for ${originator}`, opts);
+    output(`revoked ${removed2} grant(s) for ${originator}`, opts);
     return;
   }
   let specs;
@@ -4267,7 +4259,7 @@ async function resolveServe(opts) {
     fatal("server.storage.provider is pg but server.storage.dbUrl is not set. " + "Set it with: 1sat config set server.storage.dbUrl postgres://…");
   }
   const dataDir = ensureDataDir();
-  const chain = opts.chain ?? config.chain ?? "main";
+  const chain = opts.chain;
   let privateKey;
   try {
     privateKey = await loadKey();
@@ -4693,7 +4685,7 @@ function parseWindow(raw) {
 }
 async function openServeStorage(opts) {
   const config = loadConfig();
-  const chain = opts.chain ?? config.chain ?? "main";
+  const chain = opts.chain;
   const storageConfig = config.server?.storage ?? { provider: "bun-sqlite" };
   const baseOptions = StorageProvider2.createStorageBaseOptions(chain);
   let storage;
@@ -4739,11 +4731,11 @@ function selectedSweepClasses(only, skip) {
     throw new Error("--only and --skip are mutually exclusive");
   }
   if (only) {
-    const selected = parseSweepClasses(only, "--only");
-    if (selected.size === 0) {
+    const selected2 = parseSweepClasses(only, "--only");
+    if (selected2.size === 0) {
       throw new Error("--only requires at least one class");
     }
-    return selected;
+    return selected2;
   }
   const selected = new Set(SWEEP_CLASSES);
   if (skip) {
@@ -4877,13 +4869,13 @@ async function handleSweepCommand(args, opts) {
       }
   }
 }
-function loadSweepKey(args) {
+function loadSweepKey(args, chain) {
   const wif = extractFlag(args, "--wif");
   if (!wif)
     fatal("Missing --wif <private-key>");
   try {
     const pk = PrivateKey4.fromWif(wif);
-    return { wif, address: pk.toPublicKey().toAddress() };
+    return { wif, address: pk.toPublicKey().toAddress(chain) };
   } catch {
     fatal("Invalid WIF private key");
   }
@@ -4966,7 +4958,7 @@ function printInventory(address, plan, opts, mode) {
   ${transferable} transferable UTXO(s) in selected classes.`);
 }
 async function sweepScan(args, opts) {
-  const { address } = loadSweepKey(args);
+  const { address } = loadSweepKey(args, opts.chain);
   const classes = loadClasses(args);
   const privateKey = await loadKey();
   const { ctx, destroy } = await loadContext(privateKey, {
@@ -4982,7 +4974,7 @@ async function sweepScan(args, opts) {
   }
 }
 async function sweepImport(args, opts) {
-  const { wif, address } = loadSweepKey(args);
+  const { wif, address } = loadSweepKey(args, opts.chain);
   const classes = loadClasses(args);
   const dryRun = hasFlag(args, "--dry-run");
   const sweepKey = PrivateKey4.fromWif(wif);
@@ -5840,8 +5832,8 @@ async function walletListOutputs(args, opts) {
 ${result.totalOutputs} total outputs in basket '${basket}':
 `);
       for (const out of result.outputs) {
-        const tags = out.tags?.join(", ") || "none";
-        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags}`);
+        const tags2 = out.tags?.join(", ") || "none";
+        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags2}`);
       }
       console.log();
     }
@@ -6056,6 +6048,7 @@ var init_wallet = __esm(() => {
 });
 
 // src/main.ts
+var exports_main = {};
 import { existsSync as existsSync5 } from "node:fs";
 import { resolve } from "node:path";
 import { config as loadEnv } from "dotenv";
@@ -6072,7 +6065,7 @@ function applyEnvFiles(paths) {
   }
 }
 async function main() {
-  const flags = parseGlobalFlags(rawArgs);
+  const flags = parseGlobalFlags(rawArgs, loadConfig().chain);
   if (flags.envFiles.length > 0) {
     applyEnvFiles(flags.envFiles);
   }
@@ -6185,6 +6178,7 @@ var init_main = __esm(() => {
   init_tokens();
   init_tx();
   init_wallet();
+  init_config();
   init_help();
   init_monitor_once();
   init_output();
@@ -6199,4 +6193,4 @@ var init_main = __esm(() => {
 
 // src/cli.ts
 process.env.DOTENV_CONFIG_QUIET = "true";
-await Promise.resolve().then(() => (init_main(), {}));
+await Promise.resolve().then(() => (init_main(), exports_main));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.131",
+  "version": "0.0.133",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./dist/cli.js",
@@ -27,16 +27,16 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.233",
-    "@1sat/client": "0.0.62",
-    "@1sat/types": "0.0.52",
-    "@1sat/wallet": "0.0.119",
-    "@1sat/wallet-node": "0.0.86",
-    "@1sat/wallet-server": "0.0.64",
+    "@1sat/actions": "0.0.235",
+    "@1sat/client": "0.0.64",
+    "@1sat/types": "0.0.53",
+    "@1sat/wallet": "0.0.121",
+    "@1sat/wallet-node": "0.0.88",
+    "@1sat/wallet-server": "0.0.66",
     "@bopen-io/messagebox-server": "^1.3.2",
     "@bsv/sdk": "^2.6.0",
-    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@2.14.7",
-    "@bsv/wallet-toolbox-client": "npm:@bopen-io/wallet-toolbox-client@2.14.7",
+    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@2.14.8",
+    "@bsv/wallet-toolbox-client": "npm:@bopen-io/wallet-toolbox-client@2.14.8",
     "@clack/prompts": "^0.8.0",
     "bitcoin-backup": "^0.0.11",
     "chalk": "^5.0.0",

package/src/args.ts

@@ -18,12 +18,16 @@ export interface GlobalFlags {
 
 /**
  * Parse global flags from raw argv, returning structured flags and remaining args.
+ * `chain` is `--chain` when given, otherwise `defaultChain` (the configured chain).
  */
-export function parseGlobalFlags(args: string[]): GlobalFlags {
+export function parseGlobalFlags(
+	args: string[],
+	defaultChain: 'main' | 'test' = 'main',
+): GlobalFlags {
 	let json = false
 	let quiet = false
 	let yes = false
-	let chain: 'main' | 'test' = 'main'
+	let chain = defaultChain
 	let help = false
 	let version = false
 	const envFiles: string[] = []

package/src/commands/init.ts

@@ -85,7 +85,9 @@ export async function handleInitCommand(
 	if (keySource === 'generate') {
 		const pk = PrivateKey.fromRandom()
 		wif = pk.toWif()
-		const address = pk.toPublicKey().toAddress()
+		const address = pk
+			.toPublicKey()
+			.toAddress(chain === 'test' ? 'test' : 'main')
 
 		console.log()
 		console.log(formatWarning('  IMPORTANT: Back up your private key!'))
@@ -159,7 +161,7 @@ export async function handleInitCommand(
 	})
 
 	const pk = PrivateKey.fromWif(wif)
-	const address = pk.toPublicKey().toAddress()
+	const address = pk.toPublicKey().toAddress(chain === 'test' ? 'test' : 'main')
 
 	outro(formatSuccess(`Wallet configured! Address: ${address}`))
 

package/src/commands/serve.ts

@@ -163,7 +163,7 @@ async function resolveServe(opts: GlobalFlags): Promise<ResolvedServe> {
 	}
 
 	const dataDir = ensureDataDir()
-	const chain = opts.chain ?? config.chain ?? 'main'
+	const chain = opts.chain
 
 	let privateKey: PrivateKey
 	try {

package/src/commands/storage.ts

@@ -91,7 +91,7 @@ function parseWindow(raw: string): number | undefined {
 /** 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 chain = opts.chain
 	const storageConfig = config.server?.storage ?? { provider: 'bun-sqlite' }
 	const baseOptions = StorageProvider.createStorageBaseOptions(chain)
 

package/src/commands/sweep.ts

@@ -56,12 +56,15 @@ export async function handleSweepCommand(
 	}
 }
 
-function loadSweepKey(args: string[]): { wif: string; address: string } {
+function loadSweepKey(
+	args: string[],
+	chain: 'main' | 'test',
+): { wif: string; address: string } {
 	const wif = extractFlag(args, '--wif')
 	if (!wif) fatal('Missing --wif <private-key>')
 	try {
 		const pk = PrivateKey.fromWif(wif)
-		return { wif, address: pk.toPublicKey().toAddress() }
+		return { wif, address: pk.toPublicKey().toAddress(chain) }
 	} catch {
 		fatal('Invalid WIF private key')
 	}
@@ -174,7 +177,7 @@ function printInventory(
 }
 
 async function sweepScan(args: string[], opts: GlobalFlags): Promise<void> {
-	const { address } = loadSweepKey(args)
+	const { address } = loadSweepKey(args, opts.chain)
 	const classes = loadClasses(args)
 
 	const privateKey = await loadKey()
@@ -192,7 +195,7 @@ async function sweepScan(args: string[], opts: GlobalFlags): Promise<void> {
 }
 
 async function sweepImport(args: string[], opts: GlobalFlags): Promise<void> {
-	const { wif, address } = loadSweepKey(args)
+	const { wif, address } = loadSweepKey(args, opts.chain)
 	const classes = loadClasses(args)
 	const dryRun = hasFlag(args, '--dry-run')
 	const sweepKey = PrivateKey.fromWif(wif)

package/src/main.ts

@@ -30,6 +30,7 @@ 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 { loadConfig } from './config.js'
 import {
 	getCommand,
 	printCommandHelp,
@@ -56,7 +57,7 @@ function applyEnvFiles(paths: string[]): void {
 }
 
 async function main(): Promise<void> {
-	const flags = parseGlobalFlags(rawArgs)
+	const flags = parseGlobalFlags(rawArgs, loadConfig().chain)
 	if (flags.envFiles.length > 0) {
 		applyEnvFiles(flags.envFiles)
 	}