shinjuku-shielded 0.3.20 → 0.3.22

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "c1963de19cc61973bc35d2d55284b771db5846c323419f771e342f9cd3052e57",
-  "bytes": 11128106,
-  "sourceCommit": "b5e68064df487336e92684f0006a64a5b8018ee9",
+  "sha256": "00da3f6dfb766d83cd9f1fdb8c3a335c2de51a5dbab0d13b0e6ce3d50106cf02",
+  "bytes": 11131156,
+  "sourceCommit": "de187f4fedfed133b529b7763adc27c639613f2f",
   "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.20",
+  "version": "0.3.22",
   "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": "c1963de1",
-  "shinjukuSha256": "c1963de19cc61973bc35d2d55284b771db5846c323419f771e342f9cd3052e57",
+  "shinjukuRelease": "00da3f6d",
+  "shinjukuSha256": "00da3f6dfb766d83cd9f1fdb8c3a335c2de51a5dbab0d13b0e6ce3d50106cf02",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -54737,7 +54737,7 @@ function canonicalField(value, label) {
   }
   return value;
 }
-var FIELD_MODULUS4, SUBTREE_LEAVES2, LOCAL_DEPTH, OUTER_DEPTH, TREE_DEPTH, P03_RECOVERY_PATH_SOURCE_MODEL, P03_PINNED_POSEIDON_PARAMETERS_SHA256, P03_PINNED_ZERO_LEAF, hash3, REBUILT_BY_REPORT, lastFold, FOLDS_IN_FLIGHT, ZERO_UPPER_ROOTS, LOCAL_ZERO_ROOTS, lastOuter;
+var FIELD_MODULUS4, SUBTREE_LEAVES2, LOCAL_DEPTH, OUTER_DEPTH, TREE_DEPTH, P03_RECOVERY_PATH_SOURCE_MODEL, P03_PINNED_POSEIDON_PARAMETERS_SHA256, P03_PINNED_ZERO_LEAF, hashCalls, hash3, REBUILT_BY_REPORT, lastFold, FOLDS_IN_FLIGHT, ZERO_UPPER_ROOTS, LOCAL_ZERO_ROOTS, lastOuter;
 var init_recoveryPath = __esm({
   "wallet/src/recovery/recoveryPath.mjs"() {
     "use strict";
@@ -54753,10 +54753,14 @@ var init_recoveryPath = __esm({
     P03_RECOVERY_PATH_SOURCE_MODEL = "carbon/shielded-x402-wallet/p03-finalized-recovery-path/v1";
     P03_PINNED_POSEIDON_PARAMETERS_SHA256 = "d979d972277a601aeaf628d703e7b070a6662e952e9946d60e5f6f2304bb6e1b";
     P03_PINNED_ZERO_LEAF = 7848971562719066880601334108362337871940338669244961380918189469732108181768n;
-    hash3 = (left, right) => poseidon2([
-      canonicalField(left, "hash_left"),
-      canonicalField(right, "hash_right")
-    ], 3);
+    hashCalls = 0;
+    hash3 = (left, right) => {
+      hashCalls += 1;
+      return poseidon2([
+        canonicalField(left, "hash_left"),
+        canonicalField(right, "hash_right")
+      ], 3);
+    };
     REBUILT_BY_REPORT = /* @__PURE__ */ new WeakMap();
     FOLDS_IN_FLIGHT = /* @__PURE__ */ new WeakMap();
   }
@@ -118247,8 +118251,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: "5fa83692",
-    sumsSha256: "5fa8369234088b532977254d91109e7eced3aef0228b9ed55c7c8a02e0a9a908"
+    dir: "78c71143",
+    sumsSha256: "78c71143ecedf22096fdc1901eda5160e29c141f6961cce935b92e714ff85bd9"
   })
 });
 var UPDATE_NEXT = "update the wallet: npx -y shinjuku-shielded@latest setup";
@@ -118871,6 +118875,7 @@ var SELF_PAY_ORIGIN2 = "https://self-pay.invalid/";
 var POCKET_FILL_RECORD = "self-pay-pocket-";
 var MERGE_RECORD = "self-pay-merge-";
 var POOL_MOVE_SCHEMA = "carbon-shielded-wallet/pool-move/v1";
