shinjuku-shielded 0.3.9 → 0.3.11

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "701809bdf80ea16a9d16105f067998029d2a0f03d69b885720a08d806eae30d4",
-  "bytes": 10943907,
-  "sourceCommit": "88b144748643ad89029b53d4feeb52ee9b26f13a",
+  "sha256": "a9b9ea19ca82a7e4fe991f01050aae148bea45db0bb46be31c22df310e081969",
+  "bytes": 10949292,
+  "sourceCommit": "043825750e3f2f6138f265ad8b909764455bc24d",
   "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.9",
+  "version": "0.3.11",
   "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": "701809bd",
-  "shinjukuSha256": "701809bdf80ea16a9d16105f067998029d2a0f03d69b885720a08d806eae30d4",
+  "shinjukuRelease": "a9b9ea19",
+  "shinjukuSha256": "a9b9ea19ca82a7e4fe991f01050aae148bea45db0bb46be31c22df310e081969",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -50517,11 +50517,15 @@ var init_chain2 = __esm({
       // Production E1 pool 45mh (since the tag-28 window): the same proxy
       // (UNDERMARKET_HISTORY_PROXY_POOLS = AAG16,45mh). AAG16 stays: an old
       // wallet home still reads its retired pool.
-      "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR": "http://d6xg3phhurxhzqcsgh2mh52yf744labhrnd7mducwynlertfsjzyslqd.onion/"
+      "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR": "http://d6xg3phhurxhzqcsgh2mh52yf744labhrnd7mducwynlertfsjzyslqd.onion/",
+      // Production E1 pool F7MW (since 2026-10-12): the same proxy serves it beside 45mh, which
+      // stays while its wallets move out (the move walks 45mh).
+      F7MWGF8vG8Bv3Y4pRRFqky5YzZndGtQaUXbMMvpmtoRV: "http://d6xg3phhurxhzqcsgh2mh52yf744labhrnd7mducwynlertfsjzyslqd.onion/"
     });
     PINNED_HISTORY_HTTPS = Object.freeze({
       AAG16mNWTtC1sBeu2tTVTwWjqWXCefLTCByVPj5X3kV8: "https://pay.shinjukustaition.com/history-proxy/",
-      "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR": "https://pay.shinjukustaition.com/history-proxy/"
+      "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR": "https://pay.shinjukustaition.com/history-proxy/",
+      F7MWGF8vG8Bv3Y4pRRFqky5YzZndGtQaUXbMMvpmtoRV: "https://pay.shinjukustaition.com/history-proxy/"
     });
     HISTORY_RPC_OWN = "own";
     historyRpcErrors = /* @__PURE__ */ new WeakSet();
