shinjuku-shielded 0.3.14 → 0.3.15

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "db079e3700b17388873252fb91358d1918801ff69d1ee26f4e3e9f21bccbab34",
-  "bytes": 11121670,
-  "sourceCommit": "181724d44e72d6b49f062fb641761811e66e23a6",
+  "sha256": "6a87b0a15ec5979313adc3e9b7f19e239c2f14af1c46565e958054dbc60e8af7",
+  "bytes": 11122024,
+  "sourceCommit": "b5ba33a6fa8251d6c6226defa8fbfd235efe5817",
   "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.14",
+  "version": "0.3.15",
   "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": "db079e37",
-  "shinjukuSha256": "db079e3700b17388873252fb91358d1918801ff69d1ee26f4e3e9f21bccbab34",
+  "shinjukuRelease": "6a87b0a1",
+  "shinjukuSha256": "6a87b0a15ec5979313adc3e9b7f19e239c2f14af1c46565e958054dbc60e8af7",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -58607,9 +58607,6 @@ async function prepareRelayedDepositLeased({ store, connection, programId, proof
   const minimum = closing ? config.closingSourceMinimumAtomic : pocketIndex !== void 0 && config.pocketMinimumAtomic !== void 0 ? config.pocketMinimumAtomic : config.minimumAtomic;
   if (legacySource && amount < minimum) throw legacyBelowMinimum(legacySource, amount, minimum);
   if (amount < minimum) fail11(pocketIndex !== void 0 && config.pocketMinimumAtomic === void 0 ? "relay_pocket_reshield_not_offered" : "relay_amount_below_facilitator_minimum");
-  if (!record && pocketIndex === void 0 && !legacySource && config.depositUnitAtomic !== void 0 && amount % config.depositUnitAtomic !== 0n) {
-    fail11("relay_amount_not_whole_unit");
-  }
   const pool = await poolState(connection, id);
   if (amount > pool.maxDepositValue) fail11("amount_above_pool_deposit_cap");
   if (BigInt(pool.depositCount) >= BigInt(pool.maxDeposits)) fail11("pool_at_deposit_cap");
@@ -58713,7 +58710,6 @@ async function readRelayConfig({ serviceUrl: serviceUrl2, fetchImpl, id }) {
     minimumAtomic: BigInt(config.minimumAtomic),
     closesSource: config.sourceCloseAuthority !== void 0,
     ...config.pocketMinimumAtomic === void 0 ? {} : { pocketMinimumAtomic: BigInt(config.pocketMinimumAtomic) },
-    ...config.depositUnitAtomic === void 0 ? {} : { depositUnitAtomic: BigInt(config.depositUnitAtomic) },
     ...config.closingSourceMinimumAtomic === void 0 ? {} : { closingSourceMinimumAtomic: BigInt(config.closingSourceMinimumAtomic) }
   };
 }
@@ -61876,6 +61872,8 @@ var init_errorCodes = __esm({
       "mcp_unshield_to_not_allowed",
       "mcp_unshield_to_invalid",
       "mcp_shield_cap_exceeded",
+      "mcp_shield_above_balance_cap",
+      "mcp_balance_unknown",
       "mcp_unshield_cap_exceeded",
       "mcp_request_id_reused",
       "mcp_shield_failed",
@@ -62362,6 +62360,7 @@ var init_errorCodes = __esm({
       "float_not_ready",
       "float_seller_uses_our_facilitator",
       "float_payment_in_flight",
+      "float_quote_open",
       "float_already_paid",
       "float_paid",
       "p03_payer_float_wallet_pool_mismatch",
@@ -90984,9 +90983,9 @@ async function payViaFloat({
         });
       } catch (error) {
         if (seen.refusal) {
-          if (seen.refusal.code === "float_payment_in_flight" && !regenerated && innerUnsent()) {
+          if (REGENERATE_CODES.has(seen.refusal.code) && !regenerated && innerUnsent()) {
             regenerated = true;
-            const refundTo = await ownRefundAddress(store, connection);
+            const refundTo = await (deps.ownRefundAddress ?? ownRefundAddress)(store, connection);
             const body = canonicalBody({ requestId, resourceUrl: record.url, requirement: record.requirement, refundTo });
             record = { ...record, floatId: body.floatId, bodyBase64: body.bodyBase64, refundTo };
             store.writeWal(walName2, record);
@@ -91090,7 +91089,7 @@ function paidResult(record, replayed) {
     float: { floatId: record.floatId }
   };
 }
-var import_web3109, FLOAT_PAYMENT_SCHEMA, FLOAT_PAYMENT_WAL_PREFIX, FLOAT_CONFIG_SCHEMA, FLOAT_PAY_PATH, MAX_BODY_BYTES, FLOAT_REFUND_ETA_SECONDS, REFUND_SETTLED_AFTER_MS, FINISHING_POLL_MS, FINISHING_LIMIT_MS, SELLER_TIMEOUT_MS, CONFIG_TIMEOUT_MS, DECIMAL3, POSITIVE, PENDING_CODES, hash9, fail18, floatPaymentWalName, plainText;
+var import_web3109, FLOAT_PAYMENT_SCHEMA, REGENERATE_CODES, FLOAT_PAYMENT_WAL_PREFIX, FLOAT_CONFIG_SCHEMA, FLOAT_PAY_PATH, MAX_BODY_BYTES, FLOAT_REFUND_ETA_SECONDS, REFUND_SETTLED_AFTER_MS, FINISHING_POLL_MS, FINISHING_LIMIT_MS, SELLER_TIMEOUT_MS, CONFIG_TIMEOUT_MS, DECIMAL3, POSITIVE, PENDING_CODES, hash9, fail18, floatPaymentWalName, plainText;
 var init_floatPay = __esm({
   "wallet/src/pay/floatPay.mjs"() {
     "use strict";
@@ -91107,6 +91106,7 @@ var init_floatPay = __esm({
     init_proxy();
     init_payResource();
     FLOAT_PAYMENT_SCHEMA = "carbon-shielded-wallet/float-payment/v1";
+    REGENERATE_CODES = /* @__PURE__ */ new Set(["float_payment_in_flight", "float_quote_open"]);
     FLOAT_PAYMENT_WAL_PREFIX = "float-";
     FLOAT_CONFIG_SCHEMA = "carbon-shielded-x402/float-config/v1";
     FLOAT_PAY_PATH = "/api/x402/float/pay/";
@@ -124406,7 +124406,7 @@ async function readOwnPublicBalance({ session, store }) {
     solLamports: String(solAccount?.lamports ?? 0)
   };
 }
-async function runShield({ session, depositId, amountAtomic, unitAtomic, onStage, steps = {} }) {
+async function runShield({ session, depositId, amountAtomic, onStage, steps = {} }) {
   const store = session.openStore();
   const existing = store.readWal(`deposit-${depositId}`);
   if (existing && !existing.relay) return runSelfBroadcastShield({ session, depositId, onStage });
@@ -124424,9 +124424,8 @@ async function runShield({ session, depositId, amountAtomic, unitAtomic, onStage
       ...common,
       amountAtomic,
       ownKey: true,
-      // The CLI deposit's own admission check (shielded-wallet.mjs runSelfCustodyDeposit), with the pool's deposit unit.
+      // The CLI deposit's own admission check (shielded-wallet.mjs runSelfCustodyDeposit); any amount (no deposit unit).
       checkAmount: ({ amount, pool, sourceAmount, vaultAmount }) => resolveAgentDepositAmount({
-        denominationAtomic: unitAtomic,
         requestedAtomic: amount,
         walletBalanceAtomic: sourceAmount,
         maxDepositValueAtomic: pool.maxDepositValue,
@@ -124469,7 +124468,7 @@ var usdcText = (atomic3, decimals = 6) => {
   const text3 = formatAtomic(BigInt(atomic3), decimals);
   return text3.includes(".") ? text3.replace(/0+$/, "").replace(/\.$/, "") : text3;
 };
-async function runShieldFromElsewhere({ session, depositId, amountAtomic, unitAtomic, onStage, steps = {} }) {
+async function runShieldFromElsewhere({ session, depositId, amountAtomic, onStage, steps = {} }) {
   const store = session.openStore();
   const common = {
     store,
@@ -124486,9 +124485,8 @@ async function runShieldFromElsewhere({ session, depositId, amountAtomic, unitAt
       await (steps.prepare ?? prepareRelayedDeposit)({
         ...common,
         amountAtomic,
-        // The CLI deposit --relay admission check, with the pool's deposit unit; the source is the one-time address.
+        // The CLI deposit --relay admission check (any amount, no deposit unit); the source is the one-time address.
         checkAmount: ({ amount, pool, sourceAmount, vaultAmount }) => resolveAgentDepositAmount({
-          denominationAtomic: unitAtomic,
           requestedAtomic: amount,
           walletBalanceAtomic: sourceAmount,
           maxDepositValueAtomic: pool.maxDepositValue,
@@ -124720,6 +124718,7 @@ var REFRESH_RETRY_MS = 6e4;
 var SWITCH_WAIT_MS = 4e4;
 var ELICIT_TIMEOUT_MS = 5 * 6e4;
 var POLL_SECONDS2 = 30;
+var MAX_SHIELDED_BALANCE_ATOMIC = 5000000n;
 function createWalletTools({
   session,
   policy,
@@ -125691,8 +125690,6 @@ function createWalletTools({
     else if (/another_deposit_unresolved/.test(code)) {
       const waiting = waitingElsewhereIds();
       next = waiting.length > 0 ? `Nothing new was moved. A wallet_shield_from_elsewhere address of this wallet still waits for its USDC (request_id ${waiting.map((id) => `"${id}"`).join(", ")}), and the wallet runs one deposit at a time. Either fund it and call wallet_shield_from_elsewhere again with that request_id until it is done, or, if nothing was sent to it, close it: call wallet_shield_from_elsewhere with action "cancel" and request_id "${waiting[0]}" (it refuses when any USDC or any transaction already reached the address; then only the owner's CLI deposit-reclaim frees it). Then call this one again` : `Nothing new was moved. Another deposit of this wallet is not finished (a wallet_shield, or a wallet_shield_from_elsewhere): call that tool again with its request_id until it is done, then call this one again. If no tool knows it, tell your owner: ${code} (the CLI's deposit records show which one)`;
-    } else if (/relay_amount_not_whole_unit/.test(code)) {
-      next = `Nothing was moved and no address was made. This pool takes deposits in whole units of its pocket size (the facilitator's /api/x402/deposit shows depositUnitAtomic): call ${KINDS[kind].tool} with a NEW request_id and amount_atomic a whole multiple of it`;
     } else if (kind === "shield" && /relay_amount_below_facilitator_minimum/.test(code)) {
       next = "Nothing was moved. The facilitator does not relay a deposit this small: call wallet_shield with a NEW request_id and a larger amount_atomic";
     } else if (kind === "shield" && /relay_not_offered|relay_config_mismatch|relay_config_invalid|relay_service_required|proof_tools_missing/.test(code)) {
@@ -125730,13 +125727,6 @@ function createWalletTools({
     if (typeof amount !== "string" || !POSITIVE_ATOMIC4.test(amount)) {
       return { refusal: ["mcp_argument_invalid", "amount_atomic must be a positive whole number of atomic units (USDC: 1000000 = 1 USDC)", 'pass amount_atomic as a string, like "1000000"'] };
     }
-    if (kind !== "unshield" && money.depositUnitAtomic && BigInt(amount) % BigInt(money.depositUnitAtomic) !== 0n) {
-      return { refusal: [
-        "mcp_argument_invalid",
-        `amount_atomic must be a whole multiple of ${money.depositUnitAtomic} on this pool (whole deposit units); nothing was moved`,
-        `pass a multiple of ${money.depositUnitAtomic}, like ${money.depositUnitAtomic}`
-      ] };
-    }
     if (kind === "unshield") {
       let canonical5 = false;
       try {
@@ -125902,6 +125892,35 @@ function createWalletTools({
         const detail = `this MCP session already moved ${total} of its ${spec.capFlag} ${max}; ${amount} more is above it`;
         return refuse9(spec.capCode, `${detail}; nothing ${record ? "more " : ""}was moved`, ownerNext(detail), { requestId: request.requestId });
       }
+      if (kind !== "unshield" && !record) {
+        let stale;
+        try {
+          stale = shieldedUnknown(session.openStore());
+        } catch {
+          stale = true;
+        }
+        if (stale) await refreshShared().catch(() => {
+        });
+        const one = localBalance(session);
+        if (one?.balanceAtomic === null || one?.balanceAtomic === void 0) {
+          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`,
+            `call ${spec.tool} again with the same request_id and amount_atomic in ${POLL_SECONDS2} s`,
+            { requestId: request.requestId }
+          );
+        }
+        const room = MAX_SHIELDED_BALANCE_ATOMIC - BigInt(one.balanceAtomic);
+        if (BigInt(request.amountAtomic) > room) {
+          const left = room > 0n ? room : 0n;
+          return refuse9(
+            "mcp_shield_above_balance_cap",
+            `the shielded balance may hold at most ${usdcText(MAX_SHIELDED_BALANCE_ATOMIC)} USDC; it holds ${usdcText(one.balanceAtomic)} USDC, so at most ${usdcText(left)} USDC more can be shielded now; nothing was moved`,
+            left > 0n ? `Tell the user the cap. Call ${spec.tool} with a NEW request_id and amount_atomic at most "${left}"` : "Tell the user the shielded balance is at its cap: spend some with x402_pay, or send some out with wallet_unshield, before shielding more",
+            { requestId: request.requestId, balanceAtomic: one.balanceAtomic, maxBalanceAtomic: MAX_SHIELDED_BALANCE_ATOMIC.toString(), roomAtomic: left.toString() }
+          );
+        }
+      }
       if (!deferCount) {
         moved[spec.counter] += amount;
         counted.set(key, amount);
@@ -126007,7 +126026,6 @@ function createWalletTools({
       session,
       depositId: moneyId(job.requestId),
       amountAtomic: job.amountAtomic,
-      unitAtomic: money.depositUnitAtomic,
       onStage,
       steps: { prepare: ops.prepareOwnRelayed, submit: ops.submitOwnRelayed }
     });
@@ -126017,7 +126035,6 @@ function createWalletTools({
       session,
       depositId: elsewhereId(job.requestId),
       amountAtomic: job.amountAtomic,
-      unitAtomic: money.depositUnitAtomic,
       onStage,
       steps: { prepare: ops.prepareRelayed, submit: ops.submitRelayed }
     });
@@ -126158,11 +126175,11 @@ function createWalletTools({
   const shield = {
     name: "wallet_shield",
     title: "Shield USDC (make it private)",
-    description: `Use this when the user says "shield 5 USDC", "make my USDC private", or "add funds to my shielded balance": it moves amount_atomic of the plain public USDC on this wallet's own Solana key (wallet_balance unshieldedAtomic) into the SHIELDED balance, which x402_pay and wallet_unshield spend. The USDC stays the user's. Cost: no SOL. The wallet's key only signs an approval of the amount; the facilitator's relayer submits the deposit and pays every network fee and rent. The facilitator relays deposits of at least its minimum (1 USDC by default). Privacy: the chain shows this key depositing this amount; later payments from the shielded balance do not show this wallet. It takes a few minutes: the first call starts it and answers stage (proving, submitting, done); call wallet_shield again with the SAME request_id and amount_atomic in ${POLL_SECONDS2} s for the status. When the deposit lands, the wallet reads it from the chain by itself (refreshing: true until it is spendable) and writes an encrypted backup (backupPath). The same request_id never deposits twice, also after a restart. One deposit at a time. An optional owner cap (--max-shield) may bound each call and this session (mcp_shield_cap_exceeded: tell the owner). Refusals: mcp_argument_invalid, mcp_request_id_reused, wallet_locked, mcp_tool_disabled, mcp_shield_failed, and the deposit's own p03_deposit_* codes.`,
+    description: `Use this when the user says "shield 5 USDC", "make my USDC private", or "add funds to my shielded balance": it moves amount_atomic of the plain public USDC on this wallet's own Solana key (wallet_balance unshieldedAtomic) into the SHIELDED balance, which x402_pay and wallet_unshield spend. The USDC stays the user's. Cost: no SOL. The wallet's key only signs an approval of the amount; the facilitator's relayer submits the deposit and pays every network fee and rent. Any amount from 0.01 USDC (amount_atomic 10000; the facilitator's minimum) works, cents included, while the shielded balance stays at most 5 USDC (mcp_shield_above_balance_cap says how much more fits). Privacy: the chain shows this key depositing this amount; later payments from the shielded balance do not show this wallet. It takes a few minutes: the first call starts it and answers stage (proving, submitting, done); call wallet_shield again with the SAME request_id and amount_atomic in ${POLL_SECONDS2} s for the status. When the deposit lands, the wallet reads it from the chain by itself (refreshing: true until it is spendable) and writes an encrypted backup (backupPath). The same request_id never deposits twice, also after a restart. One deposit at a time. An optional owner cap (--max-shield) may bound each call and this session (mcp_shield_cap_exceeded: tell the owner). Refusals: mcp_argument_invalid, mcp_request_id_reused, wallet_locked, mcp_tool_disabled, mcp_shield_failed, and the deposit's own p03_deposit_* codes.`,
     inputSchema: {
       type: "object",
       properties: {
-        amount_atomic: { type: "string", pattern: "^[1-9][0-9]*$", description: "USDC to shield, in atomic units (1000000 = 1 USDC). A whole number of USDC on this service's pools." },
+        amount_atomic: { type: "string", pattern: "^[1-9][0-9]*$", description: "USDC to shield, in atomic units (1000000 = 1 USDC, 370000 = 0.37 USDC): any amount from 10000 (0.01 USDC) while the balance stays at most 5 USDC." },
         request_id: { type: "string", pattern: "^[A-Za-z0-9_-]{1,44}$", description: "Your stable name for this deposit, like shield-1; pass it again to read the status." }
       },
       required: ["amount_atomic", "request_id"],
@@ -126195,7 +126212,7 @@ function createWalletTools({
     inputSchema: {
       type: "object",
       properties: {
-        amount_atomic: { type: "string", pattern: "^[1-9][0-9]*$", description: "USDC to shield, in atomic units (1000000 = 1 USDC). A whole number of USDC on this service's pools. Required unless action is cancel." },
+        amount_atomic: { type: "string", pattern: "^[1-9][0-9]*$", description: "USDC to shield, in atomic units (1000000 = 1 USDC, 370000 = 0.37 USDC): any amount from 10000 (0.01 USDC) while the balance stays at most 5 USDC. Required unless action is cancel." },
         request_id: { type: "string", pattern: "^[A-Za-z0-9_-]{1,44}$", description: "Your stable name for this deposit, like from-phantom-1; pass it again (with the same amount_atomic) to read the status." },
         action: { type: "string", enum: ["deposit", "cancel"], description: "deposit (the default): start or read this deposit. cancel: close this request's one-time address while nothing at all reached it (no amount_atomic needed)." }
       },
@@ -126772,8 +126789,7 @@ function moneyOptions({
   exitProofToolsPath,
   profilePath,
   proofToolsPath,
-  memoServiceUrl,
-  depositUnitAtomic
+  memoServiceUrl
 }, asText = (value) => value === void 0 || value === null ? "" : String(value)) {
   if (noShield === true && allowShield === true) setupInvalid("--no-shield and --allow-shield contradict each other; pass one");
   const shieldCap = asText(maxShieldAtomic);
@@ -126828,8 +126844,7 @@ function moneyOptions({
     ...shieldOn && shieldCap ? { maxShieldAtomic: shieldCap } : {},
     allowUnshield: unshieldOn,
     unshieldTo: Object.freeze([...new Set(addresses)]),
-    ...unshieldOn ? { ...unshieldCap ? { maxUnshieldAtomic: unshieldCap } : {}, exitProofTools, profile, facilitatorOrigin: facilitatorOrigin2 } : {},
-    ...depositUnitAtomic ? { depositUnitAtomic: asText(depositUnitAtomic) } : {}
+    ...unshieldOn ? { ...unshieldCap ? { maxUnshieldAtomic: unshieldCap } : {}, exitProofTools, profile, facilitatorOrigin: facilitatorOrigin2 } : {}
   });
 }
 async function runMcpServer({ input = process.stdin, output: output2 = process.stdout, errorOutput = process.stderr, updateCheck, ...options } = {}) {
@@ -126876,7 +126891,6 @@ async function openWalletServer({
   maxUnshieldAtomic,
   exitProofToolsPath,
   profilePath,
-  depositUnitAtomic,
   autoPockets = true,
   readyPockets,
   discoverWarmup = false,
@@ -126904,8 +126918,7 @@ async function openWalletServer({
     exitProofToolsPath,
     profilePath,
     proofToolsPath,
-    memoServiceUrl,
-    depositUnitAtomic
+    memoServiceUrl
   }, asText);
   const live = {
     ...proofToolsPath ? { proofToolsPath: resolve23(proofToolsPath) } : {},
@@ -131995,8 +132008,6 @@ function mcpServerOptions(values, deps) {
     ...values.has("--max-unshield") ? { maxUnshieldAtomic: values.get("--max-unshield") } : {},
     ...values.has("--exit-proof-tools") ? { exitProofToolsPath: values.get("--exit-proof-tools") } : {},
     ...values.has("--profile") ? { profilePath: values.get("--profile") } : {},
-    // A wallet_shield deposit takes whole units of this service's pools, as a relayed deposit does.
-    ...!values.has("--no-shield") && RELAYED_DEPOSIT_UNIT[pool] ? { depositUnitAtomic: RELAYED_DEPOSIT_UNIT[pool] } : {},
     // Automatic pockets: on by default (they fill with the unshield inputs, which config.json from setup holds).
     autoPockets: !values.has("--no-auto-pockets"),
     ...values.has("--ready-pockets") ? { readyPockets: values.get("--ready-pockets") } : {},
@@ -134491,9 +134502,6 @@ function relayDepositFailureHint(reason) {
   if (/p03_deposit_token_balance_unreadable/.test(reason)) {
     return "the RPC did not answer a USDC balance read (after 5 tries), so the wallet stopped: it never reads a failed read as 0. Do NOT send more USDC because of this; nothing was sent. Rerun the same command later, or use another --rpc";
   }
-  if (/p03_deposit_relay_amount_not_whole_unit/.test(reason)) {
-    return "this pool takes deposits in whole units of its pocket size (GET <facilitator>/api/x402/deposit shows depositUnitAtomic), so no amount marks one depositor; nothing was recorded or sent. Rerun with --amount a whole multiple of it";
-  }
   if (/p03_deposit_relay_amount_below_facilitator_minimum/.test(reason)) {
     return "the facilitator relays deposits of at least its minimum (GET <facilitator>/api/x402/deposit shows minimumAtomic); nothing was recorded. Rerun with a larger --amount";
   }