@bananapus/nana-sdk-core 6.0.0 → 6.2.0

package/dist/esm/review/relayrLaunch.d.ts

@@ -0,0 +1,90 @@
+import type { Address, Hex } from "viem";
+import type { RelayrEntry, RelayrQuote, RelayrSentPayment, RelayrTransactionRecord } from "./relayr.js";
+/** The phases a saved Relayr launch journal may be in, in order. */
+export declare const RELAYR_LAUNCH_PHASES: readonly ["signing", "quoting", "quoted", "payment-signing", "submitted", "executing", "payment-reverted"];
+/** `payment-reverted`: the latest payment canonically reverted; only the SDK's retry rule lets the quote be paid again. */
+export type RelayrLaunchPhase = (typeof RELAYR_LAUNCH_PHASES)[number];
+export type RelayrSignedLaunch = {
+    chainId: number;
+    entry: RelayrEntry;
+    nonce: string;
+    deadline: number;
+    /** Replaced before any quote was asked for, so nothing of it was ever posted. */
+    unposted?: true;
+};
+/** A launch's Relayr journal: exact signatures and quote bindings that survive reloads, including the wallet's no-hash send window. */
+export type RelayrLaunchJournal = {
+    account: Address;
+    paymentChainId?: number;
+    phase: RelayrLaunchPhase;
+    signed: RelayrSignedLaunch[];
+    superseded?: RelayrSignedLaunch[];
+    /** Retrying a known failed attempt must reuse its nonce, even if the old signature is still live. */
+    retryNonces?: Record<number, string>;
+    quote?: RelayrQuote;
+    paymentHash?: Hex;
+    /** Every payment sent for the quote, as relayrPaymentDetails authenticated it, under the hash it was mined. */
+    payments?: RelayrSentPayment[];
+    paymentDeadline?: string;
+    records: RelayrTransactionRecord[];
+    published?: true;
+    abandonable?: true;
+};
+export declare const isRelayrLaunchPhase: (value: unknown) => value is RelayrLaunchPhase;
+/** A payment was or may be sent: the saved payment chain is required. */
+export declare const relayrLaunchPaying: (phase: RelayrLaunchPhase) => phase is "payment-signing" | "submitted" | "executing" | "payment-reverted";
+/** Nothing funds the quote: published requests are classified, and an abandonable journal signs again. */
+export declare const relayrLaunchUnfunded: (phase: RelayrLaunchPhase) => phase is "signing" | "quoting" | "quoted" | "payment-reverted";
+/** A payment is with the wallet or the chain: resume reconciles it, never pays again. */
+export declare const relayrLaunchInFlight: (phase: RelayrLaunchPhase) => phase is "payment-signing" | "submitted" | "executing";
+export type RelayrLaunchEvent = 
+/** Persisted before the signed entries are posted to Relayr. */
+{
+    type: "quoting";
+} | {
+    type: "quoted";
+    quote: RelayrQuote;
+} | {
+    type: "chosen";
+    paymentChainId: number;
+    paymentDeadline: string;
+}
+/** The wallet holds the payment and has returned no hash. */
+ | {
+    type: "sending";
+} | {
+    type: "sent";
+    payments: RelayrSentPayment[];
+}
+/** The payment attempt failed; `outcome` is relayrPaymentAttemptOutcome's answer. */
+ | {
+    type: "unsent";
+    outcome: "reverted" | "unpaid" | null;
+} | {
+    type: "executing";
+}
+/** A saved payment was proven reverted on resume. */
+ | {
+    type: "reverted";
+}
+/** revertedRelayrQuote proved nothing can fund the quote: the same signatures are quoted again. */
+ | {
+    type: "released";
+};
+/**
+ * Moves a launch journal through its payment lifecycle, in place, since the
+ * session holds it: true when it changed and must be persisted.
+ */
+export declare function advanceRelayrLaunch(journal: RelayrLaunchJournal, event: RelayrLaunchEvent): boolean;
+/**
+ * A new journal that signs again: `superseded` (published signatures it
+ * replaces) marks it published, and `retryNonces` pins each chain's nonce so
+ * the forwarder runs at most one of old and new.
+ */
+export declare function resignedRelayrLaunch({ account, retryNonces, superseded, abandonable, }: {
+    account: Address;
+    retryNonces?: Record<number, string>;
+    superseded?: RelayrSignedLaunch[];
+    abandonable?: boolean;
+}): RelayrLaunchJournal;
+//# sourceMappingURL=relayrLaunch.d.ts.map

