shinjuku-shielded 0.3.36 → 0.3.37

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "658897741c5d9bce482ff9d932f4ade7e51cf98f834e78c3f693da1e1771e547",
-  "bytes": 11193868,
-  "sourceCommit": "60ad77f63dbc238b88ee877a67ae54d30ebdbdfb",
+  "sha256": "1335e815f99108526e1a9d4e93f53a94d95910ea150e404987f09826c39fc547",
+  "bytes": 11195840,
+  "sourceCommit": "c27f02e8ca3ec7ba4862c1292aad35ed9d766934",
   "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.36",
+  "version": "0.3.37",
   "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": "65889774",
-  "shinjukuSha256": "658897741c5d9bce482ff9d932f4ade7e51cf98f834e78c3f693da1e1771e547",
+  "shinjukuRelease": "1335e815",
+  "shinjukuSha256": "1335e815f99108526e1a9d4e93f53a94d95910ea150e404987f09826c39fc547",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -52762,6 +52762,7 @@ async function readFinalizedPoolForRefresh(connection, program, pool2) {
     { commitment: "finalized", dataSlice: { offset: 0, length: REFRESH_READ_BYTES } }
   ));
   if (!Array.isArray(both?.value) || both.value.length !== 2) throw new Error("p03_history_e1_tree_read_invalid");
+  if (both.value[0]?.data && Buffer.from(both.value[0].data).length >= REFRESH_READ_BYTES) return readFinalizedPool(connection, program, pool2);
   const snapshot = parseFinalizedPool({ context: both.context, value: both.value[0] }, program);
   if (snapshot.replayStore !== REPLAY_STORE_INDEXED) return snapshot;
   const treeAccount = both.value[1];
