ckb-session-kit 1.0.0 → 2.0.0

package/dist/onchain.js

@@ -1,13 +1,33 @@
 import { ccc } from "@ckb-ccc/core";
 import { relativeBlocksSince, sessionLockCellDep, sessionLockScript, } from "./lock.js";
+import { assertCurrentDeployment } from "./deployment.js";
 import { checkRequest, isActive, SessionPolicyError } from "./session.js";
 import { ScopeError, sessionSigner } from "./transfer.js";
 export class SessionBalanceError extends Error {
-    constructor(message) {
+    reason;
+    constructor(message, reason) {
         super(message);
         this.name = "SessionBalanceError";
+        if (reason)
+            this.reason = reason;
     }
 }
+/** The warnings for a session opened with these terms. */
+function sessionWarnings(minInterval, recipient) {
+    if (minInterval > 1n)
+        return [];
+    return [
+        {
+            code: "no-rate-limit",
+            message: (minInterval === 0n
+                ? "minInterval is 0: no rate limit. Each spend is held to maxPerTx, but spends can repeat every block "
+                : "minInterval is 1: almost no rate limit. Each spend is held to maxPerTx, but spends can repeat one block apart ") +
+                "until the session is empty, so a leaked key can drain the whole budget" +
+                (recipient ? " (with a recipient too: the fee is not an output, so up to maxPerTx can go to the miner each time)" : "") +
+                ". Set minInterval to limit how often the key can spend.",
+        },
+    ];
+}
 const KEY_CELL_MIN = 61n * 100000000n;
 /** What the key cell keeps above the cell it returns to the owner as, for fees. */
 const FEE_MARGIN = 1n * 100000000n;
@@ -20,11 +40,28 @@ export function keyCellFloor(ownerLock) {
     const ownerCell = ccc.CellOutput.from({ lock: ownerLock }, "0x").capacity;
     return ownerCell > KEY_CELL_MIN ? ownerCell : KEY_CELL_MIN;
 }
+/**
+ * A send failed and the node could not then be asked whether it has the
+ * transaction (review W6 L4): it may have been taken and committed. Never
+ * retried; `txHash` is the transaction to look for, and `cause` the send's own
+ * error. Its message never repeats the cause's, so nothing reads it as a
+ * refusal for a spent input.
+ */
+export class SendOutcomeUnknownError extends Error {
+    txHash;
+    constructor(txHash, cause) {
+        super(`the send of ${txHash} failed and its status could not be looked up: it may still commit; check it before paying again`, { cause });
+        this.name = "SendOutcomeUnknownError";
+        this.txHash = txHash;
+    }
+}
 /**
  * Signs `tx`, hands its final hash to `beforeSend`, then sends it. The hash is
  * known before anything leaves, so a caller can record the payment or the key
  * against it first. If the send throws but the node did take the transaction (a
- * timeout on the reply, say), the hash is returned all the same.
+ * timeout on the reply, say), the hash is returned all the same. If the send
+ * throws and the status lookup fails too, a `SendOutcomeUnknownError` is thrown
+ * instead of the send's error, which `rebuildOnDeadInputs` never retries.
  */
 export async function signAndSend(signer, tx, beforeSend) {
     const signed = await signer.signTransaction(tx);
@@ -34,7 +71,14 @@ export async function signAndSend(signer, tx, beforeSend) {
         return await signer.client.sendTransaction(signed);
     }
     catch (e) {
-        const known = await signer.client.getTransaction(hash).catch(() => undefined);
+        let known;
+        try {
+            known = await signer.client.getTransaction(hash);
+        }
+        catch {
+            // A lost reply, then a fallback node answering Dead because this one committed: not a refusal.
+            throw new SendOutcomeUnknownError(hash, e);
+        }
         if (known && ["pending", "proposed", "committed"].includes(known.status))
             return hash;
         throw e;
@@ -68,6 +112,175 @@ export const plainTokenCell = (cell, type) => cell.cellOutput.type?.eq(type) ===
 export async function sessionLockOf(session, client, deployment, binding) {
     return sessionLockScript(deployment, params(session, await keyLockOf(session, client), binding));
 }
+const U128_MAX = (1n << 128n) - 1n;
+/** The most inputs a creating transaction may have for its origin to be looked up (each is an RPC call). */
+const MAX_ORIGIN_INPUTS = 32;
+/**
+ * Whether a session-lock cell was created by a transaction its owner or its
+ * session key took part in (an input under the lock hash in args bytes 0..32 or
+ * 32..64). Nobody else can sign for those, so a planted cell never passes.
+ */
+export async function ownOrigin(client, cell) {
+    const args = ccc.bytesFrom(cell.cellOutput.lock.args);
+    const own = [ccc.hexFrom(args.slice(0, 32)), ccc.hexFrom(args.slice(32, 64))];
+    const inputs = (await client.getTransaction(cell.outPoint.txHash))?.transaction.inputs ?? [];
+    if (!inputs.length || inputs.length > MAX_ORIGIN_INPUTS)
+        return false;
+    const spent = await Promise.all(inputs.map((i) => client.getCell(i.previousOutput)));
+    return spent.some((c) => !!c && own.includes(c.cellOutput.lock.hash()));
+}
+/**
+ * `cells` less those whose token amounts would overflow a u128, per token type.
+ * Anyone can plant a cell holding 2^128-1 units of a free token under a session
+ * lock, and xUDT refuses a transaction whose inputs overflow, so taking every
+ * cell would block spends, closes, recovery, charges and cancels (review, 27 and
+ * 28 Oct). Which cells stay does not depend on indexer order: cells of the
+ * owner's or the key's own making first, then the smallest amounts. Without an
+ * overflow nothing is looked up and every cell stays, in order.
+ */
+export async function withinU128(client, cells) {
+    const units = (c) => c.cellOutput.type && ccc.bytesFrom(c.outputData).length >= 16 ? tokenAmount(c.outputData) : 0n;
+    const byType = new Map();
+    for (const c of cells) {
+        if (!units(c))
+            continue;
+        const key = c.cellOutput.type.hash();
+        byType.set(key, [...(byType.get(key) ?? []), c]);
+    }
+    const dropped = new Set();
+    for (const group of byType.values()) {
+        if (group.reduce((s, c) => s + units(c), 0n) <= U128_MAX)
+            continue;
+        const own = await Promise.all(group.map((c) => ownOrigin(client, c)));
+        const ranked = group
+            .map((cell, i) => ({ cell, own: own[i], units: units(cell) }))
+            .sort((a, b) => (a.own !== b.own ? (a.own ? -1 : 1) : a.units < b.units ? -1 : a.units > b.units ? 1 : 0));
+        let sum = 0n;
+        for (const r of ranked) {
+            if (sum + r.units > U128_MAX)
+                dropped.add(r.cell);
+            else
+                sum += r.units;
+        }
+    }
+    return dropped.size ? cells.filter((c) => !dropped.has(c)) : cells;
+}
+/** One of `cells` at random: payers or chargers at once then rarely compete for the same cell. */
+export const randomPick = (cells) => cells[Math.floor(Math.random() * cells.length)];
+/** Whether `lock` is this network's anyone-can-pay lock (RFC 0026). */
+export async function isAnyoneCanPay(lock, client) {
+    const acp = await client.getKnownScript(ccc.KnownScript.AnyoneCanPay);
+    return lock.codeHash === acp.codeHash && lock.hashType === acp.hashType;
+}
+/** The most cells of a recipient read when picking one to top up: any of them will do. */
+export const MAX_PAYOUT_CELLS = 64;
+/** The most payout cells a pick asks the node about (`get_live_cell` with the pool), all at once. */
+export const MAX_POOL_CHECKS = 4;
+const outPointKey = (op) => ccc.hexFrom(ccc.OutPoint.from(op).toBytes());
+/** The out points CCC's client cache lists as live under `lock`: outputs of transactions this client sent. */
+async function cachedOutPoints(client, lock) {
+    const cached = new Set();
+    if (!client.cache)
+        return cached;
+    for await (const c of client.cache.findCells({ script: lock, scriptType: "lock", scriptSearchMode: "exact", withData: true })) {
+        cached.add(outPointKey(c.outPoint));
+    }
+    return cached;
+}
+function shuffled(xs) {
+    const a = [...xs];
+    for (let i = a.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [a[i], a[j]] = [a[j], a[i]];
+    }
+    return a;
+}
+const payoutBusy = () => new SessionBalanceError("every payout cell is being spent by another payment in the node's pool: try again after a block, " +
+    "or give the recipient more cells (createPayoutCells)", "payout-busy");
+/**
+ * Which of `cells` (the recipient's anyone-can-pay cells) to top up, so payers at
+ * the same moment rarely take the same one (mentor review, 2 Nov):
+ *
+ * - confirmed cells first (listed by the indexer), then this client's own
+ *   outputs still pending (only CCC's cache lists them), each group shuffled;
+ * - `avoid` (out points a node rejection named as spent) left out;
+ * - the first `MAX_POOL_CHECKS` asked at once whether a transaction in the
+ *   node's pool spends them (`get_live_cell` with `include_tx_pool`: a cell a
+ *   pool transaction consumes is dead); the first free one is taken.
+ *
+ * If the node cannot be asked, an unchecked cell is taken (a rejected send is
+ * retried). If every cell checked is spent in the pool, an unchecked one is taken
+ * if any is left; otherwise a `SessionBalanceError` "payout-busy" is thrown and
+ * nothing is sent. Undefined when `cells` is empty.
+ */
+export async function pickPayoutCell(client, lock, cells, avoid = new Set()) {
+    if (!cells.length)
+        return undefined;
+    const usable = cells.filter((c) => !avoid.has(outPointKey(c.outPoint)));
+    if (!usable.length)
+        throw payoutBusy();
+    const cached = await cachedOutPoints(client, lock);
+    const isCached = (c) => cached.has(outPointKey(c.outPoint));
+    const order = [...shuffled(usable.filter((c) => !isCached(c))), ...shuffled(usable.filter(isCached))];
+    const checked = order.slice(0, MAX_POOL_CHECKS);
+    const states = await Promise.all(checked.map(async (c) => {
+        try {
+            return (await client.getCellLive(c.outPoint, false, true)) ? "free" : "taken";
+        }
+        catch {
+            return "unknown"; // the node cannot be asked
+        }
+    }));
+    const first = (state) => checked[states.indexOf(state)];
+    const picked = first("free") ?? first("unknown") ?? randomPick(order.slice(MAX_POOL_CHECKS));
+    if (!picked)
+        throw payoutBusy();
+    return picked;
+}
+/**
+ * Plain cells under the recipient's `lock` (with `token`, cells holding exactly
+ * that token), at most `MAX_PAYOUT_CELLS` of them from the first
+ * `4 * MAX_PAYOUT_CELLS` listed: anyone can create cells under any lock. The
+ * indexer lists only cells of that kind (no type and no data; or exactly the
+ * token, with a 16-byte amount), so cells of any other kind planted under an
+ * anyone-can-pay `lock` never push the real ones out of reach (review W6 L5).
+ */
+async function payoutCells(client, lock, token) {
+    const cells = [];
+    let seen = 0;
+    const filter = token
+        ? { script: token, scriptLenRange: [token.occupiedSize, token.occupiedSize + 1], outputDataLenRange: [16, 17] }
+        : { scriptLenRange: [0, 1], outputDataLenRange: [0, 1] };
+    for await (const cell of client.findCells({ script: lock, scriptType: "lock", scriptSearchMode: "exact", filter, withData: true })) {
+        if (++seen > 4 * MAX_PAYOUT_CELLS || cells.length >= MAX_PAYOUT_CELLS)
+            break;
+        if (token ? plainTokenCell(cell, token) : !cell.cellOutput.type && cell.outputData === "0x")
+            cells.push(cell);
+    }
+    return withoutDeadCached(client, lock, cells);
+}
+/**
+ * Tops up one cell under the anyone-can-pay `lock` in `tx`: one input, and one
+ * output holding `ckb` shannons more, or with `token`, `units` more of it in a
+ * cell of that token. The cell is chosen by `pickPayoutCell`, never one in
+ * `avoid`. Returns the cell, or undefined when `lock` has none to add to.
+ */
+export async function addTopUp(tx, client, lock, add, avoid) {
+    const { token } = add;
+    const cells = await payoutCells(client, lock, token);
+    // A cell the payment would take past a u128 of tokens cannot be topped up (xUDT refuses it).
+    const room = token ? cells.filter((c) => tokenAmount(c.outputData) + (add.units ?? 0n) <= U128_MAX) : cells;
+    if (cells.length && !room.length) {
+        throw new SessionBalanceError("every token cell of the recipient would hold over 2^128 - 1 units after this payment", "no-payout-cell");
+    }
+    const target = await pickPayoutCell(client, lock, room, avoid);
+    if (!target)
+        return undefined;
+    tx.inputs.push(ccc.CellInput.from({ previousOutput: target.outPoint }));
+    tx.addOutput({ lock, type: target.cellOutput.type, capacity: target.cellOutput.capacity + (add.ckb ?? 0n) }, token ? tokenData(tokenAmount(target.outputData) + (add.units ?? 0n)) : "0x");
+    await tx.addCellDepsOfKnownScripts(client, ccc.KnownScript.AnyoneCanPay, ...(token ? [ccc.KnownScript.XUdt] : []));
+    return target;
+}
 /** Plain cells under `lock`; with `token`, also cells holding exactly that token. */
 export async function collect(client, lock, token) {
     const cells = [];
@@ -75,13 +288,131 @@ export async function collect(client, lock, token) {
         if ((!cell.cellOutput.type && cell.outputData === "0x") || (token && plainTokenCell(cell, token)))
             cells.push(cell);
     }
-    return cells;
+    return withoutDeadCached(client, lock, cells);
+}
+/**
+ * `cells` (found under `lock`) less those only CCC's client cache vouches for
+ * that are gone. The cache lists the outputs of every transaction this client
+ * sent as live, ahead of the indexer's cells, and never drops them: once another
+ * tab, device or server instance spends them, every transaction built here on
+ * them would be rejected until a reload (audit, 31 Oct). A cached cell is kept
+ * while the transaction that made it is pending or proposed (a chain of
+ * payments faster than the indexer needs it), or once committed while the node
+ * says it is still live; it is dropped once the node no longer knows that
+ * transaction, or says the cell is spent. When the node cannot be asked, it is kept.
+ */
+export async function withoutDeadCached(client, lock, cells) {
+    if (!cells.length || !client.cache)
+        return cells;
+    const cached = await cachedOutPoints(client, lock);
+    if (!cached.size)
+        return cells;
+    const keep = await Promise.all(cells.map(async (c) => {
+        if (!cached.has(ccc.hexFrom(c.outPoint.toBytes())))
+            return true;
+        try {
+            const status = (await client.getTransactionNoCache(c.outPoint.txHash))?.status;
+            if (status === "pending" || status === "proposed")
+                return true;
+            if (status !== "committed")
+                return false;
+            return !!(await client.getCellLive(c.outPoint, false, false));
+        }
+        catch {
+            return true; // the node cannot be asked: a dead one is rejected, then rebuilt (rebuildOnDeadInputs)
+        }
+    }));
+    return cells.filter((_, i) => keep[i]);
+}
+/** Whether a send was rejected because an input is spent or unknown to the node. */
+export function deadInputs(e) {
+    if (e instanceof SendOutcomeUnknownError)
+        return false;
+    if (e instanceof ccc.ErrorClientResolveUnknown)
+        return true;
+    const text = e instanceof ccc.ErrorClientBase ? `${e.message} ${e.data}` : e instanceof Error ? e.message : String(e);
+    return /\b(Dead|Unknown)\(OutPoint\(/.test(text);
+}
+const errorText = (e) => e instanceof ccc.ErrorClientBase ? `${e.message} ${e.data}` : e instanceof Error ? e.message : String(e);
+/**
+ * Whether a send was rejected because an input is already spent by a
+ * transaction in the node's pool, on a node with replace-by-fee on: CKB then
+ * runs its RBF checks instead of answering `Dead`, and refuses the newcomer
+ * (`PoolRejectedRBF`, -1111) unless it pays enough more to replace the other.
+ */
+export function poolConflict(e) {
+    if (e instanceof SendOutcomeUnknownError)
+        return false;
+    if (e instanceof ccc.ErrorClientRBFRejected)
+        return true;
+    if (e instanceof ccc.ErrorClientBase && e.code === -1111)
+        return true;
+    return /\b(RBFRejected|PoolRejectedRBF)\b/.test(errorText(e));
+}
+/** The out point a `Dead` or `Unknown` rejection names (as `outPointKey`), if any. */
+function rejectedOutPoint(e) {
+    if (e instanceof ccc.ErrorClientResolveUnknown)
+        return outPointKey(e.outPoint);
+    const hex = /\b(?:Dead|Unknown)\(OutPoint\((0x[0-9a-fA-F]+)\)/.exec(errorText(e))?.[1];
+    if (!hex)
+        return undefined;
+    try {
+        return outPointKey(ccc.OutPoint.fromBytes(hex));
+    }
+    catch {
+        return undefined;
+    }
+}
+export const DEFAULT_RETRY = { attempts: 3, delayMs: 1000 };
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+/**
+ * Runs `build` (which builds and sends a transaction). If the node definitely
+ * refused it because an input was already spent (`Dead`, `Unknown`, or an RBF
+ * refusal for a conflict in its pool), or `build` sent nothing because every
+ * payout cell was busy ("payout-busy"), clears the client's cache, waits, and
+ * runs it again, up to `retry.attempts` in all (audit, 31 Oct; mentor review,
+ * 2 Nov). `build` is given the out points rejections named, so a payout cell
+ * the node called spent is not picked again. The wait is `retry.delayMs`,
+ * doubling each time, times a random 0.5 to 1.5, so payers that collided do
+ * not retry in step.
+ *
+ * Any other error is thrown at once. That includes a send whose outcome is
+ * unknown (a timeout, a lost reply): `signAndSend` returns the hash when the
+ * node did take the transaction, and otherwise throws the send's own error,
+ * which is never retried, so nothing is ever paid twice. When the node cannot
+ * be asked either, a refusal for a spent input may only mean the first send
+ * committed (CCC retries a send on a fallback node): `signAndSend` then throws
+ * `SendOutcomeUnknownError`, never retried (review W6 L4). A `beforeSend` inside
+ * runs again with each new transaction's hash: a refused one never commits.
+ */
+export async function rebuildOnDeadInputs(client, build, retry = {}) {
+    const attempts = Math.max(1, Math.floor(retry.attempts ?? DEFAULT_RETRY.attempts));
+    const delay = Math.max(0, retry.delayMs ?? DEFAULT_RETRY.delayMs);
+    const avoid = new Set();
+    for (let attempt = 1;; attempt++) {
+        try {
+            return await build(avoid);
+        }
+        catch (e) {
+            const busy = e instanceof SessionBalanceError && e.reason === "payout-busy";
+            if (!(busy || deadInputs(e) || poolConflict(e)) || attempt >= attempts)
+                throw e;
+            const named = rejectedOutPoint(e);
+            if (named)
+                avoid.add(named);
+            await client.cache?.clear();
+            const wait = delay * 2 ** (attempt - 1) * (0.5 + Math.random());
+            if (wait > 0)
+                await sleep(wait);
+        }
+    }
 }
 export async function findSessionCells(session, client, deployment, binding) {
     const keyLock = await keyLockOf(session, client);
     const lock = sessionLockScript(deployment, params(session, keyLock, binding));
     const token = binding.token && ccc.Script.from(binding.token.type);
-    const [sessionCells, keyCells] = await Promise.all([collect(client, lock, token), collect(client, keyLock)]);
+    const [found, keyCells] = await Promise.all([collect(client, lock, token), collect(client, keyLock)]);
+    const sessionCells = await withinU128(client, found);
     const sum = (cells) => cells.reduce((s, c) => s + c.cellOutput.capacity, 0n);
     const tokenBalance = sessionCells.reduce((s, c) => s + (c.cellOutput.type ? tokenAmount(c.outputData) : 0n), 0n);
     return { lock, keyLock, sessionCells, keyCells, balance: sum(sessionCells), feeBalance: sum(keyCells), tokenBalance };
@@ -101,23 +432,84 @@ export function onchainRecipient(session) {
     return recipients[0];
 }
 /**
- * Throws unless `lock` is known to need a signature over the whole transaction:
- * the session lock grants owner mode to any transaction with an input under the
- * owner's lock, so that lock is the only thing standing between a stranger and
- * every session. An allowlist, not a blocklist (code review, 14 Oct):
+ * Locks that open without any signature, on mainnet and testnet, refused
+ * whatever the client's network: anyone-can-pay (RFC 0026, and the older
+ * deployments pw-core lists as anyone-can-pay), PW-Lock (the deployed build is
+ * lay2dev/pw-lock's `secp256k1_keccak256_sighash_all_acpl`: with no signature in
+ * the witness it takes the anyone-can-pay path, whatever its args) and
+ * always-success (ckb-proxy-locks).
+ *
+ * `type`: the type-id code hash the script is deployed under (hash_type `type`).
+ * `data`: the hash of the binary itself, refused under every data hash_type
+ * (`data`, `data1`, `data2`): the same code referenced by its data hash opens
+ * the same way (review W6 L6). The data hashes are those of the code cells CCC
+ * lists for each script on testnet and mainnet, read on 2 Nov 2026.
+ */
+const SIGNATURE_FREE = [
+    { codeHash: "0xd369597ff47f29fbc0d47d2e3775370d1250b85140c670e4718af712983a2354", by: "type", what: "anyone-can-pay" },
+    { codeHash: "0x3419a1c09eb2567f6552ee7a8ecffd64155cffe0f1796e6e61ec088d740c1356", by: "type", what: "anyone-can-pay" },
+    { codeHash: "0xcd69ba816f7471e59110058aa37387c362ed9a240cd178f7bb1ecee386cb31e6", by: "data", what: "anyone-can-pay" },
+    { codeHash: "0x0fb343953ee78c9986b091defb6252154e0bb51044fd2879fde5b27314506111", by: "data", what: "anyone-can-pay" },
+    { codeHash: "0x86a1c6987a4acbe1a887cca4c9dd2ac9fcb07405bbeda51b861b18bbf7492c4b", by: "type", what: "anyone-can-pay" },
+    { codeHash: "0xbf43c3602455798c1a61a596e0d95278864c552fafe231c063b3fabf97a8febc", by: "type", what: "PW-Lock" },
+    { codeHash: "0x58c5f491aba6d61678b7cf7edf4910b1f5e00ec0cde2f42e0abb4fd9aff25a63", by: "type", what: "PW-Lock" },
+    { codeHash: "0xd6a5a0edb152e88e8bbc702e164441cb3890fae35da672b408d28ca9a1bde3ee", by: "data", what: "PW-Lock" },
+    { codeHash: "0xeffe377419256d150d68368d7cb5731edad39d1805a8c2c73ce8e9615b9f9878", by: "data", what: "PW-Lock" },
+    { codeHash: "0x3b521cc4b552f109d092d8cc468a8048acb53c5952dbe769d2b2f9cf6e47f7f1", by: "data", what: "always-success" },
+];
+/** The signature-free lock `lock` runs, if it is one of `SIGNATURE_FREE` under a matching hash_type. */
+const signatureFree = (lock) => SIGNATURE_FREE.find((s) => s.codeHash === lock.codeHash && (s.by === "type" ? lock.hashType === "type" : lock.hashType !== "type"));
+/** Omnilock auth flags that verify a signature over the whole transaction (RFC 0042, nervosnetwork/omnilock). */
+const OMNI_SIGNING_AUTH = new Set([0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x12]);
+/** Omnilock modes that only add checks: time-lock (0x04) and supply (0x08). */
+const OMNI_ADDITIVE_MODES = 0x04 | 0x08;
+/**
+ * Throws `SessionPolicyError` unless `lock` is a reviewed configuration of a lock
+ * that needs the owner's signature over the whole transaction. The session lock
+ * grants owner mode to any transaction with an input under the owner's lock, so
+ * that lock is the only thing standing between a stranger and every session.
+ * An allowlist, not a blocklist (code review, 14 Oct; mentor review, 2 Nov):
+ *
+ * Reviewed, accepted:
+ * - secp256k1-blake160 (20-byte args); secp256k1 multisig, v1 and v2 (20 bytes,
+ *   or 28 with a since, which only delays);
+ * - Omnilock with a signature auth flag (0x00-0x06: CKB, Ethereum, EOS, Tron,
+ *   Bitcoin, Dogecoin, multisig; 0x12: Ethereum with the message displayed), and
+ *   no mode other than time-lock or supply;
+ * - Nostr lock in signing mode (args[0] = 0, 21-byte args);
+ * - JoyID (closed source: reviewed from its documentation only).
  *
- * - secp256k1-blake160 (single or multisig), JoyID, Nostr, PW lock;
- * - Omnilock with a signature auth flag (0x00-0x07: CKB, Ethereum, EOS, Tron,
- *   Bitcoin, Dogecoin, multisig; 0x12: Ethereum with the message displayed) and neither administrator (0x01) nor
- *   anyone-can-pay (0x02) mode. Auth flags 0xFC-0xFE hand the decision to
- *   another lock or to arbitrary code, and are refused.
+ * Known to unlock without the owner's signature, refused always (reason
+ * `"owner-lock-unsafe"`): anyone-can-pay, PW-Lock, always-success (by their
+ * type id, or by the data hash of their deployed binaries under any data
+ * hash_type), Omnilock in anyone-can-pay or administrator mode, Nostr lock in
+ * PoW mode (args[0] != 0). Another build of those locks (a binary with a
+ * different data hash) is not recognised: it is refused as unreviewed.
  *
- * Anyone-can-pay (RFC 0026) unlocks with no signature at all: anyone could spend
- * the owner's cell back to itself unchanged and sweep every session.
+ * Anything else (Omnilock auth 0xFC-0xFE, which hand the decision to another lock
+ * or to other code; the proxy locks; unknown locks; args the lock's code would
+ * not accept) is refused with reason `"owner-lock-unreviewed"`, unless
+ * `allowUnreviewedOwnerLock` is set: then it passes with a warning.
  *
  * The owner must also never sign a partial (open) transaction with this lock.
  */
-export async function assertSigningLock(lock, client) {
+export async function assertSigningLock(lock, client, opts = {}) {
+    return checkSigningLock(lock, client, !!opts.allowUnreviewedOwnerLock, OWNER_ROLE);
+}
+const OWNER_ROLE = { whose: "the owner's lock", can: "own a session", optIn: "allowUnreviewedOwnerLock" };
+/** `assertSigningLock` for any role: a subscription's charger lock is checked the same way (review M2), with its own opt-in. */
+export async function checkSigningLock(lock, client, allowUnreviewed, role) {
+    const unsafe = (why) => {
+        throw new SessionPolicyError(`${role.whose} ${why}: it cannot ${role.can}`, "owner-lock-unsafe");
+    };
+    const unreviewed = (why) => {
+        const message = `${role.whose} ${why}`;
+        if (allowUnreviewed) {
+            console.warn(`ckb-session-kit: ${message}; allowed by ${role.optIn}`);
+            return;
+        }
+        throw new SessionPolicyError(`${message}, so it cannot ${role.can} unless you review it and pass ${role.optIn}`, "owner-lock-unreviewed");
+    };
     const is = async (known) => {
         try {
             const s = await client.getKnownScript(known);
@@ -127,39 +519,55 @@ export async function assertSigningLock(lock, client) {
             return false; // not deployed on this network
         }
     };
-    if (await is(ccc.KnownScript.AnyoneCanPay)) {
-        throw new SessionPolicyError("the owner's lock is anyone-can-pay: it needs no signature, so it cannot own a session");
+    const args = ccc.bytesFrom(lock.args);
+    const free = signatureFree(lock);
+    if (free?.what === "PW-Lock" || (await is(ccc.KnownScript.PWLock))) {
+        return unsafe("is PW-Lock, whose deployed build is anyone-can-pay: it opens with no signature");
+    }
+    if (free || (await is(ccc.KnownScript.AnyoneCanPay))) {
+        return unsafe(`is ${free?.what ?? "anyone-can-pay"}: it opens with no signature`);
     }
+    if (await is(ccc.KnownScript.AlwaysSuccess))
+        return unsafe("is always-success: it opens with no signature");
     if (await is(ccc.KnownScript.OmniLock)) {
-        // Omnilock args: auth flag (1) + auth content (20) + omnilock flags (1) + ...
-        const args = ccc.bytesFrom(lock.args);
-        const omniFlags = args[21] ?? 0;
-        if (omniFlags & 0x02) {
-            throw new SessionPolicyError("the owner's Omnilock is in anyone-can-pay mode: it cannot own a session");
+        // Omnilock args: auth flag (1) + auth content (20) + Omnilock flags (1) + mode args.
+        if (args.length < 22)
+            return unreviewed("is an Omnilock with args its code would not accept");
+        const auth = args[0];
+        const modes = args[21];
+        if (modes & 0x02)
+            return unsafe("is an Omnilock in anyone-can-pay mode, which opens with no signature");
+        if (modes & 0x01)
+            return unsafe("is an Omnilock with an administrator, who could unlock it without the owner");
+        if (auth >= 0xfc && auth <= 0xfe) {
+            const flag = auth.toString(16);
+            return unreviewed(`is an Omnilock that does not verify a signature itself (auth 0x${flag} hands the check to another lock or code)`);
         }
-        if (omniFlags & 0x01) {
-            throw new SessionPolicyError("the owner's Omnilock has an administrator, who could unlock it: it cannot own a session");
+        if (!OMNI_SIGNING_AUTH.has(auth)) {
+            return unreviewed(`is an Omnilock with auth flag 0x${auth.toString(16).padStart(2, "0")}, which is not one this kit has reviewed`);
         }
-        const auth = args[0] ?? 0xff;
-        // 0x12 is Ethereum with the message displayed: what CCC gives MetaMask and
-        // OKX (EVM) users. Missing from this list until the wallet matrix (26 Oct).
-        if (auth > 0x07 && auth !== 0x12) {
-            throw new SessionPolicyError("the owner's Omnilock does not verify a signature itself: it cannot own a session");
+        if (modes & ~OMNI_ADDITIVE_MODES) {
+            return unreviewed(`is an Omnilock with mode flags 0x${modes.toString(16).padStart(2, "0")}, not one this kit has reviewed`);
         }
         return;
     }
-    const signing = [
-        ccc.KnownScript.Secp256k1Blake160,
-        ccc.KnownScript.Secp256k1Multisig,
-        ccc.KnownScript.Secp256k1MultisigV2,
-        ccc.KnownScript.JoyId,
-        ccc.KnownScript.NostrLock,
-        ccc.KnownScript.PWLock,
-    ];
-    for (const known of signing)
-        if (await is(known))
-            return;
-    throw new SessionPolicyError("the owner's lock is not one known to sign the whole transaction, so it cannot own a session");
+    if (await is(ccc.KnownScript.NostrLock)) {
+        // Nostr lock args: PoW difficulty (1) + blake160 of the Schnorr public key (20).
+        if (args.length !== 21)
+            return unreviewed("is a Nostr lock with args its code would not accept");
+        if (args[0] !== 0)
+            return unsafe("is a Nostr lock in proof of work mode, which anyone who does the work can unlock");
+        return;
+    }
+    if (await is(ccc.KnownScript.Secp256k1Blake160)) {
+        return args.length === 20 ? undefined : unreviewed("is secp256k1-blake160 with args its code would not accept");
+    }
+    if ((await is(ccc.KnownScript.Secp256k1Multisig)) || (await is(ccc.KnownScript.Secp256k1MultisigV2))) {
+        return args.length === 20 || args.length === 28 ? undefined : unreviewed("is a multisig with args its code would not accept");
+    }
+    if (await is(ccc.KnownScript.JoyId))
+        return;
+    return unreviewed("is not one this kit has reviewed: it may open without the owner's signature");
 }
 /**
  * Owner funds the session: one transaction, one signature from `owner`.
@@ -186,7 +594,7 @@ export async function openSession(owner, session, deployment, opts) {
     if (opts.minInterval !== undefined)
         relativeBlocksSince(opts.minInterval); // a spend must be able to meet it
     const ownerLock = (await owner.getRecommendedAddressObj()).script;
-    await assertSigningLock(ownerLock, client);
+    await assertSigningLock(ownerLock, client, opts);
     const floor = keyCellFloor(ownerLock);
     const feeBudget = opts.feeBudget ?? floor + FEE_MARGIN;
     if (feeBudget <= floor) {
@@ -210,6 +618,15 @@ export async function openSession(owner, session, deployment, opts) {
     if (recipientLockHash === keyLock.hash()) {
         throw new SessionPolicyError("the recipient is the session key itself: it could then pay anyone");
     }
+    // Before any signature, so the caller can still stop (review 2 Nov).
+    for (const w of sessionWarnings(binding.minInterval, recipientLockHash !== undefined)) {
+        if (opts.onWarning)
+            await opts.onWarning(w);
+        else
+            console.warn(`ckb-session-kit: ${w.message}`);
+    }
+    // Not a legacy lock, and its code is live on this network (audit round 2, 31 Oct).
+    await assertCurrentDeployment(client, deployment);
     const lock = sessionLockScript(deployment, params(session, keyLock, binding));
     const tx = ccc.Transaction.from({
         outputs: [
@@ -245,16 +662,22 @@ export async function openSession(owner, session, deployment, opts) {
  * widens who may mint (owner mode by input or output type, code review 14 Oct).
  */
 export async function assertPlainXudt(type, client) {
-    const xudt = await client.getKnownScript(ccc.KnownScript.XUdt);
+    const fault = plainXudtFault(type, await client.getKnownScript(ccc.KnownScript.XUdt));
+    if (fault)
+        throw new SessionPolicyError(fault);
+}
+/** Why `type` is not a plain xUDT under the network's xUDT script `xudt`, or undefined if it is. */
+export function plainXudtFault(type, xudt) {
     if (type.codeHash !== xudt.codeHash || type.hashType !== xudt.hashType) {
-        throw new SessionPolicyError("a token session holds an xUDT token; this type script is not xUDT");
+        return "a token session holds an xUDT token; this type script is not xUDT";
     }
     const args = ccc.bytesFrom(type.args);
     if (args.length < 32)
-        throw new SessionPolicyError("xUDT args must start with the issuer's 32-byte lock hash");
+        return "xUDT args must start with the issuer's 32-byte lock hash";
     if (args.length >= 36 && ccc.numLeFromBytes(args.slice(32, 36)) !== 0n) {
-        throw new SessionPolicyError("xUDT tokens with flags (extension scripts, other owner modes) are not supported in a session");
+        return "xUDT tokens with flags (extension scripts, other owner modes) are not supported in a session";
     }
+    return undefined;
 }
 /**
  * The session key pays `to`: `amount` shannons, or in a token session `token`
@@ -273,8 +696,24 @@ export async function assertPlainXudt(type, client) {
  *
  * `memo` is recorded in the witness of the session key's own input, which that
  * key's signature covers: the payment commits to it (see `verifyAccess`).
+ *
+ * With `topUp`, the recipient's cell is a confirmed one that no transaction in
+ * the node's pool spends, where the node can tell (`pickPayoutCell`): readers
+ * paying at the same moment compete for those cells.
+ *
+ * If the node rejects the payment because an input is already spent (another
+ * tab, device or payer took it first) or unknown, the client's cache is cleared
+ * and the payment is built again from the live cells, with another payout
+ * cell, after a short wait: up to `retry.attempts` in all (default 3), waiting
+ * `retry.delayMs` (default 1000) doubling each time. `beforeSend` runs again
+ * with each new hash (`rebuildOnDeadInputs`). A send whose outcome is unknown
+ * is never retried.
  */
 export async function spendInSession(session, client, deployment, binding, request, now = new Date()) {
+    // Built on a cell another tab or payer spent since: rebuilt from live cells (audit, 31 Oct; review, 2 Nov).
+    return rebuildOnDeadInputs(client, (avoid) => spendOnce(session, client, deployment, binding, request, now, avoid), request.retry);
+}
+async function spendOnce(session, client, deployment, binding, request, now, avoid) {
     const tokenType = binding.token && ccc.Script.from(binding.token.type);
     const tokenOut = request.token ?? 0n;
     if (request.token !== undefined) {
@@ -302,7 +741,7 @@ export async function spendInSession(session, client, deployment, binding, reque
         throw new ScopeError("recipient not in scope");
     }
     if (!state.keyCells.length)
-        throw new SessionBalanceError("no key cell left to pay fees");
+        throw new SessionBalanceError("no key cell left to pay fees", "no-fee-cell");
     const since = binding.minInterval > 0n ? relativeBlocksSince(binding.minInterval) : 0n;
     const tx = ccc.Transaction.from({ cellDeps: [sessionLockCellDep(deployment)] });
     if (tokenType)
@@ -310,20 +749,15 @@ export async function spendInSession(session, client, deployment, binding, reque
     // The payment: output 0, plus the recipient's cell when topping up.
     let ckbOut;
     if (request.topUp) {
-        const acp = await client.getKnownScript(ccc.KnownScript.AnyoneCanPay);
-        if (toLock.codeHash !== acp.codeHash || toLock.hashType !== acp.hashType) {
+        if (!(await isAnyoneCanPay(toLock, client)))
             throw new ScopeError("top-up needs an anyone-can-pay recipient");
-        }
-        // Payers at once compete for a cell; a random pick spreads them out when the
-        // recipient keeps several.
-        const targets = (await collect(client, toLock, tokenType)).filter((c) => request.token !== undefined ? !!c.cellOutput.type : !c.cellOutput.type);
-        const target = targets[Math.floor(Math.random() * targets.length)];
-        if (!target)
-            throw new SessionBalanceError("the recipient has no anyone-can-pay cell to top up");
-        tx.inputs.push(ccc.CellInput.from({ previousOutput: target.outPoint }));
+        // Payers at once compete for a cell: a confirmed one no pool transaction spends,
+        // at random among the recipient's (pickPayoutCell).
         ckbOut = request.amount ?? 0n;
-        tx.addOutput({ lock: toLock, type: target.cellOutput.type, capacity: target.cellOutput.capacity + ckbOut }, request.token !== undefined ? tokenData(tokenAmount(target.outputData) + tokenOut) : "0x");
-        await tx.addCellDepsOfKnownScripts(client, ccc.KnownScript.AnyoneCanPay);
+        const paid = request.token !== undefined ? { token: tokenType, units: tokenOut } : { ckb: ckbOut };
+        if (!(await addTopUp(tx, client, toLock, paid, avoid))) {
+            throw new SessionBalanceError("the recipient has no anyone-can-pay cell to top up", "no-payout-cell");
+        }
     }
     else if (request.token !== undefined) {
         tx.addOutput({ lock: toLock, type: tokenType, capacity: 0n }, tokenData(tokenOut)); // CCC sizes it
@@ -379,17 +813,46 @@ export async function spendInSession(session, client, deployment, binding, reque
         }
     }
     // The key cell authorises the spend, comes back as the last output and pays the fee.
-    tx.inputs.push(ccc.CellInput.from({ previousOutput: state.keyCells[0].outPoint }));
+    // The largest one: any other plain cell sent to the key address (a stranger's
+    // 61 CKB, or a top-up beside a key cell run down to its floor) is listed first
+    // and may not cover the fee (audit, 30 Oct). One key cell in, one out, no larger.
+    tx.inputs.push(ccc.CellInput.from({ previousOutput: largestCell(state.keyCells).outPoint }));
     if (request.memo !== undefined)
         tx.setWitnessArgsAt(tx.inputs.length - 1, { inputType: request.memo });
     tx.addOutput({ lock: state.keyLock, capacity: 0n });
-    await tx.completeFeeChangeToOutput(sessionSigner(session, client), tx.outputs.length - 1);
+    await completeFeeOrNoFeeCell(tx, sessionSigner(session, client), "the key cell cannot cover the fee; top it up");
     // Below this, the key cell could no longer go back to the owner at the end.
     if (tx.outputs[tx.outputs.length - 1].capacity < keyCellFloor(binding.ownerLock)) {
-        throw new SessionBalanceError("the key cell cannot cover another fee; top it up");
+        throw new SessionBalanceError("the key cell cannot cover another fee; top it up", "no-fee-cell");
     }
     return signAndSend(sessionSigner(session, client), tx, request.beforeSend);
 }
+/**
+ * `completeFeeChangeToOutput` into the last output, with CCC's "Insufficient CKB"
+ * (the paying cell holds its floor but not the fee too) as a
+ * `SessionBalanceError` with reason `no-fee-cell` (audit round 2, 31 Oct).
+ */
+export async function completeFeeOrNoFeeCell(tx, signer, message) {
+    try {
+        await tx.completeFeeChangeToOutput(signer, tx.outputs.length - 1);
+    }
+    catch (e) {
+        // By class, or by message where a second copy of CCC threw it (a bundler's CJS and ESM builds).
+        const short = e instanceof ccc.ErrorTransactionInsufficientCapacity || (e instanceof Error && /^Insufficient CKB/.test(e.message));
+        if (short)
+            throw new SessionBalanceError(message, "no-fee-cell");
+        throw e;
+    }
+}
+/** The largest of `cells` by capacity; on a tie, the lowest out point (tx hash, then index), whatever the indexer order. */
+function largestCell(cells) {
+    const before = (x, y) => (x.txHash !== y.txHash ? x.txHash < y.txHash : x.index < y.index);
+    return cells.reduce((best, c) => {
+        const a = c.cellOutput.capacity;
+        const b = best.cellOutput.capacity;
+        return a > b || (a === b && before(c.outPoint, best.outPoint)) ? c : best;
+    });
+}
 /** The cells created at least `blocks` blocks before the tip: those a relative `since` of `blocks` can spend. */
 export async function matureCells(client, cells, blocks) {
     const tip = await client.getTip();
@@ -408,19 +871,80 @@ export async function matureCells(client, cells, blocks) {
  * it. A key-cell failure is reported in `keyError`; the key stays usable for a retry.
  *
  * `nothingFound` means no cell is left under the session or the key: the key can
- * be forgotten. If the funding transaction (`binding.openTx`) is still in flight
- * or not yet indexed, this throws instead, so the key is never forgotten before
- * the funds it controls arrive.
+ * be forgotten. If the funding transaction (`binding.openTx`) is still in flight,
+ * or committed with an output under the session or the key the node still holds
+ * live (not indexed yet), this throws instead, so the key is never forgotten
+ * before the funds it controls arrive. Once the funding is committed and every
+ * one of those outputs is spent (a close whose reply was lost, another tab's
+ * close), it is `nothingFound` (audit, 31 Oct).
+ *
+ * `owner` must be the wallet that opened the session (its lock is
+ * `binding.ownerLock`): any other is refused with a `SessionPolicyError` before
+ * it is asked to sign anything.
  */
 export async function closeSession(owner, session, deployment, binding) {
+    const client = owner.client;
+    const ownerLock = ccc.Script.from(binding.ownerLock);
+    // After a wallet switch, the connected wallet may not be the owner: it must not
+    // be shown a sweep of someone else's session to itself (audit, 31 Oct).
+    const signerLock = (await owner.getRecommendedAddressObj()).script;
+    if (signerLock.hash() !== ownerLock.hash()) {
+        throw new SessionPolicyError("this signer is not the session's owner: connect the wallet that opened it");
+    }
+    // Built on a cell another tab spent since: rebuilt once from live cells.
+    return rebuildOnDeadInputs(client, () => closeOnce(owner, session, deployment, binding));
+}
+/**
+ * Whether the node's indexer has reached the chain tip: false when it is behind,
+ * undefined for a client with no JSON-RPC requestor to ask (tests, custom clients).
+ */
+async function indexerCaughtUp(client) {
+    const requestor = client.requestor;
+    if (!requestor)
+        return undefined;
+    try {
+        const tip = (await requestor.request("get_indexer_tip", []));
+        if (!tip?.block_number)
+            return false;
+        return BigInt(tip.block_number) >= (await client.getTip());
+    }
+    catch {
+        return false; // cannot tell: keep the key
+    }
+}
+async function closeOnce(owner, session, deployment, binding) {
     const client = owner.client;
     const ownerLock = ccc.Script.from(binding.ownerLock);
     const state = await findSessionCells(session, client, deployment, binding);
     const result = {};
     if (!state.sessionCells.length && !state.keyCells.length) {
         const open = binding.openTx && (await client.getTransaction(binding.openTx));
-        if (open && ["pending", "proposed", "committed"].includes(open.status)) {
-            throw new SessionBalanceError(`the session's funding transaction is ${open.status === "committed" ? "not indexed yet" : open.status}; close again in a minute`);
+        if (binding.openTx && open && open.status === "committed") {
+            const openTx = binding.openTx;
+            // Nothing indexed under the session: the indexer lags, or every output the
+            // funding made under the session and the key is spent already. Ask the node.
+            const ours = (open.transaction?.outputs ?? [])
+                .map((o, index) => ({ o, index }))
+                .filter(({ o }) => o.lock.eq(state.lock) || o.lock.eq(state.keyLock));
+            if (!ours.length) {
+                throw new SessionBalanceError("the funding transaction made no cell under this session: is it the session's deployment?");
+            }
+            const live = await Promise.all(ours.map(({ index }) => client.getCellLive({ txHash: openTx, index }, false, false)));
+            if (live.every((c) => !c)) {
+                // Spent, but a later spend's new key cell may not be indexed yet: trust the
+                // empty search only once the indexer has reached the tip, and search again.
+                if ((await indexerCaughtUp(client)) === false) {
+                    throw new SessionBalanceError("the indexer is behind the chain; close again in a minute");
+                }
+                const again = await findSessionCells(session, client, deployment, binding);
+                if (!again.sessionCells.length && !again.keyCells.length)
+                    return { nothingFound: true };
+                throw new SessionBalanceError("the session's cells were not indexed yet; close again");
+            }
+            throw new SessionBalanceError("the session's funding transaction is not indexed yet; close again in a minute");
+        }
+        if (open && (open.status === "pending" || open.status === "proposed")) {
+            throw new SessionBalanceError(`the session's funding transaction is ${open.status}; close again in a minute`);
         }
         return { nothingFound: true };
     }
@@ -432,8 +956,10 @@ export async function closeSession(owner, session, deployment, binding) {
                 inputs: state.keyCells.map((c) => ({ previousOutput: c.outPoint })),
                 outputs: [{ lock: ownerLock, capacity: 0n }],
             });
-            await tx.completeFeeChangeToOutput(sessionSigner(session, client), 0);
-            result.keyTx = await sessionSigner(session, client).sendTransaction(tx);
+            const key = sessionSigner(session, client);
+            await tx.completeFeeChangeToOutput(key, 0);
+            // A key return the node took but whose reply was lost is still the key return.
+            result.keyTx = await signAndSend(key, tx);
         }
         catch (e) {
             result.keyError = e instanceof Error ? e.message : String(e);
@@ -449,7 +975,9 @@ export async function closeSession(owner, session, deployment, binding) {
  * for a token session) are kept: a cell with malformed args would fail the lock
  * even in owner mode, and anyone can create one with this owner's hash as a prefix
  * to block a sweep. Likewise a typed cell is kept only if it holds the session's
- * own token in well-formed data; anything else could make the sweep fail.
+ * own token, a plain xUDT, in exactly 16 bytes of data; anything else could make
+ * the sweep fail. Cells
+ * whose tokens would overflow a u128 together are left out (`withinU128`).
  *
  * Pass several deployments (`[TESTNET_DEPLOYMENT, ...TESTNET_LEGACY_DEPLOYMENTS]`)
  * to find sessions opened under earlier versions of the lock as well.
@@ -457,6 +985,7 @@ export async function closeSession(owner, session, deployment, binding) {
 export async function findOwnedSessionCells(owner, deployments) {
     const ownerLock = (await owner.getRecommendedAddressObj()).script;
     const cells = [];
+    let xudt; // looked up once, at the first typed cell
     for (const deployment of [deployments].flat()) {
         for await (const cell of owner.client.findCells({
             script: { codeHash: deployment.codeHash, hashType: deployment.hashType, args: ownerLock.hash() },
@@ -464,11 +993,13 @@ export async function findOwnedSessionCells(owner, deployments) {
             scriptSearchMode: "prefix",
             withData: true,
         })) {
-            if (sweepable(cell))
+            if (cell.cellOutput.type && !xudt)
+                xudt = await owner.client.getKnownScript(ccc.KnownScript.XUdt);
+            if (sweepable(cell, xudt))
                 cells.push(cell);
         }
     }
-    return cells;
+    return withinU128(owner.client, cells);
 }
 /**
  * Device-loss recovery: sweeps every session this owner opened back to the owner,
@@ -476,9 +1007,10 @@ export async function findOwnedSessionCells(owner, deployments) {
  *
  * Anyone can create a cell under a session lock carrying this owner's hash and
  * their own key, and spend it before the sweep lands, which would make a single
- * sweep fail. So if the one transaction is refused, each session (cells sharing a
- * session key) is swept on its own, one signature each: a cell someone else can
- * spend fails alone, and `failed` counts the sessions not recovered.
+ * sweep fail. So if the one transaction is refused, each session (cells under one
+ * session lock) is swept on its own, one signature each: a cell someone else can
+ * spend fails alone, and `failed` counts the sessions not recovered. A fault no
+ * retry can fix (the owner holds no plain cell to prove ownership) is thrown.
  *
  * The key cell (the fee budget) is under the session key's own lock and cannot be
  * recovered without that key; keep it small.
@@ -489,16 +1021,24 @@ export async function recoverSessions(owner, deployments) {
     const total = (cs) => cs.reduce((sum, c) => sum + c.cellOutput.capacity, 0n);
     if (!cells.length)
         return { txHashes: [], recovered: 0n, cells: 0, failed: 0 };
+    // A fault no other set of cells can fix (no plain owner cell) is thrown, not
+    // retried once per session (review, 28 Oct).
+    const fixed = (e) => e instanceof SessionBalanceError || e instanceof SessionPolicyError;
     try {
         return { txHashes: [await ownerSweep(owner, deployment, cells)], recovered: total(cells), cells: cells.length, failed: 0 };
     }
-    catch {
+    catch (e) {
+        if (fixed(e))
+            throw e;
         // Fall through: one session at a time.
     }
+    // One group per session lock (its full hash), not per session key: anyone can
+    // plant a cell carrying the victim's (public) key hash under other args, and a
+    // group it joined would fail on every retry (audit, 30 Oct).
     const sessions = new Map();
     for (const c of cells) {
-        const keyHash = c.cellOutput.lock.args.slice(66, 130); // session_lock_hash, bytes 32..64
-        sessions.set(keyHash, [...(sessions.get(keyHash) ?? []), c]);
+        const lockHash = c.cellOutput.lock.hash();
+        sessions.set(lockHash, [...(sessions.get(lockHash) ?? []), c]);
     }
     const result = { txHashes: [], recovered: 0n, cells: 0, failed: 0 };
     for (const group of sessions.values()) {
@@ -507,14 +1047,22 @@ export async function recoverSessions(owner, deployments) {
             result.recovered += total(group);
             result.cells += group.length;
         }
-        catch {
+        catch (e) {
+            if (fixed(e))
+                throw e;
             result.failed++;
         }
     }
     return result;
 }
-/** A session cell an owner sweep can safely include. */
-function sweepable(cell) {
+/**
+ * A session cell an owner sweep can safely include. A typed cell must hold the
+ * session's own token, a plain xUDT (`assertPlainXudt`'s rules, against the
+ * network's xUDT script `xudt`), in exactly the 16-byte amount a session makes:
+ * any other type script can refuse to be consumed, or needs code the sweep does
+ * not bring (audit, 30 Oct).
+ */
+function sweepable(cell, xudt) {
     const args = ccc.bytesFrom(cell.cellOutput.lock.args);
     const type = cell.cellOutput.type;
     if (args.length === 80 || args.length === 112)
@@ -523,13 +1071,18 @@ function sweepable(cell) {
         return false;
     if (!type)
         return true;
-    return type.hash() === ccc.hexFrom(args.slice(80, 112)) && ccc.bytesFrom(cell.outputData).length >= 16;
+    return (!!xudt &&
+        plainXudtFault(type, xudt) === undefined &&
+        type.hash() === ccc.hexFrom(args.slice(80, 112)) &&
+        ccc.bytesFrom(cell.outputData).length === 16);
 }
 /**
  * Spends `cells` in owner mode: everything returns to the owner. Tokens go back
  * in one cell per token type (xUDT would let a sweep burn them otherwise).
+ * `memo` goes in the witness (`input_type`) of the owner's own input, which the
+ * owner's signature covers: what the sweep is for (`CLEAR_PLANTED_MEMO`).
  */
-export async function ownerSweep(owner, deployments, cells) {
+export async function ownerSweep(owner, deployments, cells, opts = {}) {
     // The code of every lock version these cells are under, and only those.
     const used = [deployments].flat().filter((d) => cells.some((c) => c.cellOutput.lock.codeHash === d.codeHash));
     const tx = ccc.Transaction.from({
@@ -554,8 +1107,44 @@ export async function ownerSweep(owner, deployments, cells) {
     // Owner mode needs an owner-locked input in the transaction.
     for await (const cell of owner.findCells({ scriptLenRange: [0, 1], outputDataLenRange: [0, 1] }, true)) {
         tx.inputs.push(ccc.CellInput.from({ previousOutput: cell.outPoint }));
+        if (opts.memo)
+            tx.setWitnessArgsAt(tx.inputs.length - 1, { inputType: opts.memo });
         await tx.completeFeeBy(owner);
-        return owner.sendTransaction(tx);
+        // A sweep the node took but whose reply was lost is still the sweep (review, 28 Oct).
+        return signAndSend(owner, tx);
     }
     throw new SessionBalanceError("the owner needs one plain cell to prove ownership");
 }
+/**
+ * Gives an anyone-can-pay address (a creator's `payTo`) `count` more cells to be
+ * topped up, paid by `funder`, in one transaction. Each top-up consumes one of
+ * these cells, so readers paying at the same moment compete for them; with more
+ * cells they rarely pick the same one (mentor review, 2 Nov). Anyone can be the
+ * funder: the anyone-can-pay lock needs no signature to receive a new cell.
+ *
+ * Each cell is as small as a cell under `payTo` can be (61 CKB for a 20-byte
+ * args address) unless `capacity` is given. With `token`, each is a cell of that
+ * token holding 0 units (about 142 CKB), for token payments. `count` is 1 to
+ * `MAX_PAYOUT_CELLS`: a payment reads no more than that many.
+ */
+export async function createPayoutCells(funder, payTo, opts) {
+    const client = funder.client;
+    if (!Number.isInteger(opts.count) || opts.count < 1 || opts.count > MAX_PAYOUT_CELLS) {
+        throw new RangeError(`count must be 1 to ${MAX_PAYOUT_CELLS}`);
+    }
+    const { script: lock } = await ccc.Address.fromString(payTo, client);
+    if (!(await isAnyoneCanPay(lock, client))) {
+        throw new SessionPolicyError("payout cells go under an anyone-can-pay address", "payto-not-anyone-can-pay");
+    }
+    const token = opts.token && ccc.Script.from(opts.token);
+    const tx = ccc.Transaction.from({ outputs: [], outputsData: [] });
+    // CCC raises a capacity below what the cell occupies to that size.
+    for (let i = 0; i < opts.count; i++) {
+        tx.addOutput({ lock, capacity: opts.capacity ?? 0n, ...(token && { type: token }) }, token ? tokenData(0n) : "0x");
+    }
+    if (token)
+        await tx.addCellDepsOfKnownScripts(client, ccc.KnownScript.XUdt);
+    await tx.completeInputsByCapacity(funder);
+    await tx.completeFeeBy(funder);
+    return signAndSend(funder, tx, opts.beforeSend);
+}