shinjuku-shielded 0.3.40 → 0.3.41

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "5b21a788efa0e47f3e83f413f73a4c11a70f068edda47f4f68be3bd6c0855955",
-  "bytes": 11226333,
-  "sourceCommit": "40a82beaab73a8c1e1dbd6d44682b4d2cd93e402",
+  "sha256": "387938b415cfece575952e875ecafc7149e29279e202a4e862433f66f664a803",
+  "bytes": 11230018,
+  "sourceCommit": "60acd91587cd5576b91001c7dcdabbb1c0f723aa",
   "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.40",
+  "version": "0.3.41",
   "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": "5b21a788",
-  "shinjukuSha256": "5b21a788efa0e47f3e83f413f73a4c11a70f068edda47f4f68be3bd6c0855955",
+  "shinjukuRelease": "387938b4",
+  "shinjukuSha256": "387938b415cfece575952e875ecafc7149e29279e202a4e862433f66f664a803",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -48426,10 +48426,21 @@ function walNames(directory) {
   });
 }
 function bindWalDirectory(directory, key, claim = true) {
-  mkdirSync(directory, { recursive: true, mode: 448 });
   const ownerPath = join3(directory, WAL_OWNER_FILE);
+  const verified = verifiedWalOwners.get(key);
+  try {
+    if (verified?.get(resolve3(directory)) === ownerStatId(ownerPath)) return;
+  } catch {
+  }
+  mkdirSync(directory, { recursive: true, mode: 448 });
   const identity = createHmac("sha256", key).update(WAL_OWNER_SCHEMA).digest("hex");
   const verifyOwner = () => {
+    let statId;
+    try {
+      statId = ownerStatId(ownerPath);
+    } catch {
+      statId = void 0;
+    }
     let owner;
     try {
       owner = JSON.parse(readFileSync(ownerPath, "utf8"));
@@ -48439,6 +48450,10 @@ function bindWalDirectory(directory, key, claim = true) {
     if (owner?.schema !== WAL_OWNER_SCHEMA || owner.identity !== identity || Object.keys(owner).sort().join() !== "identity,schema") {
       throw new WalletStoreError("wallet_wal_owner_mismatch");
     }
+    if (statId === void 0) return;
+    let byDirectory = verifiedWalOwners.get(key);
+    if (!byDirectory) verifiedWalOwners.set(key, byDirectory = /* @__PURE__ */ new Map());
+    byDirectory.set(resolve3(directory), statId);
   };
   if (existsSync(ownerPath)) {
     verifyOwner();
@@ -48571,7 +48586,7 @@ function openWalletStore(path, passphrase2) {
   };
   return store;
 }
-var STORE_SCHEMA, WAL_SCHEMA, SCRYPT, WAL_OWNER_FILE, WAL_OWNER_SCHEMA, WalletStoreError, KEY_CACHE_LIMIT, keyCacheSecret, keyCache, keyStats, keyCacheId, rememberKey, assertPassphrase, assertWalName;
+var STORE_SCHEMA, WAL_SCHEMA, SCRYPT, WAL_OWNER_FILE, WAL_OWNER_SCHEMA, WalletStoreError, KEY_CACHE_LIMIT, keyCacheSecret, keyCache, keyStats, keyCacheId, rememberKey, verifiedWalOwners, ownerStatId, assertPassphrase, assertWalName;
 var init_store = __esm({
   "wallet/src/store/store.mjs"() {
     "use strict";
@@ -48597,6 +48612,11 @@ var init_store = __esm({
       keyCache.set(id, key);
       while (keyCache.size > KEY_CACHE_LIMIT) keyCache.delete(keyCache.keys().next().value);
     };
+    verifiedWalOwners = /* @__PURE__ */ new WeakMap();
+    ownerStatId = (path) => {
+      const stat = statSync(path, { bigint: true });
+      return `${stat.dev}:${stat.ino}:${stat.size}:${stat.mtimeNs}:${stat.ctimeNs}`;
+    };
     assertPassphrase = (passphrase2) => {
       if (typeof passphrase2 !== "string" || passphrase2.length < 8) {
         throw new WalletStoreError("wallet_passphrase_too_short: the wallet passphrase must be at least 8 characters");
@@ -56623,6 +56643,23 @@ function walletCompactHistoryCache(store) {
 async function loadWalletP03History(args) {
   const runKey = lastRunReportKey(args.store, args.programId, args.pool, args.deploymentIdentity, args.cache);
   const prewarm = runKey === void 0 ? void 0 : prewarmedWalks.get(runKey);
+  const share = args.share;
+  if (share !== void 0) {
+    if (prewarm !== void 0 && strictScope.getStore() !== true && args.forceRead !== true && Number.isFinite(share.notBeforeMs) && prewarm.startedAt >= share.notBeforeMs && Date.now() - prewarm.startedAt <= HISTORY_PREWARM_JOIN_MS) {
+      try {
+        const report3 = await prewarm.promise;
+        PREWARMED_REPORTS.add(report3);
+        markPhase("walk-prewarm-shared");
+        return report3;
+      } catch {
+      }
+    }
+    const { share: _share, ...walkArgs } = args;
+    const startedAt2 = Date.now();
+    const report2 = await loadWalletP03HistoryNow(walkArgs);
+    if (runKey !== void 0) recentLoads.set(runKey, { startedAt: startedAt2, report: report2 });
+    return report2;
+  }
   if (prewarm !== void 0) {
     prewarmedWalks.delete(runKey);
     if (strictScope.getStore() !== true && args.forceRead !== true && Date.now() - prewarm.startedAt <= HISTORY_PREWARM_JOIN_MS) {
@@ -96638,6 +96675,30 @@ function sellerHttpReply(result) {
   const body = result.result ? Buffer.from(result.result.bodyBase64, "base64") : Buffer.from(JSON.stringify(result.paymentRequired ?? { code: result.code, ...result.reason === FACILITATOR_UNDERFUNDED ? { reason: result.reason } : {} }));
   return { status: result.status, headers, body };
 }
+function earlyConfirmedTransaction(connection, signature) {
+  if (typeof connection.getTransaction !== "function" || typeof connection.getVerifiedTransaction === "function" || typeof connection.getVerifiedTransactions === "function") {
+    return void 0;
+  }
+  return connection.getTransaction(signature, CONFIRMED_TRANSACTION_READ).then((raw) => raw ?? null, () => null);
+}
+function withPrefetchedTransaction(connection, signature, prefetched) {
+  let pending = prefetched;
+  const getTransaction = (requested, options) => {
+    if (pending && requested === signature && options?.commitment === CONFIRMED_TRANSACTION_READ.commitment && options?.maxSupportedTransactionVersion === CONFIRMED_TRANSACTION_READ.maxSupportedTransactionVersion) {
+      const answer = pending;
+      pending = void 0;
+      return Promise.resolve(answer);
+    }
+    return connection.getTransaction(requested, options);
+  };
+  return new Proxy(connection, {
+    get(target, property) {
+      if (property === "getTransaction") return getTransaction;
+      const value = Reflect.get(target, property, target);
+      return typeof value === "function" ? value.bind(target) : value;
+    }
+  });
+}
 async function createSellerAdapter({
   config,
   connection,
@@ -96953,11 +97014,21 @@ async function createSellerAdapter({
       mark("receipt-unverified");
       return completed2;
     }
-    const status = await visibleReceiptStatus(connection, receipt.transaction, visibility);
+    const early = earlyConfirmedTransaction(connection, receipt.transaction);
+    let polled = false;
+    const status = await visibleReceiptStatus(
+      connection,
+      receipt.transaction,
+      { ...visibility, sleep: (ms) => {
+        polled = true;
+        return visibility.sleep(ms);
+      } }
+    );
     const level = receiptStatusLevel(status);
     if (!level || require2 === "finalized" && level !== "finalized") fail26("receipt_pending");
+    const prefetched = early && !polled && level === "confirmed" ? await early : null;
     await validateReceiptTransaction(
-      connection,
+      prefetched ? withPrefetchedTransaction(connection, receipt.transaction, prefetched) : connection,
       receipt,
       { paymentHeader: offer.paymentHeader },
       { pool: profile.pool },
@@ -97289,7 +97360,7 @@ async function createSellerAdapter({
   }));
   return { server, handle, close, signerPublicKey, settledTransactions, offerSummaries };
 }
-var import_web3120, BINDING, SCHEMA2, OFFERS_LAYOUT, SNAPSHOT_EVERY_MS, LOADER2, canonical4, storeProfileIdentity, jsonSafe, bigint, encodeHeader, PAYMENT_REFUSED, FACILITATOR_UNDERFUNDED, DEFINITE_VERIFY_REFUSALS, definiteVerifyRefusal, refusedBeforeSettlement, ANCHOR_REQUEST_TIMEOUT_MS2, ANCHOR_POLL_ATTEMPTS, ANCHOR_POLL_MS, PRE_SETTLE_REUSE_MARGIN_S, PRE_SETTLE_REUSE_MAX_AGE_MS, FINALIZED_MEMO_MAX_AGE_MS, pause, FOLLOW_UP_DELAYS_MS, FOLLOW_UP_RESETTLE_FROM;
+var import_web3120, BINDING, SCHEMA2, OFFERS_LAYOUT, SNAPSHOT_EVERY_MS, LOADER2, canonical4, storeProfileIdentity, jsonSafe, bigint, encodeHeader, PAYMENT_REFUSED, FACILITATOR_UNDERFUNDED, DEFINITE_VERIFY_REFUSALS, definiteVerifyRefusal, refusedBeforeSettlement, ANCHOR_REQUEST_TIMEOUT_MS2, ANCHOR_POLL_ATTEMPTS, ANCHOR_POLL_MS, PRE_SETTLE_REUSE_MARGIN_S, PRE_SETTLE_REUSE_MAX_AGE_MS, FINALIZED_MEMO_MAX_AGE_MS, pause, FOLLOW_UP_DELAYS_MS, FOLLOW_UP_RESETTLE_FROM, CONFIRMED_TRANSACTION_READ;
 var init_service = __esm({
   "wallet/src/seller/service.mjs"() {
     "use strict";
@@ -97358,6 +97429,7 @@ var init_service = __esm({
       6e5
     ]);
     FOLLOW_UP_RESETTLE_FROM = 4;
+    CONFIRMED_TRANSACTION_READ = Object.freeze({ commitment: "confirmed", maxSupportedTransactionVersion: 1 });
   }
 });
 
@@ -97533,20 +97605,19 @@ async function selfPay({
     ...record,
     state: "paid",
     transaction,
-    noteCommitment: (deps.findNote ?? selfPaidNoteCommitment)(store, unshieldId, eta).toString()
+    noteCommitment: (await (deps.findNote ?? selfPaidNoteCommitment)(store, unshieldId, eta)).toString()
   };
   store.writeWal(name, record);
   return record;
 }
-function selfPaidNoteCommitment(store, unshieldId, eta) {
+async function selfPaidNoteCommitment(store, unshieldId, eta) {
   const key = sha256Hex2(Buffer.from(selfPayRequestId(unshieldId), "utf8"));
   const payment = store.readWal(`resource-payment-${key}`);
   const proof = store.readWal(`resource-proof-${key}`)?.proved?.output;
   const accepted = payment?.paymentRequired?.accepts?.find((entry) => entry.scheme === "shielded-exact");
   if (!proof?.memoBundleHex || !accepted) fail27("payment_wal_missing");
-  const { accepted: outputs } = trialDecryptBundle({
+  const [{ accepted: outputs }] = await trialDecryptBundles([{
     bundleBytes: Uint8Array.from(Buffer.from(proof.memoBundleHex.replace(/^0x/, ""), "hex")),
-    eta,
     poolDomain: BigInt(proof.poolDomain),
     outCommitment: BigInt(proof.outCommitment),
     contextCommitment: BigInt(proof.quoteCommitment),
@@ -97554,7 +97625,7 @@ function selfPaidNoteCommitment(store, unshieldId, eta) {
     transitionKind: 2,
     zeroLeaf: P03_PINNED_ZERO_LEAF,
     subtreeStartIndex: 0n
-  });
+  }], eta);
   const notes = outputs.filter((entry) => entry.kind === "note");
   if (notes.length !== 1 || notes[0].note.b !== BigInt(proof.amountAtomic)) fail27("self_paid_note_not_found");
   return notes[0].commitment;
@@ -97566,7 +97637,7 @@ var init_selfPay = __esm({
     init_fs();
     init_service();
     init_notes2();
-    init_memo2();
+    init_memoDecryptPool();
     init_store();
     init_recoveryPath();
     init_payResource();
@@ -126400,16 +126471,17 @@ async function runShieldFromElsewhere({ session, depositId, amountAtomic, onStag
   const result = await (steps.submit ?? submitRelayedDeposit)(common);
   return { state: result.state, transaction: typeof result.receipt?.signature === "string" ? result.receipt.signature : null };
 }
-var walkWalletHistory = (session, store) => loadWalletP03History({
+var walkWalletHistory = (session, store, share) => loadWalletP03History({
   store,
   connection: connectSplit(session.connection, session.historyUrl),
   programId: session.programId,
   pool: store.state.pool,
-  deploymentIdentity: session.proofTools.deploymentIdentity
+  deploymentIdentity: session.proofTools.deploymentIdentity,
+  ...share ? { share } : {}
 });
-async function refreshWallet({ session, store, history: walked }) {
+async function refreshWallet({ session, store, history: walked, share }) {
   const walStates = captureWalStates(store);
-  const history = walked ?? await walkWalletHistory(session, store);
+  const history = walked ?? await walkWalletHistory(session, store, share);
   const result = await runRecover({
     store,
     connection: session.connection,
@@ -126666,7 +126738,13 @@ function createWalletTools({
   let refreshFailedAt = 0;
   let refreshFailedCode;
   let refreshInBackground = false;
-  const refreshStep = (store, history) => (ops.refresh ?? refreshWallet)({ session, store, ...history ? { history } : {} });
+  const refreshStep = (store, history, share) => (ops.refresh ?? refreshWallet)({
+    session,
+    store,
+    ...history ? { history } : {},
+    ...share ? { share } : {}
+  });
+  let lastWriterEndedAt = 0;
   const refreshWalk = ops.refreshWalk ?? (ops.refresh ? void 0 : (store) => walkWalletHistory(session, store));
   const errorCode2 = (error, fallback) => describeError(error, { fallback, safeText: SAFE_TEXT }).split(/[\s:;(]/, 1)[0];
   const underLease = (task) => session.serial(async () => {
@@ -126680,6 +126758,7 @@ function createWalletTools({
       return await task(session.openStore());
     } finally {
       await release();
+      lastWriterEndedAt = Date.now();
     }
   });
   const autoPockets = createAutoPockets({
@@ -126764,7 +126843,12 @@ function createWalletTools({
     }
   };
   const withPoolSwitch = (tool) => ({ ...tool, run: async (...args) => {
-    const output2 = await tool.run(...args);
+    let output2;
+    try {
+      output2 = await tool.run(...args);
+    } finally {
+      if (tool.annotations?.readOnlyHint !== true) lastWriterEndedAt = Date.now();
+    }
     if (!succession || !output2 || output2.isError || typeof output2.text !== "string") return output2;
     const read = readSwitch();
     const field4 = switchField(read);
@@ -126814,6 +126898,7 @@ function createWalletTools({
   function refreshShared({ background = false } = {}) {
     if (!refreshRun) {
       refreshInBackground = background;
+      const calledAt = Date.now();
       refreshRun = (async () => {
         let early;
         if (background && refreshWalk) {
@@ -126829,7 +126914,8 @@ function createWalletTools({
         return underLease((store) => {
           const same2 = early !== void 0 && early.pool === store.state.pool && early.records === JSON.stringify(captureWalStates(store));
           if (early !== void 0 && !same2) log("MCP_REFRESH_WALK_AGAIN");
-          return refreshStep(store, same2 ? early.history : void 0);
+          const share = early !== void 0 && !same2 ? { notBeforeMs: Math.max(calledAt, lastWriterEndedAt) } : void 0;
+          return refreshStep(store, same2 ? early.history : void 0, share);
         });
       })().then(() => {
         refreshFailedAt = 0;