@miradexio/client 0.1.0

package/dist/atomic-swap/snapshot.d.ts

@@ -0,0 +1,111 @@
+/**
+ * Recovery snapshot for a single atomic swap.
+ *
+ * Pairs with the keystore to let a recovery binary (eigenwallet swap CLI or
+ * Tauri GUI) drive a stuck swap to a terminal state. The snapshot is written
+ * exactly once per swap, between receiving Alice's encsig in /presigs and
+ * posting the signed PSBT to /fund — so it's guaranteed to exist before any
+ * on-chain commitment.
+ *
+ * The snapshot contains only PUBLIC protocol material; private keys live in
+ * the keystore. Together they are necessary and sufficient.
+ */
+/**
+ * Bumped to 2 when Alice's `tx_cancel_sig` was added to
+ * `ProtocolParamsSnapshot`. Recovery binaries that need the autonomous-cancel
+ * field MUST refuse v1 snapshots; tools that only consume the always-present
+ * fields can keep accepting v1.
+ */
+export declare const SNAPSHOT_VERSION: 2;
+export type ProtocolSnapshotPhase = 'funded-with-encsigs';
+export interface ProtocolSnapshot {
+    readonly snapshotVersion: typeof SNAPSHOT_VERSION;
+    readonly capturedAtEpochMs: number;
+    readonly capturedBy: 'miradex-client';
+    readonly capturedByVersion: string;
+    readonly phaseMarker: ProtocolSnapshotPhase;
+    readonly swapId: string;
+    readonly externalSwapId: string;
+    readonly keystoreId: string;
+    readonly network: 'mainnet' | 'testnet' | 'regtest';
+    readonly protocolParams: ProtocolParamsSnapshot;
+    readonly lockTx: LockTxSnapshot;
+    readonly maker: MakerSnapshot;
+    readonly chain: ChainSnapshot;
+    readonly digest: string;
+}
+export interface ProtocolParamsSnapshot {
+    readonly A: string;
+    readonly S_a_bitcoin: string;
+    readonly S_a_monero: string;
+    readonly v_a: string | null;
+    readonly cancel_timelock: number;
+    readonly punish_timelock: number;
+    readonly remaining_refund_timelock: number | null;
+    readonly redeem_address: string;
+    readonly punish_address: string;
+    readonly tx_cancel_fee_sats: string;
+    readonly tx_refund_fee_sats: string;
+    readonly tx_redeem_fee_sats: string;
+    readonly tx_punish_fee_sats: string;
+    readonly amnesty_amount_sats: string | null;
+    readonly tx_partial_refund_fee_sats: string | null;
+    readonly tx_reclaim_fee_sats: string | null;
+    readonly tx_withhold_fee_sats: string | null;
+    readonly tx_mercy_fee_sats: string | null;
+    readonly monero_lock_address: string | null;
+    readonly xmr_amount_pico: string;
+    readonly tx_full_refund_encsig: string | null;
+    readonly tx_partial_refund_encsig: string | null;
+    /**
+     * Alice's plain ECDSA pre-sig on TxCancel (Message3). Persisted so a
+     * future autonomous-cancel binary can construct + broadcast TxCancel
+     * without the sidecar. Null when the sidecar version in front of this
+     * client did not surface it; in that case recovery still works through
+     * the sidecar-published cancel path. V-16 enabling-work.
+     */
+    readonly tx_cancel_sig: string | null;
+}
+export interface LockTxSnapshot {
+    readonly txid: string;
+    readonly vout: number;
+    readonly amountSats: string;
+    /** UNSIGNED PSBT base64 — recovery binary signs locally with key from keystore. */
+    readonly unsignedPsbtBase64: string;
+    readonly lockAddress: string;
+}
+export interface MakerSnapshot {
+    readonly peerId: string;
+    readonly multiaddrs: ReadonlyArray<string>;
+}
+export interface ChainSnapshot {
+    readonly moneroWalletRestoreBlockheight: number | null;
+    readonly lockTransferProof: {
+        readonly tx_hash: string;
+        readonly tx_key: string | null;
+    } | null;
+    readonly sidecarStateAtCapture: string;
+}
+export interface BuildProtocolSnapshotInput {
+    readonly swapId: string;
+    readonly externalSwapId: string;
+    readonly keystoreId: string;
+    readonly network: 'mainnet' | 'testnet' | 'regtest';
+    readonly capturedByVersion: string;
+    readonly capturedAtEpochMs: number;
+    readonly protocolParams: ProtocolParamsSnapshot;
+    readonly lockTx: LockTxSnapshot;
+    readonly maker: MakerSnapshot;
+    readonly chain: ChainSnapshot;
+    readonly phaseMarker?: ProtocolSnapshotPhase;
+}
+export declare function buildProtocolSnapshot(input: BuildProtocolSnapshotInput): ProtocolSnapshot;
+/**
+ * Reproducible serialization with sorted keys. The recovery tool can compute
+ * the same digest from the snapshot (minus the digest field) and reject
+ * tampered or corrupted files.
+ */
+export declare function canonicalSerialize(obj: unknown): string;
+export declare function computeSnapshotDigest(snapshotBody: unknown): string;
+export declare function verifySnapshotIntegrity(snapshot: ProtocolSnapshot): boolean;
+//# sourceMappingURL=snapshot.d.ts.map

