@elgora/cli 7.4.1 → 7.5.1

package/dist/cli.js

@@ -532,7 +532,7 @@ var AES_GCM_TAG_BITS = 128;
 var BASE64URL_RE = /^[A-Za-z0-9_-]+$/;
 var SOLVER_SUBMISSION_NAME_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
 var MEDIA_TYPE_RE = /^[a-z0-9][a-z0-9!#$&^_.+-]*\/[a-z0-9][a-z0-9!#$&^_.+-]*$/;
-var KEY_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._:-]*$/;
+var KEY_ID_RE = /^[A-Za-z0-9][ -~]*$/;
 var base64UrlSchema = z3.string().regex(BASE64URL_RE);
 var lowerAddressSchema = z3.string().refine(isLowercaseHexAddress);
 var bytes32Schema2 = z3.string().refine(isLowercaseBytes32);
@@ -1142,8 +1142,12 @@ async function openAesKeyForRecipient(input) {
     }
   }
   if (!matched) {
+    const wanted = [...new Set(wrappedKeys.map((key) => key.key_id))].sort();
+    const configured = [
+      ...new Set(privateKeys.map((key) => key.key_id))
+    ].sort();
     throw new Error(
-      "no matching Guardian private key for private artifact envelope"
+      `no matching Guardian private key for private artifact envelope: this envelope was sealed for key_id ${JSON.stringify(wanted)}, but ELGORA_GUARDIAN_PRIVATE_KEYS_JSON configures key_id ${JSON.stringify(configured)}. key_id must be this Guardian's own registered roster name (the name passed to roster:add-guardian), not its account address.`
     );
   }
   throw new Error("matching Guardian private key could not open wrapped key", {
@@ -6903,7 +6907,7 @@ function resolveChainId(selector) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "7.4.1" : "0.0.0-dev";
+var CLI_VERSION = true ? "7.5.1" : "0.0.0-dev";
 var CLI_NODE_ENGINES = true ? ">=24 <25" : ">=24 <25";
 
 // src/node-engines.ts
@@ -7340,6 +7344,11 @@ function loadPublishFundConfig(env, apiBaseUrlOverride) {
   };
 }
 
+// src/required-env.ts
+function missingRequiredEnv(required4, env) {
+  return required4.filter((envName) => !env[envName]?.trim());
+}
+
 // src/roster-add-guardian.ts
 import { isAddress as isAddress4 } from "viem";
 import { privateKeyToAccount as privateKeyToAccount9 } from "viem/accounts";
@@ -7376,6 +7385,11 @@ async function main10(env = process.env, argv = process.argv.slice(2)) {
       `${args.guardianAccount} is already on the Guardian roster`
     );
   }
+  if (roster.some((guardian) => guardian.name === args.name)) {
+    throw new Error(
+      `"${args.name}" is already the name of a Guardian on the roster; names must be unique`
+    );
+  }
   const contractArgs = [
     args.name,
     args.guardianAccount,
@@ -7459,6 +7473,15 @@ function parseRosterAddGuardianArgs(argv) {
   const guardianAccount = positional[1]?.trim();
   const encryptionPublicKey = positional[2]?.trim();
   if (!name) throw usageError2();
+  if (!KEY_ID_RE.test(name)) {
+    throw new Error(
+      // A Solver's CLI seals private artifacts against this exact string as
+      // the Guardian's key_id, so it must be non-empty, start with an
+      // alphanumeric, and stay within printable ASCII (no control/formatting
+      // characters, no leading whitespace).
+      `name must match ${KEY_ID_RE.source} (it becomes this Guardian's private-artifact key_id)`
+    );
+  }
   if (!guardianAccount || !isAddress4(guardianAccount)) {
     throw new Error("guardian_account must be a valid EVM address");
   }
@@ -7992,6 +8015,23 @@ function requirePinnedGuardianRosterHash(hubGuardianRosterHash, apiGuardianRoste
     );
   }
 }
