shinjuku-shielded 0.3.24 → 0.3.25

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "5e07378e3416f54223cbb56fc04d28bed3106dfbdef58b62570ad0469f27aade",
-  "bytes": 11135322,
-  "sourceCommit": "6427ce901fd81417ad60ea6364079db32785626c",
+  "sha256": "1505ebf0afdb67fbbe6050d5065335f3b13e94cefd356fb422ce946f4fba3253",
+  "bytes": 11138284,
+  "sourceCommit": "d34c7e8fbb9d384d53557aeeac05386f35ce2fb9",
   "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.24",
+  "version": "0.3.25",
   "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": "5e07378e",
-  "shinjukuSha256": "5e07378e3416f54223cbb56fc04d28bed3106dfbdef58b62570ad0469f27aade",
+  "shinjukuRelease": "1505ebf0",
+  "shinjukuSha256": "1505ebf0afdb67fbbe6050d5065335f3b13e94cefd356fb422ce946f4fba3253",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -59758,6 +59758,16 @@ var init_recoveryCache = __esm({
 });
 
 // wallet/src/succession/successorHistories.mjs
+function withoutProgramHistory(identity) {
+  if (!identity || typeof identity !== "object" || identity.programHistory === void 0) return void 0;
+  const { programHistory: _history, ...rest } = identity;
+  return rest;
+}
+function errorChainText(error) {
+  const parts = [];
+  for (let current = error, depth = 0; current && depth < 8; current = current.cause, depth += 1) parts.push(String(current?.message ?? current));
+  return parts.join(" ");
+}
 async function loadSuccessorHistories({
   history,
   store,
@@ -59775,24 +59785,34 @@ async function loadSuccessorHistories({
     if (typeof target !== "string") return walks;
     if (seen.has(target) || walks.length >= MAX_SUCCESSOR_HOPS) throw new Error("wallet_succession_chain_invalid");
     seen.add(target);
-    const walk = await loadHistory({
+    const identity = deploymentIdentityFor?.(target) ?? deploymentIdentity;
+    const read = (given) => loadHistory({
       store,
       connection,
       programId,
       pool: target,
-      deploymentIdentity: deploymentIdentityFor?.(target) ?? deploymentIdentity,
+      deploymentIdentity: given,
       cache: walletSuccessorHistoryCache(store, target)
     });
+    let walk;
+    try {
+      walk = await read(identity);
+    } catch (error) {
+      const historyFree = withoutProgramHistory(identity);
+      if (!historyFree || !HISTORY_FREE_NEEDED.test(errorChainText(error))) throw error;
+      walk = await read(historyFree);
+    }
     if (walk?.pool !== target) throw new Error("wallet_succession_chain_invalid");
     walks.push(walk);
     current = walk;
   }
 }
-var MAX_SUCCESSOR_HOPS;
+var HISTORY_FREE_NEEDED, MAX_SUCCESSOR_HOPS;
 var init_successorHistories = __esm({
   "wallet/src/succession/successorHistories.mjs"() {
     "use strict";
     init_walletHistory();
+    HISTORY_FREE_NEEDED = /p03_program_history_coverage_interval_invalid_pool_initialized_after_last_upgrade_use_history_free_identity/;
     MAX_SUCCESSOR_HOPS = 8;
   }
 });
@@ -90683,14 +90703,27 @@ function floatRecordOf(store, requestId) {
 function floatInnerRequestId(requestId) {
   return requestId.length <= 122 ? `${requestId}:float` : `float:${hash8(requestId)}`;
 }
-function floatRefundsInFlightAtomic(store, refreshedAtMs) {
+function floatRefundsInFlightAtomic(store, snapshot) {
+  const refreshedAtMs = Date.parse(snapshot?.refreshedAt ?? "");
+  const outputs = Array.isArray(snapshot?.outputs) ? snapshot.outputs : [];
+  const knowsRecipients = outputs.some((output2) => output2?.kind === "note" && output2.diversifier !== void 0);
+  const arrived = (refundTo) => {
+    let address5;
+    try {
+      address5 = decodeShieldedSolanaP03Address(String(refundTo));
+    } catch {
+      return false;
+    }
+    return outputs.some((output2) => output2?.kind === "note" && output2.diversifier === address5.diversifier.toString() && output2.recipientX === address5.recipientX.toString());
+  };
   let total = 0n;
   try {
     for (const name of store.listWal()) {
       if (!name.startsWith(FLOAT_PAYMENT_WAL_PREFIX)) continue;
       const record = store.readWal(name);
       if (record?.schema !== FLOAT_PAYMENT_SCHEMA || record.state !== "refund_pending" || !POSITIVE.test(String(record.paidAtomic))) continue;
-      if (Number.isFinite(refreshedAtMs) && refreshedAtMs >= record.refundPendingAtMs + REFUND_SETTLED_AFTER_MS) continue;
+      if (arrived(record.refundTo)) continue;
+      if (!knowsRecipients && Number.isFinite(refreshedAtMs) && refreshedAtMs >= record.refundPendingAtMs + REFUND_SETTLED_AFTER_MS) continue;
       total += BigInt(record.paidAtomic);
     }
   } catch {
@@ -118928,7 +118961,10 @@ function snapshotFromRecovery({ state, programId, recovery, history, walStates,
       leafIndex: String(entry?.leafIndex),
       valueAtomic: value === void 0 ? void 0 : String(value),
       spendStatus: entry?.spendStatus,
-      digest: digestKey(entry?.digest)
+      digest: digestKey(entry?.digest),
+      // A note's one-time recipient (diversifier d and recipient x): a float refund is matched to its
+      // own refund address by these (floatRefundsInFlightAtomic). Public to this wallet only (sealed cache).
+      ...entry?.kind === "note" && /^[0-9]+$/.test(String(entry.note?.d)) && /^[0-9]+$/.test(String(entry.note?.pDX)) ? { diversifier: String(entry.note.d), recipientX: String(entry.note.pDX) } : {}
     };
     if (!["account", "note"].includes(output2.kind) || !canonicalAtomic(output2.valueAtomic) || !canonicalAtomic(output2.commitment) || !canonicalAtomic(output2.leafIndex) || !SPEND_STATUSES.has(output2.spendStatus) || !/^[0-9a-f]{64}$/.test(output2.digest)) {
       throw new Error("balance_snapshot_output_invalid");
@@ -119050,7 +119086,8 @@ function computeBalance({ store, snapshotRead, source = "local", now = Date.now(
     ...entry.record.relay?.approvedOnChain ? { approvalStanding: true } : {}
   }));
   const receipts = records.filter((entry) => entry.type === "payment" && entry.phase === "done");
-  const paid = receipts.filter((entry) => !String(entry.record.url ?? "").startsWith(SELF_PAY_ORIGIN2) && !String(entry.record.url ?? "").includes(POOL_MOVE_PATH2));
+  const refunded = new Set(records.filter((entry) => entry.type === "float-payment" && entry.state === "refund_pending").map((entry) => entry.record.innerRequestId).filter((id) => typeof id === "string"));
+  const paid = receipts.filter((entry) => !String(entry.record.url ?? "").startsWith(SELF_PAY_ORIGIN2) && !String(entry.record.url ?? "").includes(POOL_MOVE_PATH2) && !refunded.has(entry.record.requestId));
   const sum2 = (values) => values.reduce((total, value) => total + BigInt(value ?? "0"), 0n);
   const config = state.config ?? {};
   const capOrNone = (value) => String(value) === NO_LIMIT_ATOMIC2 ? "none" : value;
@@ -124966,13 +125003,13 @@ function oneBalance(report, store) {
   const shieldedAtomic = report?.split?.shieldedAtomic ?? null;
   const pocketsAtomic = report?.split?.pocketsAtomic ?? null;
   const moving = movingAtomic(store);
-  let refreshedAtMs;
+  let snapshot;
   try {
-    refreshedAtMs = Date.parse(readBalanceSnapshot(store).snapshot?.refreshedAt ?? "");
+    snapshot = readBalanceSnapshot(store).snapshot;
   } catch {
-    refreshedAtMs = void 0;
+    snapshot = void 0;
   }
-  const refunds = floatRefundsInFlightAtomic(store, refreshedAtMs);
+  const refunds = floatRefundsInFlightAtomic(store, snapshot);
   const known = shieldedAtomic !== null && pocketsAtomic !== null;
   const setAside = known ? BigInt(pocketsAtomic) + moving : null;
   const total = known ? BigInt(shieldedAtomic) + setAside + refunds : null;
@@ -125574,6 +125611,13 @@ function createWalletTools({
       next = typeof blocking === "string" && /^[A-Za-z0-9._:-]{1,128}$/.test(blocking) ? `Nothing was paid: an earlier payment (request_id "${blocking}") is not finished, and the wallet pays one at a time. Call x402_pay again with request_id "${blocking}" and that payment's url, method, headers, and body (it finishes it and never pays twice), or close it with wallet_cancel request_id "${blocking}"; then call x402_pay again with request_id "${requestId}"` : `Nothing was paid: an earlier payment is not finished, and the wallet pays one at a time. wallet_balance lists it in detail.inFlight; finish it with x402_pay and its request_id, or close it with wallet_cancel; then call x402_pay again with request_id "${requestId}"`;
     } else if (/accounts_split_merge_first/.test(line)) {
       next = `Nothing was paid: the shielded balance covers this price in total, but it sits in several accounts and one payment draws only one account and at most 3 notes. Tell your owner to join them: shinjuku-wallet merge --wallet <wallet.json> --passphrase-file passphrase.txt --program <program> --proof-tools proof-tools.json --profile public-profile.json --facilitator <facilitator origin> (--dry-run shows the plan; shinjuku-wallet help merge). After it finished and the next pool anchor (up to 5 minutes; about 30 s on a pool with sub-anchors) passed, call x402_pay again with request_id "${requestId}" and the same url, method, headers, and body`;
+    } else if (/^p03_merchant_respend_(insufficient_recovered_value|no_spendable_account)$|^(p03_payer_)?insufficient(_recovered)?_value$/.test(code)) {
+      return refuse9(
+        code,
+        "the shielded balance is less than this payment needs (price + fee); nothing was paid",
+        `Nothing was paid. Tell the user the balance is too low for this price: wallet_balance shows breakdown.shieldedAtomic (a refund still on its way shows as refundsInFlightAtomic and becomes spendable when it arrives). To pay, add USDC with wallet_shield (or wallet_shield_from_elsewhere), wait until wallet_balance counts it, then call x402_pay again with request_id "${requestId}" and the same url, method, headers, and body (it never pays twice)`,
+        { requestId }
+      );
     } else if (code.startsWith("wallet_spend_refused_")) {
       next = "the wallet file's own budget refused it (init --max-payment / --max-cumulative); nothing was paid. Read wallet_balance detail.budget";
     } else if (code.startsWith("wallet_quote_refused_") || code.startsWith("fetch_")) {