@metamask-previews/wallet-cli 0.0.0-preview-b8d04f274 → 0.0.0-preview-1ccf11bcb

package/CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Wire the `transactionController` slot in the daemon wallet's instance options, so the daemon runs the `TransactionController` with an explicit CLI-appropriate configuration (swaps processing disabled, no client hooks) rather than relying on the controller's implicit defaults ([#9509](https://github.com/MetaMask/core/pull/9509))
+- Add the `mm wallet unlock` command, which dispatches `KeyringController:submitPassword` over the daemon socket, allowing the keyring to be unlocked after a daemon start with no password or after a `mm daemon call KeyringController:setLocked` ([#8821](https://github.com/MetaMask/core/pull/8821))
 - Add the `mm daemon list` command, which prints the messenger actions the running daemon can dispatch via `daemon call`, enumerated from the live messenger so the list cannot drift from what `call` accepts ([#9339](https://github.com/MetaMask/core/pull/9339))
 - Add the `mm daemon` command suite (`start`, `stop`, `status`, `purge`, and `call`) for running the wallet daemon and dispatching messenger actions over its socket ([#9255](https://github.com/MetaMask/core/pull/9255))
 - Add a wallet factory and daemon entry point that construct a `@metamask/wallet` `Wallet` backed by the SQLite key-value store, hydrate it from persisted state, run controller initialization (aborting startup if any step fails), import the secret recovery phrase on first run, and expose a `dispose` teardown handle ([#9226](https://github.com/MetaMask/core/pull/9226))
@@ -18,7 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- `--password` / `MM_WALLET_PASSWORD` is now optional on `mm daemon start`; on subsequent runs, omitting it starts the daemon with a locked keyring, and the persisted vault is auto-unlocked when a password is supplied ([#8821](https://github.com/MetaMask/core/pull/8821))
+- The daemon RPC server now validates `params` against each handler's superstruct before dispatch, returning a `-32602 invalidParams` error on mismatch instead of passing raw params to the handler ([#8846](https://github.com/MetaMask/core/pull/8846))
 - Report daemon socket connection errors consistently across `mm daemon call` and `mm daemon list` ([#9339](https://github.com/MetaMask/core/pull/9339))
 - Bump `@metamask/wallet` from `^3.0.0` to `^7.0.1` ([#9218](https://github.com/MetaMask/core/pull/9218), [#9263](https://github.com/MetaMask/core/pull/9263), [#9349](https://github.com/MetaMask/core/pull/9349), [#9396](https://github.com/MetaMask/core/pull/9396), [#9470](https://github.com/MetaMask/core/pull/9470))
+- Wrap daemon password and SRP in opaque `Password` and `Srp` types that redact on logging; validated and unwrapped only at trust boundaries ([#8863](https://github.com/MetaMask/core/pull/8863))
 
 [Unreleased]: https://github.com/MetaMask/core/

package/README.md

@@ -12,12 +12,24 @@ or
 
 ## Usage
 
-The CLI drives a long-lived background **daemon** that holds an unlocked `@metamask/wallet` in memory and exposes its messenger over a per-user Unix socket. All commands live under the `mm daemon` topic; run `mm --help` (or `mm daemon <command> --help`) for the full reference.
+The CLI drives a long-lived background daemon that holds a `@metamask/wallet` in memory and exposes its messenger over a per-user Unix socket. All commands live under the `mm daemon` and `mm wallet` topics; run `mm --help` (or `mm <topic> <command> --help`) for the full reference.
 
 Start the daemon (flags may also be supplied as the `INFURA_PROJECT_ID`, `MM_WALLET_PASSWORD`, and `MM_WALLET_SRP` environment variables — preferred for secrets):
 
 ```sh
+# First run — password required to import the secret recovery phrase:
 mm daemon start --infura-project-id <key> --password <pw> --srp "<phrase>"
+
+# Subsequent runs — password optional. Omit to start with a locked keyring
+# and unlock later with `mm wallet unlock`:
+mm daemon start --infura-project-id <key> --srp "<phrase>"
+```
+
+Unlock the keyring after a password-less start (or after `KeyringController:setLocked`):
+
+```sh
+mm wallet unlock --password <pw>   # or: MM_WALLET_PASSWORD=<pw> mm wallet unlock
+mm wallet unlock                   # prompts interactively (input masked)
 ```
 
 Discover what the running wallet can do — `list` prints every messenger action currently dispatchable via `call`. This surface grows as more controllers are wired, so treat it as evolving rather than a stability contract:

package/dist/commands/daemon/start.cjs

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const daemon_spawn_1 = require("../../daemon/daemon-spawn.cjs");
+const secrets_1 = require("../../daemon/secrets.cjs");
 class DaemonStart extends core_1.Command {
     async run() {
         const { flags } = await this.parse(DaemonStart);
         const infuraProjectId = flags['infura-project-id'];
-        const { password, srp } = flags;
+        const password = flags.password ? secrets_1.Password.from(flags.password) : undefined;
+        const srp = secrets_1.Srp.from(flags.srp);
         const { state, socketPath } = await (0, daemon_spawn_1.ensureDaemon)({
             dataDir: this.config.dataDir,
             infuraProjectId,
@@ -26,6 +28,7 @@ DaemonStart.description = 'Start the wallet daemon';
 DaemonStart.examples = [
     '<%= config.bin %> daemon start --infura-project-id <key> --password <pw> --srp <phrase>',
     'INFURA_PROJECT_ID=<key> MM_WALLET_PASSWORD=<pw> MM_WALLET_SRP=<phrase> <%= config.bin %> daemon start',
+    '<%= config.bin %> daemon start --infura-project-id <key> --srp <phrase>   # then `mm wallet unlock` later',
 ];
 DaemonStart.flags = {
     'infura-project-id': core_1.Flags.string({
@@ -34,9 +37,10 @@ DaemonStart.flags = {
         required: true,
     }),
     password: core_1.Flags.string({
-        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production)',
+        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +
+            'Required on first run; on subsequent runs, omit (and leave MM_WALLET_PASSWORD unset) to start with a locked keyring and use `mm wallet unlock`.',
         env: 'MM_WALLET_PASSWORD',
-        required: true,
+        required: false,
     }),
     srp: core_1.Flags.string({
         description: 'Secret recovery phrase (testing only — use MM_WALLET_SRP env var in production)',

package/dist/commands/daemon/start.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"start.cjs","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":";;AAAA,sCAA6C;AAE7C,gEAAyD;AAEzD,MAAqB,WAAY,SAAQ,cAAO;IA4BvC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;QAEhC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,2BAAY,EAAC;YAC/C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,eAAe;YACf,QAAQ;YACR,GAAG;YACH,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CACN,mCAAmC,UAAU,IAAI;gBAC/C,6FAA6F,CAChG,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;;AAjDe,uBAAW,GAAG,yBAAyB,CAAC;AAExC,oBAAQ,GAAG;IACzB,yFAAyF;IACzF,uGAAuG;CACxG,CAAC;AAEc,iBAAK,GAAG;IACtB,mBAAmB,EAAE,YAAK,CAAC,MAAM,CAAC;QAChC,WAAW,EAAE,sCAAsC;QACnD,GAAG,EAAE,mBAAmB;QACxB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EACT,+EAA+E;QACjF,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,GAAG,EAAE,YAAK,CAAC,MAAM,CAAC;QAChB,WAAW,EACT,iFAAiF;QACnF,GAAG,EAAE,eAAe;QACpB,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC;kBA1BiB,WAAW","sourcesContent":["import { Command, Flags } from '@oclif/core';\n\nimport { ensureDaemon } from '../../daemon/daemon-spawn';\n\nexport default class DaemonStart extends Command {\n  static override description = 'Start the wallet daemon';\n\n  static override examples = [\n    '<%= config.bin %> daemon start --infura-project-id <key> --password <pw> --srp <phrase>',\n    'INFURA_PROJECT_ID=<key> MM_WALLET_PASSWORD=<pw> MM_WALLET_SRP=<phrase> <%= config.bin %> daemon start',\n  ];\n\n  static override flags = {\n    'infura-project-id': Flags.string({\n      description: 'Infura project ID for network access',\n      env: 'INFURA_PROJECT_ID',\n      required: true,\n    }),\n    password: Flags.string({\n      description:\n        'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production)',\n      env: 'MM_WALLET_PASSWORD',\n      required: true,\n    }),\n    srp: Flags.string({\n      description:\n        'Secret recovery phrase (testing only — use MM_WALLET_SRP env var in production)',\n      env: 'MM_WALLET_SRP',\n      required: true,\n    }),\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(DaemonStart);\n    const infuraProjectId = flags['infura-project-id'];\n    const { password, srp } = flags;\n\n    const { state, socketPath } = await ensureDaemon({\n      dataDir: this.config.dataDir,\n      infuraProjectId,\n      password,\n      srp,\n      packageRoot: this.config.root,\n    });\n\n    if (state === 'already-running') {\n      this.log(\n        `Daemon already running. Socket: ${socketPath}. ` +\n          `The provided flags were not applied; run \\`mm daemon stop\\` and start again to change them.`,\n      );\n      return;\n    }\n\n    this.log(`Daemon running. Socket: ${socketPath}`);\n  }\n}\n"]}
+{"version":3,"file":"start.cjs","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":";;AAAA,sCAA6C;AAE7C,gEAAyD;AACzD,sDAAqD;AAErD,MAAqB,WAAY,SAAQ,cAAO;IA8BvC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,GAAG,GAAG,aAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,2BAAY,EAAC;YAC/C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,eAAe;YACf,QAAQ;YACR,GAAG;YACH,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CACN,mCAAmC,UAAU,IAAI;gBAC/C,6FAA6F,CAChG,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;;AApDe,uBAAW,GAAG,yBAAyB,CAAC;AAExC,oBAAQ,GAAG;IACzB,yFAAyF;IACzF,uGAAuG;IACvG,2GAA2G;CAC5G,CAAC;AAEc,iBAAK,GAAG;IACtB,mBAAmB,EAAE,YAAK,CAAC,MAAM,CAAC;QAChC,WAAW,EAAE,sCAAsC;QACnD,GAAG,EAAE,mBAAmB;QACxB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EACT,iFAAiF;YACjF,iJAAiJ;QACnJ,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,GAAG,EAAE,YAAK,CAAC,MAAM,CAAC;QAChB,WAAW,EACT,iFAAiF;QACnF,GAAG,EAAE,eAAe;QACpB,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC;kBA5BiB,WAAW","sourcesContent":["import { Command, Flags } from '@oclif/core';\n\nimport { ensureDaemon } from '../../daemon/daemon-spawn';\nimport { Password, Srp } from '../../daemon/secrets';\n\nexport default class DaemonStart extends Command {\n  static override description = 'Start the wallet daemon';\n\n  static override examples = [\n    '<%= config.bin %> daemon start --infura-project-id <key> --password <pw> --srp <phrase>',\n    'INFURA_PROJECT_ID=<key> MM_WALLET_PASSWORD=<pw> MM_WALLET_SRP=<phrase> <%= config.bin %> daemon start',\n    '<%= config.bin %> daemon start --infura-project-id <key> --srp <phrase>   # then `mm wallet unlock` later',\n  ];\n\n  static override flags = {\n    'infura-project-id': Flags.string({\n      description: 'Infura project ID for network access',\n      env: 'INFURA_PROJECT_ID',\n      required: true,\n    }),\n    password: Flags.string({\n      description:\n        'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +\n        'Required on first run; on subsequent runs, omit (and leave MM_WALLET_PASSWORD unset) to start with a locked keyring and use `mm wallet unlock`.',\n      env: 'MM_WALLET_PASSWORD',\n      required: false,\n    }),\n    srp: Flags.string({\n      description:\n        'Secret recovery phrase (testing only — use MM_WALLET_SRP env var in production)',\n      env: 'MM_WALLET_SRP',\n      required: true,\n    }),\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(DaemonStart);\n    const infuraProjectId = flags['infura-project-id'];\n    const password = flags.password ? Password.from(flags.password) : undefined;\n    const srp = Srp.from(flags.srp);\n\n    const { state, socketPath } = await ensureDaemon({\n      dataDir: this.config.dataDir,\n      infuraProjectId,\n      password,\n      srp,\n      packageRoot: this.config.root,\n    });\n\n    if (state === 'already-running') {\n      this.log(\n        `Daemon already running. Socket: ${socketPath}. ` +\n          `The provided flags were not applied; run \\`mm daemon stop\\` and start again to change them.`,\n      );\n      return;\n    }\n\n    this.log(`Daemon running. Socket: ${socketPath}`);\n  }\n}\n"]}

package/dist/commands/daemon/start.d.cts

@@ -4,7 +4,7 @@ export default class DaemonStart extends Command {
     static examples: string[];
     static flags: {
         'infura-project-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        password: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         srp: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/daemon/start.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.cts","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,oBAAoB;AAI7C,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAA6B;IAExD,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,KAAK;;;;MAkBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBlC"}
+{"version":3,"file":"start.d.cts","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,oBAAoB;AAK7C,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAA6B;IAExD,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;MAmBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwBlC"}

package/dist/commands/daemon/start.d.mts

@@ -4,7 +4,7 @@ export default class DaemonStart extends Command {
     static examples: string[];
     static flags: {
         'infura-project-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        password: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         srp: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/daemon/start.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.mts","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,oBAAoB;AAI7C,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAA6B;IAExD,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,KAAK;;;;MAkBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBlC"}
+{"version":3,"file":"start.d.mts","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,oBAAoB;AAK7C,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAA6B;IAExD,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;MAmBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwBlC"}

package/dist/commands/daemon/start.mjs

@@ -1,10 +1,12 @@
 import { Command, Flags } from "@oclif/core";
 import { ensureDaemon } from "../../daemon/daemon-spawn.mjs";
+import { Password, Srp } from "../../daemon/secrets.mjs";
 class DaemonStart extends Command {
     async run() {
         const { flags } = await this.parse(DaemonStart);
         const infuraProjectId = flags['infura-project-id'];
-        const { password, srp } = flags;
+        const password = flags.password ? Password.from(flags.password) : undefined;
+        const srp = Srp.from(flags.srp);
         const { state, socketPath } = await ensureDaemon({
             dataDir: this.config.dataDir,
             infuraProjectId,
@@ -24,6 +26,7 @@ DaemonStart.description = 'Start the wallet daemon';
 DaemonStart.examples = [
     '<%= config.bin %> daemon start --infura-project-id <key> --password <pw> --srp <phrase>',
     'INFURA_PROJECT_ID=<key> MM_WALLET_PASSWORD=<pw> MM_WALLET_SRP=<phrase> <%= config.bin %> daemon start',
+    '<%= config.bin %> daemon start --infura-project-id <key> --srp <phrase>   # then `mm wallet unlock` later',
 ];
 DaemonStart.flags = {
     'infura-project-id': Flags.string({
@@ -32,9 +35,10 @@ DaemonStart.flags = {
         required: true,
     }),
     password: Flags.string({
-        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production)',
+        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +
+            'Required on first run; on subsequent runs, omit (and leave MM_WALLET_PASSWORD unset) to start with a locked keyring and use `mm wallet unlock`.',
         env: 'MM_WALLET_PASSWORD',
-        required: true,
+        required: false,
     }),
     srp: Flags.string({
         description: 'Secret recovery phrase (testing only — use MM_WALLET_SRP env var in production)',

package/dist/commands/daemon/start.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"start.mjs","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB;AAE7C,OAAO,EAAE,YAAY,EAAE,sCAAkC;AAEzD,MAAqB,WAAY,SAAQ,OAAO;IA4BvC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;QAEhC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,YAAY,CAAC;YAC/C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,eAAe;YACf,QAAQ;YACR,GAAG;YACH,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CACN,mCAAmC,UAAU,IAAI;gBAC/C,6FAA6F,CAChG,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;;AAjDe,uBAAW,GAAG,yBAAyB,CAAC;AAExC,oBAAQ,GAAG;IACzB,yFAAyF;IACzF,uGAAuG;CACxG,CAAC;AAEc,iBAAK,GAAG;IACtB,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC;QAChC,WAAW,EAAE,sCAAsC;QACnD,GAAG,EAAE,mBAAmB;QACxB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EACT,+EAA+E;QACjF,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;QAChB,WAAW,EACT,iFAAiF;QACnF,GAAG,EAAE,eAAe;QACpB,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC;eA1BiB,WAAW","sourcesContent":["import { Command, Flags } from '@oclif/core';\n\nimport { ensureDaemon } from '../../daemon/daemon-spawn';\n\nexport default class DaemonStart extends Command {\n  static override description = 'Start the wallet daemon';\n\n  static override examples = [\n    '<%= config.bin %> daemon start --infura-project-id <key> --password <pw> --srp <phrase>',\n    'INFURA_PROJECT_ID=<key> MM_WALLET_PASSWORD=<pw> MM_WALLET_SRP=<phrase> <%= config.bin %> daemon start',\n  ];\n\n  static override flags = {\n    'infura-project-id': Flags.string({\n      description: 'Infura project ID for network access',\n      env: 'INFURA_PROJECT_ID',\n      required: true,\n    }),\n    password: Flags.string({\n      description:\n        'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production)',\n      env: 'MM_WALLET_PASSWORD',\n      required: true,\n    }),\n    srp: Flags.string({\n      description:\n        'Secret recovery phrase (testing only — use MM_WALLET_SRP env var in production)',\n      env: 'MM_WALLET_SRP',\n      required: true,\n    }),\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(DaemonStart);\n    const infuraProjectId = flags['infura-project-id'];\n    const { password, srp } = flags;\n\n    const { state, socketPath } = await ensureDaemon({\n      dataDir: this.config.dataDir,\n      infuraProjectId,\n      password,\n      srp,\n      packageRoot: this.config.root,\n    });\n\n    if (state === 'already-running') {\n      this.log(\n        `Daemon already running. Socket: ${socketPath}. ` +\n          `The provided flags were not applied; run \\`mm daemon stop\\` and start again to change them.`,\n      );\n      return;\n    }\n\n    this.log(`Daemon running. Socket: ${socketPath}`);\n  }\n}\n"]}
+{"version":3,"file":"start.mjs","sourceRoot":"","sources":["../../../src/commands/daemon/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB;AAE7C,OAAO,EAAE,YAAY,EAAE,sCAAkC;AACzD,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,iCAA6B;AAErD,MAAqB,WAAY,SAAQ,OAAO;IA8BvC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,YAAY,CAAC;YAC/C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,eAAe;YACf,QAAQ;YACR,GAAG;YACH,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CACN,mCAAmC,UAAU,IAAI;gBAC/C,6FAA6F,CAChG,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;;AApDe,uBAAW,GAAG,yBAAyB,CAAC;AAExC,oBAAQ,GAAG;IACzB,yFAAyF;IACzF,uGAAuG;IACvG,2GAA2G;CAC5G,CAAC;AAEc,iBAAK,GAAG;IACtB,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC;QAChC,WAAW,EAAE,sCAAsC;QACnD,GAAG,EAAE,mBAAmB;QACxB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EACT,iFAAiF;YACjF,iJAAiJ;QACnJ,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;QAChB,WAAW,EACT,iFAAiF;QACnF,GAAG,EAAE,eAAe;QACpB,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC;eA5BiB,WAAW","sourcesContent":["import { Command, Flags } from '@oclif/core';\n\nimport { ensureDaemon } from '../../daemon/daemon-spawn';\nimport { Password, Srp } from '../../daemon/secrets';\n\nexport default class DaemonStart extends Command {\n  static override description = 'Start the wallet daemon';\n\n  static override examples = [\n    '<%= config.bin %> daemon start --infura-project-id <key> --password <pw> --srp <phrase>',\n    'INFURA_PROJECT_ID=<key> MM_WALLET_PASSWORD=<pw> MM_WALLET_SRP=<phrase> <%= config.bin %> daemon start',\n    '<%= config.bin %> daemon start --infura-project-id <key> --srp <phrase>   # then `mm wallet unlock` later',\n  ];\n\n  static override flags = {\n    'infura-project-id': Flags.string({\n      description: 'Infura project ID for network access',\n      env: 'INFURA_PROJECT_ID',\n      required: true,\n    }),\n    password: Flags.string({\n      description:\n        'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +\n        'Required on first run; on subsequent runs, omit (and leave MM_WALLET_PASSWORD unset) to start with a locked keyring and use `mm wallet unlock`.',\n      env: 'MM_WALLET_PASSWORD',\n      required: false,\n    }),\n    srp: Flags.string({\n      description:\n        'Secret recovery phrase (testing only — use MM_WALLET_SRP env var in production)',\n      env: 'MM_WALLET_SRP',\n      required: true,\n    }),\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(DaemonStart);\n    const infuraProjectId = flags['infura-project-id'];\n    const password = flags.password ? Password.from(flags.password) : undefined;\n    const srp = Srp.from(flags.srp);\n\n    const { state, socketPath } = await ensureDaemon({\n      dataDir: this.config.dataDir,\n      infuraProjectId,\n      password,\n      srp,\n      packageRoot: this.config.root,\n    });\n\n    if (state === 'already-running') {\n      this.log(\n        `Daemon already running. Socket: ${socketPath}. ` +\n          `The provided flags were not applied; run \\`mm daemon stop\\` and start again to change them.`,\n      );\n      return;\n    }\n\n    this.log(`Daemon running. Socket: ${socketPath}`);\n  }\n}\n"]}

package/dist/commands/wallet/unlock.cjs

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@metamask/utils");
+const core_1 = require("@oclif/core");
+const daemon_client_1 = require("../../daemon/daemon-client.cjs");
+const paths_1 = require("../../daemon/paths.cjs");
+const prompts_1 = require("../../daemon/prompts.cjs");
+const utils_2 = require("../../daemon/utils.cjs");
+class WalletUnlock extends core_1.Command {
+    async run() {
+        const { flags } = await this.parse(WalletUnlock);
+        const { timeout: timeoutMs } = flags;
+        // `emptyToUndefined` collapses `--password ''` and `MM_WALLET_PASSWORD=''`
+        // to undefined so the prompt fires instead of sending an empty string.
+        const flagPassword = (0, utils_2.emptyToUndefined)(flags.password);
+        let password;
+        try {
+            password = flagPassword ?? (await (0, prompts_1.promptPassword)());
+        }
+        catch (error) {
+            // Only swallow ExitPromptError (@inquirer/core's Ctrl+C signal); any
+            // other rejection (import failure, internal prompt crash) should surface.
+            if (error instanceof Error && error.name === 'ExitPromptError') {
+                return;
+            }
+            throw error;
+        }
+        const { socketPath } = (0, paths_1.getDaemonPaths)(this.config.dataDir);
+        let response;
+        try {
+            response = await (0, daemon_client_1.sendCommand)({
+                socketPath,
+                method: 'call',
+                params: ['KeyringController:submitPassword', password],
+                ...(timeoutMs === undefined ? {} : { timeoutMs }),
+            });
+        }
+        catch (error) {
+            this.error((0, utils_2.makeDaemonConnectionError)(error));
+        }
+        if ((0, utils_1.isJsonRpcFailure)(response)) {
+            const { code, message, data } = response.error;
+            // `isJsonRpcFailure` already validates that `data` is JSON, so
+            // `JSON.stringify` cannot throw here.
+            const dataSuffix = data === undefined || data === null
+                ? ''
+                : ` data=${JSON.stringify(data)}`;
+            this.error(`Failed to unlock: ${message} (code ${String(code)})${dataSuffix}`);
+        }
+        this.log('Wallet unlocked.');
+    }
+}
+WalletUnlock.description = 'Unlock the wallet (submits the password to KeyringController). ' +
+    'Use this after `mm daemon start` was run without `--password`, or ' +
+    'after the keyring was locked via `KeyringController:setLocked`.';
+WalletUnlock.examples = [
+    '<%= config.bin %> wallet unlock --password <pw>',
+    'MM_WALLET_PASSWORD=<pw> <%= config.bin %> wallet unlock',
+    '<%= config.bin %> wallet unlock   # prompts interactively',
+];
+WalletUnlock.flags = {
+    password: core_1.Flags.string({
+        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +
+            'When omitted, the command prompts interactively.',
+        env: 'MM_WALLET_PASSWORD',
+        required: false,
+    }),
+    timeout: core_1.Flags.integer({
+        char: 't',
+        description: 'Response timeout in milliseconds',
+        required: false,
+    }),
+};
+exports.default = WalletUnlock;
+//# sourceMappingURL=unlock.cjs.map

package/dist/commands/wallet/unlock.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"unlock.cjs","sourceRoot":"","sources":["../../../src/commands/wallet/unlock.ts"],"names":[],"mappings":";;AAAA,2CAAmD;AACnD,sCAA6C;AAE7C,kEAAyD;AACzD,kDAAoD;AACpD,sDAAsD;AACtD,kDAG4B;AAE5B,MAAqB,YAAa,SAAQ,cAAO;IA2BxC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAErC,2EAA2E;QAC3E,uEAAuE;QACvE,MAAM,YAAY,GAAG,IAAA,wBAAgB,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,QAAgB,CAAC;QACrB,IAAI,CAAC;YACH,QAAQ,GAAG,YAAY,IAAI,CAAC,MAAM,IAAA,wBAAc,GAAE,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qEAAqE;YACrE,0EAA0E;YAC1E,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBAC/D,OAAO;YACT,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAA,2BAAW,EAAC;gBAC3B,UAAU;gBACV,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,CAAC,kCAAkC,EAAE,QAAQ,CAAC;gBACtD,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;aAClD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,IAAA,iCAAyB,EAAC,KAAK,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,IAAA,wBAAgB,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC/C,+DAA+D;YAC/D,sCAAsC;YACtC,MAAM,UAAU,GACd,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI;gBACjC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,KAAK,CACR,qBAAqB,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,CACnE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC/B,CAAC;;AAzEe,wBAAW,GACzB,iEAAiE;IACjE,oEAAoE;IACpE,iEAAiE,CAAC;AAEpD,qBAAQ,GAAG;IACzB,iDAAiD;IACjD,yDAAyD;IACzD,2DAA2D;CAC5D,CAAC;AAEc,kBAAK,GAAG;IACtB,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EACT,iFAAiF;YACjF,kDAAkD;QACpD,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,kCAAkC;QAC/C,QAAQ,EAAE,KAAK;KAChB,CAAC;CACH,CAAC;kBAzBiB,YAAY","sourcesContent":["import { isJsonRpcFailure } from '@metamask/utils';\nimport { Command, Flags } from '@oclif/core';\n\nimport { sendCommand } from '../../daemon/daemon-client';\nimport { getDaemonPaths } from '../../daemon/paths';\nimport { promptPassword } from '../../daemon/prompts';\nimport {\n  emptyToUndefined,\n  makeDaemonConnectionError,\n} from '../../daemon/utils';\n\nexport default class WalletUnlock extends Command {\n  static override description =\n    'Unlock the wallet (submits the password to KeyringController). ' +\n    'Use this after `mm daemon start` was run without `--password`, or ' +\n    'after the keyring was locked via `KeyringController:setLocked`.';\n\n  static override examples = [\n    '<%= config.bin %> wallet unlock --password <pw>',\n    'MM_WALLET_PASSWORD=<pw> <%= config.bin %> wallet unlock',\n    '<%= config.bin %> wallet unlock   # prompts interactively',\n  ];\n\n  static override flags = {\n    password: Flags.string({\n      description:\n        'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +\n        'When omitted, the command prompts interactively.',\n      env: 'MM_WALLET_PASSWORD',\n      required: false,\n    }),\n    timeout: Flags.integer({\n      char: 't',\n      description: 'Response timeout in milliseconds',\n      required: false,\n    }),\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(WalletUnlock);\n    const { timeout: timeoutMs } = flags;\n\n    // `emptyToUndefined` collapses `--password ''` and `MM_WALLET_PASSWORD=''`\n    // to undefined so the prompt fires instead of sending an empty string.\n    const flagPassword = emptyToUndefined(flags.password);\n    let password: string;\n    try {\n      password = flagPassword ?? (await promptPassword());\n    } catch (error) {\n      // Only swallow ExitPromptError (@inquirer/core's Ctrl+C signal); any\n      // other rejection (import failure, internal prompt crash) should surface.\n      if (error instanceof Error && error.name === 'ExitPromptError') {\n        return;\n      }\n      throw error;\n    }\n\n    const { socketPath } = getDaemonPaths(this.config.dataDir);\n\n    let response;\n    try {\n      response = await sendCommand({\n        socketPath,\n        method: 'call',\n        params: ['KeyringController:submitPassword', password],\n        ...(timeoutMs === undefined ? {} : { timeoutMs }),\n      });\n    } catch (error) {\n      this.error(makeDaemonConnectionError(error));\n    }\n\n    if (isJsonRpcFailure(response)) {\n      const { code, message, data } = response.error;\n      // `isJsonRpcFailure` already validates that `data` is JSON, so\n      // `JSON.stringify` cannot throw here.\n      const dataSuffix =\n        data === undefined || data === null\n          ? ''\n          : ` data=${JSON.stringify(data)}`;\n      this.error(\n        `Failed to unlock: ${message} (code ${String(code)})${dataSuffix}`,\n      );\n    }\n\n    this.log('Wallet unlocked.');\n  }\n}\n"]}

package/dist/commands/wallet/unlock.d.cts

@@ -0,0 +1,11 @@
+import { Command } from "@oclif/core";
+export default class WalletUnlock extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=unlock.d.cts.map

package/dist/commands/wallet/unlock.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unlock.d.cts","sourceRoot":"","sources":["../../../src/commands/wallet/unlock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAS,oBAAoB;AAU7C,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC/C,OAAgB,WAAW,SAGyC;IAEpE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;MAanB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgDlC"}

package/dist/commands/wallet/unlock.d.mts

@@ -0,0 +1,11 @@
+import { Command } from "@oclif/core";
+export default class WalletUnlock extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=unlock.d.mts.map

package/dist/commands/wallet/unlock.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unlock.d.mts","sourceRoot":"","sources":["../../../src/commands/wallet/unlock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAS,oBAAoB;AAU7C,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC/C,OAAgB,WAAW,SAGyC;IAEpE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;MAanB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgDlC"}

package/dist/commands/wallet/unlock.mjs

@@ -0,0 +1,73 @@
+import { isJsonRpcFailure } from "@metamask/utils";
+import { Command, Flags } from "@oclif/core";
+import { sendCommand } from "../../daemon/daemon-client.mjs";
+import { getDaemonPaths } from "../../daemon/paths.mjs";
+import { promptPassword } from "../../daemon/prompts.mjs";
+import { emptyToUndefined, makeDaemonConnectionError } from "../../daemon/utils.mjs";
+class WalletUnlock extends Command {
+    async run() {
+        const { flags } = await this.parse(WalletUnlock);
+        const { timeout: timeoutMs } = flags;
+        // `emptyToUndefined` collapses `--password ''` and `MM_WALLET_PASSWORD=''`
+        // to undefined so the prompt fires instead of sending an empty string.
+        const flagPassword = emptyToUndefined(flags.password);
+        let password;
+        try {
+            password = flagPassword ?? (await promptPassword());
+        }
+        catch (error) {
+            // Only swallow ExitPromptError (@inquirer/core's Ctrl+C signal); any
+            // other rejection (import failure, internal prompt crash) should surface.
+            if (error instanceof Error && error.name === 'ExitPromptError') {
+                return;
+            }
+            throw error;
+        }
+        const { socketPath } = getDaemonPaths(this.config.dataDir);
+        let response;
+        try {
+            response = await sendCommand({
+                socketPath,
+                method: 'call',
+                params: ['KeyringController:submitPassword', password],
+                ...(timeoutMs === undefined ? {} : { timeoutMs }),
+            });
+        }
+        catch (error) {
+            this.error(makeDaemonConnectionError(error));
+        }
+        if (isJsonRpcFailure(response)) {
+            const { code, message, data } = response.error;
+            // `isJsonRpcFailure` already validates that `data` is JSON, so
+            // `JSON.stringify` cannot throw here.
+            const dataSuffix = data === undefined || data === null
+                ? ''
+                : ` data=${JSON.stringify(data)}`;
+            this.error(`Failed to unlock: ${message} (code ${String(code)})${dataSuffix}`);
+        }
+        this.log('Wallet unlocked.');
+    }
+}
+WalletUnlock.description = 'Unlock the wallet (submits the password to KeyringController). ' +
+    'Use this after `mm daemon start` was run without `--password`, or ' +
+    'after the keyring was locked via `KeyringController:setLocked`.';
+WalletUnlock.examples = [
+    '<%= config.bin %> wallet unlock --password <pw>',
+    'MM_WALLET_PASSWORD=<pw> <%= config.bin %> wallet unlock',
+    '<%= config.bin %> wallet unlock   # prompts interactively',
+];
+WalletUnlock.flags = {
+    password: Flags.string({
+        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +
+            'When omitted, the command prompts interactively.',
+        env: 'MM_WALLET_PASSWORD',
+        required: false,
+    }),
+    timeout: Flags.integer({
+        char: 't',
+        description: 'Response timeout in milliseconds',
+        required: false,
+    }),
+};
+export default WalletUnlock;
+//# sourceMappingURL=unlock.mjs.map

package/dist/commands/wallet/unlock.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"unlock.mjs","sourceRoot":"","sources":["../../../src/commands/wallet/unlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB;AACnD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB;AAE7C,OAAO,EAAE,WAAW,EAAE,uCAAmC;AACzD,OAAO,EAAE,cAAc,EAAE,+BAA2B;AACpD,OAAO,EAAE,cAAc,EAAE,iCAA6B;AACtD,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EAC1B,+BAA2B;AAE5B,MAAqB,YAAa,SAAQ,OAAO;IA2BxC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAErC,2EAA2E;QAC3E,uEAAuE;QACvE,MAAM,YAAY,GAAG,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,QAAgB,CAAC;QACrB,IAAI,CAAC;YACH,QAAQ,GAAG,YAAY,IAAI,CAAC,MAAM,cAAc,EAAE,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qEAAqE;YACrE,0EAA0E;YAC1E,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBAC/D,OAAO;YACT,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,WAAW,CAAC;gBAC3B,UAAU;gBACV,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,CAAC,kCAAkC,EAAE,QAAQ,CAAC;gBACtD,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;aAClD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC/C,+DAA+D;YAC/D,sCAAsC;YACtC,MAAM,UAAU,GACd,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI;gBACjC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,KAAK,CACR,qBAAqB,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,CACnE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC/B,CAAC;;AAzEe,wBAAW,GACzB,iEAAiE;IACjE,oEAAoE;IACpE,iEAAiE,CAAC;AAEpD,qBAAQ,GAAG;IACzB,iDAAiD;IACjD,yDAAyD;IACzD,2DAA2D;CAC5D,CAAC;AAEc,kBAAK,GAAG;IACtB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EACT,iFAAiF;YACjF,kDAAkD;QACpD,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,kCAAkC;QAC/C,QAAQ,EAAE,KAAK;KAChB,CAAC;CACH,CAAC;eAzBiB,YAAY","sourcesContent":["import { isJsonRpcFailure } from '@metamask/utils';\nimport { Command, Flags } from '@oclif/core';\n\nimport { sendCommand } from '../../daemon/daemon-client';\nimport { getDaemonPaths } from '../../daemon/paths';\nimport { promptPassword } from '../../daemon/prompts';\nimport {\n  emptyToUndefined,\n  makeDaemonConnectionError,\n} from '../../daemon/utils';\n\nexport default class WalletUnlock extends Command {\n  static override description =\n    'Unlock the wallet (submits the password to KeyringController). ' +\n    'Use this after `mm daemon start` was run without `--password`, or ' +\n    'after the keyring was locked via `KeyringController:setLocked`.';\n\n  static override examples = [\n    '<%= config.bin %> wallet unlock --password <pw>',\n    'MM_WALLET_PASSWORD=<pw> <%= config.bin %> wallet unlock',\n    '<%= config.bin %> wallet unlock   # prompts interactively',\n  ];\n\n  static override flags = {\n    password: Flags.string({\n      description:\n        'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production). ' +\n        'When omitted, the command prompts interactively.',\n      env: 'MM_WALLET_PASSWORD',\n      required: false,\n    }),\n    timeout: Flags.integer({\n      char: 't',\n      description: 'Response timeout in milliseconds',\n      required: false,\n    }),\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(WalletUnlock);\n    const { timeout: timeoutMs } = flags;\n\n    // `emptyToUndefined` collapses `--password ''` and `MM_WALLET_PASSWORD=''`\n    // to undefined so the prompt fires instead of sending an empty string.\n    const flagPassword = emptyToUndefined(flags.password);\n    let password: string;\n    try {\n      password = flagPassword ?? (await promptPassword());\n    } catch (error) {\n      // Only swallow ExitPromptError (@inquirer/core's Ctrl+C signal); any\n      // other rejection (import failure, internal prompt crash) should surface.\n      if (error instanceof Error && error.name === 'ExitPromptError') {\n        return;\n      }\n      throw error;\n    }\n\n    const { socketPath } = getDaemonPaths(this.config.dataDir);\n\n    let response;\n    try {\n      response = await sendCommand({\n        socketPath,\n        method: 'call',\n        params: ['KeyringController:submitPassword', password],\n        ...(timeoutMs === undefined ? {} : { timeoutMs }),\n      });\n    } catch (error) {\n      this.error(makeDaemonConnectionError(error));\n    }\n\n    if (isJsonRpcFailure(response)) {\n      const { code, message, data } = response.error;\n      // `isJsonRpcFailure` already validates that `data` is JSON, so\n      // `JSON.stringify` cannot throw here.\n      const dataSuffix =\n        data === undefined || data === null\n          ? ''\n          : ` data=${JSON.stringify(data)}`;\n      this.error(\n        `Failed to unlock: ${message} (code ${String(code)})${dataSuffix}`,\n      );\n    }\n\n    this.log('Wallet unlocked.');\n  }\n}\n"]}

package/dist/daemon/daemon-entry.cjs

@@ -1,12 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const superstruct_1 = require("@metamask/superstruct");
 const promises_1 = require("node:fs/promises");
 const daemon_client_1 = require("./daemon-client.cjs");
 const data_dir_1 = require("./data-dir.cjs");
 const paths_1 = require("./paths.cjs");
 const rpc_socket_server_1 = require("./rpc-socket-server.cjs");
+const secrets_1 = require("./secrets.cjs");
+const types_1 = require("./types.cjs");
 const utils_1 = require("./utils.cjs");
 const wallet_factory_1 = require("./wallet-factory.cjs");
+/**
+ * Params struct for the `call` RPC method. `params` must be a non-empty array
+ * whose first element is the messenger action name; remaining elements are
+ * positional action arguments forwarded as-is to `messenger.call`.
+ */
+const callParamsStruct = (0, superstruct_1.define)('CallParams', (value) => {
+    if (!Array.isArray(value)) {
+        return 'Expected an array';
+    }
+    if (value.length === 0) {
+        return 'Expected a non-empty array';
+    }
+    if (typeof value[0] !== 'string') {
+        return 'Expected the first element to be a string action name';
+    }
+    return true;
+});
 const startTime = Date.now();
 main().catch((error) => {
     process.stderr.write(`Daemon fatal: ${String(error)}\n`);
@@ -21,20 +41,22 @@ async function main() {
     if (!infuraProjectId) {
         throw new Error('INFURA_PROJECT_ID environment variable is required');
     }
-    const password = process.env.MM_WALLET_PASSWORD;
-    if (!password) {
-        throw new Error('MM_WALLET_PASSWORD environment variable is required');
-    }
-    const srp = process.env.MM_WALLET_SRP;
-    if (!srp) {
+    // Password is optional: when absent, the daemon starts without unlocking
+    // the keyring (e.g. when the user prefers to call `mm wallet unlock`
+    // interactively rather than embed the password in their environment).
+    // First-run startup still requires a password; wallet-factory enforces
+    // that and surfaces a clear error.
+    const passwordRaw = process.env.MM_WALLET_PASSWORD;
+    const srpRaw = process.env.MM_WALLET_SRP;
+    if (!srpRaw) {
         throw new Error('MM_WALLET_SRP environment variable is required');
     }
-    // Scrub the wallet secrets from the environment now they are captured. The
-    // daemon is long-lived and dispatches arbitrary messenger actions over its
-    // socket, so leaving the SRP/password in `process.env` for its whole lifetime
-    // needlessly widens their exposure to any in-process code.
+    // Scrub before validation so a throw from Password.from / Srp.from (bad
+    // value) does not leave the raw secrets in the long-lived daemon's env.
     delete process.env.MM_WALLET_PASSWORD;
     delete process.env.MM_WALLET_SRP;
+    const password = passwordRaw ? secrets_1.Password.from(passwordRaw) : undefined;
+    const srp = secrets_1.Srp.from(srpRaw);
     await (0, data_dir_1.ensureOwnerOnlyDirectory)(dataDir);
     const { socketPath: defaultSocketPath, pidPath, logPath, dbPath, } = (0, paths_1.getDaemonPaths)(dataDir);
     const socketPath = process.env.MM_DAEMON_SOCKET_PATH ?? defaultSocketPath;
@@ -73,29 +95,27 @@ async function main() {
             log,
         }));
         const constructedWallet = wallet;
+        // Arbitrary messenger dispatch is intentional: the CLI exposes the full
+        // messenger surface over a Unix socket inside the per-user oclif data
+        // directory. The dataDir is chmodded to 0o700 above and the socket to
+        // 0o600 by the RPC server on bind, so only the owning user can open them,
+        // but there is no in-process auth check beyond that filesystem-permission
+        // barrier. The messenger is strongly typed by action name; we narrow it
+        // once here to the RpcDispatcher shape the `call` handler needs.
+        const dispatch = constructedWallet.messenger.call.bind(constructedWallet.messenger);
         const handlers = {
-            getStatus: async () => ({
+            getStatus: (0, types_1.defineHandler)((0, superstruct_1.literal)(null), async () => ({
                 pid: process.pid,
                 uptime: Math.floor((Date.now() - startTime) / 1000),
+            })),
+            call: (0, types_1.defineHandler)(callParamsStruct, async (params) => {
+                const [action, ...args] = params;
+                return await dispatch(action, ...args);
             }),
             // Exposes the callable surface for discovery: it grows silently as
             // controllers are wired, so consumers need a way to see it without a
             // hand-kept catalog that would rot.
-            listActions: async () => constructedWallet.messenger.getRegisteredActionTypes(),
-            // Arbitrary messenger dispatch is intentional: the CLI exposes the full
-            // messenger surface over a Unix socket inside the per-user oclif data
-            // directory. The dataDir is chmodded to 0o700 above and the socket to
-            // 0o600 by the RPC server on bind, so only the owning user can open
-            // them, but there is no in-process auth check beyond that
-            // filesystem-permission barrier.
-            call: async (params) => {
-                if (!Array.isArray(params) || typeof params[0] !== 'string') {
-                    throw new Error('Expected params to be an array with an action name');
-                }
-                const [action, ...args] = params;
-                const result = constructedWallet.messenger.call(action, ...args);
-                return (result instanceof Promise ? await result : result);
-            },
+            listActions: (0, types_1.defineHandler)((0, superstruct_1.literal)(null), async () => constructedWallet.messenger.getRegisteredActionTypes()),
         };
         // `startRpcSocketServer` restricts the socket to the owner (chmod 0o600)
         // on bind and never leaves a live server/socket behind if it rejects, so
@@ -142,7 +162,12 @@ async function main() {
                 catch (closeError) {
                     log(`handle.close() failed: ${String(closeError)}`);
                 }
-                await activeDispose();
+                try {
+                    await activeDispose();
+                }
+                catch (disposeError) {
+                    log(`dispose() failed during shutdown: ${String(disposeError)}`);
+                }
                 await Promise.all([
                     removeOwnedPidFile(pidPath, pidFileContents).catch((rmError) => {
                         log(`Failed to remove PID file: ${String(rmError)}`);