package/dist/atomic-swap/snapshot.d.ts.map

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

package/dist/atomic-swap/snapshot.js

@@ -0,0 +1,69 @@
+/**
+ * Recovery snapshot for a single atomic swap.
+ *
+ * Pairs with the keystore to let a recovery binary (eigenwallet swap CLI or
+ * Tauri GUI) drive a stuck swap to a terminal state. The snapshot is written
+ * exactly once per swap, between receiving Alice's encsig in /presigs and
+ * posting the signed PSBT to /fund — so it's guaranteed to exist before any
+ * on-chain commitment.
+ *
+ * The snapshot contains only PUBLIC protocol material; private keys live in
+ * the keystore. Together they are necessary and sufficient.
+ */
+import { sha256 } from '@noble/hashes/sha2.js';
+import { bytesToHex } from '@noble/hashes/utils.js';
+/**
+ * Bumped to 2 when Alice's `tx_cancel_sig` was added to
+ * `ProtocolParamsSnapshot`. Recovery binaries that need the autonomous-cancel
+ * field MUST refuse v1 snapshots; tools that only consume the always-present
+ * fields can keep accepting v1.
+ */
+export const SNAPSHOT_VERSION = 2;
+export function buildProtocolSnapshot(input) {
+    const body = {
+        snapshotVersion: SNAPSHOT_VERSION,
+        capturedAtEpochMs: input.capturedAtEpochMs,
+        capturedBy: 'miradex-client',
+        capturedByVersion: input.capturedByVersion,
+        phaseMarker: input.phaseMarker ?? 'funded-with-encsigs',
+        swapId: input.swapId,
+        externalSwapId: input.externalSwapId,
+        keystoreId: input.keystoreId,
+        network: input.network,
+        protocolParams: input.protocolParams,
+        lockTx: input.lockTx,
+        maker: input.maker,
+        chain: input.chain,
+    };
+    const digest = computeSnapshotDigest(body);
+    return { ...body, digest };
+}
+/**
+ * Reproducible serialization with sorted keys. The recovery tool can compute
+ * the same digest from the snapshot (minus the digest field) and reject
+ * tampered or corrupted files.
+ */
+export function canonicalSerialize(obj) {
+    return JSON.stringify(sortKeysDeep(obj));
+}
+function sortKeysDeep(value) {
+    if (Array.isArray(value)) {
+        return value.map(sortKeysDeep);
+    }
+    if (value !== null && typeof value === 'object') {
+        const entries = Object.entries(value)
+            .map(([k, v]) => [k, sortKeysDeep(v)])
+            .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
+        return Object.fromEntries(entries);
+    }
+    return value;
+}
+export function computeSnapshotDigest(snapshotBody) {
+    const canonical = canonicalSerialize(snapshotBody);
+    return bytesToHex(sha256(new TextEncoder().encode(canonical)));
+}
+export function verifySnapshotIntegrity(snapshot) {
+    const { digest, ...body } = snapshot;
+    return computeSnapshotDigest(body) === digest;
+}
+//# sourceMappingURL=snapshot.js.map

package/dist/atomic-swap/snapshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../src/atomic-swap/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAU,CAAC;AAoG3C,MAAM,UAAU,qBAAqB,CAAC,KAAiC;IACrE,MAAM,IAAI,GAAG;QACX,eAAe,EAAE,gBAAgB;QACjC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,UAAU,EAAE,gBAAyB;QACrC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,qBAAqB;QACvD,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC;IACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC;aAC7D,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAU,CAAC;aAC9C,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAAqB;IACzD,MAAM,SAAS,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACnD,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,QAA0B;IAChE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC;IACrC,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC;AAChD,CAAC"}

