shinjuku-shielded 0.3.17 → 0.3.18

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "2ec5cd82c2ae8b9008491d07b5dc4740a5db5904e92814870fd66080aec7fc7b",
-  "bytes": 11113178,
-  "sourceCommit": "425179de4d0c1938a030fdfbe6f82e14e1e7a82c",
+  "sha256": "6adb44302a8db0b19245a1366e56090c0f0d27c443f37e69c1c2ef97151c9e74",
+  "bytes": 11115097,
+  "sourceCommit": "2c2f0da6189df2ed67a3ff3ef6639b40e2a8ed47",
   "sourceDirty": false,
   "installRecordMatchesLockfile": true,
   "releaseRule": "valid only when two fresh npm ci --ignore-scripts builds on different OSes give the same sha256; installRecordMatchesLockfile true means every entry npm installed equals its package-lock.json entry and every entry not marked optional, devOptional included, is installed: an optional entry (a package for another platform) may be absent",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "mcpName": "io.github.ShinjukuStaition/shinjuku-mcp",
   "description": "Shinjuku Shielded, the private x402 facilitator on Solana: the self-custody wallet CLI and its MCP server. Shield, pay, and unshield USDC from any MCP agent, under caps you set.",
-  "shinjukuRelease": "2ec5cd82",
-  "shinjukuSha256": "2ec5cd82c2ae8b9008491d07b5dc4740a5db5904e92814870fd66080aec7fc7b",
+  "shinjukuRelease": "6adb4430",
+  "shinjukuSha256": "6adb44302a8db0b19245a1366e56090c0f0d27c443f37e69c1c2ef97151c9e74",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -68165,7 +68165,7 @@ var init_production_proof_bundle2 = __esm({
 });
 
 // spikes/shielded-x402-wallet/lib/p03-recovered-exit.mjs
-import { spawnSync as spawnSync3 } from "node:child_process";
+import { spawn as spawn3, spawnSync as spawnSync3 } from "node:child_process";
 import { createHash as createHash16 } from "node:crypto";
 import { dirname as dirname13, isAbsolute as isAbsolute5, join as join11, relative as relative6, resolve as resolve11 } from "node:path";
 import { tmpdir as tmpdir2 } from "node:os";
@@ -68224,24 +68224,76 @@ function manifestTool2(base, value, label) {
   const tool = exactTool2(value, label);
   return Object.freeze({ path: manifestPath2(base, tool.path, true), sha256: tool.sha256 });
 }
+function childFailure2(status, stderr) {
+  const error = new Error(`p03_recovered_exit_child_failed:${status ?? "signal"}`);
+  Object.defineProperty(error, "childStderr", {
+    value: String(stderr ?? ""),
+    enumerable: false
+  });
+  return error;
+}
 function run3(command, args, options = {}) {
   const result = spawnSync3(command, args, {
     encoding: "utf8",
-    maxBuffer: 128 * 1024 * 1024,
-    timeout: 18e5,
+    maxBuffer: CHILD_MAX_BUFFER2,
+    timeout: CHILD_TIMEOUT_MS2,
     windowsHide: true,
     ...options
   });
-  if (result.status !== 0) {
-    const error = new Error(`p03_recovered_exit_child_failed:${result.status ?? "signal"}`);
-    Object.defineProperty(error, "childStderr", {
-      value: String(result.stderr ?? ""),
-      enumerable: false
-    });
-    throw error;
-  }
+  if (result.status !== 0) throw childFailure2(result.status, result.stderr);
   return result.stdout;
 }