@@ -61582,7 +61586,9 @@ var init_errorCodes = __esm({
       "move_body_invalid",
       "move_liquidity_wait",
       "move_payer_unavailable_retry_later",
+      "move_payment_in_flight",
       "move_pool_not_draining",
+      "move_quote_open",
       "move_refund_to_invalid",
       "move_to_pool_unknown",
       "move_unknown",
@@ -116601,14 +116607,15 @@ var NPX_PACKAGE = "shinjuku-shielded";
 var MCP_SERVER_NAME = "shinjuku-shielded";
 var P03_BINDING2 = "carbon-shielded-exact/svm-v3";
 var PRODUCTION = Object.freeze({
-  pool: "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR",
+  pool: "F7MWGF8vG8Bv3Y4pRRFqky5YzZndGtQaUXbMMvpmtoRV",
   program: "8PYPw3FSFTMbvSneXdcoH6jNoN4VD23nHwPY2A2riUy1",
   network: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
   asset: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
   memoService: DEFAULT_FACILITATOR_ORIGIN
 });
 var RETIRED_POOLS = Object.freeze({
-  AAG16mNWTtC1sBeu2tTVTwWjqWXCefLTCByVPj5X3kV8: "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR"
+  // Setup moves an AAG16 config.json to the pool the facilitator runs NOW (setup.mjs compares with the release's pool).
+  AAG16mNWTtC1sBeu2tTVTwWjqWXCefLTCByVPj5X3kV8: "F7MWGF8vG8Bv3Y4pRRFqky5YzZndGtQaUXbMMvpmtoRV"
 });
 function retiredPoolText(pool) {
   const next = RETIRED_POOLS[pool];
@@ -116875,6 +116882,7 @@ var TIMEOUT_MS = 3e4;
 var HEX642 = /^[0-9a-f]{64}$/;
 var DIR = /^[0-9a-f]{8}$/;
 var BASE58_KEY2 = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
+var V3_ONION_KEY = /^http:\/\/[a-z2-7]{56}\.onion(\/|$)/;
 var ED25519_SPKI_PREFIX3 = Buffer.from("302a300506032b6570032100", "hex");
 var fail21 = (code, detail) => new Error(`${code}: ${detail}`);
 function canonicalJson(value) {
@@ -116913,8 +116921,8 @@ function checkBody(body) {
     } catch {
       key = void 0;
     }
-    if (!key || !key.startsWith("https://") && !/^http:\/\/(127\.0\.0\.1|localhost)(:|\/|$)/.test(key)) {
-      throw fail21("wallet_channel_invalid", "a channel proof-tool set names a facilitator that is not an https URL");
+    if (!key || !key.startsWith("https://") && !V3_ONION_KEY.test(key) && !/^http:\/\/(127\.0\.0\.1|localhost)(:|\/|$)/.test(key)) {
+      throw fail21("wallet_channel_invalid", "a channel proof-tool set names a facilitator that is not an https URL or a v3 onion");
     }
     return Object.freeze({ facilitator: key, pool: set.pool, dir: set.dir, sumsSha256: set.sumsSha256 });
   });
@@ -117073,8 +117081,8 @@ function channelListsSet(body, { facilitator, pool, dir, sumsSha256 }) {
 // wallet/src/setup/proofTools.mjs
 var PINNED_PROOF_TOOLS = Object.freeze({
   [DEFAULT_FACILITATOR_ORIGIN]: Object.freeze({
-    dir: "47678912",
-    sumsSha256: "47678912949d7da8b705c399edf03d2367465f6eb581b00a059356373baed28e"
+    dir: "5bed238f",
+    sumsSha256: "5bed238f3696208ca3a8e66d206e5fffc85f1823e959abe1901c2d57c17bcdf3"
   })
 });
 var UPDATE_NEXT = "update the wallet: npx -y shinjuku-shielded@latest setup";
@@ -119548,7 +119556,11 @@ var MOVE_SERVER_CODES = Object.freeze([
   "move_payer_unavailable_retry_later",
   "move_liquidity_wait",
   "move_unknown",
-  "pool_draining"
+  "pool_draining",
+  // 409s of an UNPAID leg (production 2026-10-12 20:48Z: a re-quote of the same body met the open quote and the leg failed
+  // challenge_missing:409). Both mean "this body is quoted or being paid now"; the leg waits with the same body.
+  "move_quote_open",
+  "move_payment_in_flight"
 ]);
 var hash11 = (value) => sha256Hex2(Buffer.from(value, "utf8"));
 var sum = (values) => values.reduce((total, value) => total + BigInt(value ?? 0), 0n);
@@ -119826,6 +119838,13 @@ function refusalOf(serverCode3) {
       return { code: "wallet_move_payer_busy_retry_later", transient: true };
     case "move_liquidity_wait":
       return { code: "wallet_move_payer_busy_retry_later", transient: true };
+    // The drain holds an open quote for this exact body until its validBefore + 60 s: ask again after that, same body.
+    case "move_quote_open":
+      return { code: "wallet_move_leg_paused", transient: true };
+    // Only an unpaid request reaches here (moveFetch passes every request that carries payment bytes), so this wallet
+    // holds no bytes for the leg: it never asks for a new quote to pay; it keeps the leg and asks again later.
+    case "move_payment_in_flight":
+      return { code: "wallet_move_leg_paused", transient: true };
     case "pool_draining":
       return { code: "wallet_move_route_missing", transient: true };
     case "move_pool_not_draining":
@@ -120051,10 +120070,11 @@ async function runMove({
           if (seen.refusal) {
             const refusal2 = refusalOf(seen.refusal);
             if (unsent && !refusal2.transient) open3(sourcePath, passphrase2).removeWal(moveWalName(from.pool, leg.n));
-            log(`MOVE_LEG_REFUSED n=${leg.n} ${seen.refusal}`);
+            log(`${refusal2.transient ? "MOVE_LEG_WAIT" : "MOVE_LEG_REFUSED"} n=${leg.n} ${seen.refusal}`);
             return answer(refusal2.transient ? "waiting" : "failed", refusal2.code, { ...base, serverCode: seen.refusal });
           }
           const code = firstCode4(error);
+          const shown = /^[a-z0-9_]+:[0-9]{3}(?=$|[\s;(])/.exec(String(error?.message ?? ""))?.[0] ?? code;
           if (LEG_REFUSED_CODES.has(code)) {
             save2({ state: "refused", code, refusedAtMs: now() });
             log(`MOVE_LEG_REFUSED n=${leg.n} ${code}`);
@@ -120065,8 +120085,8 @@ async function runMove({
             return answer("waiting", "wallet_move_leg_paused", { ...base, payCode: code });
           }
           if (unsent) open3(sourcePath, passphrase2).removeWal(moveWalName(from.pool, leg.n));
-          log(`MOVE_LEG_FAILED n=${leg.n} ${code}`);
-          return answer(unsent ? "failed" : "waiting", unsent ? "wallet_move_leg_failed" : "wallet_move_leg_paused", { ...base, payCode: code });
+          log(`MOVE_LEG_FAILED n=${leg.n} ${shown}`);
+          return answer(unsent ? "failed" : "waiting", unsent ? "wallet_move_leg_failed" : "wallet_move_leg_paused", { ...base, payCode: shown });
         }
         save2({ state: "paid", paidAtMs: now(), ...isSolanaSignature(result?.receipt?.transaction) ? { settleTransaction: result.receipt.transaction } : {} });
         log(`MOVE_LEG_PAID n=${leg.n}`);
@@ -128221,7 +128241,7 @@ var CLI2 = "shinjuku-wallet";
 var P03_BINDING3 = "carbon-shielded-exact/svm-v3";
 var GUIDE = Object.freeze({
   program: "8PYPw3FSFTMbvSneXdcoH6jNoN4VD23nHwPY2A2riUy1",
-  pool: "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR",
+  pool: "F7MWGF8vG8Bv3Y4pRRFqky5YzZndGtQaUXbMMvpmtoRV",
   mint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
   network: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
   facilitator: DEFAULT_FACILITATOR_ORIGIN
@@ -129571,7 +129591,8 @@ var COMMANDS = [
       "--add-to for Claude Desktop or Cursor: a host config whose mcpServers is not a JSON object, or that has a different shinjuku-shielded entry (without --force), is left alone. Otherwise the old file is copied to <file>.bak-<time> (mode 0600 on Linux and macOS; on Windows the folder's access list) and the new file replaces it in one rename.",
       "The provers are Linux programs. Linux: ready. Windows: the wallet runs them through WSL; setup checks that wsl.exe runs (wsl --install -d Ubuntu otherwise). macOS: not supported; setup says so and creates nothing.",
       "Run it again at any time: it never changes an existing wallet, keeps the recorded caps unless you pass new ones, checks every proof-tool file again, downloads what is missing or newer, and rewrites config.json.",
-      "Then mcp needs no flags: npx -y shinjuku-shielded mcp reads config.json (a flag on the command line still wins). Before setup, mcp in a terminal offers to run setup; started by an agent host, it serves shinjuku_setup, which runs this same setup after you confirm in the host."
+      "Then mcp needs no flags: npx -y shinjuku-shielded mcp reads config.json (a flag on the command line still wins). Before setup, mcp in a terminal offers to run setup; started by an agent host, it serves shinjuku_setup, which runs this same setup after you confirm in the host.",
+      "A command that takes --pool (balance, recover, deposit, add-funds, and others) takes it, and the passphrase of this home's wallet, from config.json when you leave them out: shinjuku-wallet balance needs no flags. A flag or SHIELDED_WALLET_PASSPHRASE still wins; init and restore never use config.json, and move reads it itself."
     ],
     next: `start it from your agent host with npx -y shinjuku-shielded mcp (or ${CLI2} mcp), then ask your agent "what is my balance"`,
     run: (args, values, deps, io) => deps.setupMain(values, { ...deps, io })
@@ -130237,6 +130258,55 @@ function checkValue(spec, value) {
   }
   return void 0;
 }
+var NO_CONFIG_DEFAULTS = /* @__PURE__ */ new Set(["mcp", "setup", "init", "restore", "move"]);
+function configDefaults(command, args, deps) {
+  const unchanged = { args, passphrase: void 0 };
+  if (NO_CONFIG_DEFAULTS.has(command.name) || command.beforeValidate) return unchanged;
+  const has2 = (name) => command.flags.some((spec) => spec.name === name);
+  const given = parseFlags(command, args);
+  const passphraseFileSpec = command.flags.find((spec) => spec.name === "--passphrase-file");
+  const envPassphrase = Boolean(deps.env[PASSPHRASE_ENV2]);
+  const wantPool = has2("--pool") && !given.has("--pool") && !given.has("--wallet");
+  const wantFile = Boolean(passphraseFileSpec) && !given.has("--passphrase-file") && (passphraseFileSpec.required || !envPassphrase);
+  const wantEnv = !passphraseFileSpec && command.env.includes(PASSPHRASE_ENV2) && !envPassphrase;
+  if (!wantPool && !wantFile && !wantEnv) return unchanged;
+  const home = setupHome(deps.env);
+  const config = setupConfigOf(home);
+  if (!config) return unchanged;
+  const added = wantPool ? ["--pool", config.pool] : [];
+  const pool = wantPool ? config.pool : given.get("--pool");
+  const homePools = [config.pool, ...(config.previousPools ?? []).map((entry) => entry.pool)];
+  const ownWallet = given.has("--wallet") ? homePools.some((entry) => resolve33(given.get("--wallet")) === resolve33(homeWalletPath(home, entry))) : homePools.includes(pool);
+  if (!ownWallet || !wantFile && !wantEnv) return { args: [...args, ...added], passphrase: void 0 };
+  const where = `config.json (${join32(home, "config.json")})`;
+  if (wantFile) {
+    if (!config.passphraseFile) {
+      throw new UsageError(`${command.name} needs the wallet passphrase: ${where} names no passphrase file; pass --passphrase-file <file>, or rerun ${CLI2} setup (it keeps the wallet)`, command);
+    }
+    return { args: [...args, ...added, "--passphrase-file", config.passphraseFile], passphrase: void 0 };
+  }
+  let text3;
+  try {
+    text3 = config.passphraseFile ? readSecretText(config.passphraseFile, "the passphrase file") : void 0;
+  } catch (error) {
+    if (error instanceof SecretFileEncodingError) throw new PublicFailure(error.message);
+    text3 = void 0;
+  }
+  if (!text3) {
+    throw new UsageError(`${PASSPHRASE_ENV2} is not set, and the passphrase file that ${where} names (${config.passphraseFile ?? "none"}) could not be read or is empty: export ${PASSPHRASE_ENV2}=<your wallet passphrase>, or rerun ${CLI2} setup (it keeps the wallet)`, command);
+  }
+  return { args: [...args, ...added], passphrase: text3 };
+}
+function lendPassphrase(passphrase2) {
+  if (passphrase2 === void 0) return () => {
+  };
+  const saved = process.env[PASSPHRASE_ENV2];
+  process.env[PASSPHRASE_ENV2] = passphrase2;
+  return () => {
+    if (saved === void 0) delete process.env[PASSPHRASE_ENV2];
+    else process.env[PASSPHRASE_ENV2] = saved;
+  };
+}
 function validate3(command, values, env) {
   const missing = command.flags.filter((spec) => (spec.required || spec.requiredUnless && !values.has(spec.requiredUnless)) && !values.has(spec.name));
   if (missing.length === 1) {
@@ -130447,7 +130517,9 @@ var RELAYED_DEPOSIT_UNIT = Object.freeze({
   DFCCPHdw7pH9vKk9FEN9z6cy9M1UKjF168j7HfLwxYk3: "1000000",
   AAG16mNWTtC1sBeu2tTVTwWjqWXCefLTCByVPj5X3kV8: "1000000",
   // The production E1 pool since the tag-28 window (its pool plan: poolDenominationAtomic 1000000).
-  "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR": "1000000"
+  "45mhosfA2MuygZWeqYRVcEZX2Q3gA8KR8FwP6AZkK1zR": "1000000",
+  // The production E1 pool since 2026-10-12 (GET /api/x402/deposit: depositUnitAtomic 1000000).
+  F7MWGF8vG8Bv3Y4pRRFqky5YzZndGtQaUXbMMvpmtoRV: "1000000"
 });
 async function runDeposit(args, values, deps) {
   const unit = values.has("--relay") && !values.has("--pool-denomination") ? RELAYED_DEPOSIT_UNIT[values.get("--pool")] : void 0;
@@ -131309,17 +131381,24 @@ async function runShinjukuWallet(argv, overrides = {}) {
       io.out(commandHelp(command));
       return 0;
     }
-    const commandArgs = command.normalizeArgs ? command.normalizeArgs(command, args) : args;
+    const defaults = configDefaults(command, command.normalizeArgs ? command.normalizeArgs(command, args) : args, deps);
+    const commandArgs = defaults.args;
+    const runDeps = defaults.passphrase === void 0 ? deps : { ...deps, env: { ...deps.env, [PASSPHRASE_ENV2]: defaults.passphrase } };
     values = parseFlags(command, commandArgs);
-    const skip = command.beforeValidate?.(values, deps, commandArgs) === SKIP_VALIDATE;
-    if (!skip) validate3(command, values, deps.env);
+    const skip = command.beforeValidate?.(values, runDeps, commandArgs) === SKIP_VALIDATE;
+    if (!skip) validate3(command, values, runDeps.env);
     retiredPoolGuard(command, values, io);
-    const rpc2 = skip ? { args: commandArgs } : rpcFileArgs(command, commandArgs, values, deps, io);
+    const rpc2 = skip ? { args: commandArgs } : rpcFileArgs(command, commandArgs, values, runDeps, io);
     try {
-      applyStoredChannel({ home: setupHome(deps.env) });
+      applyStoredChannel({ home: setupHome(runDeps.env) });
     } catch {
     }
-    await command.run(rpc2.args, values, rpc2.url === void 0 ? deps : { ...deps, rpcUrlFromFile: rpc2.url }, io);
+    const restorePassphrase = lendPassphrase(defaults.passphrase);
+    try {
+      await command.run(rpc2.args, values, rpc2.url === void 0 ? runDeps : { ...runDeps, rpcUrlFromFile: rpc2.url }, io);
+    } finally {
+      restorePassphrase();
+    }
     if (!command.nextInOutput) io.err(`next: ${hintForThisRun(command.nextAfterRun?.(values, deps) ?? command.next, values)}
 `);
     writeRunResult(deps, command, 0);