shinjuku-shielded 0.3.1 → 0.3.2

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "a8516e499a99fb8c0157cbdf5321ed3e9352d4511707b5ccc39e12277771c529",
-  "bytes": 10438942,
-  "sourceCommit": "94ad3d79cdcadb32b9a4de928a6b1eff420e62ad",
+  "sha256": "d2a7291f11d583fab55b39ab67cc820808e5c7607618d1456c70cda34eb3450f",
+  "bytes": 10441804,
+  "sourceCommit": "537bcd4b3976e43c021d3a854622623b5baaeaab",
   "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.1",
+  "version": "0.3.2",
   "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": "a8516e49",
-  "shinjukuSha256": "a8516e499a99fb8c0157cbdf5321ed3e9352d4511707b5ccc39e12277771c529",
+  "shinjukuRelease": "d2a7291f",
+  "shinjukuSha256": "d2a7291f11d583fab55b39ab67cc820808e5c7607618d1456c70cda34eb3450f",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -57652,6 +57652,7 @@ var init_errorCodes = __esm({
       "external_appends_already_bound",
       "facilitator_origin_invalid",
       "facilitator_pending",
+      "facilitator_underfunded",
       "facilitator_url_invalid",
       "failed_pre_broadcast",
       "failed_record_unwritable",
@@ -57872,6 +57873,7 @@ var init_errorCodes = __esm({
       "p03_exit_account_path_signature_context_missing",
       "p03_exit_account_path_subtree_not_found",
       "p03_exit_account_path_subtree_root_mismatch",
+      "p03_facilitator_underfunded",
       "p03_history_authenticated_report_required",
       "p03_history_base58_invalid",
       "p03_history_block_gap",
@@ -82823,8 +82825,10 @@ async function unconfirmedResponseError(response) {
   error.httpStatus = response.status;
   try {
     const text3 = response.body ? await readBounded(response, 4096) : "";
-    const code = JSON.parse(text3)?.code;
+    const answer = JSON.parse(text3);
+    const code = answer?.code;
     if (typeof code === "string" && /^[a-z][a-z0-9_]{0,63}$/.test(code)) error.sellerCode = code;
+    if (answer?.reason === SELLER_REASON_FACILITATOR_UNDERFUNDED) error.sellerReason = answer.reason;
   } catch {
   }
   return error;
@@ -83542,8 +83546,9 @@ async function payResourceOnce({
       store.writeWal(walName2, { ...record, state: "cancelled", refused: { sellerCode: unconfirmed.sellerCode } });
       releaseReservation(store, requestKey);
       mark("refused");
+      const underfunded = unconfirmed.sellerReason === SELLER_REASON_FACILITATOR_UNDERFUNDED;
       throw Object.assign(
-        new Error("p03_resource_payment_refused_pay_again_new_request_id"),
+        new Error(underfunded ? "p03_facilitator_underfunded" : "p03_resource_payment_refused_pay_again_new_request_id"),
         { httpStatus: response.status, sellerCode: unconfirmed.sellerCode }
       );
     }
@@ -83574,7 +83579,7 @@ async function payResourceOnce({
   mark("receipt-pending");
   return { replayed: false, receipt, resultBase64, receiptFinality: "pending" };
 }
-var import_web3108, fail17, hash9, OWNER_UNSHIELD_REQUEST, OWNER_UNSHIELD_ORIGIN, POCKET_FILL_ID, RECEIPT_FINALITY_TIMEOUT_MS, RECEIPT_FINALITY_POLL_MS, FINALITY_GATE_MARGIN_SLOTS, FINALITY_GATE_POLL_MS, FINALITY_GATE_SKIP_AFTER_MS, PENDING_FINALITY, isPending, REPLAY_INPUTS, PAYMENT_OUTPUT_INPUT2, QUOTE_MARGIN_SECONDS, SELLER_REFUSED_PAY_AGAIN, ANCHOR_EPOCH_MS, ANCHOR_MARGIN_MS, ANCHOR_WAIT_CAP_MS, DEAD_PAYMENT_MARGIN_SECONDS, SYSVAR_OWNER, quoteLiveAt, replayValuesOf;
+var import_web3108, fail17, hash9, OWNER_UNSHIELD_REQUEST, OWNER_UNSHIELD_ORIGIN, POCKET_FILL_ID, RECEIPT_FINALITY_TIMEOUT_MS, RECEIPT_FINALITY_POLL_MS, FINALITY_GATE_MARGIN_SLOTS, FINALITY_GATE_POLL_MS, FINALITY_GATE_SKIP_AFTER_MS, PENDING_FINALITY, isPending, REPLAY_INPUTS, PAYMENT_OUTPUT_INPUT2, QUOTE_MARGIN_SECONDS, SELLER_REFUSED_PAY_AGAIN, SELLER_REASON_FACILITATOR_UNDERFUNDED, ANCHOR_EPOCH_MS, ANCHOR_MARGIN_MS, ANCHOR_WAIT_CAP_MS, DEAD_PAYMENT_MARGIN_SECONDS, SYSVAR_OWNER, quoteLiveAt, replayValuesOf;
 var init_payResource = __esm({
   "wallet/src/pay/payResource.mjs"() {
     "use strict";
@@ -83613,6 +83618,7 @@ var init_payResource = __esm({
     PAYMENT_OUTPUT_INPUT2 = 4;
     QUOTE_MARGIN_SECONDS = 120;
     SELLER_REFUSED_PAY_AGAIN = "payment_refused_pay_again";
+    SELLER_REASON_FACILITATOR_UNDERFUNDED = "facilitator_underfunded";
     ANCHOR_EPOCH_MS = 3e5;
     ANCHOR_MARGIN_MS = 2e4;
     ANCHOR_WAIT_CAP_MS = ANCHOR_EPOCH_MS + 6e4;
@@ -86524,7 +86530,7 @@ function sellerHttpReply(result) {
   const headers = { "Content-Type": result.result?.contentType ?? "application/json" };
   if (result.paymentRequired) headers["PAYMENT-REQUIRED"] = encodeHeader(result.paymentRequired);
   if (result.receipt) headers["PAYMENT-RESPONSE"] = encodeHeader(publicReceipt(result.receipt));
-  const body = result.result ? Buffer.from(result.result.bodyBase64, "base64") : Buffer.from(JSON.stringify(result.paymentRequired ?? { code: result.code }));
+  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 };
 }
 async function createSellerAdapter({
@@ -87018,7 +87024,11 @@ async function createSellerAdapter({
       if (refusedBeforeSettlement(receipt)) {
         await put(nonce, { ...offer, phase: "prepared", settleAttempted: false });
         mark("settle-refused-before-record");
-        return { status: 202, code: PAYMENT_REFUSED };
+        return {
+          status: 202,
+          code: PAYMENT_REFUSED,
+          ...receipt.errorReason === "p03_settler_underfunded" ? { reason: FACILITATOR_UNDERFUNDED } : {}
+        };
       }
       offer = await persistReceipt(nonce, offer, receipt, mark);
       return { status: offer.result.status, result: offer.result, receipt: offer.receipt };
@@ -87156,7 +87166,7 @@ async function createSellerAdapter({
   }));
   return { server, handle, close, signerPublicKey, settledTransactions, offerSummaries };
 }
-var import_web3113, BINDING, SCHEMA2, OFFERS_LAYOUT, SNAPSHOT_EVERY_MS, LOADER2, canonical, storeProfileIdentity, jsonSafe, bigint, encodeHeader, PAYMENT_REFUSED, DEFINITE_VERIFY_REFUSALS, definiteVerifyRefusal, refusedBeforeSettlement, ANCHOR_REQUEST_TIMEOUT_MS, ANCHOR_POLL_ATTEMPTS, ANCHOR_POLL_MS, pause, FOLLOW_UP_DELAYS_MS, FOLLOW_UP_RESETTLE_FROM;
+var import_web3113, BINDING, SCHEMA2, OFFERS_LAYOUT, SNAPSHOT_EVERY_MS, LOADER2, canonical, storeProfileIdentity, jsonSafe, bigint, encodeHeader, PAYMENT_REFUSED, FACILITATOR_UNDERFUNDED, DEFINITE_VERIFY_REFUSALS, definiteVerifyRefusal, refusedBeforeSettlement, ANCHOR_REQUEST_TIMEOUT_MS, ANCHOR_POLL_ATTEMPTS, ANCHOR_POLL_MS, pause, FOLLOW_UP_DELAYS_MS, FOLLOW_UP_RESETTLE_FROM;
 var init_service = __esm({
   "wallet/src/seller/service.mjs"() {
     "use strict";
@@ -87188,6 +87198,7 @@ var init_service = __esm({
     bigint = (bytes2) => BigInt(`0x${Buffer.from(bytes2).toString("hex")}`);
     encodeHeader = (v) => Buffer.from(JSON.stringify(v)).toString("base64");
     PAYMENT_REFUSED = "payment_refused_pay_again";
+    FACILITATOR_UNDERFUNDED = "facilitator_underfunded";
     DEFINITE_VERIFY_REFUSALS = /* @__PURE__ */ new Set([
       "p03_quote_expired",
       "p03_quote_commitment_invalid",
@@ -110886,6 +110897,8 @@ function createAutoPockets({
       next = `Nothing was paid. Do not retry this URL now. Tell your owner: the facilitator refuses pocket size ${sizeAtomic} atomic (${code}); the self-paid note went back to the shielded balance`;
     } else if (result?.reason === "facilitator_offers_no_pockets") {
       next = "Nothing was paid. Do not retry this URL now. Tell your owner: the facilitator (--memo-service) offers no pockets, so an exact-only seller cannot be paid";
+    } else if (code === "p03_facilitator_underfunded") {
+      next = `Nothing was spent. The facilitator cannot pay network fees right now (its settler is below its funding gate), so the pocket fill stopped. Try again later: call x402_pay again with request_id "${requestId}" after ${Math.ceil(FILL_RETRY_AFTER_MS / 6e4)} min (the fill starts again with a new quote). If it repeats, tell your owner: the facilitator's settler needs SOL`;
     } else if (result?.reason === "scan_needed") {
       next = `Nothing was paid. This wallet was restored and reads its pockets from the chain first; call x402_pay again with request_id "${requestId}" in ${POLL_SECONDS * 4} s`;
     } else if (shieldedShort()) {
@@ -112727,6 +112740,15 @@ function createWalletTools({
         `Nothing was sent. If wallet_balance shows shieldedAtomic below 1000000 (one pocket), call wallet_shield first. Then call x402_pay again with request_id "${requestId}" and the same url, method, headers, and body: it fills a pocket and pays once. If the same code repeats, tell your owner: ${code}`,
         { requestId }
       );
+    } else if (code === "p03_facilitator_underfunded") {
+      return refuse8(
+        code,
+        "the facilitator cannot pay network fees right now; nothing was spent",
+        "Nothing was spent, and this request_id is closed (its reserved amount came back). Try again later: call x402_pay with a NEW request_id and the same url, method, headers, and body in a few minutes. If it repeats, tell your owner: the facilitator's settler needs SOL",
+        { requestId }
+      );
+    } else if (code === "p03_resource_payment_refused_pay_again_new_request_id") {
+      next = "Nothing was paid, and the seller closed this request_id. To pay, call x402_pay with a NEW request_id and the same url, method, headers, and body; if the same refusal repeats, tell your owner what the detail says";
     } else if (code.startsWith("wallet_spend_refused_")) {
       next = "the wallet file's own budget refused it (init --max-payment / --max-cumulative); nothing was paid. Read wallet_balance detail.budget";
     } else if (code.startsWith("wallet_quote_refused_") || code.startsWith("fetch_")) {
@@ -113358,6 +113380,8 @@ function createWalletTools({
       next = atAddress ? `Nothing was moved. The facilitator does not relay a deposit this small: call wallet_shield_from_elsewhere again with request_id "${job.requestId}" and a larger amount_atomic (this request keeps its address)` : "Nothing was moved and no address was made. The facilitator does not relay a deposit this small: call wallet_shield_from_elsewhere with a NEW request_id and a larger amount_atomic";
     } else if (kind === "elsewhere" && /relay_not_offered|relay_config_mismatch|relay_config_invalid|proof_tools_missing/.test(code)) {
       next = `Nothing new was moved. Tell your owner: ${code} (the facilitator at --memo-service must relay deposits for this wallet's pool, and --proof-tools must hold the deposit prover).${atAddress}`;
+    } else if (code === "p03_facilitator_underfunded") {
+      next = `Nothing was spent. The facilitator cannot pay network fees right now (its settler is below its funding gate), and this request_id is closed. Try again later: call ${KINDS[kind].tool} with a NEW request_id in a few minutes. If it repeats, tell your owner: the facilitator's settler needs SOL`;
     } else if (/_use_new_unshield_id$/.test(code)) next = "the self-payment provably never landed, so nothing was spent; this request_id is closed: call wallet_unshield with a NEW request_id";
     else if (/own_key_usdc_not_finalized/.test(code)) next = "Nothing was moved. The USDC just arrived and is not final on chain yet. Call wallet_shield again with the same request_id and amount_atomic in 30 s";
     else if (/insufficient_token_balance|above_balance/.test(code)) next = "Nothing was moved. The wallet's own key holds less public USDC than amount_atomic (wallet_balance unshieldedAtomic). Tell the user, or call wallet_shield with a NEW request_id and a smaller amount_atomic";
@@ -121418,6 +121442,10 @@ function failureHint(command, reason, deps, values) {
   }
   if (/another_request_unresolved/.test(reason)) return `finish the earlier payment (rerun its pay command) or close it (${CLI2} help cancel); ${CLI2} balance lists it`;
   if (/resource_cli_out_unwritable/.test(reason)) return "the payment is recorded, but the --out file could not be written; rerun the same pay command (same --request-id) with a --out path you can write: it replays the receipt and never pays twice";
+  if (/p03_facilitator_underfunded/.test(reason)) {
+    const again = command.name === "unshield" ? "rerun the same command with a new --unshield-id" : command.name === "pocket fill" ? "rerun the same pocket fill command (it starts the fill again with a new quote)" : "pay again with a new --request-id";
+    return `the facilitator cannot pay network fees right now (its settler is below its funding gate); nothing was spent. The wallet closed the request and released its reserved amount. Try again later: ${again}`;
+  }
   if (/p03_resource_payment_refused_pay_again_new_request_id/.test(reason)) {
     const again = command.name === "unshield" ? "rerun the same command with a new --unshield-id" : "pay again with a new --request-id";
     return `the facilitator refused this payment before any money moved (for example its quote ran out, the facilitator was short of fee funds, or the payment failed a fixed check; the line names the seller's code). The wallet closed the request and released its reserved amount; ${again}`;