shinjuku-shielded 0.3.15 → 0.3.16

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "6a87b0a15ec5979313adc3e9b7f19e239c2f14af1c46565e958054dbc60e8af7",
-  "bytes": 11122024,
-  "sourceCommit": "b5ba33a6fa8251d6c6226defa8fbfd235efe5817",
+  "sha256": "b32bffc727e1e7e33fb134a3918638006259033511e1a2aaf455d037da1f70b3",
+  "bytes": 11124201,
+  "sourceCommit": "4b3c69bd892409a11b931e3a01f254a8b2f4af0f",
   "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.15",
+  "version": "0.3.16",
   "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": "6a87b0a1",
-  "shinjukuSha256": "6a87b0a15ec5979313adc3e9b7f19e239c2f14af1c46565e958054dbc60e8af7",
+  "shinjukuRelease": "b32bffc7",
+  "shinjukuSha256": "b32bffc727e1e7e33fb134a3918638006259033511e1a2aaf455d037da1f70b3",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -118735,6 +118735,8 @@ function snapshotFromRecovery({ state, programId, recovery, history, walStates,
   });
   const slot3 = history?.finalizedPoolSnapshot?.slot;
   if (slot3 === void 0 || !canonicalAtomic(String(slot3))) throw new Error("balance_snapshot_slot_invalid");
