@1sat/cli 0.0.133 → 0.1.1

package/dist/cli.js

@@ -1,7 +1,15 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __esm = (fn, res, err) => () => {
+  if (fn)
+    try {
+      res = fn(fn = 0);
+    } catch (e) {
+      err = [e];
+    }
+  if (err)
+    throw err[0];
+  return res;
+};
 
 // src/args.ts
 function parseGlobalFlags(args, defaultChain = "main") {
@@ -622,11 +630,11 @@ async function handleActionCommand(args, opts) {
 Registered actions:
 `);
     const grouped = new Map;
-    for (const action2 of actions) {
-      const cat = action2.meta.category;
+    for (const action of actions) {
+      const cat = action.meta.category;
       if (!grouped.has(cat))
         grouped.set(cat, []);
-      grouped.get(cat).push(action2);
+      grouped.get(cat).push(action);
     }
     for (const [category, categoryActions] of grouped) {
       console.log(`  ${category}:`);
@@ -658,9 +666,6 @@ Run '1sat action' to list available actions.`);
   try {
     const result = await action.execute(ctx, input);
     output(result, opts);
-    if (actionName === "cancelOwnedListings" && result !== null && typeof result === "object" && "errors" in result && Array.isArray(result.errors) && result.errors.length > 0) {
-      process.exitCode = 1;
-    }
   } finally {
     await destroy();
   }
@@ -1423,11 +1428,11 @@ var init_help = __esm(() => {
     {
       group: "Wallet",
       name: "messagebox",
-      description: "MessageBox inboxes (paymail remittances, BRC-169 handle payments). Not the same as `wallet sync` (address/owner scan).",
+      description: "MessageBox inboxes (paymail remittances; BRC-232 deliveries: 1Color tokens and BRC-169 handle payments). Not the same as `wallet sync` (address/owner scan).",
       subcommands: [
         {
           name: "sync",
-          description: "Pull payment_inbox (default) and internalize paymail payments, then metanet_inbox (BRC-169 handle payments)",
+          description: "Pull payment_inbox (default) and internalize paymail payments, then the transaction-delivery box (BRC-169 handle payments; 1Color tokens, submitted to --overlay first)",
           args: [
             {
               flag: "--url",
@@ -1437,7 +1442,12 @@ var init_help = __esm(() => {
             {
               flag: "--box",
               values: "<name>",
-              description: "Paymail inbox name (default payment_inbox); metanet_inbox is always pulled"
+              description: "Paymail inbox name (default payment_inbox)"
+            },
+            {
+              flag: "--overlay",
+              values: "<url>",
+              description: "BRC-22 overlay that received 1Color tokens are submitted to before internalizing (no default; without it, 1Color deliveries stay in the box)"
             }
           ]
         }
@@ -1665,7 +1675,7 @@ function createApprovalAuth(wallet) {
     get(target, property) {
       if (property === "createAction")
         return async (...args) => {
-          const satoshis = args[0].outputs?.reduce((sum, output2) => sum + output2.satoshis, 0) ?? 0;
+          const satoshis = args[0].outputs?.reduce((sum, output) => sum + output.satoshis, 0) ?? 0;
           if (!Number.isSafeInteger(satoshis) || satoshis <= 0)
             throw new Error("Invalid HTTP payment amount");
           if (approved === false)
@@ -2189,15 +2199,15 @@ async function handleInitCommand(_args, opts) {
   }
   let wif;
   if (keySource === "generate") {
-    const pk2 = PrivateKey2.fromRandom();
-    wif = pk2.toWif();
-    const address2 = pk2.toPublicKey().toAddress(chain === "test" ? "test" : "main");
+    const pk = PrivateKey2.fromRandom();
+    wif = pk.toWif();
+    const address = pk.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:")} ${address2}`);
+    console.log(`  ${formatValue("Address:")} ${address}`);
     console.log();
     const confirmed = await confirm2({
       message: "Have you saved your private key somewhere safe?"
@@ -2614,7 +2624,7 @@ var init_mcp_proxy = __esm(() => {
 });
 
 // src/commands/messagebox.ts
-import { syncMessages, syncMetanetInbox } from "@1sat/actions";
+import { syncMessages, syncTransactionInbox } from "@1sat/actions";
 async function handleMessageboxCommand(args, opts) {
   const [subcommand, ...rest] = args;
   switch (subcommand) {
@@ -2630,6 +2640,7 @@ async function handleMessageboxCommand(args, opts) {
 async function messageboxSync(args, opts) {
   const url = extractFlag(args, "--url");
   const box = extractFlag(args, "--box");
+  const overlay = extractFlag(args, "--overlay");
   const privateKey = await loadKey();
   const { ctx, destroy } = await loadContext(privateKey, {
     chain: opts.chain
@@ -2639,8 +2650,9 @@ async function messageboxSync(args, opts) {
       ...url ? { messageboxUrl: url } : {},
       ...box ? { messageBox: box } : {}
     });
-    const metanet = await syncMetanetInbox.execute(ctx, {
-      ...url ? { messageboxUrl: url } : {}
+    const metanet = await syncTransactionInbox.execute(ctx, {
+      ...url ? { messageboxUrl: url } : {},
+      ...overlay ? { overlay } : {}
     });
     if (opts.json) {
       output({ ...result, metanet }, opts);
@@ -2648,7 +2660,7 @@ async function messageboxSync(args, opts) {
     }
     console.log(`
 processed: ${result.processed}  failed: ${result.failed}`);
-    console.log(`metanet_inbox: received ${metanet.received.length}  skipped ${metanet.skipped.length}${metanet.error ? `  error: ${metanet.error}` : ""}`);
+    console.log(`transaction-delivery: received ${metanet.received.length}  skipped ${metanet.skipped.length}${metanet.error ? `  error: ${metanet.error}` : ""}`);
     for (const s of metanet.skipped) {
       console.log(`  skipped ${s.messageId}: ${s.reason}`);
     }
@@ -2676,7 +2688,7 @@ import {
   sellOpns,
   sendOpns
 } from "@1sat/actions";
-import { P1SAT_PROTOCOL } from "@1sat/types";
+import { ORDLOCK_V2_TAG, P1SAT_PROTOCOL } from "@1sat/types";
 import { confirm as confirm4, isCancel as isCancel5 } from "@clack/prompts";
 async function handleOpnsCommand(args, opts) {
   const [subcommand, ...rest] = args;
@@ -2793,7 +2805,7 @@ async function opnsLookup(args, opts) {
       const nameTag = getDisplayValue(o, "name", "name") ?? "";
       const publishedTag = o.tags?.find((t) => t === "opns:published");
       const status = publishedTag ? "registered" : "unregistered";
-      const price = o.tags?.some((t) => t === "ordlock") ? o.tags?.find((t) => t.startsWith("price:"))?.slice("price:".length) ?? "?" : undefined;
+      const price = o.tags?.some((t) => t === ORDLOCK_V2_TAG) ? o.tags?.find((t) => t.startsWith("price:"))?.slice("price:".length) ?? "?" : undefined;
       const listed = price ? `  ${formatLabel(`listed @ ${price}`)}` : "";
       console.log(`  ${formatValue(id)}  ${formatValue(o.outpoint)}  ${nameTag ? formatValue(nameTag) : ""}  ${formatLabel(status)}${listed}`);
     }
@@ -3530,12 +3542,12 @@ async function permissionsRevoke(args, opts) {
   const originator = normalizeOriginator2(origin);
   const { store, path } = openStore(opts);
   if (hasFlag(args, "--all")) {
-    const removed2 = await store.deleteAllForOriginator(originator);
+    const removed = await store.deleteAllForOriginator(originator);
     if (opts.json) {
-      output({ originator, removed: removed2, store: path }, opts);
+      output({ originator, removed, store: path }, opts);
       return;
     }
-    output(`revoked ${removed2} grant(s) for ${originator}`, opts);
+    output(`revoked ${removed} grant(s) for ${originator}`, opts);
     return;
   }
   let specs;
@@ -4731,11 +4743,11 @@ function selectedSweepClasses(only, skip) {
     throw new Error("--only and --skip are mutually exclusive");
   }
   if (only) {
-    const selected2 = parseSweepClasses(only, "--only");
-    if (selected2.size === 0) {
+    const selected = parseSweepClasses(only, "--only");
+    if (selected.size === 0) {
       throw new Error("--only requires at least one class");
     }
-    return selected2;
+    return selected;
   }
   const selected = new Set(SWEEP_CLASSES);
   if (skip) {
@@ -5832,8 +5844,8 @@ async function walletListOutputs(args, opts) {
 ${result.totalOutputs} total outputs in basket '${basket}':
 `);
       for (const out of result.outputs) {
-        const tags2 = out.tags?.join(", ") || "none";
-        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags2}`);
+        const tags = out.tags?.join(", ") || "none";
+        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags}`);
       }
       console.log();
     }
@@ -6048,7 +6060,6 @@ 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";
@@ -6193,4 +6204,4 @@ var init_main = __esm(() => {
 
 // src/cli.ts
 process.env.DOTENV_CONFIG_QUIET = "true";
-await Promise.resolve().then(() => (init_main(), exports_main));
+await Promise.resolve().then(() => (init_main(), {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.133",
+  "version": "0.1.1",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./dist/cli.js",
@@ -27,16 +27,16 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@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",
+    "@1sat/actions": "0.1.1",
+    "@1sat/client": "0.1.1",
+    "@1sat/types": "0.1.1",
+    "@1sat/wallet": "0.1.1",
+    "@1sat/wallet-node": "0.1.1",
+    "@1sat/wallet-server": "0.1.1",
     "@bopen-io/messagebox-server": "^1.3.2",
-    "@bsv/sdk": "^2.6.0",
-    "@bsv/wallet-toolbox": "npm:@bopen-io/wallet-toolbox@2.14.8",
-    "@bsv/wallet-toolbox-client": "npm:@bopen-io/wallet-toolbox-client@2.14.8",
+    "@bsv/sdk": "^4.0.0",
+    "@bsv/wallet-toolbox": "^2.15.0",
+    "@bsv/wallet-toolbox-client": "^2.15.0",
     "@clack/prompts": "^0.8.0",
     "bitcoin-backup": "^0.0.11",
     "chalk": "^5.0.0",

package/src/commands/action.ts

@@ -73,16 +73,6 @@ export async function handleActionCommand(
 	try {
 		const result = await action.execute(ctx, input)
 		output(result, opts)
-		if (
-			actionName === 'cancelOwnedListings' &&
-			result !== null &&
-			typeof result === 'object' &&
-			'errors' in result &&
-			Array.isArray(result.errors) &&
-			result.errors.length > 0
-		) {
-			process.exitCode = 1
-		}
 	} finally {
 		await destroy()
 	}

package/src/commands/messagebox.ts

@@ -1,11 +1,12 @@
 /**
- * MessageBox commands — pull paymail / P2P inbox and BRC-169 handle
- * payments (`metanet_inbox`) into the wallet.
+ * MessageBox commands — pull the paymail / P2P inbox and the
+ * `transaction-delivery` box (BRC-232 deliveries, 1Color tokens, BRC-169
+ * handle payments) into the wallet.
  *
- *   1sat messagebox sync [--url <host>] [--box <name>]
+ *   1sat messagebox sync [--url <host>] [--box <name>] [--overlay <url>]
  */
 
-import { syncMessages, syncMetanetInbox } from '@1sat/actions'
+import { syncMessages, syncTransactionInbox } from '@1sat/actions'
 import type { GlobalFlags } from '../args.js'
 import { extractFlag } from '../args.js'
 import { loadContext } from '../context.js'
@@ -36,6 +37,7 @@ async function messageboxSync(
 ): Promise<void> {
 	const url = extractFlag(args, '--url')
 	const box = extractFlag(args, '--box')
+	const overlay = extractFlag(args, '--overlay')
 
 	const privateKey = await loadKey()
 	const { ctx, destroy } = await loadContext(privateKey, {
@@ -47,8 +49,11 @@ async function messageboxSync(
 			...(url ? { messageboxUrl: url } : {}),
 			...(box ? { messageBox: box } : {}),
 		})
-		const metanet = await syncMetanetInbox.execute(ctx, {
+		// 1Color receipts need an overlay to submit to; without one they stay
+		// in the box (overlay-required) and everything else is processed.
+		const metanet = await syncTransactionInbox.execute(ctx, {
 			...(url ? { messageboxUrl: url } : {}),
+			...(overlay ? { overlay } : {}),
 		})
 
 		if (opts.json) {
@@ -58,7 +63,7 @@ async function messageboxSync(
 
 		console.log(`\nprocessed: ${result.processed}  failed: ${result.failed}`)
 		console.log(
-			`metanet_inbox: received ${metanet.received.length}  skipped ${metanet.skipped.length}${metanet.error ? `  error: ${metanet.error}` : ''}`,
+			`transaction-delivery: received ${metanet.received.length}  skipped ${metanet.skipped.length}${metanet.error ? `  error: ${metanet.error}` : ''}`,
 		)
 		for (const s of metanet.skipped) {
 			console.log(`  skipped ${s.messageId}: ${s.reason}`)

package/src/commands/opns.ts

@@ -13,7 +13,7 @@ import {
 	sellOpns,
 	sendOpns,
 } from '@1sat/actions'
-import { P1SAT_PROTOCOL } from '@1sat/types'
+import { ORDLOCK_V2_TAG, P1SAT_PROTOCOL } from '@1sat/types'
 import { confirm, isCancel } from '@clack/prompts'
 import type { GlobalFlags } from '../args.js'
 import { extractFlag } from '../args.js'
@@ -160,7 +160,7 @@ async function opnsLookup(args: string[], opts: GlobalFlags): Promise<void> {
 			const nameTag = getDisplayValue(o, 'name', 'name') ?? ''
 			const publishedTag = o.tags?.find((t) => t === 'opns:published')
 			const status = publishedTag ? 'registered' : 'unregistered'
-			const price = o.tags?.some((t) => t === 'ordlock')
+			const price = o.tags?.some((t) => t === ORDLOCK_V2_TAG)
 				? (o.tags
 						?.find((t) => t.startsWith('price:'))
 						?.slice('price:'.length) ?? '?')

package/src/help.ts

@@ -671,12 +671,12 @@ export const COMMANDS: CommandSpec[] = [
 		group: 'Wallet',
 		name: 'messagebox',
 		description:
-			'MessageBox inboxes (paymail remittances, BRC-169 handle payments). Not the same as `wallet sync` (address/owner scan).',
+			'MessageBox inboxes (paymail remittances; BRC-232 deliveries: 1Color tokens and BRC-169 handle payments). Not the same as `wallet sync` (address/owner scan).',
 		subcommands: [
 			{
 				name: 'sync',
 				description:
-					'Pull payment_inbox (default) and internalize paymail payments, then metanet_inbox (BRC-169 handle payments)',
+					'Pull payment_inbox (default) and internalize paymail payments, then the transaction-delivery box (BRC-169 handle payments; 1Color tokens, submitted to --overlay first)',
 				args: [
 					{
 						flag: '--url',
@@ -687,8 +687,13 @@ export const COMMANDS: CommandSpec[] = [
 					{
 						flag: '--box',
 						values: '<name>',
+						description: 'Paymail inbox name (default payment_inbox)',
+					},
+					{
+						flag: '--overlay',
+						values: '<url>',
 						description:
-							'Paymail inbox name (default payment_inbox); metanet_inbox is always pulled',
+							'BRC-22 overlay that received 1Color tokens are submitted to before internalizing (no default; without it, 1Color deliveries stay in the box)',
 					},
 				],
 			},