@arkade-os/swap 0.1.0-rc.6 → 0.1.0-rc.8

package/dist/advanced.cjs

@@ -506,7 +506,7 @@ function deriveLightningReceive(input) {
     }
   };
 }
-var import_base7, import_legacy2, import_sdk5, import_sdk6, solverHex, ARKADE_BTC, LIGHTNING_BTC, ONCHAIN_BTC, rfqPair, LIGHTNING_SEND_PAIR, LIGHTNING_RECEIVE_PAIR, ONCHAIN_SEND_PAIR, ONCHAIN_RECEIVE_PAIR, SwapRefusal, AddressMismatch, newRfqId, lightningSendRequest, MIN_HEADROOM_SECONDS, gateError, assertFinite, MAX_PAIR_LENGTH, assertPairLength, verifyLockupAddress, LOCKUP_SHAPE_VARIANTS, matchQuotedLockup, assertFundable, expectQuote, pairOf, SEQUENCE_GRANULARITY_SECONDS, SOLO_REFUND_HEADROOM_SECONDS, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, l1NetworkFromArk, onchainSendRequest, lightningReceiveRequest, MIN_CLAIM_WINDOW_SECONDS, assertReceivable;
+var import_base7, import_legacy2, import_sdk5, import_sdk6, solverHex, ARKADE_BTC, LIGHTNING_BTC, ONCHAIN_BTC, rfqPair, LIGHTNING_SEND_PAIR, LIGHTNING_RECEIVE_PAIR, ONCHAIN_SEND_PAIR, ONCHAIN_RECEIVE_PAIR, RFQ_REFUSAL_ERROR_CODES, isRfqRefusalErrorCode, REFUSAL_FIELDS, REFUSAL_UNITS, safeInteger, safeRefusalDetail, refusalMessage, SwapRefusal, AddressMismatch, newRfqId, lightningSendRequest, MIN_HEADROOM_SECONDS, gateError, assertFinite, MAX_PAIR_LENGTH, assertPairLength, verifyLockupAddress, LOCKUP_SHAPE_VARIANTS, matchQuotedLockup, assertFundable, expectQuote, pairOf, SEQUENCE_GRANULARITY_SECONDS, SOLO_REFUND_HEADROOM_SECONDS, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, l1NetworkFromArk, onchainSendRequest, lightningReceiveRequest, MIN_CLAIM_WINDOW_SECONDS, assertReceivable;
 var init_rfq = __esm({
   "src/rfq.ts"() {
     "use strict";
@@ -533,6 +533,57 @@ var init_rfq = __esm({
     LIGHTNING_RECEIVE_PAIR = rfqPair(LIGHTNING_BTC, ARKADE_BTC);
     ONCHAIN_SEND_PAIR = rfqPair(ARKADE_BTC, ONCHAIN_BTC);
     ONCHAIN_RECEIVE_PAIR = rfqPair(ONCHAIN_BTC, ARKADE_BTC);
+    RFQ_REFUSAL_ERROR_CODES = [
+      "amount_side_unsupported",
+      "exact_out_unsupported",
+      "invalid_amount",
+      "invalid_payout_address",
+      "invalid_refund_address",
+      "invoice_amount_mismatch",
+      "invoice_cltv_too_large",
+      "invoice_malformed",
+      "invoice_missing_amount",
+      "invoice_missing_network",
+      "invoice_missing_payment_hash",
+      "invoice_missing_timestamp",
+      "invoice_mixed_case",
+      "invoice_sub_satoshi_amount",
+      "invoice_too_long",
+      "invoice_wrong_network"
+    ];
+    isRfqRefusalErrorCode = (value) => typeof value === "string" && RFQ_REFUSAL_ERROR_CODES.includes(value);
+    REFUSAL_FIELDS = /* @__PURE__ */ new Set([
+      "amount",
+      "amount_side",
+      "profile.invoice",
+      "profile.payout_address",
+      "profile.refund_address"
+    ]);
+    REFUSAL_UNITS = /* @__PURE__ */ new Set(["blocks", "characters", "sats"]);
+    safeInteger = (value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+    safeRefusalDetail = (detail) => {
+      if (!isRfqRefusalErrorCode(detail.errorCode)) return {};
+      return {
+        errorCode: detail.errorCode,
+        field: typeof detail.field === "string" && REFUSAL_FIELDS.has(detail.field) ? detail.field : void 0,
+        actual: safeInteger(detail.actual),
+        expected: safeInteger(detail.expected),
+        limit: safeInteger(detail.limit),
+        unit: typeof detail.unit === "string" && REFUSAL_UNITS.has(detail.unit) ? detail.unit : void 0
+      };
+    };
+    refusalMessage = (reason, detail) => {
+      if (!detail.errorCode) return `solver refused: ${reason}`;
+      const where = detail.field ? ` at ${detail.field}` : "";
+      const unit = detail.unit ? ` ${detail.unit}` : "";
+      if (detail.actual !== void 0 && detail.limit !== void 0) {
+        return `solver refused: ${reason} (${detail.errorCode}${where}: ${detail.actual}${unit}, limit ${detail.limit})`;
+      }
+      if (detail.actual !== void 0 && detail.expected !== void 0) {
+        return `solver refused: ${reason} (${detail.errorCode}${where}: ${detail.actual}${unit}, expected ${detail.expected})`;
+      }
+      return `solver refused: ${reason} (${detail.errorCode}${where})`;
+    };
     SwapRefusal = class 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
@@ -540,10 +591,23 @@ var init_rfq = __esm({
       name = "SwapRefusal";
       reason;
       rfqId;
-      constructor(reason, rfqId) {
-        super(`solver refused: ${reason}`);
+      errorCode;
+      field;
+      actual;
+      expected;
+      limit;
+      unit;
+      constructor(reason, rfqId, detail = {}) {
+        const safeDetail = safeRefusalDetail(detail);
+        super(refusalMessage(reason, safeDetail));
         this.reason = reason;
         this.rfqId = rfqId;
+        this.errorCode = safeDetail.errorCode;
+        this.field = safeDetail.field;
+        this.actual = safeDetail.actual;
+        this.expected = safeDetail.expected;
+        this.limit = safeDetail.limit;
+        this.unit = safeDetail.unit;
       }
     };
     AddressMismatch = class extends Error {
@@ -684,7 +748,16 @@ var init_rfq = __esm({
     };
     expectQuote = (payload, rfqId, requestedPair) => {
       const p = payload;
-      if (p?.type === "rfq_refusal") throw new SwapRefusal(p.reason ?? "unknown", p.rfq_id ?? rfqId);
+      if (p?.type === "rfq_refusal") {
+        throw new SwapRefusal(p.reason ?? "unknown", p.rfq_id ?? rfqId, {
+          errorCode: p.error_code,
+          field: p.field,
+          actual: p.actual,
+          expected: p.expected,
+          limit: p.limit,
+          unit: p.unit
+        });
+      }
       if (p?.type !== "rfq_quote" || p.rfq_id !== rfqId) {
         throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
       }
@@ -1176,10 +1249,10 @@ function addressOutstanding(swaps, script) {
   }
   return true;
 }
-async function promoteOfferContract(manager, script) {
+async function promoteOfferContract(manager, script, issued = Date.now()) {
   await serialize(script, async () => {
     await manager.setContractWatchState(script, "watched");
-    issuedAt.set(script, Date.now());
+    issuedAt.set(script, issued);
   });
 }
 async function retireOfferContract(manager, swaps, script) {
@@ -1512,7 +1585,6 @@ function decodeExitDelay(value) {
 var OFFER_CONTRACT_LABEL = "Arkade swap offer";
 var OFFER_CONTRACT_KIND = "asset-swap-offer";
 async function registerOfferContract(wallet, info, binding, operatorPubkey, expectedPkScript) {
-  const { program, args, keys } = swapProgramBinding(binding, operatorPubkey);
   const contractManager = await wallet.getContractManager();
   const client = await import_sdk2.arkade.Arkade.connect({
     // Registration derives and persists; it never broadcasts and never
@@ -1528,15 +1600,22 @@ async function registerOfferContract(wallet, info, binding, operatorPubkey, expe
     network: (0, import_sdk2.networkFromArkadeInfo)(info),
     contractManager
   });
+  await contractManager.createContract(
+    offerContractParams(client, binding, operatorPubkey, expectedPkScript)
+  );
+  await promoteOfferContract(contractManager, import_base2.hex.encode(expectedPkScript));
+}
+function offerContractParams(client, binding, operatorPubkey, expectedPkScript) {
+  const { program, args, keys } = swapProgramBinding(binding, operatorPubkey);
   const contract = new import_sdk2.arkade.ArkadeContract(client, program, args, keys);
   if (import_base2.hex.encode(contract.pkScript) !== import_base2.hex.encode(expectedPkScript)) {
     throw new Error("derived covenant does not match the offer's swapPkScript");
   }
-  await contract.register({
+  return {
+    ...contract.toContractParams(),
     label: OFFER_CONTRACT_LABEL,
     metadata: { genericallySpendable: false, kind: OFFER_CONTRACT_KIND }
-  });
-  await promoteOfferContract(contractManager, import_base2.hex.encode(expectedPkScript));
+  };
 }
 function serverExitDelay(delay) {
   if (typeof delay !== "bigint" || delay <= BigInt(0)) {
@@ -3788,16 +3867,33 @@ function classifyDepositSpend(offer, operatorPubkey, spendTxs, deposit) {
   return "indeterminate";
 }
 async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
-  const { operatorPubkey, scanned = /* @__PURE__ */ new Set() } = opts;
-  const candidates = unscannedSwapCandidates(txs, existingIds, scanned);
-  if (candidates.length === 0) return { restored: [], scannedTxids: [] };
+  const { operatorPubkey, scanned = /* @__PURE__ */ new Set(), reopen = [] } = opts;
+  const reopened = [];
+  for (const swap of reopen) {
+    try {
+      reopened.push({
+        fundingTx: { type: "sent", redeemTxid: swap.fundingTxid },
+        offer: decodeOffer(import_base11.hex.decode(swap.offerHex)),
+        offerHex: swap.offerHex,
+        existing: swap
+      });
+    } catch {
+    }
+  }
+  const reopenedTxids = new Set(reopened.map(({ fundingTx }) => fundingTx.redeemTxid));
+  const candidates = unscannedSwapCandidates(txs, existingIds, scanned).filter(
+    ({ redeemTxid }) => !reopenedTxids.has(redeemTxid)
+  );
+  if (candidates.length === 0 && reopened.length === 0) {
+    return { restored: [], scannedTxids: [] };
+  }
   const byTxid = new Map(candidates.map((tx) => [tx.redeemTxid, tx]));
   const parsedByTxid = await fetchParsedTxs(
     indexer,
     candidates.map((tx) => tx.redeemTxid)
   );
   const fetchedTxids = [];
-  const found = [];
+  const found = [...reopened];
   for (const [txid, parsed] of parsedByTxid) {
     const fundingTx = byTxid.get(txid);
     if (!fundingTx) continue;
@@ -3835,7 +3931,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
   const spendTxByTxid = await fetchParsedTxs(indexer, [...spendTxids]);
   const restored = [];
   const unresolved = /* @__PURE__ */ new Set();
-  for (const { fundingTx, offer, offerHex } of found) {
+  for (const { fundingTx, offer, offerHex, existing } of found) {
     const swapPkScript = import_base11.hex.encode(offer.swapPkScript);
     const vtxo = vtxoByScriptAndTxid.get(`${swapPkScript}:${fundingTx.redeemTxid}`);
     if (!vtxo) {
@@ -3866,6 +3962,12 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
       }
       status = kind;
     }
+    const completion = status === "fulfilled" && spentTxid && txByAnyId.get(spentTxid)?.createdAt ? { completedAt: txByAnyId.get(spentTxid).createdAt * 1e3 } : {};
+    if (existing) {
+      if (status === "pending") continue;
+      restored.push({ ...existing, status, spentTxid, ...completion });
+      continue;
+    }
     restored.push({
       id: fundingTx.redeemTxid,
       fromAsset,
@@ -3885,7 +3987,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
       createdAt: fundingTx.createdAt ? fundingTx.createdAt * 1e3 : vtxo.createdAt.getTime(),
       // the completion time is the caller's record of the spend, if it
       // has one — the psbt that classified it carries no timestamp
-      ...status === "fulfilled" && spentTxid && txByAnyId.get(spentTxid)?.createdAt ? { completedAt: txByAnyId.get(spentTxid).createdAt * 1e3 } : {}
+      ...completion
     });
   }
   return { restored, scannedTxids: fetchedTxids.filter((id) => !unresolved.has(id)) };
@@ -6604,7 +6706,6 @@ var verifyPlanLegs = (plan, legs, give) => {
 
 // src/client/quoteRfq.ts
 var import_base18 = require("@scure/base");
-var import_secp256k12 = require("@noble/curves/secp256k1.js");
 var import_sdk26 = require("@arkade-os/sdk");
 init_claimPacket();
 init_onchainHtlc();
@@ -6680,9 +6781,7 @@ var covenantInputs = (input) => {
 };
 var sealingKey = (deps) => {
   const configured = deps.covclaimd?.pubkey;
-  if (configured === void 0) {
-    return import_secp256k12.secp256k1.getPublicKey(import_secp256k12.secp256k1.utils.randomSecretKey(), true);
-  }
+  if (configured === void 0) return void 0;
   const key = import_base18.hex.decode(configured);
   if (key.length !== 33) {
     throw new Error(
@@ -6795,10 +6894,8 @@ var quoteLightningReceive = async (input) => {
   const paymentHash = import_base18.hex.encode(secrets.paymentHash);
   const payoutAddress = await input.wallet.getAddress();
   const lightning = input.corridors.get("lightning").deps;
-  const claimPacket = await sealClaimPacket({
-    preimage: secrets.preimage,
-    covclaimdPubkey: sealingKey(lightning)
-  });
+  const sealTo = sealingKey(lightning);
+  const claimPacket = sealTo ? await sealClaimPacket({ preimage: secrets.preimage, covclaimdPubkey: sealTo }) : void 0;
   const wire = await input.transport.requestQuote(
     withCanonicalAmount(
       lightningReceiveRequest({
@@ -6806,7 +6903,7 @@ var quoteLightningReceive = async (input) => {
         paymentHash,
         payoutAddress,
         payoutPubkey: secrets.pubkey,
-        claimPacket: claimPacket.ciphertext,
+        claimPacket: claimPacket?.ciphertext,
         // Placeholder: the v1 builders type this field `number`, and the
         // wire adapter re-encodes it as the canonical decimal string.
         // Encoding it here as well would put the decision in two places.

package/dist/advanced.d.cts

@@ -1,13 +1,13 @@
-import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-DUTOiyH2.cjs';
-export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-DUTOiyH2.cjs';
+import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-DVn92LQd.cjs';
+export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-DVn92LQd.cjs';
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
-import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-CDlK003C.cjs';
-export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-CDlK003C.cjs';
-import { I as InvoiceFacts, C as ChainSource, R as RfqQuote } from './rfq-RONK76D7.cjs';
-export { S as SwapRefusal } from './rfq-RONK76D7.cjs';
+import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-D0gFF_GA.cjs';
+export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-D0gFF_GA.cjs';
+import { I as InvoiceFacts, C as ChainSource, R as RfqQuote } from './rfq-DhkgiwQ7.cjs';
+export { S as SwapRefusal } from './rfq-DhkgiwQ7.cjs';
 import * as btc from '@scure/btc-signer';
 import { OnchainProvider, NetworkName, IWallet, VHTLC } from '@arkade-os/sdk';
-import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-JawNDXBr.cjs';
+import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-C4cMEeZT.cjs';
 
 /**
  * The alias table, filled from discovery.

package/dist/advanced.d.ts

@@ -1,13 +1,13 @@
-import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-BVhyWIM0.js';
-export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-BVhyWIM0.js';
+import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-CSpOUdCN.js';
+export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-CSpOUdCN.js';
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
-import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-D3A1amV_.js';
-export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-D3A1amV_.js';
-import { I as InvoiceFacts, C as ChainSource, R as RfqQuote } from './rfq-RONK76D7.js';
-export { S as SwapRefusal } from './rfq-RONK76D7.js';
+import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-tDT8p-Nx.js';
+export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-tDT8p-Nx.js';
+import { I as InvoiceFacts, C as ChainSource, R as RfqQuote } from './rfq-DhkgiwQ7.js';
+export { S as SwapRefusal } from './rfq-DhkgiwQ7.js';
 import * as btc from '@scure/btc-signer';
 import { OnchainProvider, NetworkName, IWallet, VHTLC } from '@arkade-os/sdk';
-import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-BJ-KKgwU.js';
+import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-DbWXdpzm.js';
 
 /**
  * The alias table, filled from discovery.

package/dist/advanced.js

@@ -133,7 +133,7 @@ import {
   withCanonicalAmount,
   withOfferStatus,
   withRfqState
-} from "./chunk-O3XMAZXS.js";
+} from "./chunk-HV7EIUE2.js";
 import {
   ACTIVITY_TOKEN,
   CORRIDOR_PASS,
@@ -148,11 +148,11 @@ import {
   onchainCorridor,
   readsChain,
   recordOutcome
-} from "./chunk-BQLGQ4WB.js";
+} from "./chunk-4PATNGYQ.js";
 import {
   SwapRefusal,
   sealClaimPacket
-} from "./chunk-6HIU2LNP.js";
+} from "./chunk-ARYFNDJY.js";
 
 // src/reveal.ts
 import { base64, hex } from "@scure/base";

package/dist/{chunk-BQLGQ4WB.js → chunk-4PATNGYQ.js}

@@ -7,7 +7,7 @@ import {
   lockupContractParams,
   onchainHtlcScript,
   registerLockupContract
-} from "./chunk-6HIU2LNP.js";
+} from "./chunk-ARYFNDJY.js";
 
 // src/store.ts
 import { hex } from "@scure/base";
@@ -239,10 +239,10 @@ function addressOutstanding(swaps, script) {
   }
   return true;
 }
-async function promoteOfferContract(manager, script) {
+async function promoteOfferContract(manager, script, issued = Date.now()) {
   await serialize(script, async () => {
     await manager.setContractWatchState(script, "watched");
-    issuedAt.set(script, Date.now());
+    issuedAt.set(script, issued);
   });
 }
 async function retireOfferContract(manager, swaps, script) {
@@ -470,7 +470,6 @@ function decodeExitDelay(value) {
 var OFFER_CONTRACT_LABEL = "Arkade swap offer";
 var OFFER_CONTRACT_KIND = "asset-swap-offer";
 async function registerOfferContract(wallet, info, binding, operatorPubkey, expectedPkScript) {
-  const { program, args, keys } = swapProgramBinding(binding, operatorPubkey);
   const contractManager = await wallet.getContractManager();
   const client = await arkade.Arkade.connect({
     // Registration derives and persists; it never broadcasts and never
@@ -486,15 +485,67 @@ async function registerOfferContract(wallet, info, binding, operatorPubkey, expe
     network: networkFromArkadeInfo(info),
     contractManager
   });
+  await contractManager.createContract(
+    offerContractParams(client, binding, operatorPubkey, expectedPkScript)
+  );
+  await promoteOfferContract(contractManager, hex2.encode(expectedPkScript));
+}
+function offerContractParams(client, binding, operatorPubkey, expectedPkScript) {
+  const { program, args, keys } = swapProgramBinding(binding, operatorPubkey);
   const contract = new arkade.ArkadeContract(client, program, args, keys);
   if (hex2.encode(contract.pkScript) !== hex2.encode(expectedPkScript)) {
     throw new Error("derived covenant does not match the offer's swapPkScript");
   }
-  await contract.register({
+  return {
+    ...contract.toContractParams(),
     label: OFFER_CONTRACT_LABEL,
     metadata: { genericallySpendable: false, kind: OFFER_CONTRACT_KIND }
+  };
+}
+async function restoreOfferCoverage(wallet, swaps) {
+  const live = swaps.filter((swap) => !RETIRABLE.includes(swap.status));
+  if (live.length === 0) return;
+  const [info, contractManager] = await Promise.all([
+    wallet.getArkadeInfo({ requireLive: true }),
+    wallet.getContractManager()
+  ]);
+  const operatorPubkey = hex2.decode(toXOnlySignerHex(info.signerPubkey));
+  const client = await arkade.Arkade.connect({
+    arkade: { getInfo: async () => info },
+    identity: wallet.identity,
+    network: networkFromArkadeInfo(info),
+    contractManager
   });
-  await promoteOfferContract(contractManager, hex2.encode(expectedPkScript));
+  const seen = /* @__PURE__ */ new Set();
+  const covenants = [];
+  for (const swap of live) {
+    if (seen.has(swap.swapPkScript)) continue;
+    seen.add(swap.swapPkScript);
+    try {
+      const { swapPkScript: _, ...binding } = decodeOffer(hex2.decode(swap.offerHex));
+      covenants.push({
+        script: swap.swapPkScript,
+        issued: swap.createdAt,
+        params: offerContractParams(
+          client,
+          binding,
+          operatorPubkey,
+          hex2.decode(swap.swapPkScript)
+        )
+      });
+    } catch (error) {
+      console.warn(`[swap] could not restore coverage for ${swap.swapPkScript}`, error);
+    }
+  }
+  const params = covenants.map((covenant) => covenant.params);
+  if (contractManager.createContracts) {
+    await contractManager.createContracts(params);
+  } else {
+    for (const contract of params) await contractManager.createContract(contract);
+  }
+  for (const covenant of covenants) {
+    await promoteOfferContract(contractManager, covenant.script, covenant.issued);
+  }
 }
 function serverExitDelay(delay) {
   if (typeof delay !== "bigint" || delay <= BigInt(0)) {
@@ -1356,6 +1407,16 @@ import {
   sideLimits
 } from "@arkade-os/solver-discovery";
 import { isSubdust } from "@arkade-os/sdk";
+
+// src/marketShape.ts
+var assetOf = (market, side) => side === "base" ? market.base_asset : market.quote_asset;
+var marketAssetId = (market, side) => {
+  const asset2 = assetOf(market, side);
+  if (typeof asset2?.caip19_id === "string") return asset2.caip19_id;
+  return typeof asset2?.id === "string" ? asset2.id : void 0;
+};
+
+// src/markets.ts
 var QUOTE_OPTIONS = { safetyBps: 0 };
 var makeCachedFeedFetch = (ttlMs = 3e4, fetchImpl = fetch) => {
   const cache = /* @__PURE__ */ new Map();
@@ -1404,14 +1465,17 @@ var makeCachedFeedFetch = (ttlMs = 3e4, fetchImpl = fetch) => {
 var MARKETS_CACHE_TTL_MS = 60 * 60 * 1e3;
 var isMarketShaped = (m) => {
   const market = m;
-  return typeof market?.pair === "string" && typeof market.base_asset?.id === "string" && typeof market.quote_asset?.id === "string" && typeof market.quote_asset.decimals === "number";
+  if (!market) return false;
+  return typeof market.base_asset?.id === "string" && typeof market.quote_asset?.id === "string" && typeof market.quote_asset.decimals === "number";
 };
 var readMarketsCache = async (repository, network, registry) => {
   try {
     const entry = await repository.getCachedMarkets(network, registry);
     if (!Array.isArray(entry?.markets) || typeof entry?.fetchedAt !== "number")
       return void 0;
-    return entry.markets.every(isMarketShaped) ? entry : void 0;
+    const markets = entry.markets.filter(isMarketShaped);
+    if (entry.markets.length > 0 && markets.length === 0) return void 0;
+    return { ...entry, markets };
   } catch {
     return void 0;
   }
@@ -1452,10 +1516,33 @@ var discoverMarkets = async (options) => {
 };
 var findMarket = (markets, fromId, toId) => {
   if (fromId === toId) return void 0;
-  const givingBase = bestMarket(markets, { baseId: fromId, quoteId: toId, wantSide: "quote" });
+  const resolveMarketId = (id) => {
+    for (const market of markets) {
+      for (const side of ["base", "quote"]) {
+        const asset2 = side === "base" ? market.base_asset : market.quote_asset;
+        if (asset2.id === id) return id;
+        const canonical = marketAssetId(market, side) ?? "";
+        const matchesBtc = id === BTC_ASSET_ID && /^arkade:[^/]+\/slip44:(?:0|1)$/.test(canonical);
+        const matchesAsset = /^[0-9a-f]{68}$/.test(id) && canonical.endsWith(`/asset:${id}`);
+        if ((matchesBtc || matchesAsset) && typeof asset2.id === "string") return asset2.id;
+      }
+    }
+    return id;
+  };
+  const resolvedFrom = resolveMarketId(fromId);
+  const resolvedTo = resolveMarketId(toId);
+  const givingBase = bestMarket(markets, {
+    baseId: resolvedFrom,
+    quoteId: resolvedTo,
+    wantSide: "quote"
+  });
   if (givingBase) return { market: givingBase, give: "base" };
   return {
-    market: bestMarket(markets, { baseId: toId, quoteId: fromId, wantSide: "base" }),
+    market: bestMarket(markets, {
+      baseId: resolvedTo,
+      quoteId: resolvedFrom,
+      wantSide: "base"
+    }),
     give: "quote"
   };
 };
@@ -1545,16 +1632,33 @@ function classifyDepositSpend(offer, operatorPubkey, spendTxs, deposit) {
   return "indeterminate";
 }
 async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
-  const { operatorPubkey, scanned = /* @__PURE__ */ new Set() } = opts;
-  const candidates = unscannedSwapCandidates(txs, existingIds, scanned);
-  if (candidates.length === 0) return { restored: [], scannedTxids: [] };
+  const { operatorPubkey, scanned = /* @__PURE__ */ new Set(), reopen = [] } = opts;
+  const reopened = [];
+  for (const swap of reopen) {
+    try {
+      reopened.push({
+        fundingTx: { type: "sent", redeemTxid: swap.fundingTxid },
+        offer: decodeOffer(hex5.decode(swap.offerHex)),
+        offerHex: swap.offerHex,
+        existing: swap
+      });
+    } catch {
+    }
+  }
+  const reopenedTxids = new Set(reopened.map(({ fundingTx }) => fundingTx.redeemTxid));
+  const candidates = unscannedSwapCandidates(txs, existingIds, scanned).filter(
+    ({ redeemTxid }) => !reopenedTxids.has(redeemTxid)
+  );
+  if (candidates.length === 0 && reopened.length === 0) {
+    return { restored: [], scannedTxids: [] };
+  }
   const byTxid = new Map(candidates.map((tx) => [tx.redeemTxid, tx]));
   const parsedByTxid = await fetchParsedTxs(
     indexer,
     candidates.map((tx) => tx.redeemTxid)
   );
   const fetchedTxids = [];
-  const found = [];
+  const found = [...reopened];
   for (const [txid, parsed] of parsedByTxid) {
     const fundingTx = byTxid.get(txid);
     if (!fundingTx) continue;
@@ -1592,7 +1696,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
   const spendTxByTxid = await fetchParsedTxs(indexer, [...spendTxids]);
   const restored = [];
   const unresolved = /* @__PURE__ */ new Set();
-  for (const { fundingTx, offer, offerHex } of found) {
+  for (const { fundingTx, offer, offerHex, existing } of found) {
     const swapPkScript = hex5.encode(offer.swapPkScript);
     const vtxo = vtxoByScriptAndTxid.get(`${swapPkScript}:${fundingTx.redeemTxid}`);
     if (!vtxo) {
@@ -1623,6 +1727,12 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
       }
       status = kind;
     }
+    const completion = status === "fulfilled" && spentTxid && txByAnyId.get(spentTxid)?.createdAt ? { completedAt: txByAnyId.get(spentTxid).createdAt * 1e3 } : {};
+    if (existing) {
+      if (status === "pending") continue;
+      restored.push({ ...existing, status, spentTxid, ...completion });
+      continue;
+    }
     restored.push({
       id: fundingTx.redeemTxid,
       fromAsset,
@@ -1642,7 +1752,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
       createdAt: fundingTx.createdAt ? fundingTx.createdAt * 1e3 : vtxo.createdAt.getTime(),
       // the completion time is the caller's record of the spend, if it
       // has one — the psbt that classified it carries no timestamp
-      ...status === "fulfilled" && spentTxid && txByAnyId.get(spentTxid)?.createdAt ? { completedAt: txByAnyId.get(spentTxid).createdAt * 1e3 } : {}
+      ...completion
     });
   }
   return { restored, scannedTxids: fetchedTxids.filter((id) => !unresolved.has(id)) };
@@ -3109,6 +3219,7 @@ export {
   retireOfferContract,
   retireSettledOfferContracts,
   BTC_ASSET_ID,
+  getAssetSwapsOrThrow,
   getAssetSwaps,
   addAssetSwap,
   updateAssetSwap,
@@ -3120,6 +3231,7 @@ export {
   OFFER_PACKET_TYPE,
   encodeOffer,
   decodeOffer,
+  restoreOfferCoverage,
   createOffer,
   cancelOffer,
   NoSpendableDepositError,