+function runAsync2(command, args, { input, ...options } = {}) {
+  return new Promise((resolvePromise, reject) => {
+    const out = [];
+    const err = [];
+    let size = 0;
+    let failed = false;
+    let child;
+    try {
+      child = spawn3(command, args, {
+        windowsHide: true,
+        stdio: [input === void 0 ? "ignore" : "pipe", "pipe", "pipe"],
+        ...options
+      });
+    } catch (error) {
+      reject(childFailure2(void 0, error?.message));
+      return;
+    }
+    const timer = setTimeout(() => {
+      failed = true;
+      child.kill("SIGKILL");
+    }, CHILD_TIMEOUT_MS2);
+    const collect = (sink) => (chunk) => {
+      size += chunk.length;
+      if (size > CHILD_MAX_BUFFER2) {
+        failed = true;
+        child.kill("SIGKILL");
+        return;
+      }
+      sink.push(chunk);
+    };
+    child.stdout.on("data", collect(out));
+    child.stderr.on("data", collect(err));
+    let settled = false;
+    const finish = (status, stderr) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (status === 0 && !failed) resolvePromise(Buffer.concat(out).toString("utf8"));
+      else reject(childFailure2(failed ? void 0 : status, stderr ?? Buffer.concat(err).toString("utf8")));
+    };
+    child.on("error", (error) => {
+      if (child.pid === void 0) finish(void 0, error?.message);
+    });
+    child.on("close", (status) => finish(status));
+    if (input !== void 0) {
+      child.stdin.on("error", () => {
+      });
+      child.stdin.end(input);
+    }
+  });
+}
 function witnessFailureSlug2(error) {
   const prefix = "p03_recovered_exit_witness: ";
   const line = String(error?.childStderr ?? "").split(/\r?\n/, 1)[0];
@@ -68308,12 +68360,12 @@ function ensureExecutable2(path) {
   const mode = statSync(path).mode;
   if ((mode & 73) !== 73) chmodSync(path, mode | 493);
 }
-function runTool2(tool, args, environment = {}, options = {}) {
+async function runTool2(tool, args, environment = {}, options = {}) {
   if (observedToolSha2562(tool) !== tool.sha256) fail14("tool_hash_mismatch");
   ensureExecutable2(tool.path);
   const wsl = isWslTool2(tool.path);
   if (wsl) {
-    return run3("wsl.exe", [
+    return runAsync2("wsl.exe", [
       "-e",
       "env",
       "-i",
@@ -68324,7 +68376,7 @@ function runTool2(tool, args, environment = {}, options = {}) {
       ...args.map((value) => toolPath2(value, true))
     ], options);
   }
-  return run3(tool.path, args, {
+  return runAsync2(tool.path, args, {
     ...options,
     env: { ...process.env, LANG: "C", LC_ALL: "C", ...environment }
   });
@@ -68436,6 +68488,9 @@ function proveRecoveredP03Exit({ request, tools }) {
   const primaryProver = tools?.[kind.tool];
   if (!primaryProver) fail14(`${kind.tool}_missing`);
   const bundle = loadBundle2(tools);
+  return proveLoadedExit({ request, tools, kind, primaryProver, bundle });
+}
+async function proveLoadedExit({ request, tools, kind, primaryProver, bundle }) {
   const scratch = mkdtempSync(join11(tmpdir2(), kind.scratchPrefix));
   try {
     const vectors = join11(scratch, "vectors");
@@ -68446,7 +68501,7 @@ function proveRecoveredP03Exit({ request, tools }) {
     mkdirSync(appendProofs, { recursive: true, mode: 448 });
     let output2;
     try {
-      output2 = JSON.parse(runTool2(
+      output2 = JSON.parse(await runTool2(
         tools.witness,
         ["--write-proof-vectors", vectors],
         {},
@@ -68464,7 +68519,7 @@ function proveRecoveredP03Exit({ request, tools }) {
       join11(vectors, "tree-append-sequence.json")
     );
     try {
-      runTool2(primaryProver, [kind.command], {
+      await runTool2(primaryProver, [kind.command], {
         SHIELDED_X402_VECTOR_PATH: primaryVector,
         SHIELDED_X402_PRODUCTION_PROOF_DIR: primaryProofs,
         SHIELDED_X402_PARAMETER_MANIFEST_SHA256: bundle.manifestSha256,
@@ -68474,7 +68529,7 @@ function proveRecoveredP03Exit({ request, tools }) {
       throw new Error("p03_recovered_exit_primary_prover_phase_failed", { cause: error });
     }
     try {
-      runTool2(tools.treeAppendProver, ["prove"], {
+      await runTool2(tools.treeAppendProver, ["prove"], {
         SHIELDED_X402_VECTOR_PATH: appendVector,
         SHIELDED_X402_PRODUCTION_PROOF_DIR: appendProofs,
         SHIELDED_X402_PARAMETER_MANIFEST_SHA256: bundle.manifestSha256,
@@ -68501,7 +68556,7 @@ function proveRecoveredP03NoteExit({ request, tools }) {
   if (request?.exitKind !== "NoteExitV1") fail14("request_invalid");
   return proveRecoveredP03Exit({ request, tools });
 }
-var import_web3104, TOOLS_SCHEMA2, REQUEST_SCHEMA2, sha2568, jsonBytes2, TOOLS_KEYS_WITHOUT_WITHDRAW, TOOLS_KEYS_WITH_WITHDRAW, EXIT_KINDS, P03_EXIT_KINDS;
+var import_web3104, TOOLS_SCHEMA2, REQUEST_SCHEMA2, sha2568, jsonBytes2, CHILD_MAX_BUFFER2, CHILD_TIMEOUT_MS2, TOOLS_KEYS_WITHOUT_WITHDRAW, TOOLS_KEYS_WITH_WITHDRAW, EXIT_KINDS, P03_EXIT_KINDS;
 var init_p03_recovered_exit = __esm({
   "spikes/shielded-x402-wallet/lib/p03-recovered-exit.mjs"() {
     "use strict";
@@ -68515,6 +68570,8 @@ var init_p03_recovered_exit = __esm({
     sha2568 = (value) => createHash16("sha256").update(value).digest("hex");
     jsonBytes2 = (value) => Buffer.from(`${JSON.stringify(value, null, 2)}
 `, "utf8");
+    CHILD_MAX_BUFFER2 = 128 * 1024 * 1024;
+    CHILD_TIMEOUT_MS2 = 18e5;
     TOOLS_KEYS_WITHOUT_WITHDRAW = "bundleDir,deploymentIdentity,manifestSha256,noteExitProver,schema,treeAppendProver,witness";
     TOOLS_KEYS_WITH_WITHDRAW = "bundleDir,deploymentIdentity,manifestSha256,noteExitProver,schema,treeAppendProver,withdrawProver,witness";
     EXIT_KINDS = Object.freeze({
@@ -116824,7 +116881,7 @@ init_walk();
 init_cli();
 import { randomBytes as randomBytes29 } from "node:crypto";
 import { join as join34, resolve as resolve35 } from "node:path";
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn6 } from "node:child_process";
 import { fileURLToPath as fileURLToPath21 } from "node:url";
 
 // wallet/src/fetch/session.mjs
@@ -128114,7 +128171,7 @@ init_rpcDefault();
 init_store();
 init_incremental();
 init_walletHistory();
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { randomInt as randomInt5 } from "node:crypto";
 import { resolve as resolve27 } from "node:path";
 var KEEP_WARM_PARENT_ENV = "SHINJUKU_KEEP_WARM_PARENT";
@@ -128168,7 +128225,7 @@ async function keepWarmMain(args, values, { io, env = process.env, entry } = {})
   try {
     while (!stopped) {
       const code = await new Promise((done) => {
-        child = spawn3(process.execPath, [...process.execArgv, entry, ...proxy.args, "keep-warm", ...args, "--once"], {
+        child = spawn4(process.execPath, [...process.execArgv, entry, ...proxy.args, "keep-warm", ...args, "--once"], {
           env: proxy.env,
           stdio: ["ignore", "ignore", "inherit"],
           windowsHide: true
@@ -130390,7 +130447,7 @@ init_deposit();
 
 // wallet/src/funds/addFunds.mjs
 init_fs();
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 import { randomBytes as randomBytes22, randomInt as randomInt7 } from "node:crypto";
 import { tmpdir as tmpdir4 } from "node:os";
 import { join as join31, resolve as resolve29 } from "node:path";
@@ -130644,7 +130701,7 @@ async function runStep(ctx, argv) {
   const file = join31(ctx.tempDir, `step-${randomBytes22(8).toString("hex")}.json`);
   const held = [];
   let last;
-  const proc = spawn4(process.execPath, [...process.execArgv, ctx.entry, ...ctx.proxyArgs, ...argv], {
+  const proc = spawn5(process.execPath, [...process.execArgv, ctx.entry, ...ctx.proxyArgs, ...argv], {
     env: { ...ctx.childEnv, [RESULT_FILE_ENV]: file },
     stdio: ["ignore", "ignore", "pipe"],
     windowsHide: true
@@ -131826,7 +131883,7 @@ function startKeepWarm(options, env = process.env) {
     options.memoServiceUrl,
     ...options.historyRpc ? ["--history-rpc", options.historyRpc] : []
   ];
-  const child = spawn5(process.execPath, [...process.execArgv, CLI_FILE, ...proxy.args, ...warmArgs], {
+  const child = spawn6(process.execPath, [...process.execArgv, CLI_FILE, ...proxy.args, ...warmArgs], {
     env: {
       ...proxy.env,
       [PASSPHRASE_ENV2]: options.passphrase,