+  const anchorIndexes = Array.isArray(history?.finalizedPoolSnapshot?.anchors) ? history.finalizedPoolSnapshot.anchors.map((anchor) => BigInt(anchor.index)) : [];
+  const anchorIndex = anchorIndexes.length ? anchorIndexes.reduce((a, b) => b > a ? b : a).toString() : void 0;
   return {
     schema: BALANCE_SNAPSHOT_SCHEMA,
     pool: state.pool,
@@ -118742,6 +118744,7 @@ function snapshotFromRecovery({ state, programId, recovery, history, walStates,
     refreshedAt: new Date(now).toISOString(),
     slot: String(slot3),
     poolIndex: String(recovery.poolIndex),
+    ...anchorIndex === void 0 ? {} : { anchorIndex },
     fresh: fresh === true,
     walStates: { ...walStates },
     outputs
@@ -119021,7 +119024,8 @@ function computeBalance({ store, snapshotRead, source = "local", now = Date.now(
   const reservedAtomic = unknownInputs ? unspentAtomic : sum2([...reserved].filter((commitment) => unspent.has(commitment)).map((commitment) => unspent.get(commitment).valueAtomic));
   detail.reservedAtomic = reservedAtomic.toString();
   const spendable = unspentAtomic - reservedAtomic;
-  detail.fundedAccounts = unknownInputs ? 0 : [...unspent.values()].filter((output2) => output2.kind === "account" && BigInt(output2.valueAtomic) > 0n && !reserved.has(output2.commitment)).length;
+  const anchorIndex = canonicalAtomic(snapshot.anchorIndex) ? BigInt(snapshot.anchorIndex) : void 0;
+  detail.fundedAccounts = unknownInputs ? 0 : [...unspent.values()].filter((output2) => output2.kind === "account" && BigInt(output2.valueAtomic) > 0n && !reserved.has(output2.commitment) && (anchorIndex === void 0 || BigInt(output2.leafIndex) < anchorIndex)).length;
   const next = detail.inFlight.length ? "finish or cancel the work in detail.inFlight; the wallet runs one payment at a time" : pendingDeposits.length ? `deposit ${pendingDeposits[0].depositId} is not finished: rerun the same deposit command with --submit --service <facilitator URL>` : pocketsUnscanned ? scanPockets2 : unspentAtomic === 0n && successionMovableAtomic > 0n ? "this pool was succeeded by a new pool: its value moves there (a move per account, the facilitator pays the fee) and counts in this balance until then" : unspentAtomic === 0n ? "nothing to spend: deposit (shinjuku-wallet help deposit), or run balance --refresh if a payment to this wallet settled" : void 0;
   return report("current", spendable + successionMovableAtomic, next);
 }
@@ -124142,6 +124146,7 @@ function writeCache(key, record, ctx) {
 // wallet/src/mcp/tools.mjs
 init_pool_denomination();
 init_serviceUrl();
+init_anchorClock();
 var shownCaps = (caps) => Object.fromEntries(Object.entries(caps).map(([name, value]) => [name, String(value) === NO_LIMIT_ATOMIC2 ? "none" : value]));
 var RESOURCE_PAYMENT_WAL_PREFIX2 = "resource-payment-";
 var SELF_PAY_ORIGIN3 = "https://self-pay.invalid/";
@@ -124714,6 +124719,8 @@ function localBalance(session) {
     return null;
   }
 }
+var CAP_BALANCE_WAIT_MS = 35e3;
+var CAP_BALANCE_RETRY_MS = 5e3;
 var REFRESH_RETRY_MS = 6e4;
 var SWITCH_WAIT_MS = 4e4;
 var ELICIT_TIMEOUT_MS = 5 * 6e4;
@@ -124730,7 +124737,9 @@ function createWalletTools({
   client,
   exportBackup,
   balanceRefreshWaitMs = BALANCE_REFRESH_WAIT_MS,
-  elicitTimeoutMs = ELICIT_TIMEOUT_MS
+  elicitTimeoutMs = ELICIT_TIMEOUT_MS,
+  capBalanceWaitMs = CAP_BALANCE_WAIT_MS,
+  capBalanceRetryMs = CAP_BALANCE_RETRY_MS
 }) {
   const outDir = join26(dirname23(session.walletPath), "mcp-out");
   const knownIds = /* @__PURE__ */ new Map();
@@ -125564,6 +125573,19 @@ function createWalletTools({
   const again = (kind, job) => `call ${KINDS[kind].tool} again with request_id "${job.requestId}", amount_atomic "${job.amountAtomic}"${job.to ? `, and to "${job.to}"` : ""}`;
   const unboundNext = (requestId, amountAtomic) => `Nothing was signed. Do not retry this request_id. Tell your owner: the self-payment of this unshield has no recipient bound to it, so this server will not choose one. The owner finishes it with the CLI: shinjuku-wallet unshield (the same --wallet, proof tools, --profile, --program, --facilitator) --unshield-id ${moneyId(requestId)} --amount ${amountAtomic} --to <recipient USDC account> --recipient-owner <recipient owner>`;
   const preApproved = () => [...new Set(unshieldTo)];
+  async function anchorWaitAfterDeposit() {
+    try {
+      const read = await underLease((store) => readBalanceSnapshot(store));
+      const anchorIndex = read.snapshot?.anchorIndex;
+      if (anchorIndex === void 0) return {};
+      const waiting = read.snapshot.outputs.some((output2) => output2.kind === "account" && output2.spendStatus === "unspent" && BigInt(output2.leafIndex) >= BigInt(anchorIndex));
+      if (!waiting) return {};
+      noteAnchorOrigin(session.memoServiceUrl);
+      return { spendableAtMs: Date.now() + nextAnchorWaitMs(Date.now(), 0) };
+    } catch {
+      return {};
+    }
+  }
   function doneNext(kind, job) {
     if (kind === "unshield") {
       return `the USDC was sent to ${job.to}; tell the user (exitTransaction). wallet_balance shows the new shielded balance${job.result?.backupPath ? `. An encrypted backup of the wallet was saved at ${job.result.backupPath}` : ""}`;
@@ -125573,6 +125595,9 @@ function createWalletTools({
       return `the deposit landed. The wallet now reads it from the chain so it becomes spendable: call wallet_balance in ${POLL_SECONDS2} s (x402_pay and wallet_unshield also wait for it by themselves)`;
     }
     if (!post.refreshed) return `the deposit landed; reading it from the chain failed (${post.refreshError}): call wallet_balance in a minute, it retries by itself`;
+    if (post.spendableAtMs !== void 0 && post.spendableAtMs > Date.now()) {
+      return `the deposit landed and is in the shielded balance. It is spendable after the next pool anchor, in about ${Math.ceil((post.spendableAtMs - Date.now()) / 1e3)} s: x402_pay and wallet_unshield wait for it by themselves, so call them now if the user wants to${post.backupPath ? `. An encrypted backup of the wallet was saved at ${post.backupPath}` : ""}`;
+    }
     return `the deposit landed and is in the shielded balance: x402_pay and wallet_unshield can spend it now${post.backupPath ? `. An encrypted backup of the wallet was saved at ${post.backupPath}` : ""}`;
   }
   const ELSEWHERE_PRIVACY = "the chain shows the other wallet paying this new one-time address, and that address depositing this amount into the pool (both public; the facilitator also sees the amount and time). Later payments from the shielded balance do not show which deposit paid them. With few depositors in the pool, an amount few other deposits share, or a payment soon after the deposit, is easier to pair";
@@ -125899,13 +125924,19 @@ function createWalletTools({
         } catch {
           stale = true;
         }
-        if (stale) await refreshShared().catch(() => {
-        });
-        const one = localBalance(session);
-        if (one?.balanceAtomic === null || one?.balanceAtomic === void 0) {
+        let one = stale ? null : localBalance(session);
+        const unknown = () => one?.balanceAtomic === null || one?.balanceAtomic === void 0;
+        for (const deadline = Date.now() + capBalanceWaitMs; unknown(); ) {
+          await refreshShared().catch(() => {
+          });
+          one = localBalance(session);
+          if (!unknown() || Date.now() + capBalanceRetryMs > deadline) break;
+          await new Promise((resolve36) => setTimeout(resolve36, capBalanceRetryMs));
+        }
+        if (unknown()) {
           return refuse9(
             "mcp_balance_unknown",
-            `the shielded balance could not be read just now (the chain read failed, or another wallet command holds this wallet), so the wallet cannot check the ${usdcText(MAX_SHIELDED_BALANCE_ATOMIC)} USDC balance cap; nothing was moved`,
+            `the shielded balance could not be read just now (a payment from moments ago is not final yet, the chain read failed, or another wallet command holds this wallet), so the wallet cannot check the ${usdcText(MAX_SHIELDED_BALANCE_ATOMIC)} USDC balance cap; nothing was moved`,
             `call ${spec.tool} again with the same request_id and amount_atomic in ${POLL_SECONDS2} s`,
             { requestId: request.requestId }
           );
@@ -126041,7 +126072,10 @@ function createWalletTools({
   }
   function afterShield(job) {
     job.post = { state: "running" };
-    job.postPromise = refreshShared().then(() => ({ refreshed: true }), (error) => ({ refreshed: false, refreshError: errorCode2(error, "mcp_refresh_failed") })).then((refresh) => underLease((store) => backupNow(store)).catch((error) => typeof exportBackup === "function" ? { backupPath: null, backupError: errorCode2(error, "wallet_locked") } : {}).then((backup) => {
+    job.postPromise = refreshShared().then(
+      () => anchorWaitAfterDeposit().then((wait2) => ({ refreshed: true, ...wait2 })),
+      (error) => ({ refreshed: false, refreshError: errorCode2(error, "mcp_refresh_failed") })
+    ).then((refresh) => underLease((store) => backupNow(store)).catch((error) => typeof exportBackup === "function" ? { backupPath: null, backupError: errorCode2(error, "wallet_locked") } : {}).then((backup) => {
       job.post = { state: "done", ...refresh, ...backup };
     })).finally(() => {
       if (money.autoPockets === true) autoPockets.onShielded();