shinjuku-shielded 0.3.29 → 0.3.31

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "902397c7c00f815b7f80b1275a1a987ca78871df5fdf370e7c80a282ecfb15a4",
-  "bytes": 11176401,
-  "sourceCommit": "7c322196100fd59b6193ea99e999fd61f0ef6ed5",
+  "sha256": "c8c82dc4ce0277f8c560adec5cb16119709d00240a8efa4ebbb2a426e5161b6a",
+  "bytes": 11178235,
+  "sourceCommit": "206a11827c4c668d65b7e8e2040a344f17aad1d0",
   "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.29",
+  "version": "0.3.31",
   "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": "902397c7",
-  "shinjukuSha256": "902397c7c00f815b7f80b1275a1a987ca78871df5fdf370e7c80a282ecfb15a4",
+  "shinjukuRelease": "c8c82dc4",
+  "shinjukuSha256": "c8c82dc4ce0277f8c560adec5cb16119709d00240a8efa4ebbb2a426e5161b6a",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -70299,11 +70299,14 @@ async function runRecoveredP03NoteExit({
   }
   wal = { ...wal, state: "confirmed", signature };
   store.writeWal(walName2, wal);
-  poolState2 = await readPool2(connection, pool2, "finalized");
-  if (!poolState2 || !poolState2.owner.equals(chainProgramId) || poolState2.version !== 3) {
-    throw new Error("finalized note-exit pool postcondition invalid");
+  for (let attempt = 1; ; attempt += 1) {
+    history = await walkHistory();
+    poolState2 = await readPool2(connection, pool2, "finalized");
+    if (!poolState2 || !poolState2.owner.equals(chainProgramId) || poolState2.version !== 3) {
+      throw new Error("finalized note-exit pool postcondition invalid");
+    }
+    if (attempt >= 4 || history.finalizedPoolSnapshot.currentIndex === poolState2.currentIndex && history.finalizedPoolSnapshot.currentRoot === poolState2.currentRoot) break;
   }
-  history = await walkHistory();
   await prepareFold(history);
   const spentPath = buildRecoveryPath({
     history,
@@ -72326,7 +72329,7 @@ async function validateReceiptTransaction(connection, receipt, record, state, pr
     [{ signature: receipt.transaction, slot: status.slot, failed: false }],
     blockCache,
     transactions,
-    { commitment }
+    { commitment, positionWhen: () => false }
   );
   const settlements = targetInstructions([...transactions.values()], program).filter((instruction) => (instruction.data[0] === 4 || instruction.data[0] === COMPRESSED_SETTLE_TAG.payment || instruction.data[0] === E1_SETTLE_TAG.payment) && instruction.accounts[0] === pool2.toBase58());
   if (settlements.length !== 1) fail16("receipt_payment_instruction_missing");
@@ -91047,6 +91050,36 @@ var init_pay = __esm({
   }
 });
 
+// wallet/src/fetch/keepAlive.mjs
+function proxiedRun() {
+  const env = process.env;
+  return Boolean(env.SHINJUKU_WALLET_PROXIED || env.NODE_USE_ENV_PROXY || env.HTTPS_PROXY || env.HTTP_PROXY || env.https_proxy || env.http_proxy);
+}
+function keepAliveDispatcher() {
+  if (shared !== void 0) return shared;
+  try {
+    if (proxiedRun()) return void 0;
+    const global2 = globalThis[GLOBAL_DISPATCHER];
+    if (global2?.constructor?.name !== "Agent") return void 0;
+    shared = new global2.constructor({ keepAliveTimeout: KEEP_ALIVE_MS, keepAliveMaxTimeout: KEEP_ALIVE_MS });
+    return shared;
+  } catch {
+    return void 0;
+  }
+}
+function keepAliveInit(init = {}) {
+  const dispatcher = keepAliveDispatcher();
+  return dispatcher === void 0 ? init : { ...init, dispatcher };
+}
+var GLOBAL_DISPATCHER, KEEP_ALIVE_MS, shared;
+var init_keepAlive = __esm({
+  "wallet/src/fetch/keepAlive.mjs"() {
+    "use strict";
+    GLOBAL_DISPATCHER = /* @__PURE__ */ Symbol.for("undici.globalDispatcher.1");
+    KEEP_ALIVE_MS = 2e4;
+  }
+});
+
 // wallet/src/pay/floatPay.mjs
 import { createHash as createHash20, randomBytes as randomBytes11 } from "node:crypto";
 import { fileURLToPath as fileURLToPath9 } from "node:url";
@@ -91140,7 +91173,7 @@ async function readFloatConfig({ origin, fetchImpl = fetch }) {
   try {
     response = await fetchImpl(
       new URL("/api/x402/float/config", origin).href,
-      { method: "GET", redirect: "error", signal: AbortSignal.timeout(CONFIG_TIMEOUT_MS) }
+      keepAliveInit({ method: "GET", redirect: "error", signal: AbortSignal.timeout(CONFIG_TIMEOUT_MS) })
     );
   } catch (error) {
     fail18("p03_float_config_unreadable", { cause: error });
@@ -91271,7 +91304,7 @@ function withSellerResource(xPayment, record) {
 }
 function floatFetch(base, seen) {
   return async (target, init = {}) => {
-    const response = await base(target, init);
+    const response = await base(target, keepAliveInit(init));
     const paid = Object.keys(init.headers ?? {}).some((name) => name.toLowerCase() === "payment-signature");
     if (paid || response.status === 402 || response.status < 400) return response;
     let answer;
@@ -91469,13 +91502,13 @@ async function payViaFloat({
   mark("seller-sent");
   let response;
   try {
-    response = await fetchImpl(record.url, {
+    response = await fetchImpl(record.url, keepAliveInit({
       method: record.request.method,
       headers: { ...Object.fromEntries(record.request.headers), "PAYMENT-SIGNATURE": record.xPayment },
       ...record.request.method === "POST" ? { body: Buffer.from(record.request.bodyBase64, "base64") } : {},
       redirect: "error",
       signal: AbortSignal.timeout(SELLER_TIMEOUT_MS)
-    });
+    }));
   } catch (error) {
     fail18("p03_float_seller_unanswered_retry_same_request", { cause: error, floatId: record.floatId });
   }
@@ -91548,6 +91581,7 @@ var init_floatPay = __esm({
     init_http();
     init_ShieldedSolanaP03QuoteCrypto();
     init_chain2();
+    init_keepAlive();
     init_notes2();
     init_pay();
     init_quote2();
@@ -91934,7 +91968,7 @@ async function assertRefusedPaymentsCannotLand({ store, walName: walName2, payme
     resolve38("proved-dead");
   }
 }
-async function finalizePendingReceipt({ store, connection, programId, name, timeoutMs, pollMs, deps = {} }) {
+async function finalizePendingReceipt({ store, connection, programId, name, timeoutMs, pollMs, deps = {}, shared: shared2 }) {
   const sleep5 = deps.sleep ?? ((ms) => new Promise((resolve38) => setTimeout(resolve38, ms)));
   const now = deps.now ?? Date.now;
   const deadline = now() + timeoutMs;
@@ -91944,6 +91978,20 @@ async function finalizePendingReceipt({ store, connection, programId, name, time
     const record = store.readWal(name);
     if (!isPending(record)) return record;
     if (!connection || !programId || typeof deps.walkHistory !== "function") fail19("receipt_finality_needs_chain");
+    if (!gated && shared2?.history !== void 0) {
+      gated = true;
+      const { clock: clock3, history: history2 } = shared2;
+      const settlement2 = settlementInHistory(history2, record.paymentHeader, store.state, programId);
+      markPhase("walk-shared");
+      if (settlement2) return writeFinalized(store, name, record, settlement2);
+      if (!paymentBlockerAt(record, clock3, history2)) {
+        const dead = { ...record, receiptFinality: "never-finalized" };
+        store.writeWal(name, dead);
+        return dead;
+      }
+      strict = true;
+      continue;
+    }
     if (!gated) {
       gated = true;
       const answeredLongAgo = Number.isSafeInteger(record.answeredAtMs) && Date.now() - record.answeredAtMs >= FINALITY_GATE_SKIP_AFTER_MS;
@@ -91962,13 +92010,9 @@ async function finalizePendingReceipt({ store, connection, programId, name, time
       await (strict ? withStrictHistorySource(() => deps.walkHistory()) : deps.walkHistory())
     );
     markPhase("walk");
+    if (shared2) Object.assign(shared2, { clock: clock2, history });
     const settlement = settlementInHistory(history, record.paymentHeader, store.state, programId);
-    if (settlement) {
-      const settledTransaction = settlement.provenance?.signature;
-      const finalized = settledTransaction === record.receipt.transaction ? { ...record, receiptFinality: "finalized" } : { ...record, receiptFinality: "finalized", receiptMismatch: "transaction", settledTransaction };
-      store.writeWal(name, finalized);
-      return finalized;
-    }
+    if (settlement) return writeFinalized(store, name, record, settlement);
     if (!paymentBlockerAt(record, clock2, history)) {
       const dead = { ...record, receiptFinality: "never-finalized" };
       store.writeWal(name, dead);
@@ -91978,6 +92022,12 @@ async function finalizePendingReceipt({ store, connection, programId, name, time
     await sleep5(pollMs);
   }
 }
+function writeFinalized(store, name, record, settlement) {
+  const settledTransaction = settlement.provenance?.signature;
+  const finalized = settledTransaction === record.receipt.transaction ? { ...record, receiptFinality: "finalized" } : { ...record, receiptFinality: "finalized", receiptMismatch: "transaction", settledTransaction };
+  store.writeWal(name, finalized);
+  return finalized;
+}
 async function awaitResourceReceiptFinality({
   store,
   connection,
@@ -92208,13 +92258,13 @@ async function payResourceOnce({
     rpcUrl: pocket.rpcUrl,
     readResult,
     deps: pocket.deps ?? {},
-    send: (paymentHeaders) => (deps.fetchImpl ?? fetch)(url, {
+    send: (paymentHeaders) => (deps.fetchImpl ?? fetch)(url, keepAliveInit({
       method: suppliedRequest.method,
       headers: { ...Object.fromEntries(suppliedRequest.headers), ...paymentHeaders },
       ...suppliedRequest.method === "POST" ? { body: Buffer.from(suppliedRequest.bodyBase64, "base64") } : {},
       redirect: "error",
       signal: AbortSignal.timeout(12e4)
-    })
+    }))
   });
   if (!record && store.readWal(pocketPaymentWalName(requestKey))) {
     if (!pocket) fail19("pocket_payment_needs_rpc");
@@ -92272,13 +92322,13 @@ async function payResourceOnce({
   }
   let requestData = record?.request ?? suppliedRequest;
   const fetchImpl = deps.fetchImpl ?? fetch;
-  const request = (paymentHeaders = {}) => fetchImpl(url, {
+  const request = (paymentHeaders = {}) => fetchImpl(url, keepAliveInit({
     method: requestData.method,
     headers: { ...Object.fromEntries(requestData.headers), ...paymentHeaders },
     ...requestData.method === "POST" ? { body: Buffer.from(requestData.bodyBase64, "base64") } : {},
     redirect: "error",
     signal: AbortSignal.timeout(12e4)
-  });
+  }));
   const challengeSleep = deps.sleep ?? ((ms) => new Promise((resolve38) => setTimeout(resolve38, ms)));
   let prefetched = !record && typeof sellerChallenge === "string" && sellerChallenge.length > 0 && sellerChallenge.length <= 128 * 1024 ? sellerChallenge : void 0;
   const requestChallenge = async () => {
@@ -92314,11 +92364,11 @@ async function payResourceOnce({
   };
   const held = /* @__PURE__ */ new Set();
   const deferred = [];
-  const settlePrior = async (name) => {
+  const settlePrior = async (name, shared2) => {
     let other = store.readWal(name);
     if (isPending(other)) {
       mark("prior-finality-wait");
-      other = await withPhaseScope(mark, "fin", () => finalizePendingReceipt({ store, connection, programId, name, ...finalityWait, deps: finality }));
+      other = await withPhaseScope(mark, "fin", () => finalizePendingReceipt({ store, connection, programId, name, ...finalityWait, deps: finality, shared: shared2 }));
       if (isPending(other)) failUnresolved(other);
       mark("prior-finality-done");
     }
@@ -92483,7 +92533,9 @@ 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");
-          for (const name of deferred.splice(0)) await settlePrior(name);
+          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();
           continue;
         }
@@ -92601,6 +92653,7 @@ var init_payResource = __esm({
     init_anchorWait();
     init_anchorClock();
     init_requestId();
+    init_keepAlive();
     fail19 = (reason) => {
       throw new Error(`p03_resource_payment_${reason}`);
     };
@@ -96173,6 +96226,7 @@ async function createSellerAdapter({
       return { status: original.result.status, result: original.result, receipt: original.receipt };
     }
     let offer = original;
+    let intakeChain;
     try {
       if (!offer.outboundJson) {
         const parsed = parseSolanaP03HttpPaymentPayload(payment.payload);
@@ -96187,6 +96241,7 @@ async function createSellerAdapter({
         const recoveredNote = await scanner.recoverMerchantNoteYielding({ parsed, authenticatedQuote: auth });
         mark("intake-note-recovered");
         const chain = await intakeRead;
+        intakeChain = chain;
         mark("intake-anchor-read");
         const issuedAt = Number(chain.chainTimestamp);
         const expiresAt = Math.min(issuedAt + 300, Number(payment.accepted.extra.validBefore));
@@ -96227,11 +96282,18 @@ async function createSellerAdapter({
         await put(nonce, offer);
         mark("intake-durable");
       }
+      const firstIntake = intakeChain !== void 0 && !offer.settleAttempted;
+      if (firstIntake) {
+        await readCurrentAnchor(intakeChain);
+        offer = { ...offer, phase: "settlement_pending", settleAttempted: true };
+        await put(nonce, offer);
+        mark("first-intake-settle");
+      }
       const preVerifyReadAt = Date.now();
       const preVerifyRead = offer.settleAttempted ? void 0 : readAnchor();
       preVerifyRead?.catch(() => void 0);
-      const claimed = await facilitator("claim", offer.outboundJson);
-      mark("claim");
+      const claimed = firstIntake ? void 0 : await facilitator("claim", offer.outboundJson);
+      if (!firstIntake) mark("claim");
       if (claimed) {
         offer = await persistReceipt(nonce, offer, claimed, mark);
         return { status: offer.result.status, result: offer.result, receipt: offer.receipt };
@@ -117728,40 +117790,14 @@ init_payResource();
 init_quote2();
 init_floatPay();
 init_walletHistory();
-import { randomBytes as randomBytes12 } from "node:crypto";
-
-// wallet/src/fetch/keepAlive.mjs
-var GLOBAL_DISPATCHER = /* @__PURE__ */ Symbol.for("undici.globalDispatcher.1");
-var KEEP_ALIVE_MS = 2e4;
-var shared;
-function proxiedRun() {
-  const env = process.env;
-  return Boolean(env.SHINJUKU_WALLET_PROXIED || env.NODE_USE_ENV_PROXY || env.HTTPS_PROXY || env.HTTP_PROXY || env.https_proxy || env.http_proxy);
-}
-function keepAliveDispatcher() {
-  if (shared !== void 0) return shared;
-  try {
-    if (proxiedRun()) return void 0;
-    const global2 = globalThis[GLOBAL_DISPATCHER];
-    if (global2?.constructor?.name !== "Agent") return void 0;
-    shared = new global2.constructor({ keepAliveTimeout: KEEP_ALIVE_MS, keepAliveMaxTimeout: KEEP_ALIVE_MS });
-    return shared;
-  } catch {
-    return void 0;
-  }
-}
-function keepAliveInit(init = {}) {
-  const dispatcher = keepAliveDispatcher();
-  return dispatcher === void 0 ? init : { ...init, dispatcher };
-}
-
-// wallet/src/fetch/payAndFetch.mjs
+init_keepAlive();
 init_phaseTiming();
 init_chain2();
 init_processLease();
 init_store();
 init_proxy();
 init_book();
+import { randomBytes as randomBytes12 } from "node:crypto";
 
 // wallet/src/caps/spendPolicy.mjs
 init_book();