@@ -53320,20 +53321,26 @@ async function retryTransientRpc(operation, {
   attempts = TRANSIENT_RPC_ATTEMPTS,
   baseDelayMs = TRANSIENT_RPC_BASE_DELAY_MS
 } = {}) {
-  let lastError;
-  for (let attempt = 0; attempt < attempts; attempt += 1) {
+  const budgetMs = baseDelayMs * (2 ** Math.max(0, attempts - 1) - 1);
+  let waitedMs = 0;
+  let transportRetries = 0;
+  let laggingRetries = 0;
+  for (; ; ) {
     try {
       return await operation();
     } catch (error) {
       if (!isTransientRpcError(error)) throw error;
-      lastError = error;
+      if (error?.code === -32016 && historyRpcFailed(error)) throw error;
       markPhase(`rpc-retry-${transientCause(error)}`);
-      if (attempt + 1 < attempts) {
-        await new Promise((resolve38) => setTimeout(resolve38, baseDelayMs * 2 ** attempt));
-      }
+      const lagging = error instanceof import_web396.SolanaJSONRPCError && LAGGING_NODE_RPC_CODES.has(error.code);
+      const delayMs = lagging ? baseDelayMs * LAGGING_NODE_STEP_OF_BASE : baseDelayMs * 2 ** transportRetries;
+      if (waitedMs + delayMs > budgetMs || lagging && laggingRetries >= LAGGING_NODE_MAX_RETRIES) throw error;
+      if (lagging) laggingRetries += 1;
+      else transportRetries += 1;
+      waitedMs += delayMs;
+      await new Promise((resolve38) => setTimeout(resolve38, delayMs));
     }
   }
-  throw lastError;
 }
 function reuseRefusalCause(error) {
   const message = String(error?.message ?? error);
@@ -54279,7 +54286,7 @@ function base58Decode(value) {
   while (zeros < value.length && value[zeros] === "1") zeros += 1;
   return Uint8Array.from(Buffer.concat([Buffer.alloc(zeros), body]));
 }
-var import_web396, REPLAY_STORE_INDEXED, CLOSE_REPLAY_TREE_TAG, EXTEND_ANCHOR_RING_TAG, LINK_SUCCESSOR_TAG, IMPORT_REPLAY_LEAVES_TAG, SETTLE_MOVE_TAG, SWEEP_PREDECESSOR_VAULT_TAG, RELINK_SUCCESSOR_TAG, ROTATE_PAYMENT_SETTLER_TAG, IMPORT_A_LEAF_BYTES, IMPORT_MEMBERSHIP_BYTES, IMPORT_PRESENT_SHIFT, IMPORT_MAX_ENTRIES, MOVE_HEAD_BYTES, MOVE_INSERTED_VALUES, DEFAULT_KEY, FIELD_BYTES2, PRIMARY_PROOF_BYTES, SUBTREE_LEAVES, PAGE_SIZE, FIELD_MODULUS3, BPF_LOADER_UPGRADEABLE_PROGRAM_ID, SYSTEM_PROGRAM, TEST_EXECUTABLES, reviewedExecutables, isProgramDataIdentityError, ASSUMED_ORIGINAL_EXECUTABLE, AUTHENTICATED_HISTORY_REPORTS, HISTORY_ATTESTATIONS, hasExecutableEvidence, P03_FINALIZED_HISTORY_SOURCE_MODEL, P03_PROGRAMDATA_COVERAGE_SOURCE_MODEL, P03_RUN_RECOVER_UNAVAILABLE_FROM_CHAIN, PROFILES, P03_SETTLEMENT_TAGS, P03_INLINE_SETTLEMENT_TAGS, P03_PAYMENT_REPLAY_INDICES, NO_CONTEXTS, REFRESH_READ_BYTES, E1_TREE_HEADER_BYTES, HISTORY_FETCH_CONCURRENCY, HISTORY_BULK_TRANSACTIONS, HISTORY_BULK_ADDRESSES, TRANSIENT_RPC_ATTEMPTS, TRANSIENT_RPC_BASE_DELAY_MS, LAGGING_NODE_RPC_CODES;
+var import_web396, REPLAY_STORE_INDEXED, CLOSE_REPLAY_TREE_TAG, EXTEND_ANCHOR_RING_TAG, LINK_SUCCESSOR_TAG, IMPORT_REPLAY_LEAVES_TAG, SETTLE_MOVE_TAG, SWEEP_PREDECESSOR_VAULT_TAG, RELINK_SUCCESSOR_TAG, ROTATE_PAYMENT_SETTLER_TAG, IMPORT_A_LEAF_BYTES, IMPORT_MEMBERSHIP_BYTES, IMPORT_PRESENT_SHIFT, IMPORT_MAX_ENTRIES, MOVE_HEAD_BYTES, MOVE_INSERTED_VALUES, DEFAULT_KEY, FIELD_BYTES2, PRIMARY_PROOF_BYTES, SUBTREE_LEAVES, PAGE_SIZE, FIELD_MODULUS3, BPF_LOADER_UPGRADEABLE_PROGRAM_ID, SYSTEM_PROGRAM, TEST_EXECUTABLES, reviewedExecutables, isProgramDataIdentityError, ASSUMED_ORIGINAL_EXECUTABLE, AUTHENTICATED_HISTORY_REPORTS, HISTORY_ATTESTATIONS, hasExecutableEvidence, P03_FINALIZED_HISTORY_SOURCE_MODEL, P03_PROGRAMDATA_COVERAGE_SOURCE_MODEL, P03_RUN_RECOVER_UNAVAILABLE_FROM_CHAIN, PROFILES, P03_SETTLEMENT_TAGS, P03_INLINE_SETTLEMENT_TAGS, P03_PAYMENT_REPLAY_INDICES, NO_CONTEXTS, REFRESH_READ_BYTES, E1_TREE_HEADER_BYTES, HISTORY_FETCH_CONCURRENCY, HISTORY_BULK_TRANSACTIONS, HISTORY_BULK_ADDRESSES, TRANSIENT_RPC_ATTEMPTS, TRANSIENT_RPC_BASE_DELAY_MS, LAGGING_NODE_STEP_OF_BASE, LAGGING_NODE_MAX_RETRIES, LAGGING_NODE_RPC_CODES;
 var init_walk = __esm({
   "wallet/src/history/walk.mjs"() {
     "use strict";
@@ -54515,13 +54522,15 @@ var init_walk = __esm({
     P03_INLINE_SETTLEMENT_TAGS = Object.freeze([24, 25, 26, 32]);
     P03_PAYMENT_REPLAY_INDICES = PROFILES[4].replayIndices;
     NO_CONTEXTS = Object.freeze([]);
-    REFRESH_READ_BYTES = POOL_STATE_LEN_RING2;
+    REFRESH_READ_BYTES = 4096;
     E1_TREE_HEADER_BYTES = 80;
     HISTORY_FETCH_CONCURRENCY = 4;
     HISTORY_BULK_TRANSACTIONS = 256;
     HISTORY_BULK_ADDRESSES = 256;
     TRANSIENT_RPC_ATTEMPTS = 6;
     TRANSIENT_RPC_BASE_DELAY_MS = 250;
+    LAGGING_NODE_STEP_OF_BASE = 1.6;
+    LAGGING_NODE_MAX_RETRIES = 10;
     LAGGING_NODE_RPC_CODES = /* @__PURE__ */ new Set([-32004, -32016]);
   }
 });
@@ -56453,8 +56462,15 @@ async function loadWalletP03HistoryNow({ store, connection: given, programId, po
   let movedIndex;
   if (earlier !== void 0) {
     markPhase("refresh-start");
+    const refreshing = refreshFinalizedP03HistorySnapshot({ connection, programId, pool: pool2, history: earlier });
+    if (typeof onCompactList === "function" && Array.isArray(earlier.contexts)) {
+      try {
+        onCompactList(earlier.contexts);
+      } catch {
+      }
+    }
     try {
-      const refreshed = await refreshFinalizedP03HistorySnapshot({ connection, programId, pool: pool2, history: earlier });
+      const refreshed = await refreshing;
       markPhase("walk-refreshed");
       rememberRunReport(runKey, refreshed);
       writeStderr("history: the pool made no transition since this run's last walk; that history was moved to the current pool account (your own RPC read the pool account and the program's deployment account; the history source answered one signature read)\n");
@@ -60447,7 +60463,9 @@ async function syncedOutputs({ store, finalizedHistory: finalizedHistory2, diges
     if (!serviceUrl2) {
       throw new Error(`p03_memo_service_required: ${pending.length} transitions this wallet has not read come from the memo service; rerun with --service <facilitator URL>`);
     }
-    const wal = fresh ? /* @__PURE__ */ new Map() : walMemoBundles(store);
+    if (!fresh) store.listWal();
+    let wal;
+    const walFor = () => wal ??= fresh ? /* @__PURE__ */ new Map() : walMemoBundles(store);
     const reader = deps.memoReader ?? createMemoReader(serviceUrl2, { fetchImpl: deps.fetchImpl ?? fetch, ...deps.pause ? { pause: deps.pause } : {} });
     (deps.notice ?? ((text3) => process.stderr.write(text3)))(
       `reading ${pending.length} memos from the memo service, ${Math.ceil(pending.length / MEMO_BATCH_MAX)} request(s)
@@ -60467,7 +60485,7 @@ async function syncedOutputs({ store, finalizedHistory: finalizedHistory2, diges
       for (const context of chunk) {
         const digest2 = hexOf2(context.memoDigest);
         const fromService = served.get(digest2);
-        const bytes2 = fromService ?? wal.get(digest2);
+        const bytes2 = fromService ?? walFor().get(digest2);
         if (!bytes2) {
           absent2 += 1;
           continue;
@@ -72071,13 +72089,31 @@ function exitReservedNoteCommitments(store) {
     const selfPay2 = name.startsWith("self-pay-");
     if (!selfPay2 && !name.startsWith("note-exit-")) continue;
     if (name.startsWith("self-pay-merge-")) continue;
+    const settledKey = selfPay2 ? void 0 : settledNoteExitKey(store, name);
+    const before = settledKey === void 0 ? void 0 : walFileValidator(store, name);
+    if (before !== void 0 && settledNoteExits.get(settledKey) === before) continue;
     const record = store.readWal(name);
+    if (before !== void 0) {
+      if (record?.state === "settled" && walFileValidator(store, name) === before) settledNoteExits.set(settledKey, before);
+      else settledNoteExits.delete(settledKey);
+    }
     const pending = selfPay2 ? record?.state === "paid" : ["selected", "proved", "confirmed"].includes(record?.state);
     if (!pending || typeof record?.noteCommitment !== "string" || !/^[0-9]{1,90}$/.test(record.noteCommitment)) continue;
     reserved.add(BigInt(record.noteCommitment).toString());
   }
   return reserved;
 }
+function settledNoteExitKey(store, name) {
+  return typeof store?.walDirectory === "string" ? `${resolve15(store.walDirectory)}\0${name}` : void 0;
+}
+function walFileValidator(store, name) {
+  try {
+    const stat = statSync(join13(store.walDirectory, `${name}.json`), { bigint: true, throwIfNoEntry: false });
+    return stat?.isFile() ? `${stat.ino}:${stat.size}:${stat.mtimeNs}:${stat.ctimeNs}` : void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function readFinalizedClock(connection) {
   const info = await connection.getAccountInfo(import_web3106.SYSVAR_CLOCK_PUBKEY, "finalized");
   const data = info?.data;
@@ -72455,7 +72491,7 @@ function assertProvedPaymentBinding(proved, { poolDomain, inputAccountCommitment
     fail15("proved_request_binding_invalid");
   }
 }
-var import_web3106, MODEL_DIR3, seedBytes5, EARLY_CHAIN_TIME_MAX_AGE_MS;
+var import_web3106, MODEL_DIR3, seedBytes5, EARLY_CHAIN_TIME_MAX_AGE_MS, settledNoteExits;
 var init_prepareRecoveredPayment = __esm({
   "wallet/src/pay/prepareRecoveredPayment.mjs"() {
     "use strict";
@@ -72476,6 +72512,7 @@ var init_prepareRecoveredPayment = __esm({
     MODEL_DIR3 = resolve15(fileURLToPath8(new URL("../../vendor/shielded-x402-model/", new URL("__bundled_source__/wallet/src/pay/prepareRecoveredPayment.mjs", import.meta.url).href)));
     seedBytes5 = (state) => Uint8Array.from(Buffer.from(state.seedHex, "hex"));
     EARLY_CHAIN_TIME_MAX_AGE_MS = 3e4;
+    settledNoteExits = /* @__PURE__ */ new Map();
   }
 });