package/dist/atomic-swap/submit-encsig.d.ts

@@ -0,0 +1,10 @@
+import { type SubmitEncsigParams } from './types.js';
+/**
+ * Poll until the server signals `submit_encsig`, then compute the TxRedeem
+ * adaptor signature from the supplied signed PSBT and submit it.
+ *
+ * @internal Exposed for standalone experimentation. Production consumers
+ *   should use `MiradexEngine` / `AtomicFlow`.
+ */
+export declare function submitEncsigWhenReady(options: SubmitEncsigParams): Promise<void>;
+//# sourceMappingURL=submit-encsig.d.ts.map

package/dist/atomic-swap/submit-encsig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"submit-encsig.d.ts","sourceRoot":"","sources":["../../src/atomic-swap/submit-encsig.ts"],"names":[],"mappings":"AAQA,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAKzE;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDtF"}

package/dist/atomic-swap/submit-encsig.js

@@ -0,0 +1,56 @@
+/**
+ * Standalone submit_encsig helper for external consumers. Internal drivers
+ * handle this inline inside `driveSwapToCompletion`.
+ */
+import { TERMINAL_STATUSES, ProtocolError } from '../types/index.js';
+import { computeRedeemDigest } from './presign.js';
+import { encsignDigest } from '../lib/crypto/wasm.js';
+import { delay } from '../lib/delay.js';
+import { SwapCancelledError } from './types.js';
+const TIMEOUT_MS = 3_600_000;
+const POLL_MS = 10_000;
+/**
+ * Poll until the server signals `submit_encsig`, then compute the TxRedeem
+ * adaptor signature from the supplied signed PSBT and submit it.
+ *
+ * @internal Exposed for standalone experimentation. Production consumers
+ *   should use `MiradexEngine` / `AtomicFlow`.
+ */
+export async function submitEncsigWhenReady(options) {
+    const { api, swapId, keys, signedPsbtBase64, network, onProgress, signal } = options;
+    const deadline = Date.now() + TIMEOUT_MS;
+    while (Date.now() < deadline) {
+        if (signal?.aborted)
+            throw new SwapCancelledError();
+        const detail = await api.getSwapDetail(swapId);
+        if (TERMINAL_STATUSES.has(detail.status))
+            return;
+        const actionType = detail.requiredAction?.type;
+        if (actionType === 'submit_encsig') {
+            onProgress({ stage: 'submit_encsig', message: 'Computing encrypted signature', swapId });
+            const protocolParams = detail.protocolData?.type === 'atomicswap' ? detail.protocolData.params : null;
+            if (!protocolParams) {
+                throw new ProtocolError('E_PROTOCOL_PARAMS_MISSING', 'server requested submit_encsig but protocolParams are missing');
+            }
+            const redeemDigest = computeRedeemDigest({
+                signedPsbtBase64,
+                protocolParams,
+                bPubHex: keys.B,
+                network,
+            });
+            const txRedeemEncsig = encsignDigest(keys.b, protocolParams.S_a_bitcoin, redeemDigest);
+            onProgress({ stage: 'submit_encsig', message: 'Submitting encrypted signature', swapId });
+            await api.executeAction(swapId, {
+                type: 'submit_encsig',
+                tx_redeem_encsig: txRedeemEncsig,
+            });
+            onProgress({ stage: 'submit_encsig', message: 'Encrypted signature submitted', swapId });
+            return;
+        }
+        if (actionType === 'cancel' || actionType === 'refund' || actionType === 'sweep')
+            return;
+        await delay(POLL_MS);
+    }
+    throw new ProtocolError('E_DRIVE_TIMEOUT', 'timed out waiting for submit_encsig signal');
+}
+//# sourceMappingURL=submit-encsig.js.map

