shinjuku-shielded 0.3.33 → 0.3.35

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "dae9ba8800e48179602d5595c5bbc71029a758be726e72482d24a52126649ac9",
-  "bytes": 11184999,
-  "sourceCommit": "5a445fbb0e06e50a3365809a078f3d5b0de03c51",
+  "sha256": "fc7329d0267d82e7f06546009c64924d0ec713165c3bfe270512ba0672b94cbd",
+  "bytes": 11187416,
+  "sourceCommit": "dcbbb1497a0fcf92d4e0ff9bd78fb81b72075631",
   "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.33",
+  "version": "0.3.35",
   "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": "dae9ba88",
-  "shinjukuSha256": "dae9ba8800e48179602d5595c5bbc71029a758be726e72482d24a52126649ac9",
+  "shinjukuRelease": "fc7329d0",
+  "shinjukuSha256": "fc7329d0267d82e7f06546009c64924d0ec713165c3bfe270512ba0672b94cbd",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -53257,6 +53257,7 @@ async function retryTransientRpc(operation, {
     } catch (error) {
       if (!isTransientRpcError(error)) throw error;
       lastError = error;
+      markPhase(`rpc-retry-${transientCause(error)}`);
       if (attempt + 1 < attempts) {
         await new Promise((resolve38) => setTimeout(resolve38, baseDelayMs * 2 ** attempt));
       }
@@ -53274,6 +53275,10 @@ function reuseRefusalCause(error) {
   if (status) return `http_${status}`;
   return error instanceof import_web396.SolanaJSONRPCError ? "rpc_error" : "read_failed";
 }
+function transientCause(error) {
+  if (error instanceof import_web396.SolanaJSONRPCError) return String(-error.code);
+  return reuseRefusalCause(error);
+}
 function isTransientRpcError(error) {
   if (error?.transientRpcError === true) return true;
   if (error instanceof import_web396.SolanaJSONRPCError) return LAGGING_NODE_RPC_CODES.has(error.code);
@@ -54216,6 +54221,7 @@ var init_walk = __esm({
     init_esm2();
     init_chain2();
     init_proxy();
+    init_phaseTiming();
     init_quote2();
     init_compressedReplay();
     init_p03E1Tree();
@@ -56322,7 +56328,6 @@ async function loadWalletP03History(args) {
   }
   if (runKey !== void 0 && recentScope.getStore() === true && strictScope.getStore() !== true && args.forceRead !== true) {
     const recent = recentLoads.get(runKey);
-    recentLoads.delete(runKey);
     if (recent !== void 0 && Date.now() - recent.startedAt <= HISTORY_PREWARM_JOIN_MS) {
       PREWARMED_REPORTS.add(recent.report);
       markPhase("walk-recent");
@@ -56367,6 +56372,7 @@ async function loadWalletP03HistoryNow({ store, connection: given, programId, po
   const earlier = remembered !== void 0 && Date.now() - remembered.at <= HISTORY_WARM_FRESH_MS ? remembered.report : void 0;
   let movedSnapshot;
   if (earlier !== void 0) {
+    markPhase("refresh-start");
     try {
       const refreshed = await refreshFinalizedP03HistorySnapshot({ connection, programId, pool: pool2, history: earlier });
       markPhase("walk-refreshed");
@@ -56534,7 +56540,7 @@ function reportHistoryRpc(split5, source, result, crossChecked) {
   writeStderr(`history: ${who} answered ${list(split5.history)}; your own RPC answered ${list(split5.own)} (the pool account the history must match, and the cross-check)${window2}${integrity}
 `);
 }
-var strictScope, withStrictHistorySource, recentScope, withRecentWalletHistory, recentLoads, historyCacheKey, HISTORY_PREWARM_JOIN_MS, prewarmedWalks, PREWARMED_REPORTS, isPrewarmedWalletHistory, COMPACT_BEHIND_RETRY_MS, lastRunReports, writeStderr, announcedSources;
+var strictScope, withStrictHistorySource, recentScope, withRecentWalletHistory, recentLoads, forgetRecentWalletHistory, historyCacheKey, HISTORY_PREWARM_JOIN_MS, prewarmedWalks, PREWARMED_REPORTS, isPrewarmedWalletHistory, COMPACT_BEHIND_RETRY_MS, lastRunReports, writeStderr, announcedSources;
 var init_walletHistory = __esm({
   "wallet/src/history/walletHistory.mjs"() {
     "use strict";
@@ -56551,6 +56557,9 @@ var init_walletHistory = __esm({
     recentScope = new AsyncLocalStorage2();
     withRecentWalletHistory = (fn) => recentScope.run(true, fn);
     recentLoads = /* @__PURE__ */ new Map();
+    forgetRecentWalletHistory = () => {
+      recentLoads.clear();
+    };
     historyCacheKey = (store) => createHmac5("sha256", Buffer.from(store.state.seedHex, "hex")).update("carbon-shielded-wallet/history-cache-key/v1").digest("hex");
     HISTORY_PREWARM_JOIN_MS = 1e4;
     prewarmedWalks = /* @__PURE__ */ new Map();
@@ -61134,6 +61143,7 @@ var init_errorCodes = __esm({
       "p03_merchant_respend_evidence_account_file_invalid_json",
       "p03_merchant_respend_evidence_digests_invalid_json",
       "p03_merchant_respend_accounts_split_merge_first",
+      "walk_history_required",
       "merge_id_invalid",
       "merge_id_reserved",
       "p03_merchant_respend_insufficient_recovered_value",
@@ -62914,6 +62924,7 @@ var init_errorCodes = __esm({
       "absorb_note_ambiguous",
       "p03_payer_float_absorb_pocket_mismatch",
       "p03_payer_float_absorb_exit_failed",
+      "p03_payer_float_absorb_merge_failed",
       "reverted_payment",
       "config_invalid",
       "p03_payer_float_journal_unwritable",
@@ -71956,6 +71967,26 @@ function startFinalizedChainTime(connection) {
     return time + Math.floor(age / 1e3);
   };
 }
+async function everyAccountHeld({ store, connection, programId, serviceUrl: serviceUrl2, reservedReplayValues, deps = {} }) {
+  if (typeof deps.walkHistory !== "function") fail15("walk_history_required");
+  const viewing = deriveWalletViewingAuthority2({ seedBytes: seedBytes5(store.state), generator: pinnedGenerator4() });
+  const history = assertAuthenticatedFinalizedP03History(await withRecentWalletHistory(() => deps.walkHistory()));
+  const recovery = await (deps.recover ?? runRecover)({
+    store,
+    connection,
+    programId: new import_web3106.PublicKey(programId),
+    serviceUrl: serviceUrl2,
+    deps: { fetchImpl: deps.fetchImpl, finalizedHistory: history, transitionContextFor: history.transitionContextFor }
+  });
+  return recovery.recovered.filter((entry) => entry.kind === "account" && entry.spendStatus === "unspent").every((entry) => {
+    if (entry.leafIndex === void 0 || entry.leafIndex === null) return true;
+    try {
+      return reservedReplayValues.has(accountNullifier(entry.commitment, viewing.eta, entry.leafIndex).toString());
+    } catch {
+      return true;
+    }
+  });
+}
 async function prepareRecoveredPayment({
   store,
   connection,
@@ -72034,6 +72065,7 @@ async function prepareRecoveredPayment({
       quoteCommitment: witnessQuote.quoteCommitment,
       amountAtomic: witnessQuote.amountAtomic
     });
+    forgetRecentWalletHistory();
     return {
       replayed: false,
       walName: walName2,
@@ -72223,6 +72255,7 @@ async function prepareRecoveredPayment({
   if (persisted !== void 0 && persisted.requestHash !== requestHash2) {
     fail15("wal_request_binding_mismatch");
   }
+  forgetRecentWalletHistory();
   const proved = await (deps.provePayment ?? proveRecoveredP03Payment)({ request, tools: proofTools });
   const binding = {
     poolDomain: request.poolDomain,
@@ -91553,7 +91586,8 @@ async function payViaFloat({
           method: "POST",
           body: Buffer.from(record.bodyBase64, "base64"),
           headers: { "content-type": "application/json" },
-          deps: { ...withoutCallerBody(deps), fetchImpl: floatFetch(fetchImpl, seen) }
+          // settlePriorBeforeQuote: a prior answer that holds every input is settled before the leg-1 402 (one quote, one row).
+          deps: { ...withoutCallerBody(deps), fetchImpl: floatFetch(fetchImpl, seen), settlePriorBeforeQuote: true }
         });
       } catch (error) {
         if (seen.refusal) {
@@ -92494,6 +92528,31 @@ async function payResourceOnce({
       }
       await settlePrior(name);
     }
+    const settleDeferred = async () => {
+      const answeredAt = (name) => store.readWal(name)?.answeredAtMs ?? 0;
+      const shared2 = {};
+      for (const name of deferred.splice(0).sort((a, b) => answeredAt(b) - answeredAt(a))) await settlePrior(name, shared2);
+      held.clear();
+    };
+    if (deps.settlePriorBeforeQuote === true && deferred.length > 0 && !record) {
+      let first = false;
+      try {
+        first = await withPhaseScope(mark, "held", () => (deps.everyAccountHeld ?? everyAccountHeld)({
+          store,
+          connection,
+          programId,
+          serviceUrl: serviceUrl2,
+          reservedReplayValues: held,
+          deps: { fetchImpl: deps.fetchImpl, walkHistory: finality.walkHistory }
+        }));
+      } catch {
+        first = false;
+      }
+      if (first === true) {
+        mark("prior-finality-first");
+        await settleDeferred();
+      }
+    }
     if (!record?.paymentHeader && typeof deps.warmHistory === "function") {
       if (walkedThisRun && deps.warmHistory === deps.walkHistory) {
         mark("history-warm-reused");
@@ -92631,10 +92690,7 @@ async function payResourceOnce({
         const noProof = store.readWal(`resource-proof-${requestKey}`)?.proved === void 0;
         if (noProof && deferred.length > 0 && /^p03_merchant_respend_inputs_held_by_pending_payment/.test(message)) {
           mark("prior-finality-fallback");
-          const answeredAt = (name) => store.readWal(name)?.answeredAtMs ?? 0;
-          const shared2 = {};
-          for (const name of deferred.splice(0).sort((a, b) => answeredAt(b) - answeredAt(a))) await settlePrior(name, shared2);
-          held.clear();
+          await settleDeferred();
           continue;
         }
         if (!requoted && noProof && (/^p03_merchant_respend_quote_life_short_requote/.test(message) || /^p03_merchant_respend_quote_expired/.test(message))) {