@metamask-previews/wallet-cli 0.0.0-preview-2a8139a3e → 0.0.0-preview-b8d04f274

package/CHANGELOG.md

@@ -9,8 +9,6 @@ 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))
@@ -20,10 +18,7 @@ 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,24 +12,12 @@ or
 
 ## Usage
 
-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.
+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.
 
 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,13 +2,11 @@
 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 = flags.password ? secrets_1.Password.from(flags.password) : undefined;
-        const srp = secrets_1.Srp.from(flags.srp);
+        const { password, srp } = flags;
         const { state, socketPath } = await (0, daemon_spawn_1.ensureDaemon)({
             dataDir: this.config.dataDir,
             infuraProjectId,
@@ -28,7 +26,6 @@ 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({
@@ -37,10 +34,9 @@ DaemonStart.flags = {
         required: true,
     }),
     password: core_1.Flags.string({
-        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`.',
+        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production)',
         env: 'MM_WALLET_PASSWORD',
-        required: false,
+        required: true,
     }),
     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;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"]}
+{"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"]}

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 | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        password: import("@oclif/core/interfaces").OptionFlag<string, 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;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"}
+{"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"}

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 | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        password: import("@oclif/core/interfaces").OptionFlag<string, 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;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"}
+{"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"}

package/dist/commands/daemon/start.mjs

@@ -1,12 +1,10 @@
 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 = flags.password ? Password.from(flags.password) : undefined;
-        const srp = Srp.from(flags.srp);
+        const { password, srp } = flags;
         const { state, socketPath } = await ensureDaemon({
             dataDir: this.config.dataDir,
             infuraProjectId,
@@ -26,7 +24,6 @@ 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({
@@ -35,10 +32,9 @@ DaemonStart.flags = {
         required: true,
     }),
     password: Flags.string({
-        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`.',
+        description: 'Wallet password (testing only — use MM_WALLET_PASSWORD env var in production)',
         env: 'MM_WALLET_PASSWORD',
-        required: false,
+        required: true,
     }),
     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;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"]}
+{"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"]}

package/dist/daemon/daemon-entry.cjs

@@ -1,32 +1,12 @@
 "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`);
@@ -41,22 +21,20 @@ async function main() {
     if (!infuraProjectId) {
         throw new Error('INFURA_PROJECT_ID environment variable is required');
     }
-    // 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) {
+    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) {
         throw new Error('MM_WALLET_SRP environment variable is required');
     }
-    // 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.
+    // 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.
     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;
@@ -95,27 +73,29 @@ 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: (0, types_1.defineHandler)((0, superstruct_1.literal)(null), async () => ({
+            getStatus: 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: (0, types_1.defineHandler)((0, superstruct_1.literal)(null), async () => constructedWallet.messenger.getRegisteredActionTypes()),
+            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);
+            },
         };
         // `startRpcSocketServer` restricts the socket to the owner (chmod 0o600)
         // on bind and never leaves a live server/socket behind if it rejects, so
@@ -162,12 +142,7 @@ async function main() {
                 catch (closeError) {
                     log(`handle.close() failed: ${String(closeError)}`);
                 }
-                try {
-                    await activeDispose();
-                }
-                catch (disposeError) {
-                    log(`dispose() failed during shutdown: ${String(disposeError)}`);
-                }
+                await activeDispose();
                 await Promise.all([
                     removeOwnedPidFile(pidPath, pidFileContents).catch((rmError) => {
                         log(`Failed to remove PID file: ${String(rmError)}`);

package/dist/daemon/daemon-entry.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"daemon-entry.cjs","sourceRoot":"","sources":["../../src/daemon/daemon-entry.ts"],"names":[],"mappings":"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","sourcesContent":["import { define, literal } from '@metamask/superstruct';\nimport type { Json } from '@metamask/utils';\nimport type { Wallet } from '@metamask/wallet';\nimport { appendFile, readFile, rm, writeFile } from 'node:fs/promises';\n\nimport { pingDaemon } from './daemon-client';\nimport { ensureOwnerOnlyDirectory } from './data-dir';\nimport { getDaemonPaths } from './paths';\nimport { startRpcSocketServer } from './rpc-socket-server';\nimport type { RpcSocketServerHandle } from './rpc-socket-server';\nimport { Password, Srp } from './secrets';\nimport { defineHandler } from './types';\nimport type {\n  DaemonStatusInfo,\n  Logger,\n  RpcDispatcher,\n  RpcHandlerMap,\n} from './types';\nimport { isErrorWithCode, isProcessAlive, readPidFile } from './utils';\nimport { createWallet } from './wallet-factory';\n\n/**\n * Params struct for the `call` RPC method. `params` must be a non-empty array\n * whose first element is the messenger action name; remaining elements are\n * positional action arguments forwarded as-is to `messenger.call`.\n */\nconst callParamsStruct = define<[string, ...unknown[]]>(\n  'CallParams',\n  (value) => {\n    if (!Array.isArray(value)) {\n      return 'Expected an array';\n    }\n    if (value.length === 0) {\n      return 'Expected a non-empty array';\n    }\n    if (typeof value[0] !== 'string') {\n      return 'Expected the first element to be a string action name';\n    }\n    return true;\n  },\n);\n\nconst startTime = Date.now();\n\nmain().catch((error: unknown) => {\n  process.stderr.write(`Daemon fatal: ${String(error)}\\n`);\n  process.exitCode = 1;\n});\n\nasync function main(): Promise<void> {\n  const dataDir = process.env.MM_DAEMON_DATA_DIR;\n  if (!dataDir) {\n    throw new Error('MM_DAEMON_DATA_DIR environment variable is required');\n  }\n\n  const infuraProjectId = process.env.INFURA_PROJECT_ID;\n  if (!infuraProjectId) {\n    throw new Error('INFURA_PROJECT_ID environment variable is required');\n  }\n\n  // Password is optional: when absent, the daemon starts without unlocking\n  // the keyring (e.g. when the user prefers to call `mm wallet unlock`\n  // interactively rather than embed the password in their environment).\n  // First-run startup still requires a password; wallet-factory enforces\n  // that and surfaces a clear error.\n  const passwordRaw = process.env.MM_WALLET_PASSWORD;\n\n  const srpRaw = process.env.MM_WALLET_SRP;\n  if (!srpRaw) {\n    throw new Error('MM_WALLET_SRP environment variable is required');\n  }\n\n  // Scrub before validation so a throw from Password.from / Srp.from (bad\n  // value) does not leave the raw secrets in the long-lived daemon's env.\n  delete process.env.MM_WALLET_PASSWORD;\n  delete process.env.MM_WALLET_SRP;\n\n  const password = passwordRaw ? Password.from(passwordRaw) : undefined;\n  const srp = Srp.from(srpRaw);\n\n  await ensureOwnerOnlyDirectory(dataDir);\n\n  const {\n    socketPath: defaultSocketPath,\n    pidPath,\n    logPath,\n    dbPath,\n  } = getDaemonPaths(dataDir);\n  const socketPath = process.env.MM_DAEMON_SOCKET_PATH ?? defaultSocketPath;\n\n  const log = makeLogger(logPath);\n  log('Starting daemon...');\n\n  // Pre-flight: refuse to take over if a responsive daemon already owns this\n  // socket. If the existing PID file is stale (or the socket is dead), clean\n  // it up so the exclusive PID-file write below has a chance to succeed.\n  await claimDaemonSlot(pidPath, socketPath, log);\n\n  const pidFileContents = `${process.pid}\\n${startTime}\\n`;\n\n  // Claim the slot atomically BEFORE opening the SQLite database or\n  // constructing the Wallet. Two concurrent `daemon start` invocations can\n  // both pass `claimDaemonSlot` (the gap between its preflight and the slot\n  // write is racy); without this ordering, both would open `wallet.db` and\n  // both would run first-run SRP import before one loses the wx race.\n  try {\n    await writeFile(pidPath, pidFileContents, { flag: 'wx' });\n  } catch (error) {\n    throw error instanceof Error\n      ? Object.assign(error, {\n          message: `Failed to claim daemon slot at ${pidPath}: ${error.message}`,\n        })\n      : /* istanbul ignore next -- node:fs/promises always rejects with an Error */\n        new Error(\n          `Failed to claim daemon slot at ${pidPath}: ${String(error)}`,\n        );\n  }\n\n  let wallet: Wallet | undefined;\n  let dispose: (() => Promise<void>) | undefined;\n  let handle: RpcSocketServerHandle | undefined;\n\n  try {\n    ({ wallet, dispose } = await createWallet({\n      databasePath: dbPath,\n      password,\n      srp,\n      infuraProjectId,\n      log,\n    }));\n\n    const constructedWallet = wallet;\n    // Arbitrary messenger dispatch is intentional: the CLI exposes the full\n    // messenger surface over a Unix socket inside the per-user oclif data\n    // directory. The dataDir is chmodded to 0o700 above and the socket to\n    // 0o600 by the RPC server on bind, so only the owning user can open them,\n    // but there is no in-process auth check beyond that filesystem-permission\n    // barrier. The messenger is strongly typed by action name; we narrow it\n    // once here to the RpcDispatcher shape the `call` handler needs.\n    const dispatch = constructedWallet.messenger.call.bind(\n      constructedWallet.messenger,\n    ) as unknown as RpcDispatcher;\n\n    const handlers: RpcHandlerMap = {\n      getStatus: defineHandler(\n        literal(null),\n        async (): Promise<DaemonStatusInfo> => ({\n          pid: process.pid,\n          uptime: Math.floor((Date.now() - startTime) / 1000),\n        }),\n      ),\n      call: defineHandler(callParamsStruct, async (params) => {\n        const [action, ...args] = params;\n        return await dispatch(action, ...(args as Json[]));\n      }),\n      // Exposes the callable surface for discovery: it grows silently as\n      // controllers are wired, so consumers need a way to see it without a\n      // hand-kept catalog that would rot.\n      listActions: defineHandler(\n        literal(null),\n        async (): Promise<Json> =>\n          constructedWallet.messenger.getRegisteredActionTypes(),\n      ),\n    };\n\n    // `startRpcSocketServer` restricts the socket to the owner (chmod 0o600)\n    // on bind and never leaves a live server/socket behind if it rejects, so\n    // the catch below has nothing of its own to close.\n    handle = await startRpcSocketServer({\n      socketPath,\n      handlers,\n      onShutdown: async () => shutdown('RPC shutdown'),\n      log,\n    });\n  } catch (error) {\n    // `dispose` is undefined only when `createWallet` itself threw — it has\n    // already torn down its own store in that case.\n    if (dispose) {\n      await dispose();\n    }\n    // Only remove the PID file if it's still ours (we may have lost the race\n    // and the file now belongs to another daemon).\n    await removeOwnedPidFile(pidPath, pidFileContents).catch(\n      (rmError: unknown) => {\n        log(`Failed to remove PID file during cleanup: ${String(rmError)}`);\n      },\n    );\n    throw error;\n  }\n\n  // Stable non-undefined refs for the shutdown closures (TS won't narrow the\n  // outer `let`s across closure escape).\n  const activeHandle = handle;\n  const activeDispose = dispose;\n\n  log(`Daemon started. Socket: ${socketPath}`);\n\n  let shutdownPromise: Promise<void> | undefined;\n\n  /**\n   * Shut down the daemon idempotently. Concurrent calls coalesce.\n   *\n   * @param reason - A label describing why shutdown was triggered.\n   * @returns A promise that resolves when shutdown completes.\n   */\n  async function shutdown(reason: string): Promise<void> {\n    if (shutdownPromise === undefined) {\n      log(`Shutting down (${reason})...`);\n      shutdownPromise = (async (): Promise<void> => {\n        try {\n          await activeHandle.close();\n        } catch (closeError) {\n          log(`handle.close() failed: ${String(closeError)}`);\n        }\n        try {\n          await activeDispose();\n        } catch (disposeError) {\n          log(`dispose() failed during shutdown: ${String(disposeError)}`);\n        }\n        await Promise.all([\n          removeOwnedPidFile(pidPath, pidFileContents).catch(\n            (rmError: unknown) => {\n              log(`Failed to remove PID file: ${String(rmError)}`);\n            },\n          ),\n          rm(socketPath, { force: true }).catch((rmError: unknown) => {\n            log(`Failed to remove socket file: ${String(rmError)}`);\n          }),\n        ]);\n      })();\n    }\n    return shutdownPromise;\n  }\n\n  process.on('SIGTERM', () => {\n    /* istanbul ignore next -- `shutdown` logs each step internally; the catch only guards against an unhandled rejection from the signal handler. */\n    shutdown('SIGTERM').catch(() => undefined);\n  });\n  process.on('SIGINT', () => {\n    /* istanbul ignore next -- `shutdown` logs each step internally; the catch only guards against an unhandled rejection from the signal handler. */\n    shutdown('SIGINT').catch(() => undefined);\n  });\n}\n\n/**\n * Refuse to start if a responsive daemon already owns the socket. Otherwise\n * clear any stale PID/socket files so the exclusive PID-file write can\n * proceed.\n *\n * @param pidPath - The PID file path.\n * @param socketPath - The socket path.\n * @param log - Logger for diagnostic messages.\n */\nasync function claimDaemonSlot(\n  pidPath: string,\n  socketPath: string,\n  log: Logger,\n): Promise<void> {\n  const existingPid = await readPidFile(pidPath);\n  const ping = await pingDaemon(socketPath);\n\n  if (ping.status === 'responsive') {\n    const pidPart =\n      existingPid === undefined\n        ? '(no PID file present)'\n        : `(pid ${existingPid})`;\n    throw new Error(`A daemon is already running on ${socketPath} ${pidPart}`);\n  }\n\n  // Refuse to clobber when the recorded PID is still alive, regardless of\n  // whether the socket exists. Possible scenarios:\n  // - `unreachable`: wedged or mid-startup sibling daemon (socket present\n  //   but not responding to JSON-RPC).\n  // - `absent`: a sibling daemon that hasn't yet bound its socket, or one\n  //   whose socket was manually removed. In either case, removing its PID\n  //   file would orphan it from `daemon stop`.\n  if (existingPid !== undefined && isProcessAlive(existingPid)) {\n    const detail =\n      ping.status === 'unreachable'\n        ? `socket at ${socketPath} is unresponsive (${ping.error.message})`\n        : `no socket at ${socketPath}, but pid is still alive`;\n    throw new Error(\n      `A daemon is already running (pid ${existingPid}): ${detail}. ` +\n        `Run \\`mm daemon stop\\` (or \\`mm daemon purge\\`) before starting a new daemon.`,\n    );\n  }\n\n  if (ping.status === 'unreachable') {\n    log(`Removing stale socket at ${socketPath} (${ping.error.message}).`);\n  }\n  // Always clear both files before claiming the slot. The PID file may be\n  // corrupt (truncated, partial write from a crashed run); without this, the\n  // exclusive `wx` write below would fail with EEXIST and the daemon could\n  // not start until a human manually deleted the file.\n  await Promise.all([\n    rm(pidPath, { force: true }),\n    rm(socketPath, { force: true }),\n  ]);\n}\n\n/**\n * Remove the PID file only if it still contains our exact contents. Guards\n * against a racing daemon's PID file being removed by this daemon during\n * cleanup.\n *\n * @param pidPath - Path to the PID file.\n * @param expectedContents - The contents we wrote when claiming the slot.\n */\nasync function removeOwnedPidFile(\n  pidPath: string,\n  expectedContents: string,\n): Promise<void> {\n  let actual: string;\n  try {\n    actual = await readFile(pidPath, 'utf-8');\n  } catch (error: unknown) {\n    if (isErrorWithCode(error, 'ENOENT')) {\n      return;\n    }\n    throw error;\n  }\n  if (actual === expectedContents) {\n    await rm(pidPath, { force: true });\n  }\n}\n\n/**\n * Create a file logger that appends timestamped lines to `logPath`, falling\n * back to stderr if the append fails.\n *\n * @param logPath - The log file path.\n * @returns A logging function.\n */\nfunction makeLogger(logPath: string): Logger {\n  return (message: string): void => {\n    const line = `[${new Date().toISOString()}] ${message}\\n`;\n    appendFile(logPath, line).catch((error: unknown) => {\n      process.stderr.write(`[log write failed: ${String(error)}] ${message}\\n`);\n    });\n  };\n}\n"]}
+{"version":3,"file":"daemon-entry.cjs","sourceRoot":"","sources":["../../src/daemon/daemon-entry.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Json } from '@metamask/utils';\nimport type { Wallet } from '@metamask/wallet';\nimport { appendFile, readFile, rm, writeFile } from 'node:fs/promises';\n\nimport { pingDaemon } from './daemon-client';\nimport { ensureOwnerOnlyDirectory } from './data-dir';\nimport { getDaemonPaths } from './paths';\nimport { startRpcSocketServer } from './rpc-socket-server';\nimport type { RpcSocketServerHandle } from './rpc-socket-server';\nimport type { DaemonStatusInfo, Logger, RpcHandlerMap } from './types';\nimport { isErrorWithCode, isProcessAlive, readPidFile } from './utils';\nimport { createWallet } from './wallet-factory';\n\nconst startTime = Date.now();\n\nmain().catch((error: unknown) => {\n  process.stderr.write(`Daemon fatal: ${String(error)}\\n`);\n  process.exitCode = 1;\n});\n\nasync function main(): Promise<void> {\n  const dataDir = process.env.MM_DAEMON_DATA_DIR;\n  if (!dataDir) {\n    throw new Error('MM_DAEMON_DATA_DIR environment variable is required');\n  }\n\n  const infuraProjectId = process.env.INFURA_PROJECT_ID;\n  if (!infuraProjectId) {\n    throw new Error('INFURA_PROJECT_ID environment variable is required');\n  }\n\n  const password = process.env.MM_WALLET_PASSWORD;\n  if (!password) {\n    throw new Error('MM_WALLET_PASSWORD environment variable is required');\n  }\n\n  const srp = process.env.MM_WALLET_SRP;\n  if (!srp) {\n    throw new Error('MM_WALLET_SRP environment variable is required');\n  }\n\n  // Scrub the wallet secrets from the environment now they are captured. The\n  // daemon is long-lived and dispatches arbitrary messenger actions over its\n  // socket, so leaving the SRP/password in `process.env` for its whole lifetime\n  // needlessly widens their exposure to any in-process code.\n  delete process.env.MM_WALLET_PASSWORD;\n  delete process.env.MM_WALLET_SRP;\n\n  await ensureOwnerOnlyDirectory(dataDir);\n\n  const {\n    socketPath: defaultSocketPath,\n    pidPath,\n    logPath,\n    dbPath,\n  } = getDaemonPaths(dataDir);\n  const socketPath = process.env.MM_DAEMON_SOCKET_PATH ?? defaultSocketPath;\n\n  const log = makeLogger(logPath);\n  log('Starting daemon...');\n\n  // Pre-flight: refuse to take over if a responsive daemon already owns this\n  // socket. If the existing PID file is stale (or the socket is dead), clean\n  // it up so the exclusive PID-file write below has a chance to succeed.\n  await claimDaemonSlot(pidPath, socketPath, log);\n\n  const pidFileContents = `${process.pid}\\n${startTime}\\n`;\n\n  // Claim the slot atomically BEFORE opening the SQLite database or\n  // constructing the Wallet. Two concurrent `daemon start` invocations can\n  // both pass `claimDaemonSlot` (the gap between its preflight and the slot\n  // write is racy); without this ordering, both would open `wallet.db` and\n  // both would run first-run SRP import before one loses the wx race.\n  try {\n    await writeFile(pidPath, pidFileContents, { flag: 'wx' });\n  } catch (error) {\n    throw error instanceof Error\n      ? Object.assign(error, {\n          message: `Failed to claim daemon slot at ${pidPath}: ${error.message}`,\n        })\n      : /* istanbul ignore next -- node:fs/promises always rejects with an Error */\n        new Error(\n          `Failed to claim daemon slot at ${pidPath}: ${String(error)}`,\n        );\n  }\n\n  let wallet: Wallet | undefined;\n  let dispose: (() => Promise<void>) | undefined;\n  let handle: RpcSocketServerHandle | undefined;\n\n  try {\n    ({ wallet, dispose } = await createWallet({\n      databasePath: dbPath,\n      password,\n      srp,\n      infuraProjectId,\n      log,\n    }));\n\n    const constructedWallet = wallet;\n    const handlers: RpcHandlerMap = {\n      getStatus: async (): Promise<DaemonStatusInfo> => ({\n        pid: process.pid,\n        uptime: Math.floor((Date.now() - startTime) / 1000),\n      }),\n      // Exposes the callable surface for discovery: it grows silently as\n      // controllers are wired, so consumers need a way to see it without a\n      // hand-kept catalog that would rot.\n      listActions: async (): Promise<Json> =>\n        constructedWallet.messenger.getRegisteredActionTypes(),\n      // Arbitrary messenger dispatch is intentional: the CLI exposes the full\n      // messenger surface over a Unix socket inside the per-user oclif data\n      // directory. The dataDir is chmodded to 0o700 above and the socket to\n      // 0o600 by the RPC server on bind, so only the owning user can open\n      // them, but there is no in-process auth check beyond that\n      // filesystem-permission barrier.\n      call: async (params) => {\n        if (!Array.isArray(params) || typeof params[0] !== 'string') {\n          throw new Error('Expected params to be an array with an action name');\n        }\n        const [action, ...args] = params as [string, ...Json[]];\n        // The messenger's `call` is typed to a literal action-name union; the\n        // daemon dispatches arbitrary action names from RPC. Cast to a\n        // string-keyed `call` (which preserves arity) rather than to `any`, so\n        // the only untyped value is the `unknown` result narrowed below.\n        type ArbitraryDispatch = {\n          call: (actionName: string, ...callArgs: Json[]) => unknown;\n        };\n        const result = (\n          constructedWallet.messenger as unknown as ArbitraryDispatch\n        ).call(action, ...args);\n        return (result instanceof Promise ? await result : result) as Json;\n      },\n    };\n\n    // `startRpcSocketServer` restricts the socket to the owner (chmod 0o600)\n    // on bind and never leaves a live server/socket behind if it rejects, so\n    // the catch below has nothing of its own to close.\n    handle = await startRpcSocketServer({\n      socketPath,\n      handlers,\n      onShutdown: async () => shutdown('RPC shutdown'),\n      log,\n    });\n  } catch (error) {\n    // `dispose` is undefined only when `createWallet` itself threw — it has\n    // already torn down its own store in that case.\n    if (dispose) {\n      await dispose();\n    }\n    // Only remove the PID file if it's still ours (we may have lost the race\n    // and the file now belongs to another daemon).\n    await removeOwnedPidFile(pidPath, pidFileContents).catch(\n      (rmError: unknown) => {\n        log(`Failed to remove PID file during cleanup: ${String(rmError)}`);\n      },\n    );\n    throw error;\n  }\n\n  // Stable non-undefined refs for the shutdown closures (TS won't narrow the\n  // outer `let`s across closure escape).\n  const activeHandle = handle;\n  const activeDispose = dispose;\n\n  log(`Daemon started. Socket: ${socketPath}`);\n\n  let shutdownPromise: Promise<void> | undefined;\n\n  /**\n   * Shut down the daemon idempotently. Concurrent calls coalesce.\n   *\n   * @param reason - A label describing why shutdown was triggered.\n   * @returns A promise that resolves when shutdown completes.\n   */\n  async function shutdown(reason: string): Promise<void> {\n    if (shutdownPromise === undefined) {\n      log(`Shutting down (${reason})...`);\n      shutdownPromise = (async (): Promise<void> => {\n        try {\n          await activeHandle.close();\n        } catch (closeError) {\n          log(`handle.close() failed: ${String(closeError)}`);\n        }\n        await activeDispose();\n        await Promise.all([\n          removeOwnedPidFile(pidPath, pidFileContents).catch(\n            (rmError: unknown) => {\n              log(`Failed to remove PID file: ${String(rmError)}`);\n            },\n          ),\n          rm(socketPath, { force: true }).catch((rmError: unknown) => {\n            log(`Failed to remove socket file: ${String(rmError)}`);\n          }),\n        ]);\n      })();\n    }\n    return shutdownPromise;\n  }\n\n  process.on('SIGTERM', () => {\n    /* istanbul ignore next -- `shutdown` logs each step internally; the catch only guards against an unhandled rejection from the signal handler. */\n    shutdown('SIGTERM').catch(() => undefined);\n  });\n  process.on('SIGINT', () => {\n    /* istanbul ignore next -- `shutdown` logs each step internally; the catch only guards against an unhandled rejection from the signal handler. */\n    shutdown('SIGINT').catch(() => undefined);\n  });\n}\n\n/**\n * Refuse to start if a responsive daemon already owns the socket. Otherwise\n * clear any stale PID/socket files so the exclusive PID-file write can\n * proceed.\n *\n * @param pidPath - The PID file path.\n * @param socketPath - The socket path.\n * @param log - Logger for diagnostic messages.\n */\nasync function claimDaemonSlot(\n  pidPath: string,\n  socketPath: string,\n  log: Logger,\n): Promise<void> {\n  const existingPid = await readPidFile(pidPath);\n  const ping = await pingDaemon(socketPath);\n\n  if (ping.status === 'responsive') {\n    const pidPart =\n      existingPid === undefined\n        ? '(no PID file present)'\n        : `(pid ${existingPid})`;\n    throw new Error(`A daemon is already running on ${socketPath} ${pidPart}`);\n  }\n\n  // Refuse to clobber when the recorded PID is still alive, regardless of\n  // whether the socket exists. Possible scenarios:\n  // - `unreachable`: wedged or mid-startup sibling daemon (socket present\n  //   but not responding to JSON-RPC).\n  // - `absent`: a sibling daemon that hasn't yet bound its socket, or one\n  //   whose socket was manually removed. In either case, removing its PID\n  //   file would orphan it from `daemon stop`.\n  if (existingPid !== undefined && isProcessAlive(existingPid)) {\n    const detail =\n      ping.status === 'unreachable'\n        ? `socket at ${socketPath} is unresponsive (${ping.error.message})`\n        : `no socket at ${socketPath}, but pid is still alive`;\n    throw new Error(\n      `A daemon is already running (pid ${existingPid}): ${detail}. ` +\n        `Run \\`mm daemon stop\\` (or \\`mm daemon purge\\`) before starting a new daemon.`,\n    );\n  }\n\n  if (ping.status === 'unreachable') {\n    log(`Removing stale socket at ${socketPath} (${ping.error.message}).`);\n  }\n  // Always clear both files before claiming the slot. The PID file may be\n  // corrupt (truncated, partial write from a crashed run); without this, the\n  // exclusive `wx` write below would fail with EEXIST and the daemon could\n  // not start until a human manually deleted the file.\n  await Promise.all([\n    rm(pidPath, { force: true }),\n    rm(socketPath, { force: true }),\n  ]);\n}\n\n/**\n * Remove the PID file only if it still contains our exact contents. Guards\n * against a racing daemon's PID file being removed by this daemon during\n * cleanup.\n *\n * @param pidPath - Path to the PID file.\n * @param expectedContents - The contents we wrote when claiming the slot.\n */\nasync function removeOwnedPidFile(\n  pidPath: string,\n  expectedContents: string,\n): Promise<void> {\n  let actual: string;\n  try {\n    actual = await readFile(pidPath, 'utf-8');\n  } catch (error: unknown) {\n    if (isErrorWithCode(error, 'ENOENT')) {\n      return;\n    }\n    throw error;\n  }\n  if (actual === expectedContents) {\n    await rm(pidPath, { force: true });\n  }\n}\n\n/**\n * Create a file logger that appends timestamped lines to `logPath`, falling\n * back to stderr if the append fails.\n *\n * @param logPath - The log file path.\n * @returns A logging function.\n */\nfunction makeLogger(logPath: string): Logger {\n  return (message: string): void => {\n    const line = `[${new Date().toISOString()}] ${message}\\n`;\n    appendFile(logPath, line).catch((error: unknown) => {\n      process.stderr.write(`[log write failed: ${String(error)}] ${message}\\n`);\n    });\n  };\n}\n"]}

package/dist/daemon/daemon-entry.mjs

@@ -1,30 +1,10 @@
-import { define, literal } from "@metamask/superstruct";
 import { appendFile, readFile, rm, writeFile } from "node:fs/promises";
 import { pingDaemon } from "./daemon-client.mjs";
 import { ensureOwnerOnlyDirectory } from "./data-dir.mjs";
 import { getDaemonPaths } from "./paths.mjs";
 import { startRpcSocketServer } from "./rpc-socket-server.mjs";
-import { Password, Srp } from "./secrets.mjs";
-import { defineHandler } from "./types.mjs";
 import { isErrorWithCode, isProcessAlive, readPidFile } from "./utils.mjs";
 import { createWallet } from "./wallet-factory.mjs";
-/**
- * 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 = 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`);
@@ -39,22 +19,20 @@ async function main() {
     if (!infuraProjectId) {
         throw new Error('INFURA_PROJECT_ID environment variable is required');
     }
-    // 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) {
+    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) {
         throw new Error('MM_WALLET_SRP environment variable is required');
     }
-    // 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.
+    // 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.
     delete process.env.MM_WALLET_PASSWORD;
     delete process.env.MM_WALLET_SRP;
-    const password = passwordRaw ? Password.from(passwordRaw) : undefined;
-    const srp = Srp.from(srpRaw);
     await ensureOwnerOnlyDirectory(dataDir);
     const { socketPath: defaultSocketPath, pidPath, logPath, dbPath, } = getDaemonPaths(dataDir);
     const socketPath = process.env.MM_DAEMON_SOCKET_PATH ?? defaultSocketPath;
@@ -93,27 +71,29 @@ 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: defineHandler(literal(null), async () => ({
+            getStatus: async () => ({
                 pid: process.pid,
                 uptime: Math.floor((Date.now() - startTime) / 1000),
-            })),
-            call: 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: defineHandler(literal(null), async () => constructedWallet.messenger.getRegisteredActionTypes()),
+            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);
+            },
         };
         // `startRpcSocketServer` restricts the socket to the owner (chmod 0o600)
         // on bind and never leaves a live server/socket behind if it rejects, so
@@ -160,12 +140,7 @@ async function main() {
                 catch (closeError) {
                     log(`handle.close() failed: ${String(closeError)}`);
                 }
-                try {
-                    await activeDispose();
-                }
-                catch (disposeError) {
-                    log(`dispose() failed during shutdown: ${String(disposeError)}`);
-                }
+                await activeDispose();
                 await Promise.all([
                     removeOwnedPidFile(pidPath, pidFileContents).catch((rmError) => {
                         log(`Failed to remove PID file: ${String(rmError)}`);