package/dist/atomic-swap/submit-encsig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"submit-encsig.js","sourceRoot":"","sources":["../../src/atomic-swap/submit-encsig.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAA2B,MAAM,YAAY,CAAC;AAEzE,MAAM,UAAU,GAAG,SAAS,CAAC;AAC7B,MAAM,OAAO,GAAG,MAAM,CAAC;AAEvB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAA2B;IACrE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC;IAEzC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,IAAI,kBAAkB,EAAE,CAAC;QAEpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;YAAE,OAAO;QAEjD,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC;QAE/C,IAAI,UAAU,KAAK,eAAe,EAAE,CAAC;YACnC,UAAU,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,CAAC,CAAC;YAEzF,MAAM,cAAc,GAClB,MAAM,CAAC,YAAY,EAAE,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;YACjF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,aAAa,CACrB,2BAA2B,EAC3B,+DAA+D,CAChE,CAAC;YACJ,CAAC;YAED,MAAM,YAAY,GAAG,mBAAmB,CAAC;gBACvC,gBAAgB;gBAChB,cAAc;gBACd,OAAO,EAAE,IAAI,CAAC,CAAC;gBACf,OAAO;aACR,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YAEvF,UAAU,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,gCAAgC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1F,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC9B,IAAI,EAAE,eAAe;gBACrB,gBAAgB,EAAE,cAAc;aACjC,CAAC,CAAC;YAEH,UAAU,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,CAAC,CAAC;YACzF,OAAO;QACT,CAAC;QAED,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,OAAO;YAAE,OAAO;QAEzF,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,aAAa,CACrB,iBAAiB,EACjB,4CAA4C,CAC7C,CAAC;AACJ,CAAC"}

package/dist/atomic-swap/types.d.ts

