shinjuku-shielded 0.3.38 → 0.3.39

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "a72559850e57ae647a20df449f9f47be5d359e1cf1debda30ded104225bdacb5",
-  "bytes": 11212421,
-  "sourceCommit": "642d0e3290e0c8d57c5439d950fda334e3330e46",
+  "sha256": "5f5ca189829786779ba9e05c237bb6edf057a06d4745f0a601212136aa0bf68f",
+  "bytes": 11216201,
+  "sourceCommit": "c72d3c75917cf35191aa263f3e30878779ed814b",
   "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.38",
+  "version": "0.3.39",
   "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": "a7255985",
-  "shinjukuSha256": "a72559850e57ae647a20df449f9f47be5d359e1cf1debda30ded104225bdacb5",
+  "shinjukuRelease": "5f5ca189",
+  "shinjukuSha256": "5f5ca189829786779ba9e05c237bb6edf057a06d4745f0a601212136aa0bf68f",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -6359,13 +6359,13 @@ var require_src = __commonJS({
           zeroes++;
         }
         var size = (pend - pbegin) * iFACTOR + 1 >>> 0;
-        var b582 = new Uint8Array(size);
+        var b583 = new Uint8Array(size);
         while (pbegin !== pend) {
           var carry = source[pbegin];
           var i2 = 0;
           for (var it1 = size - 1; (carry !== 0 || i2 < length) && it1 !== -1; it1--, i2++) {
-            carry += 256 * b582[it1] >>> 0;
-            b582[it1] = carry % BASE2 >>> 0;
+            carry += 256 * b583[it1] >>> 0;
+            b583[it1] = carry % BASE2 >>> 0;
             carry = carry / BASE2 >>> 0;
           }
           if (carry !== 0) {
@@ -6375,12 +6375,12 @@ var require_src = __commonJS({
           pbegin++;
         }
         var it2 = size - length;
-        while (it2 !== size && b582[it2] === 0) {
+        while (it2 !== size && b583[it2] === 0) {
           it2++;
         }
         var str = LEADER.repeat(zeroes);
         for (; it2 < size; ++it2) {
-          str += ALPHABET.charAt(b582[it2]);
+          str += ALPHABET.charAt(b583[it2]);
         }
         return str;
       }
@@ -50068,11 +50068,11 @@ function connectSplit(own, historyUrl, commitment = "finalized", { pause: pause3
     integrity: { signaturesVerified: 0, crossChecked: 0 }
   });
   const served = /* @__PURE__ */ new Map();
-  let memo = runTransactions.get(historyUrl);
-  if (memo === void 0) runTransactions.set(historyUrl, memo = /* @__PURE__ */ new Map());
+  let memo2 = runTransactions.get(historyUrl);
+  if (memo2 === void 0) runTransactions.set(historyUrl, memo2 = /* @__PURE__ */ new Map());
   const memoKey3 = (signature, config) => `${signature}|${config?.commitment ?? commitment}|${config?.maxSupportedTransactionVersion ?? 1}`;
   const remembered = (signature, config) => {
-    const hit = memo.get(memoKey3(signature, config));
+    const hit = memo2.get(memoKey3(signature, config));
     if (hit === void 0) return void 0;
     counts.integrity.signaturesVerified += 1;
     served.set(signature, hit.fingerprint);
@@ -50136,7 +50136,7 @@ function connectSplit(own, historyUrl, commitment = "finalized", { pause: pause3
           const { response, fingerprint } = verifiedTransaction(result, call3[0]);
           counts.integrity.signaturesVerified += 1;
           served.set(call3[0], fingerprint);
-          memo.set(memoKey3(call3[0], call3[1]), { response, fingerprint });
+          memo2.set(memoKey3(call3[0], call3[1]), { response, fingerprint });
           return response;
         } catch (error) {
           if (error?.code === HISTORY_RPC_BEHIND_CODE && !strict) {
@@ -50184,7 +50184,7 @@ function connectSplit(own, historyUrl, commitment = "finalized", { pause: pause3
       const { response: verified, fingerprint } = verifiedTransaction(result, signatures[index]);
       counts.integrity.signaturesVerified += 1;
       served.set(signatures[index], fingerprint);
-      memo.set(memoKey3(signatures[index], config), { response: verified, fingerprint });
+      memo2.set(memoKey3(signatures[index], config), { response: verified, fingerprint });
       return verified;
     });
     let next = 0;
@@ -52548,6 +52548,15 @@ var init_genericHistory = __esm({
 
 // wallet/src/history/walk.mjs
 import { createHash as createHash10 } from "node:crypto";
+function e1TreeAddress2(poolBase58, programBase58) {
+  return memo(`e1|${poolBase58}|${programBase58}`, () => e1TreeAddress(poolBase58, programBase58));
+}
+function vaultAuthorityAddress3(program, pool2) {
+  return memo(`va|${b58(program)}|${b58(pool2)}`, () => vaultAuthorityAddress2(program, pool2));
+}
+function depositAuthorityAddress3(program, pool2, outHex) {
+  return memo(`da|${b58(program)}|${b58(pool2)}|${outHex}`, () => depositAuthorityAddress2(program, pool2, outHex));
+}
 function p03SettlementConsumesBuffer(tag2) {
   return P03_SETTLEMENT_TAGS.includes(tag2) && !P03_INLINE_SETTLEMENT_TAGS.includes(tag2);
 }
@@ -52673,7 +52682,7 @@ function buildFinalizedP03HistoryReport({
     sourceModel: P03_FINALIZED_HISTORY_SOURCE_MODEL,
     complete: true,
     commitment: "finalized",
-    programId: program.toBase58(),
+    programId: b58(program),
     pool: poolKey.toBase58(),
     initialization: Object.freeze({
       signature: initialization.signature,
@@ -52731,14 +52740,14 @@ async function refreshFinalizedP03HistorySnapshot({
   const authenticated = assertAuthenticatedFinalizedP03History(history);
   const program = canonicalKey(programId, "program_id");
   const poolKey = canonicalKey(pool2, "pool");
-  if (authenticated.programId !== program.toBase58() || authenticated.pool !== poolKey.toBase58()) {
+  if (authenticated.programId !== b58(program) || authenticated.pool !== poolKey.toBase58()) {
     throw new Error("p03_history_refresh_binding_invalid");
   }
   const snapshot = await readFinalizedPoolForRefresh(connection, program, poolKey);
   if (snapshot.terminal !== authenticated.finalizedPoolSnapshot.terminal || snapshot.currentIndex !== authenticated.finalizedPoolSnapshot.currentIndex || snapshot.currentRoot !== authenticated.finalizedPoolSnapshot.currentRoot || !sameP03PoolPolicy(snapshot, authenticated.finalizedPoolSnapshot.policy) || !sameE1TreeHeader(snapshot, authenticated.finalizedPoolSnapshot.e1Tree, program, poolKey) || paymentSettler !== void 0 && snapshot.paymentSettler?.toBase58() !== paymentSettler) {
     throw Object.assign(
       new Error("p03_history_refresh_transition_detected"),
-      { currentIndex: snapshot.currentIndex, snapshotBinding: { programId: program.toBase58(), pool: poolKey.toBase58() } }
+      { currentIndex: snapshot.currentIndex, snapshotBinding: { programId: b58(program), pool: poolKey.toBase58() } }
     );
   }
   const priorCoverage = authenticated.deploymentCoverage;
@@ -52805,7 +52814,7 @@ async function readFinalizedPool(connection, program, pool2) {
     if (only.replayStore === REPLAY_STORE_INDEXED) throw new Error("p03_history_e1_tree_read_unavailable");
     return only;
   }
-  const tree = new import_web396.PublicKey(e1TreeAddress(pool2.toBase58(), program.toBase58()));
+  const tree = new import_web396.PublicKey(e1TreeAddress2(b58(pool2), b58(program)));
   const both = await retryTransientRpc(() => connection.getMultipleAccountsInfoAndContext(
     [pool2, tree],
     { commitment: "finalized" }
@@ -52826,7 +52835,7 @@ async function readFinalizedPool(connection, program, pool2) {
 }
 async function readFinalizedPoolForRefresh(connection, program, pool2) {
   if (typeof connection.getMultipleAccountsInfoAndContext !== "function") return readFinalizedPool(connection, program, pool2);
-  const tree = new import_web396.PublicKey(e1TreeAddress(pool2.toBase58(), program.toBase58()));
+  const tree = new import_web396.PublicKey(e1TreeAddress2(b58(pool2), b58(program)));
   const both = await retryTransientRpc(() => connection.getMultipleAccountsInfoAndContext(
     [pool2, tree],
     { commitment: "finalized", dataSlice: { offset: 0, length: REFRESH_READ_BYTES } }
@@ -52850,7 +52859,7 @@ function parseFinalizedPool(response, program) {
   const slot3 = response?.context?.slot;
   safeSlot(slot3, "snapshot_slot");
   if (!value) throw new Error("p03_history_pool_missing");
-  if (canonicalKey(value.owner, "pool_owner").toBase58() !== program.toBase58()) {
+  if (canonicalKey(value.owner, "pool_owner").toBase58() !== b58(program)) {
     throw new Error("p03_history_pool_owner_mismatch");
   }
   const data = Buffer.from(value.data);
@@ -52937,7 +52946,7 @@ function coverageKey({ program, initialization, deploymentIdentity }) {
     return createHash10("sha256").update(JSON.stringify({
       // v2: coverage carries the executable timeline; older caches re-attest.
       coverageModel: 2,
-      program: program.toBase58(),
+      program: b58(program),
       initializationSignature: initialization.signature,
       programDataAddress: canonicalKey(deploymentIdentity.programDataAddress, "programdata_address").toBase58(),
       deployedAtSlot: (typeof slot3 === "bigint" ? slot3 : BigInt(safeSlot(slot3, "deployed_at_slot"))).toString(),
@@ -53072,7 +53081,7 @@ async function attestProgramDataCoverage({
   if (programHistory) {
     const coverage = await attestP03ProgramHistory({
       history: programHistory,
-      programId: program.toBase58(),
+      programId: b58(program),
       programDataAddress: address5.toBase58(),
       currentProgramData: data,
       initializationSlot: BigInt(initialization.slot),
@@ -53104,7 +53113,7 @@ async function attestProgramDataCoverage({
       sourceModel: P03_PROGRAMDATA_COVERAGE_SOURCE_MODEL,
       complete: true,
       commitment: "finalized",
-      programId: program.toBase58(),
+      programId: b58(program),
       programDataAddress: address5.toBase58(),
       deployedAtSlot,
       programDataSha256: expectedHash,
@@ -53134,7 +53143,7 @@ async function attestProgramDataCoverage({
     sourceModel: P03_PROGRAMDATA_COVERAGE_SOURCE_MODEL,
     complete: true,
     commitment: "finalized",
-    programId: program.toBase58(),
+    programId: b58(program),
     programDataAddress: address5.toBase58(),
     deployedAtSlot,
     programDataSha256: expectedHash,
@@ -53362,7 +53371,7 @@ function blockIndex(blockCache, slot3, signature) {
   return transactionIndex;
 }
 function positionsEvidence(program) {
-  const target = program.toBase58();
+  const target = b58(program);
   return (transaction) => !transaction.failed && transaction.instructions.some((instruction) => instruction.programId === target && (instruction.data[0] === 0 || instruction.data[0] === 8 || P03_SETTLEMENT_TAGS.includes(instruction.data[0])));
 }
 function historyCommitmentLevels(commitment) {
@@ -53516,14 +53525,14 @@ function exactInstructionData(data) {
   throw new Error("p03_history_instruction_data_invalid");
 }
 function targetInstructions(transactions, program) {
-  const target = program.toBase58();
+  const target = b58(program);
   if (transactions.some((transaction) => transaction.innerInstructions.some((instruction) => instruction.programId === target))) {
     throw new Error("p03_history_inner_program_instruction_unsupported");
   }
   return transactions.flatMap((transaction) => transaction.instructions.filter((instruction) => instruction.programId === target)).sort(compareInstruction);
 }
 function validateAndFindInitialization(instructions2, pool2, program) {
-  const poolString = pool2.toBase58();
+  const poolString = b58(pool2);
   const candidates = instructions2.filter((instruction) => instruction.accounts.includes(poolString) && (instruction.data[0] === 0 || instruction.data[0] === 8));
   if (candidates.length !== 1) throw new Error("p03_history_initialization_count_invalid");
   const initialization = candidates[0];
@@ -53533,8 +53542,8 @@ function validateAndFindInitialization(instructions2, pool2, program) {
   )[0].toBase58();
   const store = initializationReplayStore(initialization);
   const gated = initialization.accounts.length === 6 && initialization.accounts[4] === programData;
-  const gatedIndexed = initialization.accounts.length === 7 && initialization.accounts[4] === programData && initialization.accounts[6] === e1TreeAddress(poolString, program.toBase58());
-  if (store === void 0 || (store === REPLAY_STORE_INDEXED ? !gatedIndexed : initialization.accounts.length !== 4 && !gated) || initialization.accounts[0] !== poolString || initialization.accounts[3] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58()) {
+  const gatedIndexed = initialization.accounts.length === 7 && initialization.accounts[4] === programData && initialization.accounts[6] === e1TreeAddress2(poolString, b58(program));
+  if (store === void 0 || (store === REPLAY_STORE_INDEXED ? !gatedIndexed : initialization.accounts.length !== 4 && !gated) || initialization.accounts[0] !== poolString || initialization.accounts[3] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY)) {
     throw new Error("p03_history_initialization_invalid");
   }
   if (instructions2.some((instruction) => compareInstruction(instruction, initialization) < 0)) {
@@ -53555,21 +53564,21 @@ function assertP03E1TreeComplete({ program, pool: pool2, poolSnapshot, settles,
   };
   const tree = poolSnapshot.e1TreeAccount;
   if (!tree || tree.slot !== poolSnapshot.slot) mismatch("tree_snapshot_missing");
-  if (tree.address !== e1TreeAddress(pool2.toBase58(), program.toBase58())) mismatch("tree_address");
+  if (tree.address !== e1TreeAddress2(b58(pool2), b58(program))) mismatch("tree_address");
   const empty = tree.data === null || tree.ownerProgramId === null || tree.ownerProgramId === SYSTEM_PROGRAM && tree.data.every((byte) => byte === 0);
   if (closed) {
     if (!empty) mismatch("closed_pool_has_tree");
     return Object.freeze({ state: "closed", address: tree.address, slot: BigInt(poolSnapshot.slot) });
   }
   if (empty) mismatch("tree_empty_without_close");
-  if (tree.ownerProgramId !== program.toBase58() || tree.data.length !== E1.treeBytes) mismatch("tree_owner_or_length");
+  if (tree.ownerProgramId !== b58(program) || tree.data.length !== E1.treeBytes) mismatch("tree_owner_or_length");
   let header;
   try {
     header = readE1TreeAccount(tree.data);
   } catch (error) {
     mismatch(`tree_header:${error?.message ?? "invalid"}`);
   }
-  if (header.pool !== pool2.toBase58()) mismatch("tree_pool");
+  if (header.pool !== b58(pool2)) mismatch("tree_pool");
   const mirror = E1TreeMirror.fromOrderedValues(settles.flatMap((values) => e1SortValues(values)));
   const leaves = mirror.leaves();
   if (header.leaves !== leaves) mismatch(`leaves:${header.leaves}/${leaves}`);
@@ -53584,19 +53593,19 @@ function sameE1TreeHeader(snapshot, verified, program, pool2) {
   if (!tree || tree.address !== verified.address) return false;
   const empty = tree.data === null || tree.ownerProgramId === null || tree.ownerProgramId === SYSTEM_PROGRAM && tree.data.every((byte) => byte === 0);
   if (verified.state === "closed") return empty;
-  if (empty || tree.ownerProgramId !== program.toBase58() || tree.data.length < E1_TREE_HEADER_BYTES || !Number.isSafeInteger(verified.leaves) || verified.leaves < 1) return false;
+  if (empty || tree.ownerProgramId !== b58(program) || tree.data.length < E1_TREE_HEADER_BYTES || !Number.isSafeInteger(verified.leaves) || verified.leaves < 1) return false;
   const data = tree.data;
   if (data.subarray(0, 8).toString("latin1") !== "SX402T01" || !data.subarray(8, 40).equals(pool2.toBuffer()) || data[40] !== 1 || data[41] !== E1.depth || data.readUInt16LE(42) !== E1.bufferSize || data[44] !== E1.canopyDepth || data[45] !== 0 || data[46] !== 0 || data[47] !== 0) return false;
   return data.readBigUInt64LE(56) === BigInt(2 * verified.leaves - 1);
 }
 function assertIndexedSettlementCpis(cpis, kind) {
   const exit = kind === "withdraw" || kind === "note-exit";
-  if (cpis.length !== (exit ? 1 : 0) || exit && (cpis[0].programId !== TOKEN_PROGRAM_ID.toBase58() || cpis[0].data.length !== 10 || cpis[0].data[0] !== 12)) {
+  if (cpis.length !== (exit ? 1 : 0) || exit && (cpis[0].programId !== b58(TOKEN_PROGRAM_ID) || cpis[0].data.length !== 10 || cpis[0].data[0] !== 12)) {
     throw new Error("p03_history_indexed_settlement_cpis_invalid");
   }
 }
 function validateBufferInit(instruction, pool2) {
-  if (instruction.data.length !== 10 || instruction.accounts.length !== 4 || instruction.accounts[2] !== pool2.toBase58() || instruction.accounts[3] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58() || ![1, 2, 3, 4].includes(instruction.data[1])) {
+  if (instruction.data.length !== 10 || instruction.accounts.length !== 4 || instruction.accounts[2] !== b58(pool2) || instruction.accounts[3] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY) || ![1, 2, 3, 4].includes(instruction.data[1])) {
     throw new Error("p03_history_buffer_init_invalid");
   }
 }
@@ -53617,8 +53626,8 @@ function rebuildContexts({
   if (!(transactions instanceof Map)) throw new Error("p03_history_transactions_required");
   const snapshotSlot = BigInt(poolSnapshot.slot);
   instructions2 = instructions2.filter((instruction) => BigInt(instruction.slot) <= snapshotSlot);
-  const poolString = pool2.toBase58();
-  const programString = program.toBase58();
+  const poolString = b58(pool2);
+  const programString = b58(program);
   const executableAt = (slot3, subject) => {
     if (!deploymentCoverage) {
       if (assumeOriginalExecutable === true) return ASSUMED_ORIGINAL_EXECUTABLE;
@@ -53699,7 +53708,7 @@ function rebuildContexts({
     }
     if (tag2 === CLOSE_REPLAY_TREE_TAG) {
       const withRecord = instruction.accounts.length === 5;
-      if (!indexedPool || !retired || instruction.data.length !== 1 || instruction.accounts.length !== 4 && !withRecord || instruction.accounts[0] !== poolString || instruction.accounts[1] !== e1TreeAddress(poolString, programString) || instruction.accounts[2] !== settler || instruction.accounts[3] !== P03_E1_TREE_RENT_DESTINATION || withRecord && instruction.accounts[4] !== successionRecordAddress(program, poolString)) {
+      if (!indexedPool || !retired || instruction.data.length !== 1 || instruction.accounts.length !== 4 && !withRecord || instruction.accounts[0] !== poolString || instruction.accounts[1] !== e1TreeAddress2(poolString, programString) || instruction.accounts[2] !== settler || instruction.accounts[3] !== P03_E1_TREE_RENT_DESTINATION || withRecord && instruction.accounts[4] !== successionRecordAddress(program, poolString)) {
         throw new Error("p03_history_tree_close_invalid");
       }
       const atClose = executableAt(instruction.slot, "tree_close");
@@ -53711,7 +53720,7 @@ function rebuildContexts({
     }
     if (tag2 === 12) {
       const withTree = instruction.accounts.length === 5;
-      if (!deploymentCoverage || retired || instruction.data.length !== 25 || instruction.accounts.length !== 3 && !withTree || instruction.accounts[0] !== poolString || instruction.accounts[1] !== deploymentCoverage.programDataAddress || withTree && (!indexedPool || instruction.accounts[3] !== e1TreeAddress(poolString, programString) || instruction.accounts[4] !== successionInboundAddress(program, poolString))) {
+      if (!deploymentCoverage || retired || instruction.data.length !== 25 || instruction.accounts.length !== 3 && !withTree || instruction.accounts[0] !== poolString || instruction.accounts[1] !== deploymentCoverage.programDataAddress || withTree && (!indexedPool || instruction.accounts[3] !== e1TreeAddress2(poolString, programString) || instruction.accounts[4] !== successionInboundAddress(program, poolString))) {
         throw new Error("p03_history_policy_update_invalid");
       }
       if (withTree) successionAt(instruction, "policy_update");
@@ -53755,7 +53764,7 @@ function rebuildContexts({
       continue;
     }
     if (tag2 === 6) {
-      if (instruction.data.length !== 1 || instruction.accounts.length !== 3 || instruction.accounts[2] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58()) {
+      if (instruction.data.length !== 1 || instruction.accounts.length !== 3 || instruction.accounts[2] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY)) {
         throw new Error("p03_history_buffer_close_invalid");
       }
       const state2 = active.get(instruction.accounts[0]);
@@ -53764,27 +53773,27 @@ function rebuildContexts({
       continue;
     }
     if (tag2 === 7) {
-      if (instruction.data.length !== 1 || instruction.accounts.length !== 2 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58()) {
+      if (instruction.data.length !== 1 || instruction.accounts.length !== 2 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY)) {
         throw new Error("p03_history_checkpoint_invalid");
       }
       continue;
     }
     if (tag2 === 10) {
-      if (instruction.data.length !== 1 || instruction.accounts.length !== 3 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== settler || instruction.accounts[2] !== poolSnapshot.vault.toBase58()) {
+      if (instruction.data.length !== 1 || instruction.accounts.length !== 3 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== settler || instruction.accounts[2] !== b58(poolSnapshot.vault)) {
         throw new Error("p03_history_retire_instruction_invalid");
       }
       retired = true;
       continue;
     }
     if (tag2 === 23) {
-      if (instruction.data.length !== 1 || instruction.accounts.length !== 7 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== settler || instruction.accounts[2] !== poolSnapshot.vault.toBase58()) {
+      if (instruction.data.length !== 1 || instruction.accounts.length !== 7 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== settler || instruction.accounts[2] !== b58(poolSnapshot.vault)) {
         throw new Error("p03_history_test_pool_retire_invalid");
       }
       retired = true;
       continue;
     }
     if (tag2 === 28) {
-      if (retired || poolString !== P03_LOCKED_RETIRE_POOL || instruction.data.length !== 1 || instruction.accounts.length !== 7 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== P03_LOCKED_RETIRE_AUTHORITY || instruction.accounts[2] !== poolSnapshot.vault.toBase58() || instruction.accounts[4] !== P03_LOCKED_RETIRE_DESTINATION) {
+      if (retired || poolString !== P03_LOCKED_RETIRE_POOL || instruction.data.length !== 1 || instruction.accounts.length !== 7 || instruction.accounts[0] !== poolString || instruction.accounts[1] !== P03_LOCKED_RETIRE_AUTHORITY || instruction.accounts[2] !== b58(poolSnapshot.vault) || instruction.accounts[4] !== P03_LOCKED_RETIRE_DESTINATION) {
         throw new Error("p03_history_locked_retire_invalid");
       }
       if (executableAt(instruction.slot, "locked_retire").lockedPoolRetire !== true) {
@@ -53830,18 +53839,18 @@ function rebuildContexts({
     }
     if (tag2 === LINK_SUCCESSOR_TAG) {
       const accounts = instruction.accounts;
-      if (!deploymentCoverage || !indexedPool || instruction.data.length !== 1 || accounts.length !== 15 || accounts[0] === accounts[1] || accounts[2] !== successionRecordAddress(program, accounts[0]) || accounts[5] !== poolSnapshot.mint.toBase58() || accounts[7] !== TOKEN_PROGRAM_ID.toBase58() || accounts[8] !== e1TreeAddress(accounts[0], programString) || accounts[9] !== e1TreeAddress(accounts[1], programString) || accounts[10] !== deploymentCoverage.programDataAddress || accounts[12] !== SYSTEM_PROGRAM || accounts[13] !== successionInboundAddress(program, accounts[0]) || accounts[14] !== successionInboundAddress(program, accounts[1])) {
+      if (!deploymentCoverage || !indexedPool || instruction.data.length !== 1 || accounts.length !== 15 || accounts[0] === accounts[1] || accounts[2] !== successionRecordAddress(program, accounts[0]) || accounts[5] !== b58(poolSnapshot.mint) || accounts[7] !== b58(TOKEN_PROGRAM_ID) || accounts[8] !== e1TreeAddress2(accounts[0], programString) || accounts[9] !== e1TreeAddress2(accounts[1], programString) || accounts[10] !== deploymentCoverage.programDataAddress || accounts[12] !== SYSTEM_PROGRAM || accounts[13] !== successionInboundAddress(program, accounts[0]) || accounts[14] !== successionInboundAddress(program, accounts[1])) {
         throw new Error("p03_history_link_successor_invalid");
       }
       successionAt(instruction, "link_successor");
       if (accounts[0] === poolString) {
-        if (retired || linkedTo !== void 0 || accounts[3] !== poolSnapshot.vault.toBase58() || accounts[6] !== vaultAuthorityAddress2(program, pool2).toBase58()) {
+        if (retired || linkedTo !== void 0 || accounts[3] !== b58(poolSnapshot.vault) || accounts[6] !== vaultAuthorityAddress3(program, pool2).toBase58()) {
           throw new Error("p03_history_link_successor_invalid");
         }
         retired = true;
         linkedTo = Object.freeze({ successor: accounts[1], record: accounts[2], ...positionOf(instruction) });
       } else if (accounts[1] === poolString) {
-        if (retired || accounts[4] !== poolSnapshot.vault.toBase58()) throw new Error("p03_history_link_successor_invalid");
+        if (retired || accounts[4] !== b58(poolSnapshot.vault)) throw new Error("p03_history_link_successor_invalid");
         predecessors.push(Object.freeze({ predecessor: accounts[0], record: accounts[2], ...positionOf(instruction) }));
       } else {
         throw new Error("p03_history_link_successor_invalid");
@@ -53850,7 +53859,7 @@ function rebuildContexts({
     }
     if (tag2 === IMPORT_REPLAY_LEAVES_TAG) {
       const accounts = instruction.accounts;
-      if (!indexedPool || retired || accounts.length !== 5 || accounts[1] !== poolString || accounts[2] !== e1TreeAddress(poolString, programString) || accounts[4] !== successionInboundAddress(program, poolString)) {
+      if (!indexedPool || retired || accounts.length !== 5 || accounts[1] !== poolString || accounts[2] !== e1TreeAddress2(poolString, programString) || accounts[4] !== successionInboundAddress(program, poolString)) {
         throw new Error("p03_history_import_replay_invalid");
       }
       canonicalKey(accounts[0], "import_record");
@@ -53867,15 +53876,15 @@ function rebuildContexts({
     }
     if (tag2 === SWEEP_PREDECESSOR_VAULT_TAG) {
       const accounts = instruction.accounts;
-      if (!indexedPool || instruction.data.length !== 1 || accounts.length !== 8 || accounts[1] === accounts[2] || accounts[0] !== successionRecordAddress(program, accounts[1]) || accounts[5] !== poolSnapshot.mint.toBase58() || accounts[7] !== TOKEN_PROGRAM_ID.toBase58()) {
+      if (!indexedPool || instruction.data.length !== 1 || accounts.length !== 8 || accounts[1] === accounts[2] || accounts[0] !== successionRecordAddress(program, accounts[1]) || accounts[5] !== b58(poolSnapshot.mint) || accounts[7] !== b58(TOKEN_PROGRAM_ID)) {
         throw new Error("p03_history_sweep_invalid");
       }
       if (accounts[1] === poolString) {
-        if (!retired || accounts[3] !== poolSnapshot.vault.toBase58() || accounts[6] !== vaultAuthorityAddress2(program, pool2).toBase58()) {
+        if (!retired || accounts[3] !== b58(poolSnapshot.vault) || accounts[6] !== vaultAuthorityAddress3(program, pool2).toBase58()) {
           throw new Error("p03_history_sweep_invalid");
         }
       } else if (accounts[2] === poolString) {
-        if (retired || accounts[4] !== poolSnapshot.vault.toBase58()) throw new Error("p03_history_sweep_invalid");
+        if (retired || accounts[4] !== b58(poolSnapshot.vault)) throw new Error("p03_history_sweep_invalid");
       } else {
         throw new Error("p03_history_sweep_invalid");
       }
@@ -53988,7 +53997,7 @@ function rebuildContexts({
         broadcaster: instruction.accounts[2],
         settleData: instruction.data,
         replayValues: transitionReplayValues.map(fieldHex),
-        tokenProgram: TOKEN_PROGRAM_ID.toBase58()
+        tokenProgram: b58(TOKEN_PROGRAM_ID)
       });
     }
     if (profile.indexed === true) {
@@ -54103,16 +54112,16 @@ function p03SuccessorMovedReplayValues(successorReport, sourceDomain) {
   return Object.freeze([...new Set(report.contexts.filter((context) => context.kind === "move" && context.sourceDomain === domain3).flatMap((context) => context.replayValues.map(String)))].sort());
 }
 function successionRecordAddress(program, poolBase58) {
-  return import_web396.PublicKey.findProgramAddressSync(
+  return memo(`sr|${b58(program)}|${poolBase58}`, () => import_web396.PublicKey.findProgramAddressSync(
     [Buffer.from("sx402-succ"), canonicalKey(poolBase58, "succession_pool").toBuffer()],
     program
-  )[0].toBase58();
+  )[0].toBase58());
 }
 function successionInboundAddress(program, poolBase58) {
-  return import_web396.PublicKey.findProgramAddressSync(
+  return memo(`si|${b58(program)}|${poolBase58}`, () => import_web396.PublicKey.findProgramAddressSync(
     [Buffer.from("sx402-succ-in"), canonicalKey(poolBase58, "succession_pool").toBuffer()],
     program
-  )[0].toBase58();
+  )[0].toBase58());
 }
 function decodeImportValues(data) {
   const invalid4 = () => {
@@ -54191,7 +54200,7 @@ function validateInitializationBinding(instruction, snapshot, { settlerRotated =
   const data = instruction.data;
   const expectedAnchorMode = data[0] === 0 ? 0 : 1;
   const anchorModeMatches = snapshot.anchorMode === expectedAnchorMode || expectedAnchorMode === 0 && snapshot.anchorMode === 2;
-  if (!anchorModeMatches || instruction.accounts[1] !== snapshot.mint.toBase58() || instruction.accounts[2] !== snapshot.vault.toBase58() || data[65] !== snapshot.decimals || !settlerRotated && !data.subarray(66, 98).equals(snapshot.paymentSettler.toBuffer())) {
+  if (!anchorModeMatches || instruction.accounts[1] !== b58(snapshot.mint) || instruction.accounts[2] !== b58(snapshot.vault) || data[65] !== snapshot.decimals || !settlerRotated && !data.subarray(66, 98).equals(snapshot.paymentSettler.toBuffer())) {
     throw new Error("p03_history_initialization_snapshot_binding_invalid");
   }
 }
@@ -54210,14 +54219,14 @@ function sameP03PoolPolicy(left, right) {
 function validateSettlementAccounts(instruction, profile, program, pool2) {
   if (profile.move === true) {
     const accounts2 = instruction.accounts;
-    if (accounts2.length !== profile.accountCount || accounts2[0] !== pool2.toBase58() || accounts2[3] !== import_web396.SystemProgram.programId.toBase58() || accounts2[4] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58() || accounts2[5] !== e1TreeAddress(pool2.toBase58(), program.toBase58()) || accounts2[6] !== successionInboundAddress(program, pool2.toBase58())) {
+    if (accounts2.length !== profile.accountCount || accounts2[0] !== b58(pool2) || accounts2[3] !== b58(import_web396.SystemProgram.programId) || accounts2[4] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY) || accounts2[5] !== e1TreeAddress2(b58(pool2), b58(program)) || accounts2[6] !== successionInboundAddress(program, b58(pool2))) {
       throw new Error("p03_history_move_accounts_invalid");
     }
     canonicalKey(accounts2[2], "move_record");
     return;
   }
   const accounts = settlementAccountsByLegacyIndex(instruction, profile);
-  if (instruction.accounts.length !== profile.accountCount || accounts[0] !== pool2.toBase58()) {
+  if (instruction.accounts.length !== profile.accountCount || accounts[0] !== b58(pool2)) {
     throw new Error("p03_history_settlement_accounts_invalid");
   }
   if (profile.compressed === true) {
@@ -54225,19 +54234,19 @@ function validateSettlementAccounts(instruction, profile, program, pool2) {
     const start = accounts.length - light.length;
     if (light.some((key, index) => accounts[start + index] !== key)) throw new Error("p03_history_light_section_invalid");
   }
-  if (profile.indexed === true && instruction.accounts[instruction.accounts.length - 1] !== e1TreeAddress(pool2.toBase58(), program.toBase58())) {
+  if (profile.indexed === true && instruction.accounts[instruction.accounts.length - 1] !== e1TreeAddress2(b58(pool2), b58(program))) {
     throw new Error("p03_history_e1_tree_account_invalid");
   }
   if (profile.kind === "deposit") {
-    if (accounts[7] !== TOKEN_PROGRAM_ID.toBase58() || accounts[8] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58() || accounts[10] !== import_web396.SystemProgram.programId.toBase58()) {
+    if (accounts[7] !== b58(TOKEN_PROGRAM_ID) || accounts[8] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY) || accounts[10] !== b58(import_web396.SystemProgram.programId)) {
       throw new Error("p03_history_deposit_accounts_invalid");
     }
   } else if (profile.kind === "payment") {
-    if (accounts[3] !== import_web396.SystemProgram.programId.toBase58() || accounts[4] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58()) {
+    if (accounts[3] !== b58(import_web396.SystemProgram.programId) || accounts[4] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY)) {
       throw new Error("p03_history_payment_accounts_invalid");
     }
   } else {
-    if (accounts[7] !== TOKEN_PROGRAM_ID.toBase58() || accounts[8] !== import_web396.SystemProgram.programId.toBase58() || accounts[9] !== import_web396.SYSVAR_CLOCK_PUBKEY.toBase58() || accounts[6] !== vaultAuthorityAddress2(program, pool2).toBase58()) {
+    if (accounts[7] !== b58(TOKEN_PROGRAM_ID) || accounts[8] !== b58(import_web396.SystemProgram.programId) || accounts[9] !== b58(import_web396.SYSVAR_CLOCK_PUBKEY) || accounts[6] !== vaultAuthorityAddress3(program, pool2).toBase58()) {
       throw new Error("p03_history_exit_accounts_invalid");
     }
   }
@@ -54250,13 +54259,13 @@ function settlementAccountsByLegacyIndex(instruction, profile) {
 function validateCircuitBoundAccounts(instruction, profile, publicInputs, program, pool2, snapshot, settler) {
   const accounts = settlementAccountsByLegacyIndex(instruction, profile);
   if (profile.kind === "deposit") {
-    if (accounts[4] !== snapshot.mint.toBase58() || accounts[5] !== snapshot.vault.toBase58() || accounts[6] !== depositAuthorityAddress2(program, pool2, fieldHex(publicInputs[3])).toBase58()) {
+    if (accounts[4] !== b58(snapshot.mint) || accounts[5] !== b58(snapshot.vault) || accounts[6] !== depositAuthorityAddress3(program, pool2, fieldHex(publicInputs[3])).toBase58()) {
       throw new Error("p03_history_deposit_binding_invalid");
     }
-    const intent = import_web396.PublicKey.findProgramAddressSync(
+    const intent = memo(`di|${b58(program)}|${b58(pool2)}|${fieldHex(publicInputs[3])}`, () => import_web396.PublicKey.findProgramAddressSync(
       [Buffer.from("deposit-intent"), pool2.toBuffer(), Buffer.from(fieldHex(publicInputs[3]), "hex")],
       program
-    )[0].toBase58();
+    )[0].toBase58());
     if (accounts[9] !== intent) throw new Error("p03_history_deposit_intent_invalid");
     return;
   }
@@ -54264,7 +54273,7 @@ function validateCircuitBoundAccounts(instruction, profile, publicInputs, progra
     throw new Error("p03_history_payment_settler_invalid");
   }
   if (profile.kind === "withdraw" || profile.kind === "note-exit") {
-    if (accounts[4] !== snapshot.mint.toBase58() || accounts[5] !== snapshot.vault.toBase58()) {
+    if (accounts[4] !== b58(snapshot.mint) || accounts[5] !== b58(snapshot.vault)) {
       throw new Error("p03_history_exit_binding_invalid");
     }
     if (u160Commitment2(new import_web396.PublicKey(accounts[3]).toBytes()) !== publicInputs[4]) {
@@ -54375,7 +54384,7 @@ function base58Decode(value) {
   while (zeros < value.length && value[zeros] === "1") zeros += 1;
   return Uint8Array.from(Buffer.concat([Buffer.alloc(zeros), body]));
 }
-var import_web396, REPLAY_STORE_INDEXED, CLOSE_REPLAY_TREE_TAG, EXTEND_ANCHOR_RING_TAG, WIDEN_ANCHOR_RING_TAG, WIDE_ANCHOR_RING_POOL_BYTES, LINK_SUCCESSOR_TAG, IMPORT_REPLAY_LEAVES_TAG, SETTLE_MOVE_TAG, SWEEP_PREDECESSOR_VAULT_TAG, RELINK_SUCCESSOR_TAG, ROTATE_PAYMENT_SETTLER_TAG, IMPORT_A_LEAF_BYTES, IMPORT_MEMBERSHIP_BYTES, IMPORT_PRESENT_SHIFT, IMPORT_MAX_ENTRIES, MOVE_HEAD_BYTES, MOVE_INSERTED_VALUES, DEFAULT_KEY, FIELD_BYTES2, PRIMARY_PROOF_BYTES, SUBTREE_LEAVES, PAGE_SIZE, FIELD_MODULUS3, BPF_LOADER_UPGRADEABLE_PROGRAM_ID, SYSTEM_PROGRAM, TEST_EXECUTABLES, reviewedExecutables, isProgramDataIdentityError, ASSUMED_ORIGINAL_EXECUTABLE, AUTHENTICATED_HISTORY_REPORTS, HISTORY_ATTESTATIONS, hasExecutableEvidence, P03_FINALIZED_HISTORY_SOURCE_MODEL, P03_PROGRAMDATA_COVERAGE_SOURCE_MODEL, P03_RUN_RECOVER_UNAVAILABLE_FROM_CHAIN, PROFILES, P03_SETTLEMENT_TAGS, P03_INLINE_SETTLEMENT_TAGS, P03_PAYMENT_REPLAY_INDICES, NO_CONTEXTS, REFRESH_READ_BYTES, E1_TREE_HEADER_BYTES, HISTORY_FETCH_CONCURRENCY, HISTORY_BULK_TRANSACTIONS, HISTORY_BULK_ADDRESSES, TRANSIENT_RPC_ATTEMPTS, TRANSIENT_RPC_BASE_DELAY_MS, LAGGING_NODE_STEP_OF_BASE, LAGGING_NODE_MAX_RETRIES, LAGGING_NODE_FAST_RETRIES, LAGGING_NODE_SLOW_STEP_OF_BASE, LAGGING_NODE_RPC_CODES;
+var import_web396, b58Cache, b58, REPLAY_STORE_INDEXED, CLOSE_REPLAY_TREE_TAG, EXTEND_ANCHOR_RING_TAG, WIDEN_ANCHOR_RING_TAG, WIDE_ANCHOR_RING_POOL_BYTES, LINK_SUCCESSOR_TAG, IMPORT_REPLAY_LEAVES_TAG, SETTLE_MOVE_TAG, SWEEP_PREDECESSOR_VAULT_TAG, RELINK_SUCCESSOR_TAG, ROTATE_PAYMENT_SETTLER_TAG, IMPORT_A_LEAF_BYTES, IMPORT_MEMBERSHIP_BYTES, IMPORT_PRESENT_SHIFT, IMPORT_MAX_ENTRIES, MOVE_HEAD_BYTES, MOVE_INSERTED_VALUES, DEFAULT_KEY, FIELD_BYTES2, PRIMARY_PROOF_BYTES, SUBTREE_LEAVES, PAGE_SIZE, FIELD_MODULUS3, BPF_LOADER_UPGRADEABLE_PROGRAM_ID, SYSTEM_PROGRAM, TEST_EXECUTABLES, derivationMemo, memo, reviewedExecutables, isProgramDataIdentityError, ASSUMED_ORIGINAL_EXECUTABLE, AUTHENTICATED_HISTORY_REPORTS, HISTORY_ATTESTATIONS, hasExecutableEvidence, P03_FINALIZED_HISTORY_SOURCE_MODEL, P03_PROGRAMDATA_COVERAGE_SOURCE_MODEL, P03_RUN_RECOVER_UNAVAILABLE_FROM_CHAIN, PROFILES, P03_SETTLEMENT_TAGS, P03_INLINE_SETTLEMENT_TAGS, P03_PAYMENT_REPLAY_INDICES, NO_CONTEXTS, REFRESH_READ_BYTES, E1_TREE_HEADER_BYTES, HISTORY_FETCH_CONCURRENCY, HISTORY_BULK_TRANSACTIONS, HISTORY_BULK_ADDRESSES, TRANSIENT_RPC_ATTEMPTS, TRANSIENT_RPC_BASE_DELAY_MS, LAGGING_NODE_STEP_OF_BASE, LAGGING_NODE_MAX_RETRIES, LAGGING_NODE_FAST_RETRIES, LAGGING_NODE_SLOW_STEP_OF_BASE, LAGGING_NODE_RPC_CODES;
 var init_walk = __esm({
   "wallet/src/history/walk.mjs"() {
     "use strict";
@@ -54389,6 +54398,15 @@ var init_walk = __esm({
     init_compressedReplay();
     init_p03E1Tree();
     init_genericHistory();
+    b58Cache = /* @__PURE__ */ new WeakMap();
+    b58 = (key) => {
+      let text3 = b58Cache.get(key);
+      if (text3 === void 0) {
+        text3 = key.toBase58();
+        b58Cache.set(key, text3);
+      }
+      return text3;
+    };
     REPLAY_STORE_INDEXED = 2;
     CLOSE_REPLAY_TREE_TAG = 27;
     EXTEND_ANCHOR_RING_TAG = 29;
@@ -54415,8 +54433,17 @@ var init_walk = __esm({
     BPF_LOADER_UPGRADEABLE_PROGRAM_ID = new import_web396.PublicKey(
       "BPFLoaderUpgradeab1e11111111111111111111111"
     );
-    SYSTEM_PROGRAM = import_web396.SystemProgram.programId.toBase58();
+    SYSTEM_PROGRAM = b58(import_web396.SystemProgram.programId);
     TEST_EXECUTABLES = [];
+    derivationMemo = /* @__PURE__ */ new Map();
+    memo = (key, make) => {
+      let value = derivationMemo.get(key);
+      if (value === void 0) {
+        value = make();
+        derivationMemo.set(key, value);
+      }
+      return value;
+    };
     reviewedExecutables = () => [...p03ReviewedExecutables(), ...TEST_EXECUTABLES];
     isProgramDataIdentityError = (error) => /\bp03_history_programdata_(identity|deployment_slot)_invalid\b/.test(String(error?.message ?? ""));
     ASSUMED_ORIGINAL_EXECUTABLE = p03ReviewedExecutable(P03_COMPATIBLE_CODE.previous);
@@ -60082,11 +60109,11 @@ function openRecoveryCache(store, { programId, pool: pool2 }) {
       if (read.value.programId !== programId || read.value.pool !== pool2 || !Array.isArray(read.value.memos)) {
         throw new Error("recovery_cache_identity_mismatch");
       }
-      for (const memo of read.value.memos) {
-        if (typeof memo?.digest !== "string" || !/^[0-9a-f]{64}$/.test(memo.digest) || typeof memo.binding !== "string" || !Array.isArray(memo.outputs)) throw new Error("recovery_cache_value_invalid");
+      for (const memo2 of read.value.memos) {
+        if (typeof memo2?.digest !== "string" || !/^[0-9a-f]{64}$/.test(memo2.digest) || typeof memo2.binding !== "string" || !Array.isArray(memo2.outputs)) throw new Error("recovery_cache_value_invalid");
         entries.set(
-          entryKey(memo.digest, memo.binding),
-          { digest: memo.digest, binding: memo.binding, outputs: memo.outputs.map(decodeOutput) }
+          entryKey(memo2.digest, memo2.binding),
+          { digest: memo2.digest, binding: memo2.binding, outputs: memo2.outputs.map(decodeOutput) }
         );
       }
     } catch {
@@ -60672,8 +60699,7 @@ function prefetchRecoveryMemos({ store, finalizedHistory: finalizedHistory2, ser
     const cache = openRecoveryCache(store, { programId: new import_web3102.PublicKey(programId).toBase58(), pool: new import_web3102.PublicKey(store.state.pool).toBase58() });
     const pending = finalizedHistory2.contexts.filter((context) => !cache?.lookup(hexOf2(context.memoDigest), context)).map((context) => hexOf2(context.memoDigest));
     if (pending.length === 0) return;
-    createMemoReader(serviceUrl2, { fetchImpl: deps.fetchImpl ?? fetch, notice: () => {
-    } }).prefetch(pending);
+    createMemoReader(serviceUrl2, { fetchImpl: deps.fetchImpl ?? fetch, ...deps.notice ? { notice: deps.notice } : {} }).prefetch(pending);
     warmMemoDecryptPool();
   } catch {
   }
@@ -72252,18 +72278,39 @@ function preflightSpend({ account: account2, notes, accountPath, notePaths, amou
     changeAtomic: (inputTotal - amount).toString()
   });
 }
-function respendNoteSubset({ accounts, notes, outputIndex, amountAtomic }) {
+function respendNoteSubset({ accounts, notes, outputIndex, amountAtomic, refusedInput }) {
   const out = BigInt(outputIndex);
   const want = BigInt(amountAtomic);
   const value = (taken) => taken.reduce((sum2, note) => sum2 + BigInt(note.note.b), 0n);
+  const sets = (fits) => {
+    const byLeaf = (left, right) => {
+      const a = BigInt(left.leafIndex);
+      const b = BigInt(right.leafIndex);
+      return a < b ? -1 : a > b ? 1 : 0;
+    };
+    const byValue = (left, right) => {
+      const a = BigInt(left.note.b);
+      const b = BigInt(right.note.b);
+      return a > b ? -1 : a < b ? 1 : byLeaf(left, right);
+    };
+    const plain = [[...fits].sort(byLeaf).slice(0, MAX_RESPEND_NOTES), [...fits].sort(byValue).slice(0, MAX_RESPEND_NOTES)];
+    const refused = refusedInput === void 0 ? [] : fits.filter(refusedInput).sort(byLeaf).slice(0, MAX_RESPEND_NOTES);
+    if (refused.length === 0) return { refused: [], plain };
+    const rest = fits.filter((note) => !refused.includes(note));
+    const fill = (order) => [...refused, ...[...rest].sort(order).slice(0, MAX_RESPEND_NOTES - refused.length)];
+    return { refused: [fill(byLeaf), fill(byValue)], plain };
+  };
+  const candidates = [];
   for (const account2 of accounts) {
     const accountI = BigInt(account2.account.i);
     if (out <= accountI || account2.leafIndex !== void 0 && account2.leafIndex !== null && BigInt(account2.leafIndex) >= out) continue;
-    const fits = notes.filter((note) => BigInt(note.leafIndex) >= accountI && BigInt(note.leafIndex) < out);
-    const oldest = [...fits].sort((left, right) => BigInt(left.leafIndex) < BigInt(right.leafIndex) ? -1 : 1).slice(0, MAX_RESPEND_NOTES);
-    const largest = [...fits].sort((left, right) => BigInt(left.note.b) > BigInt(right.note.b) ? -1 : 1).slice(0, MAX_RESPEND_NOTES);
-    for (const taken of [oldest, largest]) {
-      if (BigInt(account2.account.b) + value(taken) >= want) return Object.freeze(taken);
+    candidates.push({ account: account2, ...sets(notes.filter((note) => BigInt(note.leafIndex) >= accountI && BigInt(note.leafIndex) < out)) });
+  }
+  for (const pass of ["refused", "plain"]) {
+    for (const candidate of candidates) {
+      for (const taken of candidate[pass]) {
+        if (BigInt(candidate.account.account.b) + value(taken) >= want) return Object.freeze(taken);
+      }
     }
   }
   return void 0;
@@ -72470,6 +72517,15 @@ async function prepareRecoveredPayment({
   const exitReserved = exitReservedNoteCommitments(store);
   const notes = unspentNotes.filter((entry) => !heldByPending(entry) && !exitReserved.has(BigInt(entry.commitment).toString()));
   const held = accounts.length !== unspentAccounts.length || unspentNotes.filter((entry) => !exitReserved.has(BigInt(entry.commitment).toString())).length !== notes.length;
+  let refusedValues;
+  const refusedInput = typeof deps.refusedReplayValues !== "function" ? void 0 : (entry) => {
+    try {
+      refusedValues ??= deps.refusedReplayValues();
+      return refusedValues instanceof Set && refusedValues.size > 0 && entry.leafIndex !== void 0 && entry.leafIndex !== null && refusedValues.has(noteNullifier2(poolDomain, entry.commitment, viewing.eta, entry.leafIndex).toString());
+    } catch {
+      return false;
+    }
+  };
   const wantedNotes = selection?.noteCommitments !== void 0 ? selection.noteCommitments.map((commitment) => {
     const wanted = BigInt(commitment);
     const found = notes.find((entry) => BigInt(entry.commitment) === wanted);
@@ -72481,7 +72537,8 @@ async function prepareRecoveredPayment({
     accounts: selection?.accountCommitment === void 0 ? accounts : accounts.filter((entry) => BigInt(entry.commitment) === BigInt(selection.accountCommitment)),
     notes,
     outputIndex: anchor.index,
-    amountAtomic: witnessQuote.amountAtomic
+    amountAtomic: witnessQuote.amountAtomic,
+    refusedInput
   }) ?? notes : notes;
   const accountFile = selection?.accountFile;
   let account2;
@@ -72539,11 +72596,12 @@ async function prepareRecoveredPayment({
       const notesValue = wantedNotes.reduce((sum2, note) => sum2 + BigInt(note.note.b), 0n);
       const pays = (candidate) => candidate !== void 0 && BigInt(candidate.account.b) + notesValue >= BigInt(witnessQuote.amountAtomic);
       if (held && !pays(underAnchor)) heldInputsWait();
-      if (!pays(underAnchor) && pays(selectSpendAccount({
+      const laterNotes = wantedNotes.length > MAX_RESPEND_NOTES && selection?.noteCommitments === void 0 ? respendNoteSubset({ accounts, notes, outputIndex: history.finalizedPoolSnapshot.currentIndex, amountAtomic: witnessQuote.amountAtomic }) : void 0;
+      if (!pays(underAnchor) && (laterNotes !== void 0 || pays(selectSpendAccount({
         accounts,
         notes: wantedNotes,
         outputIndex: history.finalizedPoolSnapshot.currentIndex
-      }).account)) {
+      }).account))) {
         throw new Error("p03_quote_anchor_older_than_note_wait_next_epoch");
       }
       account2 = underAnchor ?? accounts[0];
@@ -91094,6 +91152,9 @@ async function finalizedPocketBalance({ connection, entry, state }) {
   } catch (error) {
     fail17("pocket_balance_unreadable", { cause: error });
   }
+  return pocketBalanceOf(info, entry, state);
+}
+function pocketBalanceOf(info, entry, state) {
   if (info === null) return 0n;
   let account2;
   try {
@@ -91699,14 +91760,20 @@ function floatOffer({ paymentRequired, store, config }) {
   return { requirement, priceAtomic, feeAtomic, paidAtomic: (BigInt(priceAtomic) + BigInt(feeAtomic)).toString(), config };
 }
 async function ownRefundAddress(store, connection) {
-  const pool2 = await readPoolState2(connection, new import_web3109.PublicKey(store.state.pool));
-  if (!pool2?.poolDomain) fail18("p03_float_pool_unreadable_retry_same_request");
-  const generator2 = JSON.parse(readFileSync(fileURLToPath9(new URL(
+  const poolKey = `${store.state.network}:${store.state.pool}`;
+  let poolDomain = poolDomains.get(poolKey);
+  if (poolDomain === void 0) {
+    const pool2 = await readPoolState2(connection, new import_web3109.PublicKey(store.state.pool));
+    if (!pool2?.poolDomain) fail18("p03_float_pool_unreadable_retry_same_request");
+    poolDomain = BigInt(pool2.poolDomain);
+    poolDomains.set(poolKey, poolDomain);
+  }
+  payerGenerator ??= JSON.parse(readFileSync(fileURLToPath9(new URL(
     "../../vendor/shielded-x402-model/vectors/rust-vectors.json",
     new URL("__bundled_source__/wallet/src/pay/floatPay.mjs", import.meta.url).href
   )), "utf8")).payerKeys.generator;
-  const { eta } = deriveWalletViewingAuthority2({ seedBytes: Uint8Array.from(Buffer.from(store.state.seedHex, "hex")), generator: generator2 });
-  return deriveShieldedSolanaP03Recipient({ eta, poolDomain: BigInt(pool2.poolDomain), resourceNonce: randomBytes11(32) }).payTo;
+  const { eta } = deriveWalletViewingAuthority2({ seedBytes: Uint8Array.from(Buffer.from(store.state.seedHex, "hex")), generator: payerGenerator });
+  return deriveShieldedSolanaP03Recipient({ eta, poolDomain, resourceNonce: randomBytes11(32) }).payTo;
 }
 function canonicalBody({ requestId, resourceUrl, requirement, refundTo }) {
   const opaque = `w-${hash8(`carbon-road/float-request/v1|${requestId}`).slice(0, 40)}`;
@@ -92035,7 +92102,7 @@ function paidResult(record, replayed) {
     float: { floatId: record.floatId }
   };
 }
-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, CONFIG_CACHE_MS, DECIMAL3, POSITIVE, PENDING_CODES, hash8, fail18, floatPaymentWalName, configCache, 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, CONFIG_CACHE_MS, DECIMAL3, POSITIVE, PENDING_CODES, hash8, fail18, floatPaymentWalName, configCache, poolDomains, payerGenerator, plainText;
 var init_floatPay = __esm({
   "wallet/src/pay/floatPay.mjs"() {
     "use strict";
@@ -92074,6 +92141,7 @@ var init_floatPay = __esm({
     };
     floatPaymentWalName = (requestKey) => `${FLOAT_PAYMENT_WAL_PREFIX}${requestKey}`;
     configCache = /* @__PURE__ */ new Map();
+    poolDomains = /* @__PURE__ */ new Map();
     plainText = (value) => value.replace(/[^ -~]+/g, " ").trim().slice(0, 300);
   }
 });
@@ -93029,7 +93097,23 @@ async function payResourceOnce({
           deps: {
             ...deps,
             quoteMarginSeconds: QUOTE_MARGIN_SECONDS,
-            ...held.size > 0 ? { reservedReplayValues: new Set(held) } : {}
+            ...held.size > 0 ? { reservedReplayValues: new Set(held) } : {},
+            // The inputs of this wallet's open refused payments (the records
+            // assertRefusedPaymentsCannotLand reads), asked only by a default spend
+            // of more than 3 notes: its 3-note set then spends one (steps, 2026-10-15).
+            refusedReplayValues: () => {
+              const values = /* @__PURE__ */ new Set();
+              for (const name of store.listWal()) {
+                if (!name.startsWith("resource-payment-") || name === walName2) continue;
+                const refused = readPriorPayment(store, name);
+                if (refused === FINAL_UNCHANGED || refused?.state !== "cancelled" || !refused.refused || refused.refused.resolved || refused.paymentHeader === void 0) continue;
+                try {
+                  for (const value of replayValuesOf(refused.paymentHeader)) values.add(value);
+                } catch {
+                }
+              }
+              return values;
+            }
           },
           walName: `resource-proof-${requestKey}`,
           quote: {
@@ -95823,8 +95907,8 @@ var init_ShieldedSolanaP03MemoScanner = __esm({
           const record = parsed.memoBundle.subarray(offset, offset + MEMO_RECORD_BYTES);
           const candidate = this.#candidateRecord(record, slot3, context);
           if (candidate === void 0) continue;
-          const memo = this.#recoverRecord(record, slot3, context, quoteFields, candidate);
-          if (memo !== void 0) recovered.push(memo);
+          const memo2 = this.#recoverRecord(record, slot3, context, quoteFields, candidate);
+          if (memo2 !== void 0) recovered.push(memo2);
         }
         if (!quoteBindingValid || recovered.length !== 1) throw new Error("invalid");
         const merchant = recovered[0];
@@ -113239,8 +113323,8 @@ function poolDomainOf(programId, pool2) {
   if (d === 0n) throw new Error("zero pool domain");
   return d;
 }
-function memoDigest(memo) {
-  const d = sha25611(new TextEncoder().encode(memo));
+function memoDigest(memo2) {
+  const d = sha25611(new TextEncoder().encode(memo2));
   return { memoHi: beInt(d.slice(0, 16)), memoLo: beInt(d.slice(16, 32)) };
 }
 var FR, DEPOSIT_CT_DOMAIN, EXIT_CT_DOMAIN, EXIT_CT_AUTH_DOMAIN, BIND_DOMAIN, BIND_TAG, POOL_DOMAIN_TAG, RELATION, beInt, DEPOSIT_CT_PUBLIC, EXIT_CT_PUBLIC, TREE_APPEND_PUBLIC, depositContext, exitContext, exitAuthorizationFields, TAG, POOL_MAGIC, POOL_LEN, RING_LEN, MAX_PENDING_CREDITS, DEPOSIT_DATA_LEN, EXIT_DATA_LEN, ESCAPE_MAGIC, FXREQ_MAGIC, ESCAPE_LEN, FXREQ_LEN, FORCED_DATA_LEN, COMPLETE_DATA_LEN, ESCAPE_N_MAX, ESCAPE_MODE, ESCAPE_MAX_TIMER_S, ESCAPE_MAX_SLACK_S, ESCAPE_TRIGGER, ERR;
@@ -114111,7 +114195,7 @@ var init_witness2 = __esm({
     WITNESS_SCHEMA = "carbon-shielded-x402/ctvault-v0b-witness/v1";
     dec = (x) => x.toString();
     acct = (a) => ({ d: dec(a.d), pDX: dec(a.pDX), i: dec(a.i), b: dec(a.b) });
-    memoDigestHex2 = (memo) => `0x${createHash33("sha256").update(memo, "utf8").digest("hex")}`;
+    memoDigestHex2 = (memo2) => `0x${createHash33("sha256").update(memo2, "utf8").digest("hex")}`;
     bindFields = (b) => ({
       value: dec(b.v),
       blinding: dec(b.k),
@@ -117511,14 +117595,14 @@ function proveConfidentialAmount({ transactions, sourceSecretKey, amount, nonce
     const A2b = A2.toBytes();
     const c = challenge2({ nonce: nonce32, half: name, sourcePubkey: context.sourcePubkey, sourceHandle: part.sourceHandle, R: Rb, A1: A1b, A2: A2b, commitment: part.commitment });
     const z = modL2(k + c * s4);
-    out[name] = { R: b58(Rb), A1: b58(A1b), A2: b58(A2b), z: b58(bigTo32LE2(z)) };
+    out[name] = { R: b582(Rb), A1: b582(A1b), A2: b582(A2b), z: b582(bigTo32LE2(z)) };
   }
   for (const name of ["lo", "hi"]) {
     if (!verifyHalf(name, nonce32, context.sourcePubkey, context[name], out[name], halves[name])) refuse13(`the ${name} amount proof does not verify`);
   }
   return out;
 }
-var Point4, L3, G2, H2, AMOUNT_PROOF_DOMAIN, AMOUNT_PROOF_VERSION, AMOUNT_PROOF_LAYOUT_CODE, ZK_PROOF_PROGRAM2, TOKEN_2022_PROGRAM, VALIDITY_TAG, VALIDITY_DATA_BYTES, MAX_AMOUNT_EXCLUSIVE, refuse13, modL2, leToBig2, bigTo32LE2, mulPublic, mulSecret, pointOf, b58, unb58;
+var Point4, L3, G2, H2, AMOUNT_PROOF_DOMAIN, AMOUNT_PROOF_VERSION, AMOUNT_PROOF_LAYOUT_CODE, ZK_PROOF_PROGRAM2, TOKEN_2022_PROGRAM, VALIDITY_TAG, VALIDITY_DATA_BYTES, MAX_AMOUNT_EXCLUSIVE, refuse13, modL2, leToBig2, bigTo32LE2, mulPublic, mulSecret, pointOf, b582, unb58;
 var init_amountProof = __esm({
   "wallet/src/laneb/amountProof.mjs"() {
     "use strict";
@@ -117571,7 +117655,7 @@ var init_amountProof = __esm({
         return refuse13(`the plan's ${what} is not a valid ristretto255 point`);
       }
     };
-    b58 = (bytes2) => kit.getBase58Decoder().decode(bytes2);
+    b582 = (bytes2) => kit.getBase58Decoder().decode(bytes2);
     unb58 = (text3) => Uint8Array.from(kit.getAddressEncoder().encode(text3));
   }
 });
@@ -118918,13 +119002,13 @@ function checkConfig(value) {
   if (value.schema !== CONFIG_SCHEMA) throw invalid3(`has no schema ${CONFIG_SCHEMA}`);
   for (const name of ["pool", "program", "asset"]) if (!isPubkey(value[name])) throw invalid3(`${name} is not a base58 Solana address`);
   if (typeof value.network !== "string" || !/^solana:[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(value.network)) throw invalid3("network is not a solana: CAIP-2 id");
-  let memo;
+  let memo2;
   try {
-    memo = new URL(value.memoService);
+    memo2 = new URL(value.memoService);
   } catch {
-    memo = void 0;
+    memo2 = void 0;
   }
-  if (!memo || memo.protocol !== "https:") throw invalid3("memoService is not an https origin");
+  if (!memo2 || memo2.protocol !== "https:") throw invalid3("memoService is not an https origin");
   for (const name of ["proofTools", "exitProofTools", "profile", "passphraseFile", "recoveryFile"]) {
     if (value[name] !== void 0 && (typeof value[name] !== "string" || !isAbsolute6(value[name]))) throw invalid3(`${name} is not an absolute path`);
   }
@@ -119350,8 +119434,8 @@ function channelListsSet(body, { facilitator, pool: pool2, dir, sumsSha256 }) {
 // wallet/src/setup/proofTools.mjs
 var PINNED_PROOF_TOOLS = Object.freeze({
   [DEFAULT_FACILITATOR_ORIGIN]: Object.freeze({
-    dir: "78c71143",
-    sumsSha256: "78c71143ecedf22096fdc1901eda5160e29c141f6961cce935b92e714ff85bd9"
+    dir: "8d8db6a0",
+    sumsSha256: "8d8db6a0ef847031d01a2b65608e4b456c231c0d348f893e01eba4ad908907f3"
   })
 });
 var UPDATE_NEXT = "update the wallet: npx -y shinjuku-shielded@latest setup";