@zerc20/wallet-sdk 0.5.0 → 0.6.0

package/dist/services.d.ts

@@ -26,8 +26,9 @@ export interface Relayed {
     noteIndex1: number | null;
     noteIndex2: number | null;
 }
-/** What `relay` reports when it cannot say whether the transaction landed. */
-export declare class RelayUnknown extends WalletError {
+/** What `relay` reports while the relayer is relaying a request with the same nullifiers: the request already there
+ * gets the answer, and one after it finds the transaction landed. */
+export declare class Relaying extends WalletError {
 }
 /** Has the relayer submit `request`. A 400 means the call reverts, which includes "already landed". */
 export declare const relay: (c: ChainConfig, request: object, feeNote?: {

package/dist/services.js

@@ -78,23 +78,25 @@ export async function relayerFees(c) {
     const fees = new Map(Object.entries(r.body.fees).map(([t, f]) => [Number(t), { fee: BigInt(f.fee) }]));
     return { relayer: r.body.relayer, publicKey: r.body.publicKey, fees };
 }
-/** What `relay` reports when it cannot say whether the transaction landed. */
-export class RelayUnknown extends WalletError {
+/** What `relay` reports while the relayer is relaying a request with the same nullifiers: the request already there
+ * gets the answer, and one after it finds the transaction landed. */
+export class Relaying extends WalletError {
 }
 /** Has the relayer submit `request`. A 400 means the call reverts, which includes "already landed". */
 export const relay = (c, request, feeNote) => relayed(`${c.transactRelayer}/transact`, { request, feeNote });
 /** Has the relayer submit a merge's `request`, as `relay` does a JoinSplit's. Answers the merged note's index. */
 export const relayMerge = (c, request) => relayed(`${c.transactRelayer}/merge`, { request });
 async function relayed(url, body) {
-    // the relayer answers once mined, after fee bumping if need be
-    const r = await post(url, body, 15 * 60_000).catch((e) => {
-        throw new RelayUnknown('unavailable', `transact-relayer: ${e.message}`);
-    });
+    // the relayer answers once mined, after fee bumping if need be. Without an answer it may have sent it all the same:
+    // the same request goes again next sync, and lands at most once
+    const r = await post(url, body, 15 * 60_000);
     if (typeof r.body !== 'string')
         return r.body;
     if (r.status === 400)
         return { reverted: r.body };
-    throw new RelayUnknown('unavailable', `transact-relayer: HTTP ${r.status}: ${r.body}`);
+    if (r.status === 409)
+        throw new Relaying('unavailable', `transact-relayer: ${r.body}`);
+    return fail('unavailable', `transact-relayer: HTTP ${r.status}: ${r.body}`);
 }
 /** Sends a merge's witness (JSON, of `inputs` inputs) sealed to the merge prover's enclave, to prove `statement` (the
  * attester's `Merge`). Proving takes minutes: `proofOf` tells when it is done. */

package/dist/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"services.js","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"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"}

package/dist/spend.d.ts

@@ -2,7 +2,7 @@ import { type Recipient } from '@zerc20/storage-sdk';
 import { type Address, type Hex } from 'viem';
 import { type Ctx } from './context.js';
 import type { Indexer } from './servers.js';
-import { type OperationRecord, type Position, type SpendOperation } from './state.js';
+import { type NoteRecord, type OperationRecord, type Position, type SpendOperation } from './state.js';
 /** Something spendable. */
 export interface Coin {
     kind: 'note' | 'burn';
@@ -41,9 +41,14 @@ export interface Step {
     attempts: number;
     /** Once relayed: the block the relayer saw it mined in. */
     relayedBlock?: number;
-    /** The indexer's nullifier count once it is past that block, or just after a relay that found it landed already.
-     * Final nullifiers past it, and the input's still not among them, means a reorg dropped the transaction. */
+    /** The indexer's nullifier count once it is past that block, or just after a relay that reverted on an input spent
+     * already: that leaves the step `attested`, not relayed again until its change tells whose transaction spent it.
+     * Final nullifiers past it, and its inputs still not among them, means whatever spent them is gone: a reorg dropped
+     * it, or the relayer never sent it. */
     relayedAt?: number;
+    /** The final commitment count once an input is seen spent. Final commitments past it, and the change still not among
+     * them, means another transaction spent the input, and this step can never land. */
+    spentAt?: number;
 }
 /** The most inputs one merge spends: the attester takes requests up to 2 MB, at 8 KiB of sealed witness per input
  * sent as hex, and the prover folds them in one job. */
@@ -65,9 +70,13 @@ export interface MergeStep {
     /** Refused by the prover, or reverting with no sign of it on chain: built again with the same output a few times,
      * then failed. */
     attempts: number;
-    /** As a JoinSplit's. */
+    /** Built again after a relay of it reverted, which counts in `attempts` beside the prover's refusals: the request
+     * out may still land, so the step is not cancelled. */
+    sent?: true;
+    /** As a JoinSplit's, with `proved` where a JoinSplit is `attested`. */
     relayedBlock?: number;
     relayedAt?: number;
+    spentAt?: number;
 }
 /** Where a send or withdrawal goes; `self` merges the wallet's own notes and nothing leaves. */
 export type Destination = {
@@ -157,10 +166,15 @@ export declare const codeOf: (code: string) => import("@zerc20/storage-sdk").Rec
 /** What `step` paid besides `op`'s amount, the relayer's fee and the protocol's cut: what its inputs hold beyond the
  * amount and the change. */
 export declare const feeOf: (op: SpendOperation, step: Step) => bigint;
-/** Where a relayed JoinSplit stands, by its first input `f` as sync last saw it and `relayedAt`, a nullifier count past
- * its own (`undefined` while not known): spent, or the final nullifiers passed that count without its own (a reorg
- * dropped it, or the relayer never sent it), or neither yet. */
-export declare function relayedState(f: Position | undefined, relayedAt: number | undefined): 'landed' | 'dropped' | 'waiting';
+/** Where a relayed step stands, by its `change` (a merge's note) and its `inputs` as sync last saw them:
+ * - `landed`: the change is final where this wallet expects it;
+ * - `taken`: an input is spent and the final commitments passed `spentAt` without the change, so another transaction
+ *   spent it, and this step can never land;
+ * - `dropped`: no input is spent and the final nullifiers passed `relayedAt` without them: whatever was spending them
+ *   is gone, a reorg dropped it or the relayer never sent it;
+ * - `mined`: the change is in a block, not final yet;
+ * - `waiting`: none of these yet. */
+export declare function relayedState(change: Pick<NoteRecord, 'found' | 'watch'> | undefined, inputs: (Position | undefined)[], relayedAt: number | undefined, spentAt: number | undefined): 'landed' | 'taken' | 'dropped' | 'mined' | 'waiting';
 /** The indexer's nullifier count once it is past `block`, so past the nullifiers of a transaction mined there unless a
  * reorg moved them; `undefined` until then. The relayer answers once the block is mined, which may be before the
  * indexer has read it. */
@@ -168,5 +182,12 @@ export declare function nullifiersPast(indexer: Pick<Indexer, 'status'>, block:
 /** Whether `op`'s payment or withdrawal is on chain: done, or relayed, which the relayer answers once it is mined. Until
  * it is final a reorg may still drop it, and the operation relays it again. */
 export declare function landed(op: SpendOperation): boolean;
-/** Takes `op` as far as it can go now, saving before each step that leaves the device. */
+/** Whether `op` can still be cancelled, having paid nothing: a payment, withdrawal or consolidation under way with no
+ * request out to the relayer, and no merge of it landed. A step at its relay stage has one out, as its request leaves
+ * the moment it gets there; so has one built again after a relay of it reverted, as that request may still land: a
+ * JoinSplit's `attempts` count only those, and a merge, whose `attempts` count its prover's refusals too, is `sent`. */
+export declare function cancellable(op: OperationRecord): boolean;
+/** Takes `op` as far as it can go now, saving before each step that leaves the device. One cancelled meanwhile
+ * (`cancel`) finishes the stage under way and starts no other: its status is looked at after each, and nothing it does
+ * later is kept, as it is out of the state. A relayer that is relaying its request already throws `Relaying`. */
 export declare function advanceSpend(ctx: Ctx, op: SpendOperation): Promise<void>;

package/dist/spend.js

@@ -6,9 +6,12 @@
 // and deposits into one note to self, proved by the merge prover (a wallet cannot: its key is 6.3 GB). More take
 // another merge, once a root is over the first one's note.
 //
-// A relayed JoinSplit or merge is done once its first input's nullifier is final, as sync sees it: the relayer's
-// answer alone could be a lie, or a reorg could drop the transaction. Only one that cannot land fails, which frees its
-// inputs: one whose nullifier is nowhere on chain, after it kept reverting.
+// A relayed JoinSplit or merge is done once its change (a merge's note) is final where this wallet expects it, as sync
+// sees it: only its own transaction puts that note there, as its salt is fresh and the proof binds it to the inputs'
+// nullifiers. The relayer's answer alone could be a lie, a reorg could drop the transaction, and a spent input alone
+// could be another device's doing: each device of a wallet locks its inputs in its own state. Only one that cannot
+// land fails, which frees its inputs: one that kept reverting with no input spent, or one whose input another
+// transaction spent.
 import { commit, decodeCode, planPayCode, planSelf, planSend } from '@zerc20/storage-sdk';
 import { bytesToHex, decodeAbiParameters, hexToBytes, numberToHex, parseAbiParameters, } from 'viem';
 import { UNWRAP_INTENT } from './chain.js';
@@ -17,7 +20,7 @@ import { core } from './core.js';
 import { fail } from './errors.js';
 import { prove } from './prove.js';
 import { scan } from './scan.js';
-import { RelayUnknown, attest, proofOf, relay, relayMerge, relayerFees, requestProof, } from './services.js';
+import { attest, proofOf, relay, relayMerge, relayerFees, requestProof } from './services.js';
 import { unspent } from './state.js';
 import { commitmentsAt, noteReceipt, storageState, takeRefresh, tokenIds } from './sync.js';
 import { aspPath, aspPaths, commitmentPath, commitmentPaths } from './tree.js';
@@ -474,29 +477,65 @@ const positionsAt = (ctx, chainId, index) => [...ctx.state.notes, ...ctx.state.d
     .flatMap((r) => r.found.filter((f) => f.index === index));
 /** The final one of them: an input is final. */
 const positionOf = (ctx, chainId, index) => positionsAt(ctx, chainId, index).find((f) => !f.tentative);
-/** Whether the step's first input is spent on chain: among the final nullifiers (as sync last saw them), or among the
- * newer ones. Nothing but the step spends a locked input (rage exit refuses one, and a wallet is open in one tab), so
- * a spent input is the step landing. Reads the pages everyone polls, never asks about the nullifier. */
-async function inputSpent(ctx, op, step) {
-    const f = positionOf(ctx, op.chainId, step.inputs[0].index);
-    if (f?.spent)
+/** Whether any of the step's inputs is spent on chain: among the final nullifiers (as sync last saw them), or among
+ * the newer ones. Reads the pages everyone polls, never asks about a nullifier. */
+async function inputsSpent(ctx, op, step) {
+    const inputs = step.inputs.map((coin) => positionOf(ctx, op.chainId, coin.index));
+    if (inputs.some((f) => f?.spent))
         return true;
-    if (!f?.nullifier)
+    // copies: sync alone moves the watches, over final entries
+    const watches = inputs.flatMap((f) => (f?.nullifier ? [{ ...f.nullifier }] : []));
+    if (watches.length === 0)
         return false;
     const c = chainCtx(ctx, op.chainId);
     const { nullifiers } = await c.indexer.status();
-    // a copy: sync alone moves the watch, over final entries
-    const watch = { ...f.nullifier };
-    const hits = await scan([watch], 8, (p) => c.indexer.page('nullifiers', p), watch.scannedTo, nullifiers);
+    const from = Math.min(...watches.map((w) => w.scannedTo));
+    const hits = await scan(watches, 8, (p) => c.indexer.page('nullifiers', p), from, nullifiers);
     return hits.length > 0;
 }
-/** Where a relayed JoinSplit stands, by its first input `f` as sync last saw it and `relayedAt`, a nullifier count past
- * its own (`undefined` while not known): spent, or the final nullifiers passed that count without its own (a reorg
- * dropped it, or the relayer never sent it), or neither yet. */
-export function relayedState(f, relayedAt) {
-    if (f?.spent)
+/** Where a relayed step stands, by its `change` (a merge's note) and its `inputs` as sync last saw them:
+ * - `landed`: the change is final where this wallet expects it;
+ * - `taken`: an input is spent and the final commitments passed `spentAt` without the change, so another transaction
+ *   spent it, and this step can never land;
+ * - `dropped`: no input is spent and the final nullifiers passed `relayedAt` without them: whatever was spending them
+ *   is gone, a reorg dropped it or the relayer never sent it;
+ * - `mined`: the change is in a block, not final yet;
+ * - `waiting`: none of these yet. */
+export function relayedState(change, inputs, relayedAt, spentAt) {
+    const seen = change?.found.filter((f) => f.confirmed) ?? [];
+    if (seen.some((f) => !f.tentative))
         return 'landed';
-    return f?.nullifier && relayedAt !== undefined && f.nullifier.scannedTo >= relayedAt ? 'dropped' : 'waiting';
+    if (inputs.some((f) => f?.spent)) {
+        // a final position not read yet may be the change
+        const missed = spentAt !== undefined &&
+            !!change?.watch &&
+            change.watch.scannedTo >= spentAt &&
+            !change.found.some((f) => !f.tentative);
+        if (missed)
+            return 'taken';
+    }
+    else {
+        const watches = inputs.flatMap((f) => (f?.nullifier ? [f.nullifier] : []));
+        if (relayedAt !== undefined && watches.length > 0 && watches.every((w) => w.scannedTo >= relayedAt))
+            return 'dropped';
+    }
+    return seen.length > 0 ? 'mined' : 'waiting';
+}
+/** `relayedState` of `step`, failing the operation once another transaction took an input. The first time an input
+ * is seen spent, short of the step landing, it notes the final commitment count: a later status counts no fewer, so
+ * once the change's watch passes it, it has looked wherever that transaction put its notes. */
+async function standing(ctx, op, step) {
+    const inputs = step.inputs.map((coin) => positionOf(ctx, op.chainId, coin.index));
+    const salt = 'output' in step ? step.output.salt : step.outputs[1].salt;
+    const change = ctx.state.notes.find((n) => n.chainId === op.chainId && n.salt === salt);
+    const now = relayedState(change, inputs, step.relayedAt, step.spentAt);
+    if (now === 'taken')
+        fail('spent-elsewhere', 'another device of this wallet spent a note or deposit of it first: it paid nothing');
+    if (now !== 'landed' && step.spentAt === undefined && inputs.some((f) => f?.spent)) {
+        step.spentAt = (await chainCtx(ctx, op.chainId).indexer.status()).commitmentsFinal;
+        await ctx.save();
+    }
+    return now;
 }
 /** The indexer's nullifier count once it is past `block`, so past the nullifiers of a transaction mined there unless a
  * reorg moved them; `undefined` until then. The relayer answers once the block is mined, which may be before the
@@ -512,6 +551,20 @@ export async function nullifiersPast(indexer, block) {
 export function landed(op) {
     return (op.status === 'done' || (op.status === 'pending' && op.kind !== 'consolidate' && op.data.step?.stage === 'relayed'));
 }
+/** Whether `op` can still be cancelled, having paid nothing: a payment, withdrawal or consolidation under way with no
+ * request out to the relayer, and no merge of it landed. A step at its relay stage has one out, as its request leaves
+ * the moment it gets there; so has one built again after a relay of it reverted, as that request may still land: a
+ * JoinSplit's `attempts` count only those, and a merge, whose `attempts` count its prover's refusals too, is `sent`. */
+export function cancellable(op) {
+    if (op.status !== 'pending' || op.kind === 'deposit' || op.data.paid > 0n)
+        return false;
+    const step = op.data.step;
+    if (!step)
+        return true;
+    if ('output' in step)
+        return !step.sent && step.stage !== 'proved' && step.stage !== 'relayed';
+    return step.attempts === 0 && step.stage !== 'attested' && step.stage !== 'relayed';
+}
 function markSpent(ctx, op, step) {
     for (const coin of step.inputs)
         for (const f of positionsAt(ctx, op.chainId, coin.index))
@@ -524,14 +577,18 @@ function placeChange(ctx, op, salt, index) {
         note.found.push({ index, tentative: true, spent: false });
     }
 }
-/** Takes `op` as far as it can go now, saving before each step that leaves the device. */
+/** Takes `op` as far as it can go now, saving before each step that leaves the device. One cancelled meanwhile
+ * (`cancel`) finishes the stage under way and starts no other: its status is looked at after each, and nothing it does
+ * later is kept, as it is out of the state. A relayer that is relaying its request already throws `Relaying`. */
 export async function advanceSpend(ctx, op) {
     const data = op.data;
     const c = chainCtx(ctx, op.chainId);
     for (;;) {
+        if (op.status !== 'pending')
+            return;
         if (!data.step) {
             const step = await planStep(ctx, op);
-            if (!step)
+            if (!step || op.status !== 'pending')
                 return;
             if (step === 'done') {
                 op.status = 'done';
@@ -552,6 +609,8 @@ export async function advanceSpend(ctx, op) {
             step.stage = 'noted';
             await ctx.save();
         }
+        if (op.status !== 'pending')
+            return;
         if (step.stage === 'noted') {
             const built = await witnessOf(ctx, op, step);
             if (!built)
@@ -596,6 +655,8 @@ export async function advanceSpend(ctx, op) {
             step.stage = 'proved';
             await ctx.save();
         }
+        if (op.status !== 'pending')
+            return;
         if (step.stage === 'proved') {
             const attestation = await attest(c.config, step.statement, step.witness);
             step.request = { ...step.request, attestation };
@@ -603,19 +664,25 @@ export async function advanceSpend(ctx, op) {
             step.stage = 'attested';
             await ctx.save();
         }
+        if (op.status !== 'pending')
+            return;
+        if (step.stage === 'attested' && step.relayedAt !== undefined) {
+            // a relay of it reverted on an input spent already: an earlier relay of it landed, one whose answer was lost, or
+            // another transaction spent the input. Relaying it again would tell nothing more
+            const now = await standing(ctx, op, step);
+            if (now === 'waiting')
+                return;
+            if (now === 'dropped')
+                delete step.relayedAt;
+            else
+                step.stage = 'relayed';
+            await ctx.save();
+        }
         if (step.stage === 'attested') {
             const relayerOut = step.outputs.find((o) => o.role === 'relayer');
-            let result;
-            try {
-                result = await relay(c.config, step.request, relayerOut ? { value: relayerOut.value, salt: relayerOut.salt } : undefined);
-            }
-            catch (e) {
-                if (e instanceof RelayUnknown)
-                    return; // try the same request again next time
-                throw e;
-            }
+            const result = await relay(c.config, step.request, relayerOut ? { value: relayerOut.value, salt: relayerOut.salt } : undefined);
             if ('reverted' in result) {
-                if (!(await inputSpent(ctx, op, step))) {
+                if (!(await inputsSpent(ctx, op, step))) {
                     // stale roots, most likely: prove again with the same outputs, next sync. A JoinSplit that keeps reverting
                     // is not on chain and cannot land, so failing it frees its inputs.
                     if (++step.attempts > 3)
@@ -624,24 +691,24 @@ export async function advanceSpend(ctx, op) {
                     await ctx.save();
                     return;
                 }
-                // an earlier relay of it landed, one whose answer was lost, and the indexer counts its nullifier already
+                // the indexer counts the nullifiers of whatever spent it already
                 step.relayedAt = (await c.indexer.status()).nullifiers;
+                await ctx.save();
+                return;
             }
-            else {
-                placeChange(ctx, op, step.outputs[1].salt, result.noteIndex2);
-                data.txHashes = [...(data.txHashes ?? []), result.txHash];
-                step.relayedBlock = result.block;
-                delete step.relayedAt;
-            }
+            placeChange(ctx, op, step.outputs[1].salt, result.noteIndex2);
+            data.txHashes = [...(data.txHashes ?? []), result.txHash];
+            step.relayedBlock = result.block;
             step.stage = 'relayed';
             await ctx.save();
         }
         if (step.stage === 'relayed') {
             step.relayedAt ??= await nullifiersPast(c.indexer, step.relayedBlock);
-            const now = relayedState(positionOf(ctx, op.chainId, step.inputs[0].index), step.relayedAt);
+            const now = await standing(ctx, op, step);
             if (now === 'dropped') {
                 // relay it again next sync; if it did land after all, that reverts and finds it
                 step.stage = 'attested';
+                delete step.relayedAt;
                 await ctx.save();
             }
             if (now !== 'landed')
@@ -674,6 +741,8 @@ async function advanceMerge(ctx, op, step) {
         step.stage = 'noted';
         await ctx.save();
     }
+    if (op.status !== 'pending')
+        return false;
     if (step.stage === 'noted') {
         const built = await mergeWitnessOf(ctx, op, step);
         if (!built)
@@ -708,6 +777,8 @@ async function advanceMerge(ctx, op, step) {
         step.stage = 'attested';
         await ctx.save();
     }
+    if (op.status !== 'pending')
+        return false;
     if (step.stage === 'attested') {
         await requestProof(c.config, prover, step.statement, step.witness, step.inputs.length);
         delete step.witness; // the prover has it: the inputs' openings need not stay saved here
@@ -731,37 +802,43 @@ async function advanceMerge(ctx, op, step) {
         step.stage = 'proved';
         await ctx.save();
     }
+    if (op.status !== 'pending')
+        return false;
+    if (step.stage === 'proved' && step.relayedAt !== undefined) {
+        // as a JoinSplit's, told apart by its note
+        const now = await standing(ctx, op, step);
+        if (now === 'waiting')
+            return false;
+        if (now === 'dropped')
+            delete step.relayedAt;
+        else
+            step.stage = 'relayed';
+        await ctx.save();
+    }
     if (step.stage === 'proved') {
-        let result;
-        try {
-            result = await relayMerge(c.config, step.request);
-        }
-        catch (e) {
-            if (e instanceof RelayUnknown)
-                return false; // try the same request again next time
-            throw e;
-        }
+        const result = await relayMerge(c.config, step.request);
         if ('reverted' in result) {
             // stale roots, most likely: built again with the same output, next sync
-            if (!(await inputSpent(ctx, op, step)))
+            if (!(await inputsSpent(ctx, op, step))) {
+                step.sent = true;
                 return again(result.reverted);
-            // an earlier relay of it landed, one whose answer was lost, and the indexer counts its nullifiers already
+            }
             step.relayedAt = (await c.indexer.status()).nullifiers;
+            await ctx.save();
+            return false;
         }
-        else {
-            placeChange(ctx, op, step.output.salt, result.noteIndex);
-            data.txHashes = [...(data.txHashes ?? []), result.txHash];
-            step.relayedBlock = result.block;
-            delete step.relayedAt;
-        }
+        placeChange(ctx, op, step.output.salt, result.noteIndex);
+        data.txHashes = [...(data.txHashes ?? []), result.txHash];
+        step.relayedBlock = result.block;
         step.stage = 'relayed';
         await ctx.save();
     }
     step.relayedAt ??= await nullifiersPast(c.indexer, step.relayedBlock);
-    const now = relayedState(positionOf(ctx, op.chainId, step.inputs[0].index), step.relayedAt);
+    const now = await standing(ctx, op, step);
     if (now === 'dropped') {
         // relay it again next sync; if it did land after all, that reverts and finds it
         step.stage = 'proved';
+        delete step.relayedAt;
         await ctx.save();
     }
     if (now !== 'landed')