@@ -0,0 +1,168 @@
+/**
+ * Shared types and error classes for the BTC↔XMR atomic-swap driver.
+ */
+import type { Logger } from '../interfaces/logger.js';
+import type { ApiClient } from '../api/index.js';
+import type { VerificationResult, ClientKeys } from '../types/index.js';
+import type { TempBtcWallet } from '../lib/bitcoin/wallet.js';
+import type { SwapKeystore } from '../lib/keystore.js';
+import type { DetectedDeposit } from '../lib/bitcoin/deposit-watcher.js';
+import type { BlockchainDataProvider } from '../interfaces/blockchain.js';
+export type AtomicSwapStage = 'keygen' | 'keystore_saved' | 'awaiting_deposit' | 'deposit_detected' | 'creating_swap' | 'signing_psbt' | 'funding' | 'submit_encsig' | 'verifying_xmr' | 'confirming' | 'sweeping' | 'complete' | 'cancelled' | 'error' | 'initializing' | 'pending' | 'awaiting_funding' | 'deposited' | 'swapping' | 'sending' | 'completed' | 'failed' | 'refunded' | 'cancelling' | 'withheld' | 'expired' | 'punished' | `unknown:${string}`;
+/**
+ * Progress callback payload. Every stage populates `message`; per-stage
+ * fields:
+ *
+ *  - `keygen` / `cancelled` / `error` — message only (plus swapId on error).
+ *  - `keystore_saved` — `keystoreId`, `depositAddress`.
+ *  - `awaiting_deposit` — `depositAddress`, `depositAmount`, `qr?`, `expectedOutput?`.
+ *  - `deposit_detected` — `depositAddress`.
+ *  - `creating_swap` — `swapId?`, `swapNumber?`, `expectedOutput?`.
+ *  - `signing_psbt` — `swapId`, `verification?`.
+ *  - `funding` / `submit_encsig` / `verifying_xmr` / `confirming` / `sweeping` — `swapId`.
+ *  - `complete` — `swapId`, `txHash`.
+ *  - `error` — `swapId?`, `errorCode?`.
+ *
+ * This remains a single readonly shape rather than a discriminated union to
+ * preserve call-site compatibility; consumers narrow by inspecting `stage`.
+ * Exhaustive-switch UIs can type-guard by stage + presence of the expected field.
+ */
+export interface AtomicSwapProgress {
+    readonly stage: AtomicSwapStage;
+    readonly message: string;
+    readonly keystoreId?: string;
+    readonly depositAddress?: string;
+    readonly depositAmount?: string;
+    readonly swapId?: string;
+    readonly txHash?: string;
+    readonly qr?: string;
+    readonly expectedOutput?: string;
+    readonly swapNumber?: string;
+    readonly verification?: VerificationResult;
+    /** Set on stage='error'. Maps to one of `ERROR_CODES`. */
+    readonly errorCode?: string;
+}
+export type ProgressCallback = (p: AtomicSwapProgress) => void;
+export interface AtomicSwapCallbacks {
+    readonly onProgress: ProgressCallback;
+    readonly onDepositRequired: (address: string, amount: string, qr?: string) => void;
+    readonly saveKeystore: (id: string, json: string) => Promise<void>;
+    readonly loadKeystore: (id: string) => Promise<string | null>;
+    /**
+     * Persist the recovery snapshot for a swap. Called once per swap, AFTER the
+     * client has received Alice's encsig from /presigs and BEFORE it broadcasts
+     * via /fund. The snapshot pairs with the keystore to enable cross-binary
+     * recovery (e.g. via the eigenwallet swap CLI). Optional for back-compat.
+     */
+    readonly saveProtocolSnapshot?: (swapId: string, snapshotJson: string) => Promise<void>;
+    readonly loadProtocolSnapshot?: (swapId: string) => Promise<string | null>;
+}
+export interface AtomicSwapParams {
+    readonly amount: string;
+    readonly destAddress: string;
+    readonly refundAddress: string;
+    readonly network?: 'mainnet' | 'testnet' | 'regtest';
+    readonly blockchain?: BlockchainDataProvider;
+    readonly logger?: Logger;
+    readonly monerodNodes?: readonly string[];
+    /**
+     * Pin a specific maker by `variantId` (as returned in `/quotes`) — e.g.
+     * `maker-K4ZK7eSx`. When omitted the server picks the highest-scored
+     * maker. Useful for load-distribution tests with multiple makers.
+     */
+    readonly variantId?: string;
+}
+export interface AtomicSwapHandle {
+    readonly keystoreId: string;
+    readonly depositAddress: string;
+    readonly abort: () => void;
+}
+export interface RunAtomicSwapOptions {
+    readonly api: ApiClient;
+    readonly params: AtomicSwapParams;
+    readonly callbacks: AtomicSwapCallbacks;
+    readonly signal?: AbortSignal;
+    readonly fetchFn?: typeof globalThis.fetch;
+}
+export interface ResumeAtomicSwapParams {
+    readonly keystore: SwapKeystore;
+    readonly deposit: DetectedDeposit;
+    readonly network?: 'mainnet' | 'testnet' | 'regtest';
+    readonly blockchain?: BlockchainDataProvider;
+    readonly logger?: Logger;
+    readonly existingSwapId?: string;
+    readonly monerodNodes?: readonly string[];
+    /**
+     * Forwarded to `createSwap` when this resume call is creating a new swap
+     * (no `existingSwapId`). Pins a specific atomicswap maker. Ignored when
+     * `existingSwapId` is set because the maker was already chosen.
+     */
+    readonly variantId?: string;
+}
+export interface ResumeAtomicSwapOptions {
+    readonly api: ApiClient;
+    readonly params: ResumeAtomicSwapParams;
+    readonly onProgress: ProgressCallback;
+    readonly signal?: AbortSignal;
+    readonly fetchFn?: typeof globalThis.fetch;
+    /**
+     * Optional snapshot persistence for resumed swaps. Normally the snapshot
+     * is written during the original run (between /presigs and /fund); the
+     * resume path writes a snapshot only if one hasn't been captured yet and
+     * the swap is still pre-fund.
+     */
+    readonly saveProtocolSnapshot?: (swapId: string, snapshotJson: string) => Promise<void>;
+    readonly loadProtocolSnapshot?: (swapId: string) => Promise<string | null>;
+}
+export interface SubmitEncsigParams {
+    readonly api: ApiClient;
+    readonly swapId: string;
+    readonly keys: Pick<ClientKeys, 'b' | 'B'>;
+    readonly signedPsbtBase64: string;
+    readonly network: 'mainnet' | 'testnet' | 'regtest';
+    readonly onProgress: ProgressCallback;
+    readonly signal?: AbortSignal;
+}
+export interface DriveSwapOptions {
+    readonly api: ApiClient;
+    readonly swapId: string;
+    readonly keystoreId: string;
+    readonly wallet: TempBtcWallet;
+    readonly deposit: DetectedDeposit;
+    readonly keystore: SwapKeystore;
+    readonly network: 'mainnet' | 'testnet' | 'regtest';
+    readonly onProgress: ProgressCallback;
+    readonly signal?: AbortSignal;
+    readonly logger: Logger;
+    /**
+     * Blockchain data provider used by the resume path to fetch the raw
+     * TxLock hex when recomputing the redeem digest locally. Required by
+     * resumed swaps; the fresh-fund path never reads from it.
+     */
+    readonly blockchain?: BlockchainDataProvider;
+    /**
+     * Optional snapshot persistence. When supplied, the driver writes a
+     * snapshot pairing with the keystore between /presigs and /fund — before
+     * any on-chain commitment.
+     */
+    readonly saveProtocolSnapshot?: (swapId: string, snapshotJson: string) => Promise<void>;
+    readonly loadProtocolSnapshot?: (swapId: string) => Promise<string | null>;
+    /** Maker peer-id captured at swap-creation time, for the snapshot. */
+    readonly makerPeerId?: string;
+    /** Maker multiaddrs captured at swap-creation time, for the snapshot. */
+    readonly makerMultiaddrs?: ReadonlyArray<string>;
+    /** Optional package version stamped into the snapshot for diagnostics. */
+    readonly clientVersion?: string;
+    /** Optional override for Monero RPC nodes. Defaults to DEFAULT_NODES[network].monero. */
+    readonly monerodNodes?: readonly string[];
+}
+export interface FundingProofEntry {
+    readonly txid: string;
+    readonly vout: number;
+    readonly value: number;
+    readonly address: string;
+    readonly nonce: string;
+    readonly signature: string;
+}
+export { SwapCancelledError } from '../lib/errors.js';
+//# sourceMappingURL=types.d.ts.map

