@did-btcr2/cli 0.20.0 → 0.21.0

package/dist/cjs/index.js

@@ -2294,51 +2294,40 @@ function parseGenesisBytes(hex, type) {
 }
 
 // src/commands/resolve.ts
+var import_api5 = require("@did-btcr2/api");
+
+// src/resolution-options.ts
 var import_api4 = require("@did-btcr2/api");
 var import_promises = require("fs/promises");
-function registerResolveCommand(program, factory, globals) {
-  program.command("resolve").alias("read").description("Resolve the DID document of the identifier.").requiredOption("-i, --identifier <identifier>", "did:btcr2 identifier").option("-r, --resolution-options <json>", "JSON string containing resolution options").option("-p, --resolution-options-path <path>", "Path to a JSON file containing resolution options").option(
-    "--min-conf <n>",
-    `Minimum block confirmations a beacon signal needs before resolution applies it (positive integer, default: ${import_api4.DEFAULT_MIN_CONF}). Overrides minConf inside -r/-p`,
-    parseMinConf
-  ).action(async (options) => {
-    const parsed = await validateResolveOptions(options);
-    const network = deriveNetwork(parsed.identifier);
-    const api = factory(network, globals());
-    const data = await api.resolveDid(parsed.identifier, parsed.options);
-    const result = { action: "resolve", data };
-    console.log(formatResult(result, globals()));
-  });
-}
-async function validateResolveOptions(options) {
-  import_api4.Identifier.decode(options.identifier);
-  let resolutionOptions = void 0;
-  if (options.resolutionOptions) {
+var MIN_CONF_HELP = `Minimum block confirmations a beacon signal needs before resolution applies it (positive integer, default: ${import_api4.DEFAULT_MIN_CONF}). Overrides a minConf inside the JSON resolution options`;
+async function readResolutionOptions(flags) {
+  let resolutionOptions;
+  if (flags.resolutionOptions) {
     try {
-      resolutionOptions = JSON.parse(options.resolutionOptions);
+      resolutionOptions = JSON.parse(flags.resolutionOptions);
     } catch {
       throw new CLIError(
         "Invalid resolution options. Must be a valid JSON string.",
         "INVALID_ARGUMENT_ERROR",
-        options
+        { resolutionOptions: flags.resolutionOptions }
       );
     }
-  } else if (options.resolutionOptionsPath) {
+  } else if (flags.resolutionOptionsPath) {
     try {
-      const content = await (0, import_promises.readFile)(options.resolutionOptionsPath, "utf-8");
+      const content = await (0, import_promises.readFile)(flags.resolutionOptionsPath, "utf-8");
       resolutionOptions = JSON.parse(content);
     } catch {
       throw new CLIError(
         "Invalid resolution options path. Must be a valid path to a JSON file.",
         "INVALID_ARGUMENT_ERROR",
-        options
+        { resolutionOptionsPath: flags.resolutionOptionsPath }
       );
     }
   }
-  if (options.minConf !== void 0) {
-    resolutionOptions = { ...resolutionOptions ?? {}, minConf: options.minConf };
+  if (flags.minConf !== void 0) {
+    resolutionOptions = { ...resolutionOptions ?? {}, minConf: flags.minConf };
   }
-  return { identifier: options.identifier, options: resolutionOptions };
+  return resolutionOptions;
 }
 function parseMinConf(value) {
   if (!/^[1-9]\d*$/.test(value)) {
@@ -2351,28 +2340,47 @@ function parseMinConf(value) {
   return Number(value);
 }
 
-// src/commands/update.ts
+// src/commands/resolve.ts
+function registerResolveCommand(program, factory, globals) {
+  program.command("resolve").alias("read").description("Resolve the DID document of the identifier.").requiredOption("-i, --identifier <identifier>", "did:btcr2 identifier").option("-r, --resolution-options <json>", "JSON string containing resolution options").option("-p, --resolution-options-path <path>", "Path to a JSON file containing resolution options").option("--min-conf <n>", MIN_CONF_HELP, parseMinConf).action(async (options) => {
+    const parsed = await validateResolveOptions(options);
+    const network = deriveNetwork(parsed.identifier);
+    const api = factory(network, globals());
+    const data = await api.resolveDid(parsed.identifier, parsed.options);
+    const result = { action: "resolve", data };
+    console.log(formatResult(result, globals()));
+  });
+}
+async function validateResolveOptions(options) {
+  import_api5.Identifier.decode(options.identifier);
+  const resolutionOptions = await readResolutionOptions(options);
+  return { identifier: options.identifier, options: resolutionOptions };
+}
+
+// src/commands/write.ts
 var import_key_manager2 = require("@did-btcr2/key-manager");
-function registerUpdateCommand(program, factory, globals) {
-  program.command("update").description("Update a did:btcr2 document.").requiredOption(
+function registerWriteOptions(command) {
+  return command.option(
     "-s, --source-document <json>",
-    "Source DID document as JSON string",
+    "Source DID document as a JSON string. Requires --source-version-id. Omit both to resolve the current document first",
     parseJsonArg("--source-document")
-  ).requiredOption(
+  ).option(
     "--source-version-id <number>",
-    "Source version ID as a number"
-  ).requiredOption(
-    "-p, --patches <json>",
-    "JSON Patch operations as a JSON string array",
-    parseJsonArg("--patches")
-  ).requiredOption(
+    "Version ID of the source document, a non-negative integer. Requires --source-document",
+    parseSourceVersionId
+  ).option(
     "-m, --verification-method-id <id>",
-    "DID document verification method ID"
-  ).requiredOption(
-    "-b, --beacon-id <json>",
-    "Beacon ID as a JSON string",
-    parseJsonArg("--beacon-id")
+    "Verification method that signs the update (default: the one method of the document that publishes the signing key)"
   ).option(
+    "-b, --beacon-id <id>",
+    "Beacon service that announces the update, as a DID URL (default: the only beacon of the document, else the one beacon with a spendable UTXO)"
+  ).option(
+    "-r, --resolution-options <json>",
+    "Resolution options as a JSON string, for the resolution of the source document"
+  ).option(
+    "--resolution-options-path <path>",
+    "Path to a JSON file with resolution options, for the resolution of the source document"
+  ).option("--min-conf <n>", MIN_CONF_HELP, parseMinConf).option(
     "--publish-to-cas <mode>",
     "Publish update artifacts to a writable CAS before broadcast: auto|always|never. CAS publication is optional; the default distributes the returned artifacts via sidecar.",
     parsePublishToCasMode,
@@ -2383,51 +2391,62 @@ function registerUpdateCommand(program, factory, globals) {
   ).option(
     "--change-address <address>",
     "Send transaction change to this address instead of the beacon address, so a DID's announcements are not linked on-chain (ADR 044)."
-  ).action(async (options) => {
-    if (!/^\d+$/.test(options.sourceVersionId)) {
-      throw new CLIError(
-        "--source-version-id must be a non-negative integer.",
-        "INVALID_ARGUMENT_ERROR",
-        { value: options.sourceVersionId }
-      );
-    }
-    const parsed = {
+  );
+}
+async function prepareWrite(options, factory, g) {
+  const did = options.identifier;
+  const network = deriveNetwork(did);
+  const hasDocument = options.sourceDocument !== void 0;
+  const hasVersion = options.sourceVersionId !== void 0;
+  if (hasDocument !== hasVersion) {
+    throw new CLIError(
+      "Provide both --source-document and --source-version-id, or neither. Omit both to resolve the current document first.",
+      "INVALID_ARGUMENT_ERROR",
+      { did }
+    );
+  }
+  const hasResolutionFlags = options.resolutionOptions !== void 0 || options.resolutionOptionsPath !== void 0 || options.minConf !== void 0;
+  if (hasDocument && hasResolutionFlags) {
+    throw new CLIError(
+      "--resolution-options, --resolution-options-path, and --min-conf apply only when --source-document and --source-version-id are omitted. A supplied source pair skips resolution.",
+      "INVALID_ARGUMENT_ERROR",
+      { did }
+    );
+  }
+  assertKeystoreAllowedForNetwork(network, g);
+  const resolutionOptions = await readResolutionOptions(options);
+  const api = factory(network, g);
+  const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(g));
+  const signer = new import_key_manager2.KeyManagerSigner(api.kms.kms, keyId);
+  const broadcastOptions = resolveBroadcastOptions(network, g, {
+    feeRate: options.feeRate,
+    changeAddress: options.changeAddress
+  });
+  return {
+    network,
+    api,
+    params: {
+      did,
+      signer,
       sourceDocument: options.sourceDocument,
-      patches: options.patches,
-      sourceVersionId: Number(options.sourceVersionId),
+      sourceVersionId: options.sourceVersionId,
       verificationMethodId: options.verificationMethodId,
-      beaconId: options.beaconId
-    };
-    const did = parsed.sourceDocument?.id;
-    if (!did) {
-      throw new CLIError(
-        'Source document must contain an "id" field.',
-        "INVALID_ARGUMENT_ERROR",
-        options
-      );
-    }
-    const network = deriveNetwork(did);
-    assertKeystoreAllowedForNetwork(network, globals());
-    const api = factory(network, globals());
-    const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(globals()));
-    const signer = new import_key_manager2.KeyManagerSigner(api.kms.kms, keyId);
-    const broadcastOptions = resolveBroadcastOptions(network, globals(), {
-      feeRate: options.feeRate,
-      changeAddress: options.changeAddress
-    });
-    const data = await api.btcr2.update({
-      sourceDocument: parsed.sourceDocument,
-      patches: parsed.patches,
-      sourceVersionId: parsed.sourceVersionId,
-      verificationMethodId: parsed.verificationMethodId,
-      beaconId: parsed.beaconId,
-      signer,
+      beaconId: options.beaconId,
+      resolutionOptions,
       publishToCas: options.publishToCas,
-      ...broadcastOptions ? { broadcastOptions } : {}
-    });
-    console.log(formatResult({ action: "update", data }, globals()));
-    printWatchHint(globals(), network, data.txid);
-  });
+      broadcastOptions
+    }
+  };
+}
+function parseSourceVersionId(value) {
+  if (!/^\d+$/.test(value)) {
+    throw new CLIError(
+      "--source-version-id must be a non-negative integer.",
+      "INVALID_ARGUMENT_ERROR",
+      { value }
+    );
+  }
+  return Number(value);
 }
 function parsePublishToCasMode(value) {
   if (value !== "auto" && value !== "always" && value !== "never") {
@@ -2453,104 +2472,33 @@ function parseJsonArg(flagName) {
   };
 }
 
+// src/commands/update.ts
+function registerUpdateCommand(program, factory, globals) {
+  const command = program.command("update").description("Update a did:btcr2 document.").requiredOption("-i, --identifier <identifier>", "did:btcr2 identifier to update").requiredOption(
+    "-p, --patches <json>",
+    "JSON Patch operations as a JSON string array",
+    parseJsonArg("--patches")
+  );
+  registerWriteOptions(command).action(async (options) => {
+    const g = globals();
+    const { network, api, params } = await prepareWrite(options, factory, g);
+    const data = await api.updateDid({ ...params, patches: options.patches });
+    console.log(formatResult({ action: "update", data }, g));
+    printWatchHint(g, network, data.txid);
+  });
+}
+
 // src/commands/deactivate.ts
-var import_key_manager3 = require("@did-btcr2/key-manager");
-var DEACTIVATION_PATCH = [{ op: "add", path: "/deactivated", value: true }];
 function registerDeactivateCommand(program, factory, globals) {
-  program.command("deactivate").alias("delete").description("Deactivate the did:btcr2 identifier permanently. This is irreversible.").requiredOption(
-    "-s, --source-document <json>",
-    "Current DID document as JSON string",
-    parseJsonArg2("--source-document")
-  ).requiredOption(
-    "--source-version-id <number>",
-    "Current version ID of the DID document"
-  ).requiredOption(
-    "-m, --verification-method-id <id>",
-    "DID document verification method ID used to sign the deactivation"
-  ).requiredOption(
-    "-b, --beacon-id <json>",
-    "Beacon ID as a JSON string",
-    parseJsonArg2("--beacon-id")
-  ).option(
-    "--publish-to-cas <mode>",
-    "Publish update artifacts to a writable CAS before broadcast: auto|always|never. CAS publication is optional; the default distributes the returned artifacts via sidecar.",
-    parsePublishToCasMode2,
-    "never"
-  ).option(
-    "--fee-rate <satsPerVByte>",
-    "Fee rate in sats/vByte for the beacon transaction (default: 5). Raise it under congestion so the transaction confirms."
-  ).option(
-    "--change-address <address>",
-    "Send transaction change to this address instead of the beacon address, so a DID's announcements are not linked on-chain (ADR 044)."
-  ).action(async (options) => {
-    if (!/^\d+$/.test(options.sourceVersionId)) {
-      throw new CLIError(
-        "--source-version-id must be a non-negative integer.",
-        "INVALID_ARGUMENT_ERROR",
-        { value: options.sourceVersionId }
-      );
-    }
-    const parsed = {
-      sourceDocument: options.sourceDocument,
-      patches: DEACTIVATION_PATCH,
-      sourceVersionId: Number(options.sourceVersionId),
-      verificationMethodId: options.verificationMethodId,
-      beaconId: options.beaconId
-    };
-    const did = parsed.sourceDocument?.id;
-    if (!did) {
-      throw new CLIError(
-        'Source document must contain an "id" field.',
-        "INVALID_ARGUMENT_ERROR",
-        options
-      );
-    }
-    const network = deriveNetwork(did);
-    assertKeystoreAllowedForNetwork(network, globals());
-    const api = factory(network, globals());
-    const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(globals()));
-    const signer = new import_key_manager3.KeyManagerSigner(api.kms.kms, keyId);
-    const broadcastOptions = resolveBroadcastOptions(network, globals(), {
-      feeRate: options.feeRate,
-      changeAddress: options.changeAddress
-    });
-    const data = await api.btcr2.update({
-      sourceDocument: parsed.sourceDocument,
-      patches: parsed.patches,
-      sourceVersionId: parsed.sourceVersionId,
-      verificationMethodId: parsed.verificationMethodId,
-      beaconId: parsed.beaconId,
-      signer,
-      publishToCas: options.publishToCas,
-      ...broadcastOptions ? { broadcastOptions } : {}
-    });
-    console.log(formatResult({ action: "deactivate", data }, globals()));
-    printWatchHint(globals(), network, data.txid);
+  const command = program.command("deactivate").alias("delete").description("Deactivate the did:btcr2 identifier permanently. This is irreversible.").requiredOption("-i, --identifier <identifier>", "did:btcr2 identifier to deactivate");
+  registerWriteOptions(command).action(async (options) => {
+    const g = globals();
+    const { network, api, params } = await prepareWrite(options, factory, g);
+    const data = await api.deactivateDid(params);
+    console.log(formatResult({ action: "deactivate", data }, g));
+    printWatchHint(g, network, data.txid);
   });
 }
-function parsePublishToCasMode2(value) {
-  if (value !== "auto" && value !== "always" && value !== "never") {
-    throw new CLIError(
-      '--publish-to-cas must be one of "auto", "always", or "never".',
-      "INVALID_ARGUMENT_ERROR",
-      { value }
-    );
-  }
-  return value;
-}
-function parseJsonArg2(flagName) {
-  return (value) => {
-    try {
-      return JSON.parse(value);
-    } catch {
-      throw new CLIError(
-        `Invalid JSON for ${flagName}. Must be a valid JSON string.`,
-        "INVALID_ARGUMENT_ERROR",
-        { flagName, value }
-      );
-    }
-  };
-}
 
 // src/commands/key.ts
 var import_keypair = require("@did-btcr2/keypair");

package/dist/esm/src/commands/deactivate.js

@@ -1,98 +1,21 @@
-import { KeyManagerSigner } from '@did-btcr2/key-manager';
-import { assertKeystoreAllowedForNetwork, deriveNetwork, resolveBroadcastOptions, resolveSigningKeyRef } from '../config.js';
-import { CLIError } from '../error.js';
 import { printWatchHint } from '../hints.js';
-import { resolveKeyRef } from '../keystore/resolve-key-ref.js';
 import { formatResult } from '../output.js';
-/** The JSON Patch that marks a DID document as permanently deactivated. */
-const DEACTIVATION_PATCH = [{ op: 'add', path: '/deactivated', value: true }];
+import { prepareWrite, registerWriteOptions } from './write.js';
 export function registerDeactivateCommand(program, factory, globals) {
-    program
+    const command = program
         .command('deactivate')
         .alias('delete')
         .description('Deactivate the did:btcr2 identifier permanently. This is irreversible.')
-        .requiredOption('-s, --source-document <json>', 'Current DID document as JSON string', parseJsonArg('--source-document'))
-        .requiredOption('--source-version-id <number>', 'Current version ID of the DID document')
-        .requiredOption('-m, --verification-method-id <id>', 'DID document verification method ID used to sign the deactivation')
-        .requiredOption('-b, --beacon-id <json>', 'Beacon ID as a JSON string', parseJsonArg('--beacon-id'))
-        .option('--publish-to-cas <mode>', 'Publish update artifacts to a writable CAS before broadcast: auto|always|never. '
-        + 'CAS publication is optional; the default distributes the returned artifacts via sidecar.', parsePublishToCasMode, 'never')
-        .option('--fee-rate <satsPerVByte>', 'Fee rate in sats/vByte for the beacon transaction (default: 5). '
-        + 'Raise it under congestion so the transaction confirms.')
-        .option('--change-address <address>', 'Send transaction change to this address instead of the beacon address, '
-        + 'so a DID\'s announcements are not linked on-chain (ADR 044).')
+        .requiredOption('-i, --identifier <identifier>', 'did:btcr2 identifier to deactivate');
+    registerWriteOptions(command)
         .action(async (options) => {
-        if (!/^\d+$/.test(options.sourceVersionId)) {
-            throw new CLIError('--source-version-id must be a non-negative integer.', 'INVALID_ARGUMENT_ERROR', { value: options.sourceVersionId });
-        }
-        const parsed = {
-            sourceDocument: options.sourceDocument,
-            patches: DEACTIVATION_PATCH,
-            sourceVersionId: Number(options.sourceVersionId),
-            verificationMethodId: options.verificationMethodId,
-            beaconId: options.beaconId,
-        };
-        const did = parsed.sourceDocument?.id;
-        if (!did) {
-            throw new CLIError('Source document must contain an "id" field.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-        // Deactivation is an update that applies the deactivation patch. The core
-        // method has no separate deactivate path, so this routes through update.
-        const network = deriveNetwork(did);
-        // Refuse to sign a mainnet deactivation with an unencrypted dev keystore (ADR 080).
-        assertKeystoreAllowedForNetwork(network, globals());
-        const api = factory(network, globals());
-        const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(globals()));
-        const signer = new KeyManagerSigner(api.kms.kms, keyId);
-        // Resolve fee-rate/change-address through the flag -> env -> profile chain
-        // into beacon broadcast options. Undefined when neither is set, so the
-        // SDK defaults (5 sat/vB, change back to the beacon address) still apply.
-        const broadcastOptions = resolveBroadcastOptions(network, globals(), {
-            feeRate: options.feeRate,
-            changeAddress: options.changeAddress,
-        });
-        // CAS publication is optional and never required: every beacon update can
-        // be completed and shared via sidecar alone. It is opt-in and defaults to
-        // 'never'; pass --publish-to-cas auto|always to publish the signed update
-        // (and, for CAS beacons, the announcement) to a writable CAS configured
-        // via --cas-rpc-url. The returned artifacts (txid, announcement, proof)
-        // are always printed for sidecar distribution regardless.
-        const data = await api.btcr2.update({
-            sourceDocument: parsed.sourceDocument,
-            patches: parsed.patches,
-            sourceVersionId: parsed.sourceVersionId,
-            verificationMethodId: parsed.verificationMethodId,
-            beaconId: parsed.beaconId,
-            signer,
-            publishToCas: options.publishToCas,
-            ...(broadcastOptions ? { broadcastOptions } : {}),
-        });
-        console.log(formatResult({ action: 'deactivate', data }, globals()));
-        printWatchHint(globals(), network, data.txid);
+        const g = globals();
+        const { network, api, params } = await prepareWrite(options, factory, g);
+        // The api supplies the deactivation patch (ADR 094) and refuses a
+        // document that is deactivated already (ADR 100).
+        const data = await api.deactivateDid(params);
+        console.log(formatResult({ action: 'deactivate', data }, g));
+        printWatchHint(g, network, data.txid);
     });
 }
-/**
- * Commander argParser for `--publish-to-cas`. Validates the value is one of the
- * three {@link PublishToCasMode} policies, erroring at parse time otherwise.
- */
-function parsePublishToCasMode(value) {
-    if (value !== 'auto' && value !== 'always' && value !== 'never') {
-        throw new CLIError('--publish-to-cas must be one of "auto", "always", or "never".', 'INVALID_ARGUMENT_ERROR', { value });
-    }
-    return value;
-}
-/**
- * Returns a commander argParser that validates JSON.
- * Errors at parse time with a clear flag reference.
- */
-function parseJsonArg(flagName) {
-    return (value) => {
-        try {
-            return JSON.parse(value);
-        }
-        catch {
-            throw new CLIError(`Invalid JSON for ${flagName}. Must be a valid JSON string.`, 'INVALID_ARGUMENT_ERROR', { flagName, value });
-        }
-    };
-}
 //# sourceMappingURL=deactivate.js.map

package/dist/esm/src/commands/deactivate.js.map

@@ -1 +1 @@
-{"version":3,"file":"deactivate.js","sourceRoot":"","sources":["../../../../src/commands/deactivate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deactivate.js","sourceRoot":"","sources":["../../../../src/commands/deactivate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAmB,MAAM,YAAY,CAAC;AAEjF,MAAM,UAAU,yBAAyB,CACvC,OAAiB,EACjB,OAAoB,EACpB,OAA6B;IAE7B,MAAM,OAAO,GAAG,OAAO;SACpB,OAAO,CAAC,YAAY,CAAC;SACrB,KAAK,CAAC,QAAQ,CAAC;SACf,WAAW,CAAC,wEAAwE,CAAC;SACrF,cAAc,CAAC,+BAA+B,EAAE,oCAAoC,CAAC,CAAC;IACzF,oBAAoB,CAAC,OAAO,CAAC;SAC1B,MAAM,CAAC,KAAK,EAAE,OAAmB,EAAE,EAAE;QACpC,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACzE,kEAAkE;QAClE,kDAAkD;QAClD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/esm/src/commands/resolve.js

@@ -1,8 +1,7 @@
-import { DEFAULT_MIN_CONF, Identifier } from '@did-btcr2/api';
-import { readFile } from 'node:fs/promises';
+import { Identifier } from '@did-btcr2/api';
 import { deriveNetwork } from '../config.js';
-import { CLIError } from '../error.js';
 import { formatResult } from '../output.js';
+import { MIN_CONF_HELP, parseMinConf, readResolutionOptions } from '../resolution-options.js';
 export function registerResolveCommand(program, factory, globals) {
     program
         .command('resolve')
@@ -11,8 +10,7 @@ export function registerResolveCommand(program, factory, globals) {
         .requiredOption('-i, --identifier <identifier>', 'did:btcr2 identifier')
         .option('-r, --resolution-options <json>', 'JSON string containing resolution options')
         .option('-p, --resolution-options-path <path>', 'Path to a JSON file containing resolution options')
-        .option('--min-conf <n>', 'Minimum block confirmations a beacon signal needs before resolution applies it '
-        + `(positive integer, default: ${DEFAULT_MIN_CONF}). Overrides minConf inside -r/-p`, parseMinConf)
+        .option('--min-conf <n>', MIN_CONF_HELP, parseMinConf)
         .action(async (options) => {
         const parsed = await validateResolveOptions(options);
         const network = deriveNetwork(parsed.identifier);
@@ -25,38 +23,7 @@ export function registerResolveCommand(program, factory, globals) {
 async function validateResolveOptions(options) {
     // Validate identifier format early
     Identifier.decode(options.identifier);
-    let resolutionOptions = undefined;
-    if (options.resolutionOptions) {
-        try {
-            resolutionOptions = JSON.parse(options.resolutionOptions);
-        }
-        catch {
-            throw new CLIError('Invalid resolution options. Must be a valid JSON string.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-    }
-    else if (options.resolutionOptionsPath) {
-        try {
-            const content = await readFile(options.resolutionOptionsPath, 'utf-8');
-            resolutionOptions = JSON.parse(content);
-        }
-        catch {
-            throw new CLIError('Invalid resolution options path. Must be a valid path to a JSON file.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-    }
-    // The flag wins over a minConf inside the JSON options.
-    if (options.minConf !== undefined) {
-        resolutionOptions = { ...(resolutionOptions ?? {}), minConf: options.minConf };
-    }
+    const resolutionOptions = await readResolutionOptions(options);
     return { identifier: options.identifier, options: resolutionOptions };
 }
-/**
- * Commander argParser for `--min-conf`. Accepts a positive integer (minimum 1),
- * the domain the specification gives `minConf`. Errors at parse time otherwise.
- */
-function parseMinConf(value) {
-    if (!/^[1-9]\d*$/.test(value)) {
-        throw new CLIError('--min-conf must be a positive integer (minimum 1).', 'INVALID_ARGUMENT_ERROR', { value });
-    }
-    return Number(value);
-}
 //# sourceMappingURL=resolve.js.map

package/dist/esm/src/commands/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/commands/resolve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/commands/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAmB,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,qBAAqB,EAA8B,MAAM,0BAA0B,CAAC;AAG1H,MAAM,UAAU,sBAAsB,CACpC,OAAiB,EACjB,OAAoB,EACpB,OAA6B;IAE7B,OAAO;SACJ,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,MAAM,CAAC;SACb,WAAW,CAAC,6CAA6C,CAAC;SAC1D,cAAc,CAAC,+BAA+B,EAAE,sBAAsB,CAAC;SACvE,MAAM,CAAC,iCAAiC,EAAE,2CAA2C,CAAC;SACtF,MAAM,CAAC,sCAAsC,EAAE,mDAAmD,CAAC;SACnG,MAAM,CAAC,gBAAgB,EAAE,aAAa,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,OAAuD,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,SAAkB,EAAE,IAAI,EAAE,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAuD;IAEvD,mCAAmC;IACnC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/D,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxE,CAAC"}