@arkade-os/swap 0.0.10 → 0.1.0-rc.0

package/dist/{rfq-DglvHMNC.d.ts → rfq-CzCGjICq.d.cts}

@@ -1,4 +1,4 @@
-import { VHTLC, asset, IWallet, ProvisionedClaimSecret, ProvisionedKey } from '@arkade-os/sdk';
+import { VHTLC, IWallet, ProvisionedClaimSecret, ProvisionedKey, asset } from '@arkade-os/sdk';
 
 /** L1 confirmation-depth and reorg margin between dependent timelocks. */
 declare const ONCHAIN_ORDER_MARGIN_SECONDS: number;
@@ -251,15 +251,23 @@ type RfqRefusalReason = "unsupported_pair" | "unsupported_payload" | "amount_out
 declare const RFQ_TERMINAL_STATES: readonly ["settled", "refused", "expired", "refunded", "stuck"];
 /** A refusal from the solver, carrying its closed-set reason. */
 declare class SwapRefusal extends Error {
+    /** Literal-typed so the v2 error taxonomy's union discriminates on `name`
+     * — a `string` here collapses the discriminant for every member. Same value
+     * the constructor has always set, moved to a field initializer. */
+    readonly name = "SwapRefusal";
     readonly reason: string;
     readonly rfqId: string | undefined;
     constructor(reason: string, rfqId?: string);
 }
-/** The solver's address does not match the local derivation. NEVER fund past this. */
+/**
+ * The solver's address does not match the local derivation. NEVER fund past
+ * this. `derived` is every candidate address tried — more than one when the
+ * derivation itself is ambiguous, see {@link verifyLockupAddress}.
+ */
 declare class AddressMismatch extends Error {
-    readonly derived: string;
+    readonly derived: string | string[];
     readonly quoted: string | undefined;
-    constructor(derived: string, quoted?: string);
+    constructor(derived: string | string[], quoted?: string);
 }
 /** A fresh client-chosen negotiation id: 32 random bytes, lowercase hex. */
 declare const newRfqId: () => string;