package/dist/atomic-swap/types.d.ts.map

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

package/dist/atomic-swap/types.js

@@ -0,0 +1,5 @@
+// SwapCancelledError lives in `lib/errors.ts` so retry.ts can import it
+// without a circular dependency through `api/index.ts`. Re-exported here
+// to preserve the historical import path.
+export { SwapCancelledError } from '../lib/errors.js';
+//# sourceMappingURL=types.js.map

package/dist/atomic-swap/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/atomic-swap/types.ts"],"names":[],"mappings":"AA+MA,wEAAwE;AACxE,yEAAyE;AACzE,0CAA0C;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/blockchain/quorum-provider.d.ts

@@ -0,0 +1,25 @@
+/**
+ * N-of-M quorum wrapper for `BlockchainDataProvider`.
+ *
+ * Wraps several underlying providers and requires `quorum`-many to agree on
+ * each read. Removes the "single malicious Electrum server" failure mode
+ * (AV-E.4). Broadcast is not quorum-gated because one honest relay is
+ * sufficient to get the tx into the network.
+ */
+import type { BlockchainDataProvider } from '../interfaces/blockchain.js';
+import type { Logger } from '../interfaces/logger.js';
+export interface QuorumProviderConfig {
+    readonly providers: ReadonlyArray<BlockchainDataProvider>;
+    /** Minimum number of providers that must agree. Typically 2-of-3. */
+    readonly quorum: number;
+    readonly logger?: Logger;
+}
+/**
+ * Build a quorum provider from a set of underlying providers.
+ *
+ * @throws {VerificationError} `E_QUORUM_IMPOSSIBLE` if `providers.length < quorum`.
+ * @throws {VerificationError} `E_QUORUM_DISAGREE` (from method calls) when
+ *   fewer than `quorum` providers agree on a value.
+ */
+export declare function createQuorumProvider(config: QuorumProviderConfig): BlockchainDataProvider;
+//# sourceMappingURL=quorum-provider.d.ts.map

package/dist/blockchain/quorum-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quorum-provider.d.ts","sourceRoot":"","sources":["../../src/blockchain/quorum-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EACV,sBAAsB,EAGvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAItD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC;IAC1D,qEAAqE;IACrE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,sBAAsB,CAwDzF"}

package/dist/blockchain/quorum-provider.js

