shinjuku-shielded 0.3.30 → 0.3.31

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "a523d67b85ebcfd6f07f653c2a9bde16a7c9d87f908874ddae71cf91083fabc8",
-  "bytes": 11177579,
-  "sourceCommit": "025c6a4ab1a1c3e38019cdd7843b524a6a90d62a",
+  "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.30",
+  "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": "a523d67b",
-  "shinjukuSha256": "a523d67b85ebcfd6f07f653c2a9bde16a7c9d87f908874ddae71cf91083fabc8",
+  "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");
@@ -96223,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);
@@ -96237,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));
@@ -96277,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 };