package/dist/esm/review/relayrLaunch.d.ts.map

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

package/dist/esm/review/relayrLaunch.js

@@ -0,0 +1,97 @@
+/** The phases a saved Relayr launch journal may be in, in order. */
+export const RELAYR_LAUNCH_PHASES = [
+    "signing",
+    "quoting",
+    "quoted",
+    "payment-signing",
+    "submitted",
+    "executing",
+    "payment-reverted",
+];
+export const isRelayrLaunchPhase = (value) => RELAYR_LAUNCH_PHASES.includes(value);
+/** A payment was or may be sent: the saved payment chain is required. */
+export const relayrLaunchPaying = (phase) => phase === "payment-signing" ||
+    phase === "submitted" ||
+    phase === "executing" ||
+    phase === "payment-reverted";
+/** Nothing funds the quote: published requests are classified, and an abandonable journal signs again. */
+export const relayrLaunchUnfunded = (phase) => phase === "signing" ||
+    phase === "quoting" ||
+    phase === "quoted" ||
+    phase === "payment-reverted";
+/** A payment is with the wallet or the chain: resume reconciles it, never pays again. */
+export const relayrLaunchInFlight = (phase) => phase === "payment-signing" || phase === "submitted" || phase === "executing";
+/**
+ * Moves a launch journal through its payment lifecycle, in place, since the
+ * session holds it: true when it changed and must be persisted.
+ */
+export function advanceRelayrLaunch(journal, event) {
+    switch (event.type) {
+        case "quoting":
+            journal.phase = "quoting";
+            journal.published = true;
+            delete journal.abandonable;
+            delete journal.quote;
+            delete journal.paymentChainId;
+            delete journal.paymentDeadline;
+            return true;
+        case "quoted":
+            journal.quote = event.quote;
+            journal.phase = "quoted";
+            return true;
+        case "chosen":
+            journal.paymentChainId = event.paymentChainId;
+            journal.paymentDeadline = event.paymentDeadline;
+            return true;
+        case "sending":
+            journal.phase = "payment-signing";
+            // The wallet's payment has no hash yet, even when an earlier one reverted.
+            delete journal.paymentHash;
+            return true;
+        case "sent":
+            journal.payments = event.payments;
+            journal.paymentHash = event.payments[event.payments.length - 1].hash;
+            journal.phase = "submitted";
+            return true;
+        case "unsent":
+            if (event.outcome === "reverted")
+                journal.phase = "payment-reverted";
+            else if (event.outcome === "unpaid") {
+                journal.phase = "quoted";
+                delete journal.paymentChainId;
+                delete journal.paymentDeadline;
+            }
+            return event.outcome !== null;
+        case "executing":
+            journal.phase = "executing";
+            return true;
+        case "reverted":
+            journal.phase = "payment-reverted";
+            return true;
+        case "released":
+            journal.phase = "quoted";
+            delete journal.quote;
+            delete journal.payments;
+            delete journal.paymentHash;
+            delete journal.paymentChainId;
+            delete journal.paymentDeadline;
+            return true;
+    }
+}
+/**
+ * A new journal that signs again: `superseded` (published signatures it
+ * replaces) marks it published, and `retryNonces` pins each chain's nonce so
+ * the forwarder runs at most one of old and new.
+ */
+export function resignedRelayrLaunch({ account, retryNonces, superseded, abandonable, }) {
+    return {
+        account,
+        phase: "signing",
+        signed: [],
+        records: [],
+        ...(superseded ? { published: true, superseded } : {}),
+        ...(abandonable ? { abandonable: true } : {}),
+        ...(retryNonces ? { retryNonces } : {}),
+    };
+}
+//# sourceMappingURL=relayrLaunch.js.map

package/dist/esm/review/relayrLaunch.js.map

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

package/dist/esm/review/relayrSend.d.ts

@@ -5,6 +5,7 @@ import { type RelayrBundle, type RelayrEntry, type RelayrQuote } from "./relayr.
 import type { SafeRelayrOptions } from "./safeRelayr.js";
 import type { ReviewedSendDeps } from "./send.js";
 import { type WalletAdapter } from "./wallet.js";