@@ -0,0 +1,144 @@
+import { noopLogger } from '../interfaces/logger.js';
+import { VerificationError } from '../types/index.js';
+/**
+ * Build a quorum provider from a set of underlying providers.
+ *
+ * @throws {VerificationError} `E_QUORUM_IMPOSSIBLE` if `providers.length < quorum`.
+ * @throws {VerificationError} `E_QUORUM_DISAGREE` (from method calls) when
+ *   fewer than `quorum` providers agree on a value.
+ */
+export function createQuorumProvider(config) {
+    if (config.providers.length < config.quorum) {
+        throw new VerificationError('E_QUORUM_IMPOSSIBLE', `need ${String(config.quorum)} providers but only ${String(config.providers.length)} supplied`);
+    }
+    const log = config.logger ?? noopLogger;
+    const providers = config.providers;
+    const quorum = config.quorum;
+    return {
+        async listUnspent(scriptHash) {
+            const settled = await Promise.allSettled(providers.map((p) => p.listUnspent(scriptHash)));
+            return pickQuorumUtxos(settled, quorum, log);
+        },
+        async getTransaction(txid) {
+            const settled = await Promise.allSettled(providers.map((p) => p.getTransaction(txid)));
+            return pickQuorumString(settled, quorum, log, 'getTransaction');
+        },
+        async getTransactionHeight(txid) {
+            const settled = await Promise.allSettled(providers.map((p) => p.getTransactionHeight(txid)));
+            return pickQuorumNumber(settled, quorum, log, 'getTransactionHeight');
+        },
+        async getHistory(scriptHash) {
+            const settled = await Promise.allSettled(providers.map((p) => p.getHistory(scriptHash)));
+            return pickQuorumHistory(settled, quorum, log);
+        },
+        async broadcastTransaction(hex) {
+            const errors = [];
+            for (const p of providers) {
+                try {
+                    return await p.broadcastTransaction(hex);
+                }
+                catch (err) {
+                    errors.push(err instanceof Error ? err.message : String(err));
+                }
+            }
+            throw new VerificationError('E_QUORUM_DISAGREE', `broadcast failed on every provider: ${errors.join('; ')}`);
+        },
+        async estimateFee(blocks) {
+            const settled = await Promise.allSettled(providers.map((p) => p.estimateFee(blocks)));
+            const nums = fulfilledValues(settled).filter((n) => Number.isFinite(n));
+            if (nums.length === 0) {
+                throw new VerificationError('E_QUORUM_DISAGREE', 'no provider returned a fee estimate');
+            }
+            const sorted = [...nums].sort((a, b) => a - b);
+            const mid = sorted[Math.floor(sorted.length / 2)];
+            return mid ?? 0;
+        },
+    };
+}
+function fulfilledValues(settled) {
+    return settled
+        .filter((s) => s.status === 'fulfilled')
+        .map((s) => s.value);
+}
+function pickQuorumString(settled, quorum, log, label) {
+    const counts = new Map();
+    for (const value of fulfilledValues(settled)) {
+        counts.set(value, (counts.get(value) ?? 0) + 1);
+    }
+    for (const [value, count] of counts) {
+        if (count >= quorum)
+            return value;
+    }
+    log.warn({ label, fulfilled: counts.size }, 'quorum-string disagree');
+    throw new VerificationError('E_QUORUM_DISAGREE', `${label}: no value agreed to by ${String(quorum)} providers`);
+}
+function pickQuorumNumber(settled, quorum, log, label) {
+    const values = fulfilledValues(settled).filter((n) => Number.isFinite(n));
+    if (values.length < quorum) {
+        log.warn({ label, fulfilled: values.length }, 'quorum-number too few responses');
+        throw new VerificationError('E_QUORUM_DISAGREE', `${label}: only ${String(values.length)} providers responded, need ${String(quorum)}`);
+    }
+    // Accept the median if at least `quorum` values fall within a ±1 band of it
+    // (handles normal propagation lag for block heights).
+    const sorted = [...values].sort((a, b) => a - b);
+    const median = sorted[Math.floor(sorted.length / 2)] ?? 0;
+    const agreeing = values.filter((v) => Math.abs(v - median) <= 1).length;
+    if (agreeing >= quorum)
+        return median;
+    throw new VerificationError('E_QUORUM_DISAGREE', `${label}: no median within ±1 agreed to by ${String(quorum)} providers`);
+}
+function utxoKey(u) {
+    return `${u.txid}:${String(u.vout)}:${String(u.value)}`;
+}
+function pickQuorumUtxos(settled, quorum, log) {
+    const counts = new Map();
+    for (const list of fulfilledValues(settled)) {
+        const seenInThisList = new Set();
+        for (const u of list) {
+            const key = utxoKey(u);
+            if (seenInThisList.has(key))
+                continue;
+            seenInThisList.add(key);
+            const entry = counts.get(key);
+            if (entry)
+                entry.count += 1;
+            else
+                counts.set(key, { utxo: u, count: 1 });
+        }
+    }
+    const accepted = [];
+    for (const [, entry] of counts) {
+        if (entry.count >= quorum)
+            accepted.push(entry.utxo);
+    }
+    log.debug({ distinct: counts.size, accepted: accepted.length, quorum }, 'quorum utxo merge');
+    return accepted;
+}
+function historyKey(h) {
+    return `${h.tx_hash}:${String(h.height)}`;
+}
+function pickQuorumHistory(settled, quorum, log) {
+    const counts = new Map();
+    for (const list of fulfilledValues(settled)) {
+        const seen = new Set();
+        for (const h of list) {
+            const key = historyKey(h);
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            const slot = counts.get(key);
+            if (slot)
+                slot.count += 1;
+            else
+                counts.set(key, { entry: h, count: 1 });
+        }
+    }
+    const accepted = [];
+    for (const [, slot] of counts) {
+        if (slot.count >= quorum)
+            accepted.push(slot.entry);
+    }
+    log.debug({ distinct: counts.size, accepted: accepted.length, quorum }, 'quorum history merge');
+    return accepted;
+}
+//# sourceMappingURL=quorum-provider.js.map