+function requireUsableGuardianNames(roster) {
+  const seen = /* @__PURE__ */ new Map();
+  for (const guardian of roster) {
+    if (!KEY_ID_RE.test(guardian.name)) {
+      throw new Error(
+        `Guardian ${guardian.account} has roster name ${JSON.stringify(guardian.name)}, which cannot be used as a private-artifact key_id (must match ${KEY_ID_RE.source}). This roster cannot receive private submissions until its admin corrects the name.`
+      );
+    }
+    const collidingAccount = seen.get(guardian.name);
+    if (collidingAccount) {
+      throw new Error(
+        `Guardians ${collidingAccount} and ${guardian.account} share the roster name ${JSON.stringify(guardian.name)}. Names must be unique on the pinned roster so each Guardian's key_id resolves to exactly one recipient.`
+      );
+    }
+    seen.set(guardian.name, guardian.account);
+  }
+}
 function requireMatchingSubmitTransaction(actual, expected) {
   if (actual.chain_id !== expected.chain_id || actual.to.toLowerCase() !== expected.to.toLowerCase() || actual.value !== expected.value || actual.data.toLowerCase() !== expected.data.toLowerCase() || actual.function_name !== expected.function_name || actual.args.bounty_id !== expected.args.bounty_id || actual.args.submission_commitment.toLowerCase() !== expected.args.submission_commitment.toLowerCase() || actual.args.guardian_roster_hash.toLowerCase() !== expected.args.guardian_roster_hash.toLowerCase() || actual.args.extra_data !== expected.args.extra_data) {
     throw new Error(
@@ -8013,9 +8053,10 @@ function requireOpenSubmittableBounty(bountyFacts, bountyId) {
 async function buildSolverSubmissionEnvelope(input) {
   const solver = input.solver.toLowerCase();
   const bountyId = input.bountyId.toString();
+  requireUsableGuardianNames(input.guardianRoster);
   const guardianRecipients = input.guardianRoster.map(
     (guardian) => ({
-      key_id: guardian.account.toLowerCase(),
+      key_id: guardian.name,
       suite: PRIVATE_ARTIFACT_HPKE_SUITE,
       public_key: guardian.encryptionPublicKey
     })
@@ -8280,15 +8321,18 @@ function usageError4() {
 }
 
 // src/cli.ts
-var dotenvPath = path4.resolve(process.env.DOTENV_CONFIG_PATH ?? ".env");
-var dotenvResult = loadDotenv({
-  quiet: true,
-  ...process.env.DOTENV_CONFIG_PATH ? { path: process.env.DOTENV_CONFIG_PATH } : void 0
-});
-process.stderr.write(
-  `Env: ${dotenvPath} (${dotenvResult.error ? "not found, using process env only" : "loaded"})
+if (process.env.DOTENV_CONFIG_PATH) {
+  const dotenvPath = path4.resolve(process.env.DOTENV_CONFIG_PATH);
+  const dotenvResult = loadDotenv({ path: dotenvPath, quiet: true });
+  process.stderr.write(
+    `Env: ${dotenvPath} (${dotenvResult.error ? `not found: ${dotenvResult.error.message}` : "loaded"})
 `
-);
+  );
+} else {
+  process.stderr.write(
+    "Env: DOTENV_CONFIG_PATH not set; reading process.env only\n"
+  );
+}
 var COMMANDS = {
   "guardian:judgeable": main5,
   "guardian:open": main3,
@@ -8403,7 +8447,7 @@ var COMMAND_HELP = {
   "roster:add-guardian": {
     usage: "elgora-cli roster:add-guardian [--roster-admin-address <address>]\n   <name> <guardian_account> <encryption_public_key>",
     title: "Append one Guardian to the live roster.",
-    description: "Call ElgoraHub's guardianRosterAdmin-only addGuardian directly. Only\n  future bounties see the new roster; open bounties keep judging\n  against the hash pinned when they were created. With\n  --roster-admin-address, the transaction is simulated and printed\n  unsigned (to, data, value) for an external signer such as a Safe,\n  instead of being sent. Run roster:prepare-guardian-proof,\n  guardian:prove-roster-key, and roster:verify-guardian-proof against\n  the proposed Guardian before ever calling this.",
+    description: "Call ElgoraHub's guardianRosterAdmin-only addGuardian directly. Only\n  future bounties see the new roster; open bounties keep judging\n  against the hash pinned when they were created. With\n  --roster-admin-address, the transaction is simulated and printed\n  unsigned (to, data, value) for an external signer such as a Safe,\n  instead of being sent. Run roster:prepare-guardian-proof,\n  guardian:prove-roster-key, and roster:verify-guardian-proof against\n  the proposed Guardian before ever calling this. name becomes this\n  Guardian's key_id for every private submission a Solver seals\n  afterward \u2014 it must be unique on the roster and is what this\n  Guardian's own ELGORA_GUARDIAN_PRIVATE_KEYS_JSON entries must use as\n  their key_id, not the account address.",
     required: [],
     defaulted: ["ELGORA_CHAIN_ID", "ELGORA_HUB_ADDRESS", "ELGORA_RPC_URL"]
   },
@@ -8502,6 +8546,25 @@ async function run(rawArgv) {
     process.exitCode = 1;
     return;
   }
+  const missing = missingRequiredEnv(
+    COMMAND_HELP[subcommand]?.required ?? [],
+    env
+  );
+  if (missing.length > 0) {
+    process.stderr.write(
+      `${[
+        `${subcommand} is missing required environment variable${missing.length > 1 ? "s" : ""}:`,
+        ...missing.map((envName) => `  ${envName}`),
+        "",
+        "This CLI reads only process.env (plus DOTENV_CONFIG_PATH if you set it)",
+        "\u2014 it never assumes a secrets location. Provide these before invoking",
+        `elgora-cli, or run \`elgora-cli help ${subcommand}\` for the full list.`
+      ].join("\n")}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
   await command(env, rest);
 }
 function printUsage() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elgora/cli",
-  "version": "7.4.1",
+  "version": "7.5.1",
   "description": "Command-line client for Elgora, a decentralized bounty marketplace for science. Lets Posters, Solvers, and Guardians interact with Elgora's public API and on-chain contracts.",
   "type": "module",
   "license": "MIT",