+import { type LockHandle } from "./writeRecovery.js";
 /**
  * One destination call Relayr runs through the chain's forwarder, with the
  * gas its request signs. `raw`: Relayr runs it from its own account, unsigned
@@ -54,6 +55,8 @@ export declare function signReviewedForwardRequests(calls: readonly RelayrReview
     account: Address;
     context?: readonly ReviewContextRow[];
     title?: string;
+    /** The site's own locks, checked as the last await before each signature. */
+    locks?: readonly LockHandle[];
 }, deps: {
     adapter: WalletAdapter;
     clientFor: (chainId: number) => PublicClient;
@@ -75,6 +78,8 @@ export declare function payRelayrReviewed(quote: RelayrQuote, chainId: number, a
     context?: readonly ReviewContextRow[];
     onSending?: () => Promise<void>;
     onSent?: (hash: Hex) => Promise<void>;
+    /** The site's own locks, checked before `onSending` and as the last await before the wallet; a lost one sends nothing. */
+    locks?: readonly LockHandle[];
     /** A plan already reviewed with exactly this payment (`reviewPlan`): nothing is asked. */
     plan?: ReviewedPlan;
     /** The plan's Relayr round this quote runs: the payment spends its fee bound instead. */

package/dist/esm/review/relayrSend.d.ts.map

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

package/dist/esm/review/relayrSend.js

@@ -15,7 +15,7 @@ import { prepareSignature, signPrepared, } from "./sign.js";
 import { simulateStateChangingTransaction } from "./simulation.js";
 import { unsupportedWalletRequest, walletReady, } from "./wallet.js";
 import { openStepHold, WriteHeldError } from "./writeHold.js";
-import { browserLocks } from "./writeRecovery.js";
+import { assertLocksHeld, browserLocks, } from "./writeRecovery.js";
 import { pause, timeout } from "../pause.js";
 import { FOLLOW_MS, RECEIPT_RETRY_MS } from "./heldWrite.js";
 /**
@@ -382,7 +382,10 @@ async function sendPayment(details, account, deps, hooks = {}) {
         ...(hooks.intent ? { intent: hooks.intent.key } : {}),
     };
     const handle = openStepHold(deps.hold, account, safe, call);
-    /** The attempt is saved (`onSending`), and the wallet not yet asked. */
+    /**
+     * The app's `onSending` began, so its saved "sending" record may stand:
+     * any refusal before the wallet then says "not sent", so the app restores it.
+     */
     let saved = false;
     let invoked = false;
     /** The reservation this payment's send took. */
@@ -393,112 +396,130 @@ async function sendPayment(details, account, deps, hooks = {}) {
         const held = handle.peek();
         if (held.status !== "clear")
             throw new WriteHeldError(held);
-        return handle.send(client, (gate) => submitReviewedContractWrite({
-            request: call,
-            expectedAccount: account,
-            review: () => Promise.resolve(),
-            switchChain: async (chainId) => {
-                if (adapter.chainId() !== chainId)
-                    await adapter.switchChain(chainId);
-            },
-            currentAccount: () => adapter.account(),
-            reverify: async () => {
-                await hooks.recheck?.();
-                // A lapsed payment would only revert in simulation.
-                if (quoteExpired(details.deadline))
-                    throw new QuoteExpiredError();
-                await requireRelayrPaymentRuntime(client);
-            },
-            simulate: async () => {
-                const [, found] = await Promise.all([
-                    simulateRelayrPayment(client, {
-                        from: account,
-                        payment: details,
-                    }),
-                    // A Safe never proposes again a payment it already queued exactly.
-                    safe && hasSafeService(details.chainId)
-                        ? findPendingSafeAppProposal(client, details.chainId, account, {
-                            to: RELAYR_PAYMENT_ADDRESS,
-                            data: details.calldata,
-                            value: details.amount,
-                        }, deps.hold.safeService, true)
-                        : null,
-                ]);
-                queued = found;
-                return details;
-            },
-            beforeWrite: async () => {
-                const { intent } = hooks;
-                // Only the check and the reservation are under the lock: never a
-                // chain switch, simulation or wallet that might not answer.
-                await (intent
-                    ? browserLocks().request(`nana-sdk:relayr-payment:${account.toLowerCase()}:${intent.key}`, { mode: "exclusive" }, async () => {
-                        requireIntentClear(deps, account, intent);
-                        await gate.beforeSend();
-                    })
-                    : gate.beforeSend());
-                reserved = handle.peek().reservation;
-                try {
-                    await hooks.onSending?.();
-                }
-                catch (error) {
-                    gate.onRejected();
-                    throw error;
-                }
-                saved = true;
-            },
-            beforeSend: () => {
-                try {
-                    if (details.target.toLowerCase() !== RELAYR_PAYMENT_ADDRESS ||
-                        details.calldata.slice(0, 10).toLowerCase() !==
-                            RELAYR_PAYMENT_SELECTOR) {
-                        throw new Error("The Relayr payment is not to its pinned contract.");
-                    }
+        return handle.send(client, (gate) => {
+            /** Every lock is still this tab's: the hold's and the app's. */
+            const fence = () => assertLocksHeld([gate, ...(hooks.locks ?? [])]);
+            return submitReviewedContractWrite({
+                request: call,
+                expectedAccount: account,
+                review: () => Promise.resolve(),
+                switchChain: async (chainId) => {
+                    if (adapter.chainId() !== chainId)
+                        await adapter.switchChain(chainId);
+                },
+                currentAccount: () => adapter.account(),
+                reverify: async () => {
+                    await hooks.recheck?.();
+                    // A lapsed payment would only revert in simulation.
                     if (quoteExpired(details.deadline))
                         throw new QuoteExpiredError();
-                    if (adapter.isSafe() !== safe)
-                        throw new Error(safe
-                            ? "Wallet connection changed. Review the payment again."
-                            : ORDINARY_WALLET);
-                    if (adapter.chainId() !== details.chainId) {
-                        throw new Error("Your wallet changed networks. Review the payment again.");
+                    await requireRelayrPaymentRuntime(client);
+                },
+                simulate: async () => {
+                    const [, found] = await Promise.all([
+                        simulateRelayrPayment(client, {
+                            from: account,
+                            payment: details,
+                        }),
+                        // A Safe never proposes again a payment it already queued exactly.
+                        safe && hasSafeService(details.chainId)
+                            ? findPendingSafeAppProposal(client, details.chainId, account, {
+                                to: RELAYR_PAYMENT_ADDRESS,
+                                data: details.calldata,
+                                value: details.amount,
+                            }, deps.hold.safeService, true)
+                            : null,
+                    ]);
+                    queued = found;
+                    return details;
+                },
+                beforeWrite: async () => {
+                    const { intent } = hooks;
+                    // Only the check and the reservation are under the lock: never a
+                    // chain switch, simulation or wallet that might not answer.
+                    await (intent
+                        ? browserLocks().request(`nana-sdk:relayr-payment:${account.toLowerCase()}:${intent.key}`, { mode: "exclusive" }, async (lock) => {
+                            requireIntentClear(deps, account, intent);
+                            await gate.beforeSend();
+                            try {
+                                // A tab asleep through the reservation's reads gave this up.
+                                await lock.assertHeld();
+                            }
+                            catch (error) {
+                                gate.onRejected();
+                                throw error;
+                            }
+                        })
+                        : gate.beforeSend());
+                    reserved = handle.peek().reservation;
+                    try {
+                        // The site's own record before the wallet: never under a lost lock.
+                        await assertLocksHeld(hooks.locks);
+                        saved = true;
+                        await hooks.onSending?.();
+                        // Core's own check before the adapter, which fences again as the
+                        // last await before the wallet.
+                        await fence();
                     }
-                    // Last, after every callback above could have run.
-                    if (adapter.account()?.toLowerCase() !== account.toLowerCase()) {
-                        throw new Error(ACCOUNT_CHANGED);
+                    catch (error) {
+                        gate.onRejected();
+                        throw error;
                     }
-                }
-                catch (error) {
-                    throw new RelayrPaymentNotSentError(error);
-                }
-            },
-            onBeforeWriteAborted: () => gate.onRejected(),
-            onWriteRejected: () => gate.onRejected(),
-            onWriteSubmitted: async (submitted) => {
-                gate.afterSubmit(submitted, queued?.tx);
-                await hooks.onSent?.(submitted);
-            },
-            // The pinned contract and gas, never the quote's word.
-            write: async ({ chainId, calldata, amount }) => {
-                // An adopted proposal is already with the Safe: never "not sent".
-                invoked = true;
-                if (queued)
-                    return queued.proposalHash;
-                try {
-                    return await adapter.sendTransaction({
-                        chainId,
-                        to: RELAYR_PAYMENT_ADDRESS,
-                        data: calldata,
-                        value: amount,
-                        gas: safe ? 0n : RELAYR_PAYMENT_GAS,
-                    });
-                }
-                catch (error) {
-                    // Only the wallet's own 4001 says it declined.
-                    throw relayrWalletPaymentError(error);
-                }
-            },
-        }));
+                },
+                beforeSend: () => {
+                    try {
+                        if (details.target.toLowerCase() !== RELAYR_PAYMENT_ADDRESS ||
+                            details.calldata.slice(0, 10).toLowerCase() !==
+                                RELAYR_PAYMENT_SELECTOR) {
+                            throw new Error("The Relayr payment is not to its pinned contract.");
+                        }
+                        if (quoteExpired(details.deadline))
+                            throw new QuoteExpiredError();
+                        if (adapter.isSafe() !== safe)
+                            throw new Error(safe
+                                ? "Wallet connection changed. Review the payment again."
+                                : ORDINARY_WALLET);
+                        if (adapter.chainId() !== details.chainId) {
+                            throw new Error("Your wallet changed networks. Review the payment again.");
+                        }
+                        // Last, after every callback above could have run.
+                        if (adapter.account()?.toLowerCase() !== account.toLowerCase()) {
+                            throw new Error(ACCOUNT_CHANGED);
+                        }
+                    }
+                    catch (error) {
+                        throw new RelayrPaymentNotSentError(error);
+                    }
+                },
+                onBeforeWriteAborted: () => gate.onRejected(),
+                onWriteRejected: () => gate.onRejected(),
+                onWriteSubmitted: async (submitted) => {
+                    gate.afterSubmit(submitted, queued?.tx);
+                    await hooks.onSent?.(submitted);
+                },
+                // The pinned contract and gas, never the quote's word.
+                write: async ({ chainId, calldata, amount }) => {
+                    // An adopted proposal is already with the Safe: never "not sent".
+                    invoked = true;
+                    if (queued)
+                        return queued.proposalHash;
+                    try {
+                        return await adapter.sendTransaction({
+                            chainId,
+                            to: RELAYR_PAYMENT_ADDRESS,
+                            data: calldata,
+                            value: amount,
+                            gas: safe ? 0n : RELAYR_PAYMENT_GAS,
+                            fence,
+                        });
+                    }
+                    catch (error) {
+                        // Only the wallet's own 4001 says it declined.
+                        throw relayrWalletPaymentError(error);
+                    }
+                },
+            });
+        });
     };
     let hash;
     try {
@@ -609,7 +630,7 @@ export async function signReviewedForwardRequests(calls, action, deps) {
         ...(action.context ? { context: action.context } : {}),
     });
     await promptReview(model, Promise.resolve({ status: "passed" }), Promise.resolve(model));
-    const signatures = await signPrepared(prepared, account, deps.adapter);
+    const signatures = await signPrepared(prepared, account, deps.adapter, undefined, () => assertLocksHeld(action.locks), () => assertLocksHeld(action.locks));
     return requests.map(({ chainId, request }, index) => entryOf(chainId, request, signatures[index]));
 }
 /**
@@ -662,6 +683,7 @@ export async function payRelayrReviewed(quote, chainId, action, deps) {
         recheck: () => requireRelayrBundleUnpaid(details.bundleUuid),
         ...(action.onSending ? { onSending: action.onSending } : {}),
         ...(action.onSent ? { onSent: action.onSent } : {}),
+        ...(action.locks ? { locks: action.locks } : {}),
         safe,
     });
     return safe ? { safeTxHash: hash } : { hash };
@@ -699,11 +721,15 @@ export async function pollRelayrBundle(uuid, expectedCount, options = {}) {
             throw new Error(`Relayr is still processing paid bundle ${uuid}. Do not submit this action again; check it later.`);
         }
         await new Promise((resolve, reject) => {
-            const timer = setTimeout(resolve, POLL_INTERVAL_MS);
-            signal?.addEventListener("abort", () => {
+            const aborted = () => {
                 clearTimeout(timer);
                 reject(signal.reason);
-            }, { once: true });
+            };
+            const timer = setTimeout(() => {
+                signal?.removeEventListener("abort", aborted);
+                resolve();
+            }, POLL_INTERVAL_MS);
+            signal?.addEventListener("abort", aborted, { once: true });
         });
     }
 }