+var FLOAT_PAYMENT_SCHEMA2 = "carbon-shielded-wallet/float-payment/v1";
 var POOL_MOVE_PATH2 = "/api/x402/move/pay/";
 var POOL_SUCCESSION_SCHEMAS = /* @__PURE__ */ new Set([
   "carbon-shielded-wallet/pool-succession/v1",
@@ -118989,6 +118994,7 @@ function classify(name, record) {
   if (name.startsWith("add-funds-")) return { type: "add-funds", phase: "plan", state };
   if (name.startsWith("move-") && record?.schema === POOL_MOVE_SCHEMA) return { type: "pool-move", phase: "plan", state };
   if (name.startsWith("succ-") && POOL_SUCCESSION_SCHEMAS.has(record?.schema)) return { type: "pool-succession", phase: "plan", state };
+  if (name.startsWith("float-") && record?.schema === FLOAT_PAYMENT_SCHEMA2) return { type: "float-payment", phase: "plan", state };
   return { type: "other", phase: "other", state };
 }
 function refreshCommand(state, programId = "<program id>") {
@@ -119097,6 +119103,7 @@ function computeBalance({ store, snapshotRead, source = "local", now = Date.now(
   const snapshotDigests = new Set(snapshot.outputs.map((output2) => output2.digest));
   const unspentAtomic = sum2([...unspent.values()].map((output2) => output2.valueAtomic));
   detail.unspentAtomic = unspentAtomic.toString();
+  const settling = [];
   const movable = snapshot.outputs.filter((output2) => output2.spendStatus === "succession-movable");
   const successionMovableAtomic = sum2(movable.map((output2) => output2.valueAtomic));
   detail.successionMovableAtomic = successionMovableAtomic.toString();
@@ -119110,17 +119117,37 @@ function computeBalance({ store, snapshotRead, source = "local", now = Date.now(
     ageSeconds: Math.max(0, Math.floor((now - Date.parse(snapshot.refreshedAt)) / 1e3)),
     programId: snapshot.programId
   };
+  const settlingReasons = [];
+  const settlingPayment = (entry) => {
+    if (entry.type !== "payment" || String(entry.record.url ?? "").startsWith(SELF_PAY_ORIGIN2) || String(entry.record.url ?? "").includes(POOL_MOVE_PATH2)) return void 0;
+    const inputs = provenInputs(byName.get(`resource-proof-${entry.name.slice("resource-payment-".length)}`)?.record);
+    const amount = paymentAmount(entry.record);
+    return inputs !== void 0 && amount !== void 0 && inputs.every((commitment) => unspent.has(commitment)) ? { inputs, amountAtomic: BigInt(amount) } : void 0;
+  };
   for (const entry of records) {
     const before = Object.hasOwn(snapshot.walStates, entry.name) ? snapshot.walStates[entry.name] : void 0;
     const beforePhase = before === void 0 ? "absent" : classify(entry.name, { ...entry.record, state: before }).phase;
     if (entry.phase === "done" && beforePhase !== "done") {
+      const paying = settlingPayment(entry);
+      if (paying) {
+        settling.push(paying);
+        settlingReasons.push(`payment record ${entry.name} was answered after the last refresh: the balance counts it as paid; refresh again in a minute`);
+        continue;
+      }
       reasons.push(`${entry.type} record ${entry.name} reached ${entry.state} after the last refresh`);
     } else if (entry.phase === "other" && before !== entry.state) {
       reasons.push(`record ${entry.name} changed after the last refresh and this command cannot read it`);
     } else if (entry.phase === "done" && ["deposit", "payment"].includes(entry.type)) {
       const digest2 = digestKey(entry.record.memoDigest);
       if (digest2 && !snapshotDigests.has(digest2)) {
-        reasons.push(entry.type === "payment" && ["pending", "confirmed"].includes(entry.record.receiptFinality) ? `payment record ${entry.name} was answered, but its settlement may not have been final at the last refresh; refresh again in a minute` : `${entry.type} record ${entry.name} finished before the last refresh, but the walk has no output from its memo (unpublished memo, or --fresh before publication)`);
+        const answered = entry.type === "payment" && ["pending", "confirmed"].includes(entry.record.receiptFinality);
+        const paying = answered ? settlingPayment(entry) : void 0;
+        if (paying) {
+          settling.push(paying);
+          settlingReasons.push(`payment record ${entry.name} was answered and its settlement is on its way to finality: the balance counts it as paid; refresh again in a minute`);
+          continue;
+        }
+        reasons.push(answered ? `payment record ${entry.name} was answered, but its settlement may not have been final at the last refresh; refresh again in a minute` : `${entry.type} record ${entry.name} finished before the last refresh, but the walk has no output from its memo (unpublished memo, or --fresh before publication)`);
       }
     }
   }
@@ -119195,10 +119222,23 @@ function computeBalance({ store, snapshotRead, source = "local", now = Date.now(
   if (reasons.length) return report("stale", null, refreshCommand(state, snapshot.programId));
   const reservedAtomic = unknownInputs ? unspentAtomic : sum2([...reserved].filter((commitment) => unspent.has(commitment)).map((commitment) => unspent.get(commitment).valueAtomic));
   detail.reservedAtomic = reservedAtomic.toString();
-  const spendable = unspentAtomic - reservedAtomic;
+  const settlingInputs = new Set(settling.flatMap((payment) => payment.inputs));
+  if (settling.some((payment) => payment.inputs.some((commitment) => reserved.has(commitment))) || unknownInputs && settling.length) {
+    reasons.push(...settlingReasons);
+    return report("stale", null, refreshCommand(state, snapshot.programId));
+  }
+  const spendable = unspentAtomic - reservedAtomic - sum2(settling.map((payment) => payment.amountAtomic));
+  if (spendable < 0n) {
+    reasons.push(...settlingReasons);
+    return report("stale", null, refreshCommand(state, snapshot.programId));
+  }
   const anchorIndex = canonicalAtomic(snapshot.anchorIndex) ? BigInt(snapshot.anchorIndex) : void 0;
-  detail.fundedAccounts = unknownInputs ? 0 : [...unspent.values()].filter((output2) => output2.kind === "account" && BigInt(output2.valueAtomic) > 0n && !reserved.has(output2.commitment) && (anchorIndex === void 0 || BigInt(output2.leafIndex) < anchorIndex)).length;
+  detail.fundedAccounts = unknownInputs ? 0 : [...unspent.values()].filter((output2) => output2.kind === "account" && BigInt(output2.valueAtomic) > 0n && !reserved.has(output2.commitment) && !settlingInputs.has(output2.commitment) && (anchorIndex === void 0 || BigInt(output2.leafIndex) < anchorIndex)).length;
   const next = detail.inFlight.length ? "finish or cancel the work in detail.inFlight; the wallet runs one payment at a time" : pendingDeposits.length ? `deposit ${pendingDeposits[0].depositId} is not finished: rerun the same deposit command with --submit --service <facilitator URL>` : pocketsUnscanned ? scanPockets2 : unspentAtomic === 0n && successionMovableAtomic > 0n ? "this pool was succeeded by a new pool: its value moves there (a move per account, the facilitator pays the fee) and counts in this balance until then" : unspentAtomic === 0n ? "nothing to spend: deposit (shinjuku-wallet help deposit), or run balance --refresh if a payment to this wallet settled" : void 0;
+  if (settling.length) {
+    reasons.push(...settlingReasons);
+    return report("stale", spendable + successionMovableAtomic, next ?? refreshCommand(state, snapshot.programId));
+  }
   return report("current", spendable + successionMovableAtomic, next);
 }
 function combinePoolBalances(partsAtomic, movingAtomic2 = "0") {
@@ -122821,7 +122861,7 @@ function createSuccessionScheduler(options) {
   } = options;
   const now = options.now ?? Date.now;
   const randomInt9 = options.randomInt ?? cryptoRandomInt;
-  const valueOf = options.valueOf ?? ((store) => {
+  const valueOf = (Object.hasOwn(options, "valueOf") ? options.valueOf : void 0) ?? ((store) => {
     try {
       return computeBalance({ store, snapshotRead: readBalanceSnapshot(store), source: "local" }).split?.shieldedAtomic ?? null;
     } catch {
@@ -122911,6 +122951,7 @@ function createSuccessionScheduler(options) {
       });
     }
     if (verified.record.importDone) job = schedule(store, job);
+    else job = save2(store, job, {});
     return job;
   }
   const base = (entry, value, verified) => ({
@@ -123014,6 +123055,10 @@ function createSuccessionScheduler(options) {
     }
     switch (job.state) {
       case "linked-waiting-import": {
+        try {
+          if (hasWallet(job.to) && !readSuccessionJob(storeOf(job.to), entry.from)) job = save2(store, job, {});
+        } catch {
+        }
         if (now() - (recordCheckedAt.get(entry.from) ?? -Infinity) < SUCCESSION_TICK_MS - 1e3) return job;
         recordCheckedAt.set(entry.from, now());
         let verified;
@@ -124334,7 +124379,11 @@ var FORBIDDEN_HEADERS3 = ["host", "content-length", "connection", "transfer-enco
 var MAX_BODY_BYTES2 = 16 * 1024 * 1024;
 var PREVIEW_TIMEOUT_MS = 3e4;
 var SAFE_TEXT = /^(fetch_|spend_|mcp_|wallet_locked)/;
-var MCP_TOOL_ALIASES = Object.freeze({ fetch_paid: "x402_pay", wallet_pool_switch_status: "wallet_move_status" });
+var MCP_TOOL_ALIASES = Object.freeze({
+  fetch_paid: "x402_pay",
+  wallet_pool_switch_status: "wallet_move_status",
+  wallet_status: "wallet_balance"
+});
 var POOL_SWITCH_WHY = "Your facilitator upgraded to a new pool. The wallet moves your balance there by itself. Your money is safe, and you do not need to do anything.";
 var POOL_SWITCH_NEXT = "Nothing to do. Tell the user each message where tellUser is true. wallet_move_status shows the details.";
 var SWITCH_STATES = /* @__PURE__ */ new Set(["pending", "scheduled", "running", "done", "failed"]);
@@ -125505,7 +125554,11 @@ function createWalletTools({
       let report = computeBalance({ store, snapshotRead: readBalanceSnapshot(store), source: "local" });
       let refresh = {};
       const recentlyFailed = refreshFailedAt && Date.now() - refreshFailedAt < REFRESH_RETRY_MS && !refreshRun;
-      if (report.split?.shieldedAtomic == null && recentlyFailed) {
+      if (report.split?.shieldedAtomic != null && report.status === "stale") {
+        if (!recentlyFailed) refreshShared().catch(() => {
+        });
+        refresh = { refreshing: true };
+      } else if (report.split?.shieldedAtomic == null && recentlyFailed) {
         refresh = { refreshed: false, refreshError: refreshFailedCode ?? "mcp_refresh_failed" };
       } else if (report.split?.shieldedAtomic == null) {
         const run5 = refreshShared().then(() => "done", (error2) => ({ failed: errorCode2(error2, "mcp_refresh_failed") }));
@@ -126476,7 +126529,10 @@ function createWalletTools({
         await mover.refreshRelease();
       } catch {
       }
-      return json({ ok: true, ...mover.status(), ...extra });
+      const moved2 = mover.status();
+      const lead = switches.find((item) => item.state !== "done") ?? switches[0];
+      if (moved2.state === "none" && lead) return json({ ok: true, ...moved2, state: lead.state, detail: lead.message, next: POOL_SWITCH_NEXT, ...extra });
+      return json({ ok: true, ...moved2, ...extra });
     }
   };
   const discover = discoverTool(join26(dirname23(session.walletPath), "discover-cache"));
@@ -126755,7 +126811,7 @@ var validId = (id) => id === null || typeof id === "string" || typeof id === "nu
 function createMcpDispatcher({ tools, instructions: instructions2 = INSTRUCTIONS, aliases = {}, log = () => {
 }, client, listChanged = false }) {
   const byName = new Map(tools.map((tool) => [tool.name, tool]));
-  for (const [alias, target] of Object.entries(aliases)) if (byName.has(target)) byName.set(alias, byName.get(target));
+  for (const [alias, target] of Object.entries(aliases)) if (byName.has(target) && !byName.has(alias)) byName.set(alias, byName.get(target));
   return async function dispatch(entry) {
     const invalid4 = { jsonrpc: "2.0", id: null, error: { code: -32600, message: "Invalid request" } };
     if (!entry || typeof entry !== "object" || Array.isArray(entry)) return invalid4;