@@ -293,7 +301,7 @@ interface RfqStatus {
 /** The rfq_request for the lightning send profile. A BOLT11 profile is always
  * exact-out: the invoice fixes the amount, so none is restated here.
  * `senderPubkey` is the trader's own key for the VHTLC's sender-side leaves
- * (see {@link lightningSendVtxoScript}) — required, never sent anywhere else,
+ * (see {@link lightningSendContract}) — required, never sent anywhere else,
  * never trusted by the solver as anything but a pubkey to bind into the
  * script. On the wire it's `client_refund_pubkey` (the payload schemas are
  * public at https://docs.arkadeos.com/intents/reference/rfq — the solver's schema
@@ -323,9 +331,24 @@ declare const arkadeSwapRequest: (input: {
  * 90 because the refund CLTV matures against median-time-past (BIP-113),
  * which lags wall clock by ~1h — a smaller wall-clock margin is no margin. */
 declare const MIN_HEADROOM_SECONDS: number;
-/** Compare-only check of the solver's address against YOUR derivation.
- * Throws {@link AddressMismatch}; returns the address so calls chain. */
-declare const verifyLockupAddress: (quote: RfqQuote, derivedAddress: string) => string;
+/**
+ * Compare-only check of the solver's address against YOUR OWN derivation(s)
+ * — never extends trust, only narrows it.
+ *
+ * `derivedAddress` may be a single address or an array of candidates. Pass an
+ * array when your own derivation is ambiguous — as it is for the covenant
+ * lockups while solvers roll out the timelocked non-interactive refund leaf:
+ * nothing on the wire says whether a given quote's covenant carries it (the
+ * shape is fixed by the solver's own build, not negotiated per quote), so the
+ * only safe move is to derive BOTH shapes and accept whichever one the quote's
+ * own `lockup_address` matches. This loses no security: every candidate shape
+ * pins the refund to the trader's own refund destination, so a solver gains
+ * nothing by choosing which one to quote.
+ *
+ * Throws {@link AddressMismatch} only when NONE of the candidates match.
+ * Returns the address that matched, so calls chain exactly as before.
+ */
+declare const verifyLockupAddress: (quote: RfqQuote, derivedAddress: string | string[]) => string;
 /** The user's gates, checked immediately before funding — never at quote
  * time. Throws with a stable `reason` property. `invoiceExpiresAt` applies to
  * BOLT11 profiles only; `onchain` adds the L1-HTLC gates (§ guardrails of the
@@ -397,7 +420,7 @@ declare const SOLO_REFUND_HEADROOM_SECONDS: number;
  * exit delay exactly as the reference solver derives it — both sides read the
  * SAME server, so the derivation (not a quote field) is what keeps the two
  * scripts identical. */
-declare const unilateralClaimDelay: (serverExitDelaySeconds: number) => number;
+declare const unilateralClaimDelay: (operatorExitDelaySeconds: number) => number;
 /** VHTLC's `unilateralRefund` tier: sender + receiver, no server — LEVEL with
  * `claimDelay`, not above it. Neither party can spend a two-signature leaf
  * alone, so separating it buys no safety, and every second spent separating it
@@ -413,23 +436,25 @@ declare const unilateralRefundWithoutReceiverDelay: (claimDelay: number) => numb
  * hex); the script's HASH160 commitment is derived from it here, which is why
  * the trader never needs to see `P`.
  *
- * Every quote gets the full eight-leaf contract: VHTLC's own six
+ * Every quote gets the full emulator-covenant suite on top of VHTLC's own six
  * (`claim`/`refund`/`refundWithoutReceiver`/`unilateralClaim`/
- * `unilateralRefund`/`unilateralRefundWithoutReceiver`), plus two more the
- * emulator co-signs under a covenant pinning the payout to a pre-committed
- * destination — `nonInteractiveClaim` (server + emulator, pays the solver's
- * own `receiverPkScript`, no solver signature needed) and
- * `nonInteractiveRefund` (server + solver + emulator, pays the trader's own
- * `refundPkScript`, no timelock and no trader signature needed — see {@link
- * VHTLC.Options.nonInteractiveRefund}'s doc comment for why that matters).
+ * `unilateralRefund`/`unilateralRefundWithoutReceiver`): `nonInteractiveClaim`
+ * (server + emulator, pays the solver's own `receiverPkScript`, no solver
+ * signature needed), `nonInteractiveRefund` (server + solver + emulator, pays
+ * the trader's own `refundPkScript`, no timelock and no trader signature
+ * needed — see {@link VHTLC.Options.nonInteractiveParameters}'s doc comment for why
+ * that matters), and its timelocked twin `nonInteractiveRefundWithoutReceiver`
+ * (server + emulator alone, after `refundLocktime` — the only refund tier
+ * needing no participant at all). Nine leaves in all, unless `legacy` says
+ * otherwise.
  */
-declare function lightningSendVtxoScript(params: {
+declare function lightningSendContract(params: {
     /** Binding field #1: the solver's x-only key, from the quote. */
     solverPubkey: Uint8Array;
     /** Binding field #2: when the trader's refund path opens, from the quote. */
     refundLocktime: number;
     /** The Ark server's x-only key — the trader's OWN connection. */
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     /** BOLT11 payment hash, hex — from the trader's OWN invoice decode. */
     paymentHash: string;
     /** From {@link unilateralClaimDelay} over the trader's OWN server info.
@@ -439,7 +464,7 @@ declare function lightningSendVtxoScript(params: {
     /** Emulator x-only key (32 bytes). */
     emulatorPubkey: Uint8Array;
     /** Where a refund must pay: the trader's P2TR pkScript (34 bytes). Also
-     * `nonInteractiveRefund`'s covenant destination. */
+     * the refund covenants' destination. */
     refundPkScript: Uint8Array;
     /** The trader's own key — VHTLC's `sender` role. Required on every
      * interactive refund-side leaf; the trader generates and persists it
@@ -450,10 +475,15 @@ declare function lightningSendVtxoScript(params: {
      * covenant key can be derived; the trader does not otherwise use or trust
      * this value. P2TR pkScript, 34 bytes. */
     receiverPkScript: Uint8Array;
+    /** LEGACY REBUILD ONLY — see {@link VHTLC.Options.nonInteractiveParameters}'s
+     * `legacy` field. Set only to re-derive a lockup funded before the
+     * timelocked refund leaf shipped; {@link matchQuotedLockup} passes it when
+     * the quote's own address says the solver quoted that shape. */
+    legacy?: "preTimelockedRefund";
 }): InstanceType<typeof VHTLC.ScriptV2>;
-/** Every input {@link lightningSendVtxoScript} builds from. Derived from the
+/** Every input {@link lightningSendContract} builds from. Derived from the
  * builder rather than restated, so the two cannot drift. */
-type LightningSendTreeParams = Parameters<typeof lightningSendVtxoScript>[0];
+type LightningSendContractParams = Parameters<typeof lightningSendContract>[0];
 /** The BOLT11 facts the trader read from its OWN decode — this module takes
  * the facts, not the decoder, so any wallet's existing decoder serves. */
 interface InvoiceFacts {
@@ -487,14 +517,15 @@ interface InvoiceFacts {
  * throws while nothing is funded. `RfqSwapManager` re-registers as a backstop
  * for older records; a repeat write is a no-op.
  *
- * The `sender` key is the wallet's identity key, reused by {@link
- * provisionRefundKey} — returned as `senderPubkey` plus `secrets`. `secrets`
- * holds only a public descriptor; the signer re-derives from the wallet, so
- * nothing secret is at rest. Persist `secrets` with the record anyway: it is
- * how the refund signer is found again. `nonInteractiveRefund` recovers the funds even without it — but it needs the SOLVER's active
- * cooperation, not just infrastructure uptime.
+ * The `sender` key is the wallet's identity key, as {@link provisionRefundKey}
+ * pins it — returned as `senderPubkey` plus `secrets`. `secrets` holds only a
+ * public descriptor; the signer re-derives from the wallet, so nothing secret
+ * is at rest. Persist `secrets` with the record anyway: it is how the refund
+ * signer is found again. `nonInteractiveRefund` recovers the funds even
+ * without it — but it needs the SOLVER's active cooperation, not just
+ * infrastructure uptime.
  */
-declare function requestLightningSend(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestLightningSend(wallet: IWallet, transport: RfqTransport, params: {
     invoice: InvoiceFacts;
     rfqId?: string;
     /** Co-signer key override (33-byte compressed hex); see
@@ -527,7 +558,7 @@ declare function requestLightningSend(wallet: IWallet, arkServerUrl: string, tra
      *
      * Returned so a consumer can persist the swap without re-deriving any of
      * it. Half of these are not on the quote: `serverPubkey` and `claimDelay`
-     * come from this wallet's own `getInfo()`, `emulatorPubkey` from a
+     * come from this wallet's own `getArkadeInfo()`, `emulatorPubkey` from a
      * per-network pin, `refundPkScript` from `secrets` — decoded from the
      * refund address at provisioning time, the same address this call returns
      * as `refundAddress`.
@@ -539,7 +570,7 @@ declare function requestLightningSend(wallet: IWallet, arkServerUrl: string, tra
      * `VHTLCV2ContractHandler.serializeParams(script.options)`, the shape the
      * rebuild accepts.
      */
-    treeParams: LightningSendTreeParams;
+    contractParams: LightningSendContractParams;
 }>;
 /**
  * Map an arkade↔arkade quote onto `createOffer` terms. The trader takes the
@@ -622,7 +653,7 @@ declare function deriveOnchainSend(input: {
     quote: RfqQuote;
     paymentHash: string;
     payoutPubkey: Uint8Array;
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     emulatorPubkey: Uint8Array;
     claimDelay: number;
     hrp: string;
@@ -673,7 +704,7 @@ declare function deriveOnchainSend(input: {
  *   `claimOnchainFill`) before `htlc.refundLocktime`. Missing that window
  *   forfeits the fill and falls back to the Arkade covenant refund.
  */
-declare function requestOnchainSend(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestOnchainSend(wallet: IWallet, transport: RfqTransport, params: {
     amount: number;
     amountSide: "from" | "to";
     /** User's x-only L1 key that will claim the HTLC. */
@@ -721,6 +752,11 @@ declare function requestOnchainSend(wallet: IWallet, arkServerUrl: string, trans
     /** `profile.min_confirmations`; gates when the L1 fill becomes claimable,
      * and part of what a restored swap needs to drive its own claim. */
     minConfirmations: number;
+    /** The arkade lockup's refund deadline, as the covenant was built with it.
+     * Read this rather than `quote.refund_locktime`: that field is optional on
+     * the wire, a solver may carry the value in `profile` instead, and
+     * `deriveOnchainSend` is what settles which one this contract used. */
+    refundLocktime: number;
     /** The VHTLC `sender` x-only key, bound into the covenant. Public. */
     senderPubkey: Uint8Array;
     /** How the preimage and the `sender` key are recovered later — map it
@@ -786,13 +822,13 @@ declare const assertReceivable: (input: {
     /** Absolute sats ceiling on `from_amount`. */
     maxPayAmount?: number;
 }) => void;
-/** Compile the RECEIVE-direction VHTLC: the same eight-leaf tree as {@link
- * lightningSendVtxoScript} with the roles inverted — the trader is the
+/** Compile the RECEIVE-direction VHTLC: the same suite-carrying tree as {@link
+ * lightningSendContract} with the roles inverted — the trader is the
  * `receiver` (it generated `P` and claims the lockup with it), the solver is
  * the `sender` (it funds the lockup and holds the refund recourse). One
  * function shared by both receive corridors, mirroring the send legs' sharing
- * of `lightningSendVtxoScript`. */
-declare function receiveVtxoScript(params: {
+ * of `lightningSendContract`. */
+declare function lightningReceiveContract(params: {
     /** Binding field #1: the solver's x-only key, from the quote — VHTLC's
      * `sender` role on the receive corridors. */
     solverPubkey: Uint8Array;
@@ -800,7 +836,7 @@ declare function receiveVtxoScript(params: {
      * the quote — after it the solver may reclaim an unclaimed lockup. */
     refundLocktime: number;
     /** The Ark server's x-only key — the trader's OWN connection. */
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     /** `sha256(P)`, hex — the trader's OWN preimage hash. */
     paymentHash: string;
     /** From {@link unilateralClaimDelay} over the trader's OWN server info. */
@@ -817,10 +853,12 @@ declare function receiveVtxoScript(params: {
     /** The trader's own Arkade payout pkScript (decoded from its payout
      * address) — `nonInteractiveClaim`'s pinned destination. */
     payoutPkScript: Uint8Array;
+    /** LEGACY REBUILD ONLY — see {@link lightningSendVtxoScript}'s `legacy`. */
+    legacy?: "preTimelockedRefund";
 }): InstanceType<typeof VHTLC.ScriptV2>;
-/** Every input {@link receiveVtxoScript} builds from; see
- * {@link LightningSendTreeParams}. */
-type LightningReceiveTreeParams = Parameters<typeof receiveVtxoScript>[0];
+/** Every input {@link lightningReceiveContract} builds from; see
+ * {@link LightningSendContractParams}. */
+type LightningReceiveContractParams = Parameters<typeof lightningReceiveContract>[0];
 /**
  * The pure core of {@link requestLightningReceive}: derive the solver-funded
  * covenant locally from the quote's binding fields plus the trader's own data
@@ -834,7 +872,7 @@ declare function deriveLightningReceive(input: {
     paymentHash: string;
     payoutPubkey: Uint8Array;
     payoutAddress: string;
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     emulatorPubkey: Uint8Array;
     claimDelay: number;
     hrp: string;
@@ -847,7 +885,7 @@ declare function deriveLightningReceive(input: {
     refundLocktime: number;
     /** Every input the covenant was built from — see the same field on
      * `requestLightningSend`'s result for why a consumer needs them. */
-    treeParams: LightningReceiveTreeParams;
+    contractParams: LightningReceiveContractParams;
 };
 /**
  * The `lightning:BTC->arkade:BTC` user flow: quote → derive the covenant
@@ -880,7 +918,7 @@ declare function deriveLightningReceive(input: {
  * Pay before `invoiceExpiresAt`: the hold-invoice window is minutes, not the
  * quote's `valid_until`.
  */
-declare function requestLightningReceive(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestLightningReceive(wallet: IWallet, transport: RfqTransport, params: {
     amount: number;
     amountSide: "from" | "to";
     /** Co-signer key override (33-byte compressed hex); see
@@ -925,7 +963,7 @@ declare function requestLightningReceive(wallet: IWallet, arkServerUrl: string,
     secrets: ProvisionedClaimSecret;
     /** Every input the covenant was built from; see the same field on
      * `requestLightningSend`'s result. */
-    treeParams: LightningReceiveTreeParams;
+    contractParams: LightningReceiveContractParams;
 }>;
 /**
  * The pure core of {@link requestOnchainReceive}: derive BOTH contracts
@@ -941,7 +979,7 @@ declare function deriveOnchainReceive(input: {
     payoutAddress: string;
     /** The trader's own x-only L1 key — the HTLC's refund role. */
     refundPubkey: Uint8Array;
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     emulatorPubkey: Uint8Array;
     claimDelay: number;
     hrp: string;
@@ -969,7 +1007,7 @@ declare function deriveOnchainReceive(input: {
  * `refundPubkey`) opens at `htlc.refundLocktime` — `buildHtlcRefund` takes it
  * back from there.
  */
-declare function requestOnchainReceive(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestOnchainReceive(wallet: IWallet, transport: RfqTransport, params: {
     amount: number;
     amountSide: "from" | "to";
     /** Co-signer key override (33-byte compressed hex); see
@@ -1002,4 +1040,4 @@ declare function requestOnchainReceive(wallet: IWallet, arkServerUrl: string, tr
     secrets: ProvisionedClaimSecret;
 }>;
 
-export { newRfqId as $, ARKADE_ASSET as A, arkadeAssetLeg as B, type ChainSource as C, arkadeSwapRequest as D, assertFundable as E, assertReceivable as F, awaitOnchainFill as G, type HtlcUtxo as H, type InvoiceFacts as I, buildHtlcClaim as J, buildHtlcRefund as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, claimOnchainFill as N, type OnchainNetwork as O, classifyOnchainHtlc as P, deriveLightningReceive as Q, RFQ_TERMINAL_STATES as R, SOLO_REFUND_HEADROOM_SECONDS as S, deriveOnchainReceive as T, deriveOnchainSend as U, extractPreimage as V, httpTransport as W, lightningReceiveRequest as X, lightningSendRequest as Y, lightningSendVtxoScript as Z, newPreimage as _, type OnchainHtlc as a, offerTermsFromQuote as a0, onchainHtlcScript as a1, onchainReceiveRequest as a2, onchainSendRequest as a3, paymentHashOf as a4, receiveVtxoScript as a5, relayTransport as a6, requestLightningReceive as a7, requestLightningSend as a8, requestOnchainReceive as a9, requestOnchainSend as aa, rfqPair as ab, unilateralClaimDelay as ac, unilateralRefundDelay as ad, unilateralRefundWithoutReceiverDelay as ae, verifyLockupAddress as af, verifyReceiveInvoice as ag, type OnchainHtlcParams as b, ARKADE_BTC as c, AddressMismatch as d, type ChainUtxo as e, LIGHTNING_RECEIVE_PAIR as f, LIGHTNING_SEND_PAIR as g, LOCKTIME_THRESHOLD as h, type LightningReceiveTreeParams as i, type LightningSendTreeParams as j, MIN_CLAIM_WINDOW_SECONDS as k, MIN_HEADROOM_SECONDS as l, ONCHAIN_BTC as m, ONCHAIN_CLAIM_MARGIN_SECONDS as n, ONCHAIN_DUST_SATS as o, ONCHAIN_ORDER_MARGIN_SECONDS as p, ONCHAIN_RECEIVE_PAIR as q, ONCHAIN_SECONDS_PER_BLOCK as r, ONCHAIN_SEND_PAIR as s, type OnchainHtlcPhase as t, type RelaySocket as u, type RfqQuote as v, type RfqRefusalReason as w, type RfqStatus as x, type RfqTransport as y, SwapRefusal as z };
+export { lightningReceiveRequest as $, ARKADE_ASSET as A, type RfqRefusalReason as B, type ChainSource as C, type RfqStatus as D, SwapRefusal as E, arkadeAssetLeg as F, arkadeSwapRequest as G, type HtlcUtxo as H, type InvoiceFacts as I, assertFundable as J, assertReceivable as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, awaitOnchainFill as N, type OnchainNetwork as O, buildHtlcClaim as P, buildHtlcRefund as Q, type RfqTransport as R, SOLO_REFUND_HEADROOM_SECONDS as S, claimOnchainFill as T, classifyOnchainHtlc as U, deriveLightningReceive as V, deriveOnchainReceive as W, deriveOnchainSend as X, extractPreimage as Y, httpTransport as Z, lightningReceiveContract as _, type OnchainHtlc as a, lightningSendContract as a0, lightningSendRequest as a1, newPreimage as a2, newRfqId as a3, offerTermsFromQuote as a4, onchainHtlcScript as a5, onchainReceiveRequest as a6, onchainSendRequest as a7, paymentHashOf as a8, relayTransport as a9, requestOnchainReceive as aa, rfqPair as ab, unilateralClaimDelay as ac, unilateralRefundDelay as ad, unilateralRefundWithoutReceiverDelay as ae, verifyLockupAddress as af, verifyReceiveInvoice as ag, type OnchainHtlcParams as b, requestLightningSend as c, requestOnchainSend as d, ARKADE_BTC as e, AddressMismatch as f, type ChainUtxo as g, LIGHTNING_RECEIVE_PAIR as h, LIGHTNING_SEND_PAIR as i, LOCKTIME_THRESHOLD as j, type LightningReceiveContractParams as k, type LightningSendContractParams as l, MIN_CLAIM_WINDOW_SECONDS as m, MIN_HEADROOM_SECONDS as n, ONCHAIN_BTC as o, ONCHAIN_CLAIM_MARGIN_SECONDS as p, ONCHAIN_DUST_SATS as q, requestLightningReceive as r, ONCHAIN_ORDER_MARGIN_SECONDS as s, ONCHAIN_RECEIVE_PAIR as t, ONCHAIN_SECONDS_PER_BLOCK as u, ONCHAIN_SEND_PAIR as v, type OnchainHtlcPhase as w, RFQ_TERMINAL_STATES as x, type RelaySocket as y, type RfqQuote as z };

package/dist/{rfq-DglvHMNC.d.cts → rfq-CzCGjICq.d.ts}

@@ -1,4 +1,4 @@
-import { VHTLC, asset, IWallet, ProvisionedClaimSecret, ProvisionedKey } from '@arkade-os/sdk';
+import { VHTLC, IWallet, ProvisionedClaimSecret, ProvisionedKey, asset } from '@arkade-os/sdk';
 
 /** L1 confirmation-depth and reorg margin between dependent timelocks. */
 declare const ONCHAIN_ORDER_MARGIN_SECONDS: number;
@@ -251,15 +251,23 @@ type RfqRefusalReason = "unsupported_pair" | "unsupported_payload" | "amount_out
 declare const RFQ_TERMINAL_STATES: readonly ["settled", "refused", "expired", "refunded", "stuck"];
 /** A refusal from the solver, carrying its closed-set reason. */
 declare class SwapRefusal extends Error {
+    /** Literal-typed so the v2 error taxonomy's union discriminates on `name`
+     * — a `string` here collapses the discriminant for every member. Same value
+     * the constructor has always set, moved to a field initializer. */
+    readonly name = "SwapRefusal";
     readonly reason: string;
     readonly rfqId: string | undefined;
     constructor(reason: string, rfqId?: string);
 }
-/** The solver's address does not match the local derivation. NEVER fund past this. */
+/**
+ * The solver's address does not match the local derivation. NEVER fund past
+ * this. `derived` is every candidate address tried — more than one when the
+ * derivation itself is ambiguous, see {@link verifyLockupAddress}.
+ */
 declare class AddressMismatch extends Error {
-    readonly derived: string;
+    readonly derived: string | string[];
     readonly quoted: string | undefined;
-    constructor(derived: string, quoted?: string);
+    constructor(derived: string | string[], quoted?: string);
 }
 /** A fresh client-chosen negotiation id: 32 random bytes, lowercase hex. */
 declare const newRfqId: () => string;
@@ -293,7 +301,7 @@ interface RfqStatus {
 /** The rfq_request for the lightning send profile. A BOLT11 profile is always
  * exact-out: the invoice fixes the amount, so none is restated here.
  * `senderPubkey` is the trader's own key for the VHTLC's sender-side leaves
- * (see {@link lightningSendVtxoScript}) — required, never sent anywhere else,
+ * (see {@link lightningSendContract}) — required, never sent anywhere else,
  * never trusted by the solver as anything but a pubkey to bind into the
  * script. On the wire it's `client_refund_pubkey` (the payload schemas are
  * public at https://docs.arkadeos.com/intents/reference/rfq — the solver's schema
@@ -323,9 +331,24 @@ declare const arkadeSwapRequest: (input: {
  * 90 because the refund CLTV matures against median-time-past (BIP-113),
  * which lags wall clock by ~1h — a smaller wall-clock margin is no margin. */
 declare const MIN_HEADROOM_SECONDS: number;
-/** Compare-only check of the solver's address against YOUR derivation.
- * Throws {@link AddressMismatch}; returns the address so calls chain. */
-declare const verifyLockupAddress: (quote: RfqQuote, derivedAddress: string) => string;
+/**
+ * Compare-only check of the solver's address against YOUR OWN derivation(s)
+ * — never extends trust, only narrows it.
+ *
+ * `derivedAddress` may be a single address or an array of candidates. Pass an
+ * array when your own derivation is ambiguous — as it is for the covenant
+ * lockups while solvers roll out the timelocked non-interactive refund leaf:
+ * nothing on the wire says whether a given quote's covenant carries it (the
+ * shape is fixed by the solver's own build, not negotiated per quote), so the
+ * only safe move is to derive BOTH shapes and accept whichever one the quote's
+ * own `lockup_address` matches. This loses no security: every candidate shape
+ * pins the refund to the trader's own refund destination, so a solver gains
+ * nothing by choosing which one to quote.
+ *
+ * Throws {@link AddressMismatch} only when NONE of the candidates match.
+ * Returns the address that matched, so calls chain exactly as before.
+ */
+declare const verifyLockupAddress: (quote: RfqQuote, derivedAddress: string | string[]) => string;
 /** The user's gates, checked immediately before funding — never at quote
  * time. Throws with a stable `reason` property. `invoiceExpiresAt` applies to
  * BOLT11 profiles only; `onchain` adds the L1-HTLC gates (§ guardrails of the
@@ -397,7 +420,7 @@ declare const SOLO_REFUND_HEADROOM_SECONDS: number;
  * exit delay exactly as the reference solver derives it — both sides read the
  * SAME server, so the derivation (not a quote field) is what keeps the two
  * scripts identical. */
-declare const unilateralClaimDelay: (serverExitDelaySeconds: number) => number;
+declare const unilateralClaimDelay: (operatorExitDelaySeconds: number) => number;
 /** VHTLC's `unilateralRefund` tier: sender + receiver, no server — LEVEL with
  * `claimDelay`, not above it. Neither party can spend a two-signature leaf
  * alone, so separating it buys no safety, and every second spent separating it
@@ -413,23 +436,25 @@ declare const unilateralRefundWithoutReceiverDelay: (claimDelay: number) => numb
  * hex); the script's HASH160 commitment is derived from it here, which is why
  * the trader never needs to see `P`.
  *
- * Every quote gets the full eight-leaf contract: VHTLC's own six
+ * Every quote gets the full emulator-covenant suite on top of VHTLC's own six
  * (`claim`/`refund`/`refundWithoutReceiver`/`unilateralClaim`/
- * `unilateralRefund`/`unilateralRefundWithoutReceiver`), plus two more the
- * emulator co-signs under a covenant pinning the payout to a pre-committed
- * destination — `nonInteractiveClaim` (server + emulator, pays the solver's
- * own `receiverPkScript`, no solver signature needed) and
- * `nonInteractiveRefund` (server + solver + emulator, pays the trader's own
- * `refundPkScript`, no timelock and no trader signature needed — see {@link
- * VHTLC.Options.nonInteractiveRefund}'s doc comment for why that matters).
+ * `unilateralRefund`/`unilateralRefundWithoutReceiver`): `nonInteractiveClaim`
+ * (server + emulator, pays the solver's own `receiverPkScript`, no solver
+ * signature needed), `nonInteractiveRefund` (server + solver + emulator, pays
+ * the trader's own `refundPkScript`, no timelock and no trader signature
+ * needed — see {@link VHTLC.Options.nonInteractiveParameters}'s doc comment for why
+ * that matters), and its timelocked twin `nonInteractiveRefundWithoutReceiver`
+ * (server + emulator alone, after `refundLocktime` — the only refund tier
+ * needing no participant at all). Nine leaves in all, unless `legacy` says
+ * otherwise.
  */
-declare function lightningSendVtxoScript(params: {
+declare function lightningSendContract(params: {
     /** Binding field #1: the solver's x-only key, from the quote. */
     solverPubkey: Uint8Array;
     /** Binding field #2: when the trader's refund path opens, from the quote. */
     refundLocktime: number;
     /** The Ark server's x-only key — the trader's OWN connection. */
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     /** BOLT11 payment hash, hex — from the trader's OWN invoice decode. */
     paymentHash: string;
     /** From {@link unilateralClaimDelay} over the trader's OWN server info.
@@ -439,7 +464,7 @@ declare function lightningSendVtxoScript(params: {
     /** Emulator x-only key (32 bytes). */
     emulatorPubkey: Uint8Array;
     /** Where a refund must pay: the trader's P2TR pkScript (34 bytes). Also
-     * `nonInteractiveRefund`'s covenant destination. */
+     * the refund covenants' destination. */
     refundPkScript: Uint8Array;
     /** The trader's own key — VHTLC's `sender` role. Required on every
      * interactive refund-side leaf; the trader generates and persists it
@@ -450,10 +475,15 @@ declare function lightningSendVtxoScript(params: {
      * covenant key can be derived; the trader does not otherwise use or trust
      * this value. P2TR pkScript, 34 bytes. */
     receiverPkScript: Uint8Array;
+    /** LEGACY REBUILD ONLY — see {@link VHTLC.Options.nonInteractiveParameters}'s
+     * `legacy` field. Set only to re-derive a lockup funded before the
+     * timelocked refund leaf shipped; {@link matchQuotedLockup} passes it when
+     * the quote's own address says the solver quoted that shape. */
+    legacy?: "preTimelockedRefund";
 }): InstanceType<typeof VHTLC.ScriptV2>;
-/** Every input {@link lightningSendVtxoScript} builds from. Derived from the
+/** Every input {@link lightningSendContract} builds from. Derived from the
  * builder rather than restated, so the two cannot drift. */
-type LightningSendTreeParams = Parameters<typeof lightningSendVtxoScript>[0];
+type LightningSendContractParams = Parameters<typeof lightningSendContract>[0];
 /** The BOLT11 facts the trader read from its OWN decode — this module takes
  * the facts, not the decoder, so any wallet's existing decoder serves. */
 interface InvoiceFacts {
@@ -487,14 +517,15 @@ interface InvoiceFacts {
  * throws while nothing is funded. `RfqSwapManager` re-registers as a backstop
  * for older records; a repeat write is a no-op.
  *
- * The `sender` key is the wallet's identity key, reused by {@link
- * provisionRefundKey} — returned as `senderPubkey` plus `secrets`. `secrets`
- * holds only a public descriptor; the signer re-derives from the wallet, so
- * nothing secret is at rest. Persist `secrets` with the record anyway: it is
- * how the refund signer is found again. `nonInteractiveRefund` recovers the funds even without it — but it needs the SOLVER's active
- * cooperation, not just infrastructure uptime.
+ * The `sender` key is the wallet's identity key, as {@link provisionRefundKey}
+ * pins it — returned as `senderPubkey` plus `secrets`. `secrets` holds only a
+ * public descriptor; the signer re-derives from the wallet, so nothing secret
+ * is at rest. Persist `secrets` with the record anyway: it is how the refund
+ * signer is found again. `nonInteractiveRefund` recovers the funds even
+ * without it — but it needs the SOLVER's active cooperation, not just
+ * infrastructure uptime.
  */
-declare function requestLightningSend(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestLightningSend(wallet: IWallet, transport: RfqTransport, params: {
     invoice: InvoiceFacts;
     rfqId?: string;
     /** Co-signer key override (33-byte compressed hex); see
@@ -527,7 +558,7 @@ declare function requestLightningSend(wallet: IWallet, arkServerUrl: string, tra
      *
      * Returned so a consumer can persist the swap without re-deriving any of
      * it. Half of these are not on the quote: `serverPubkey` and `claimDelay`
-     * come from this wallet's own `getInfo()`, `emulatorPubkey` from a
+     * come from this wallet's own `getArkadeInfo()`, `emulatorPubkey` from a
      * per-network pin, `refundPkScript` from `secrets` — decoded from the
      * refund address at provisioning time, the same address this call returns
      * as `refundAddress`.
@@ -539,7 +570,7 @@ declare function requestLightningSend(wallet: IWallet, arkServerUrl: string, tra
      * `VHTLCV2ContractHandler.serializeParams(script.options)`, the shape the
      * rebuild accepts.
      */
-    treeParams: LightningSendTreeParams;
+    contractParams: LightningSendContractParams;
 }>;
 /**
  * Map an arkade↔arkade quote onto `createOffer` terms. The trader takes the
@@ -622,7 +653,7 @@ declare function deriveOnchainSend(input: {
     quote: RfqQuote;
     paymentHash: string;
     payoutPubkey: Uint8Array;
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     emulatorPubkey: Uint8Array;
     claimDelay: number;
     hrp: string;
@@ -673,7 +704,7 @@ declare function deriveOnchainSend(input: {
  *   `claimOnchainFill`) before `htlc.refundLocktime`. Missing that window
  *   forfeits the fill and falls back to the Arkade covenant refund.
  */
-declare function requestOnchainSend(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestOnchainSend(wallet: IWallet, transport: RfqTransport, params: {
     amount: number;
     amountSide: "from" | "to";
     /** User's x-only L1 key that will claim the HTLC. */
@@ -721,6 +752,11 @@ declare function requestOnchainSend(wallet: IWallet, arkServerUrl: string, trans
     /** `profile.min_confirmations`; gates when the L1 fill becomes claimable,
      * and part of what a restored swap needs to drive its own claim. */
     minConfirmations: number;
+    /** The arkade lockup's refund deadline, as the covenant was built with it.
+     * Read this rather than `quote.refund_locktime`: that field is optional on
+     * the wire, a solver may carry the value in `profile` instead, and
+     * `deriveOnchainSend` is what settles which one this contract used. */
+    refundLocktime: number;
     /** The VHTLC `sender` x-only key, bound into the covenant. Public. */
     senderPubkey: Uint8Array;
     /** How the preimage and the `sender` key are recovered later — map it
@@ -786,13 +822,13 @@ declare const assertReceivable: (input: {
     /** Absolute sats ceiling on `from_amount`. */
     maxPayAmount?: number;
 }) => void;
-/** Compile the RECEIVE-direction VHTLC: the same eight-leaf tree as {@link
- * lightningSendVtxoScript} with the roles inverted — the trader is the
+/** Compile the RECEIVE-direction VHTLC: the same suite-carrying tree as {@link
+ * lightningSendContract} with the roles inverted — the trader is the
  * `receiver` (it generated `P` and claims the lockup with it), the solver is
  * the `sender` (it funds the lockup and holds the refund recourse). One
  * function shared by both receive corridors, mirroring the send legs' sharing
- * of `lightningSendVtxoScript`. */
-declare function receiveVtxoScript(params: {
+ * of `lightningSendContract`. */
+declare function lightningReceiveContract(params: {
     /** Binding field #1: the solver's x-only key, from the quote — VHTLC's
      * `sender` role on the receive corridors. */
     solverPubkey: Uint8Array;
@@ -800,7 +836,7 @@ declare function receiveVtxoScript(params: {
      * the quote — after it the solver may reclaim an unclaimed lockup. */
     refundLocktime: number;
     /** The Ark server's x-only key — the trader's OWN connection. */
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     /** `sha256(P)`, hex — the trader's OWN preimage hash. */
     paymentHash: string;
     /** From {@link unilateralClaimDelay} over the trader's OWN server info. */
@@ -817,10 +853,12 @@ declare function receiveVtxoScript(params: {
     /** The trader's own Arkade payout pkScript (decoded from its payout
      * address) — `nonInteractiveClaim`'s pinned destination. */
     payoutPkScript: Uint8Array;
+    /** LEGACY REBUILD ONLY — see {@link lightningSendVtxoScript}'s `legacy`. */
+    legacy?: "preTimelockedRefund";
 }): InstanceType<typeof VHTLC.ScriptV2>;
-/** Every input {@link receiveVtxoScript} builds from; see
- * {@link LightningSendTreeParams}. */
-type LightningReceiveTreeParams = Parameters<typeof receiveVtxoScript>[0];
+/** Every input {@link lightningReceiveContract} builds from; see
+ * {@link LightningSendContractParams}. */
+type LightningReceiveContractParams = Parameters<typeof lightningReceiveContract>[0];
 /**
  * The pure core of {@link requestLightningReceive}: derive the solver-funded
  * covenant locally from the quote's binding fields plus the trader's own data
@@ -834,7 +872,7 @@ declare function deriveLightningReceive(input: {
     paymentHash: string;
     payoutPubkey: Uint8Array;
     payoutAddress: string;
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     emulatorPubkey: Uint8Array;
     claimDelay: number;
     hrp: string;
@@ -847,7 +885,7 @@ declare function deriveLightningReceive(input: {
     refundLocktime: number;
     /** Every input the covenant was built from — see the same field on
      * `requestLightningSend`'s result for why a consumer needs them. */
-    treeParams: LightningReceiveTreeParams;
+    contractParams: LightningReceiveContractParams;
 };
 /**
  * The `lightning:BTC->arkade:BTC` user flow: quote → derive the covenant
@@ -880,7 +918,7 @@ declare function deriveLightningReceive(input: {
  * Pay before `invoiceExpiresAt`: the hold-invoice window is minutes, not the
  * quote's `valid_until`.
  */
-declare function requestLightningReceive(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestLightningReceive(wallet: IWallet, transport: RfqTransport, params: {
     amount: number;
     amountSide: "from" | "to";
     /** Co-signer key override (33-byte compressed hex); see
@@ -925,7 +963,7 @@ declare function requestLightningReceive(wallet: IWallet, arkServerUrl: string,
     secrets: ProvisionedClaimSecret;
     /** Every input the covenant was built from; see the same field on
      * `requestLightningSend`'s result. */
-    treeParams: LightningReceiveTreeParams;
+    contractParams: LightningReceiveContractParams;
 }>;
 /**
  * The pure core of {@link requestOnchainReceive}: derive BOTH contracts
@@ -941,7 +979,7 @@ declare function deriveOnchainReceive(input: {
     payoutAddress: string;
     /** The trader's own x-only L1 key — the HTLC's refund role. */
     refundPubkey: Uint8Array;
-    serverPubkey: Uint8Array;
+    operatorPubkey: Uint8Array;
     emulatorPubkey: Uint8Array;
     claimDelay: number;
     hrp: string;
@@ -969,7 +1007,7 @@ declare function deriveOnchainReceive(input: {
  * `refundPubkey`) opens at `htlc.refundLocktime` — `buildHtlcRefund` takes it
  * back from there.
  */
-declare function requestOnchainReceive(wallet: IWallet, arkServerUrl: string, transport: RfqTransport, params: {
+declare function requestOnchainReceive(wallet: IWallet, transport: RfqTransport, params: {
     amount: number;
     amountSide: "from" | "to";
     /** Co-signer key override (33-byte compressed hex); see
@@ -1002,4 +1040,4 @@ declare function requestOnchainReceive(wallet: IWallet, arkServerUrl: string, tr
     secrets: ProvisionedClaimSecret;
 }>;
 
-export { newRfqId as $, ARKADE_ASSET as A, arkadeAssetLeg as B, type ChainSource as C, arkadeSwapRequest as D, assertFundable as E, assertReceivable as F, awaitOnchainFill as G, type HtlcUtxo as H, type InvoiceFacts as I, buildHtlcClaim as J, buildHtlcRefund as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, claimOnchainFill as N, type OnchainNetwork as O, classifyOnchainHtlc as P, deriveLightningReceive as Q, RFQ_TERMINAL_STATES as R, SOLO_REFUND_HEADROOM_SECONDS as S, deriveOnchainReceive as T, deriveOnchainSend as U, extractPreimage as V, httpTransport as W, lightningReceiveRequest as X, lightningSendRequest as Y, lightningSendVtxoScript as Z, newPreimage as _, type OnchainHtlc as a, offerTermsFromQuote as a0, onchainHtlcScript as a1, onchainReceiveRequest as a2, onchainSendRequest as a3, paymentHashOf as a4, receiveVtxoScript as a5, relayTransport as a6, requestLightningReceive as a7, requestLightningSend as a8, requestOnchainReceive as a9, requestOnchainSend as aa, rfqPair as ab, unilateralClaimDelay as ac, unilateralRefundDelay as ad, unilateralRefundWithoutReceiverDelay as ae, verifyLockupAddress as af, verifyReceiveInvoice as ag, type OnchainHtlcParams as b, ARKADE_BTC as c, AddressMismatch as d, type ChainUtxo as e, LIGHTNING_RECEIVE_PAIR as f, LIGHTNING_SEND_PAIR as g, LOCKTIME_THRESHOLD as h, type LightningReceiveTreeParams as i, type LightningSendTreeParams as j, MIN_CLAIM_WINDOW_SECONDS as k, MIN_HEADROOM_SECONDS as l, ONCHAIN_BTC as m, ONCHAIN_CLAIM_MARGIN_SECONDS as n, ONCHAIN_DUST_SATS as o, ONCHAIN_ORDER_MARGIN_SECONDS as p, ONCHAIN_RECEIVE_PAIR as q, ONCHAIN_SECONDS_PER_BLOCK as r, ONCHAIN_SEND_PAIR as s, type OnchainHtlcPhase as t, type RelaySocket as u, type RfqQuote as v, type RfqRefusalReason as w, type RfqStatus as x, type RfqTransport as y, SwapRefusal as z };
+export { lightningReceiveRequest as $, ARKADE_ASSET as A, type RfqRefusalReason as B, type ChainSource as C, type RfqStatus as D, SwapRefusal as E, arkadeAssetLeg as F, arkadeSwapRequest as G, type HtlcUtxo as H, type InvoiceFacts as I, assertFundable as J, assertReceivable as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, awaitOnchainFill as N, type OnchainNetwork as O, buildHtlcClaim as P, buildHtlcRefund as Q, type RfqTransport as R, SOLO_REFUND_HEADROOM_SECONDS as S, claimOnchainFill as T, classifyOnchainHtlc as U, deriveLightningReceive as V, deriveOnchainReceive as W, deriveOnchainSend as X, extractPreimage as Y, httpTransport as Z, lightningReceiveContract as _, type OnchainHtlc as a, lightningSendContract as a0, lightningSendRequest as a1, newPreimage as a2, newRfqId as a3, offerTermsFromQuote as a4, onchainHtlcScript as a5, onchainReceiveRequest as a6, onchainSendRequest as a7, paymentHashOf as a8, relayTransport as a9, requestOnchainReceive as aa, rfqPair as ab, unilateralClaimDelay as ac, unilateralRefundDelay as ad, unilateralRefundWithoutReceiverDelay as ae, verifyLockupAddress as af, verifyReceiveInvoice as ag, type OnchainHtlcParams as b, requestLightningSend as c, requestOnchainSend as d, ARKADE_BTC as e, AddressMismatch as f, type ChainUtxo as g, LIGHTNING_RECEIVE_PAIR as h, LIGHTNING_SEND_PAIR as i, LOCKTIME_THRESHOLD as j, type LightningReceiveContractParams as k, type LightningSendContractParams as l, MIN_CLAIM_WINDOW_SECONDS as m, MIN_HEADROOM_SECONDS as n, ONCHAIN_BTC as o, ONCHAIN_CLAIM_MARGIN_SECONDS as p, ONCHAIN_DUST_SATS as q, requestLightningReceive as r, ONCHAIN_ORDER_MARGIN_SECONDS as s, ONCHAIN_RECEIVE_PAIR as t, ONCHAIN_SECONDS_PER_BLOCK as u, ONCHAIN_SEND_PAIR as v, type OnchainHtlcPhase as w, RFQ_TERMINAL_STATES as x, type RelaySocket as y, type RfqQuote as z };