package/dist/blockchain/quorum-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quorum-provider.js","sourceRoot":"","sources":["../../src/blockchain/quorum-provider.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAStD;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAA4B;IAC/D,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,IAAI,iBAAiB,CACzB,qBAAqB,EACrB,QAAQ,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAC/F,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC;IACxC,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAE7B,OAAO;QACL,KAAK,CAAC,WAAW,CAAC,UAAkB;YAClC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC1F,OAAO,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;QACD,KAAK,CAAC,cAAc,CAAC,IAAY;YAC/B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACvF,OAAO,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAClE,CAAC;QACD,KAAK,CAAC,oBAAoB,CAAC,IAAY;YACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7F,OAAO,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,CAAC,CAAC;QACxE,CAAC;QACD,KAAK,CAAC,UAAU,CAAC,UAAkB;YACjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACzF,OAAO,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QACD,KAAK,CAAC,oBAAoB,CAAC,GAAW;YACpC,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,OAAO,MAAM,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YACD,MAAM,IAAI,iBAAiB,CACzB,mBAAmB,EACnB,uCAAuC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC3D,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,MAAc;YAC9B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtF,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACrF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,iBAAiB,CACzB,mBAAmB,EACnB,qCAAqC,CACtC,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAClD,OAAO,GAAG,IAAI,CAAC,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,OAA+C;IAE/C,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACvE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAoD,EACpD,MAAc,EACd,GAAW,EACX,KAAa;IAEb,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,KAAK,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7C,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC;IACD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC;QACpC,IAAI,KAAK,IAAI,MAAM;YAAE,OAAO,KAAK,CAAC;IACpC,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,wBAAwB,CAAC,CAAC;IACtE,MAAM,IAAI,iBAAiB,CACzB,mBAAmB,EACnB,GAAG,KAAK,2BAA2B,MAAM,CAAC,MAAM,CAAC,YAAY,CAC9D,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAoD,EACpD,MAAc,EACd,GAAW,EACX,KAAa;IAEb,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACvF,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;QAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,iCAAiC,CAAC,CAAC;QACjF,MAAM,IAAI,iBAAiB,CACzB,mBAAmB,EACnB,GAAG,KAAK,UAAU,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,8BAA8B,MAAM,CAAC,MAAM,CAAC,EAAE,CACtF,CAAC;IACJ,CAAC;IACD,4EAA4E;IAC5E,sDAAsD;IACtD,MAAM,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACxE,IAAI,QAAQ,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IACtC,MAAM,IAAI,iBAAiB,CACzB,mBAAmB,EACnB,GAAG,KAAK,sCAAsC,MAAM,CAAC,MAAM,CAAC,YAAY,CACzE,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,CAAO;IACtB,OAAO,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,eAAe,CACtB,OAA6D,EAC7D,MAAc,EACd,GAAW;IAEX,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkD,CAAC;IACzE,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACzC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YACtC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,KAAK;gBAAE,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;;gBACvB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAW,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC;QAC/B,IAAI,KAAK,CAAC,KAAK,IAAI,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC;IAC7F,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,UAAU,CAAC,CAAyB;IAC3C,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CACxB,OAA+E,EAC/E,MAAc,EACd,GAAW;IAEX,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqE,CAAC;IAC5F,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,IAAI;gBAAE,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;;gBACrB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAA6B,EAAE,CAAC;IAC9C,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,KAAK,IAAI,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAChG,OAAO,QAAQ,CAAC;AAClB,CAAC"}