@arkade-os/swap 0.0.17 → 0.0.19

package/dist/index.cjs

@@ -84,6 +84,7 @@ __export(index_exports, {
   arkadeAssetLeg: () => arkadeAssetLeg,
   arkadeRefunder: () => arkadeRefunder,
   arkadeSwapRequest: () => arkadeSwapRequest,
+  assertArkadeFundable: () => assertArkadeFundable,
   assertFundable: () => assertFundable,
   assertReceivable: () => assertReceivable,
   awaitLockupFunding: () => awaitLockupFunding,
@@ -92,6 +93,7 @@ __export(index_exports, {
   buildHtlcClaim: () => buildHtlcClaim,
   buildHtlcRefund: () => buildHtlcRefund,
   cancelOffer: () => cancelOffer,
+  canonicalAssetAmount: () => canonicalAssetAmount,
   chainSourceFrom: () => chainSourceFrom,
   claimOnchainFill: () => claimOnchainFill,
   claimPacketShape: () => claimPacketShape,
@@ -132,6 +134,8 @@ __export(index_exports, {
   newPreimage: () => newPreimage,
   newRfqId: () => newRfqId,
   nextOnchainAction: () => nextOnchainAction,
+  normalizeMakerPkScript: () => normalizeMakerPkScript,
+  normalizeMakerPublicKey: () => normalizeMakerPublicKey,
   offerTermsFromQuote: () => offerTermsFromQuote,
   offerVtxoScript: () => offerVtxoScript,
   onchainHtlcScript: () => onchainHtlcScript,
@@ -149,6 +153,7 @@ __export(index_exports, {
   registerAssetSwapRestore: () => registerAssetSwapRestore,
   registerLockupContract: () => registerLockupContract,
   relayTransport: () => relayTransport,
+  requestArkadeSwap: () => requestArkadeSwap,
   requestLightningReceive: () => requestLightningReceive,
   requestLightningSend: () => requestLightningSend,
   requestOnchainReceive: () => requestOnchainReceive,
@@ -186,6 +191,7 @@ __export(index_exports, {
   updateRfqSwapRecord: () => updateRfqSwapRecord,
   validatePlan: () => validatePlan,
   verifyLockupAddress: () => verifyLockupAddress,
+  verifyOfferAddress: () => verifyOfferAddress,
   verifyReceiveInvoice: () => verifyReceiveInvoice,
   watchOfferSwaps: () => watchOfferSwaps
 });
@@ -1064,12 +1070,14 @@ var discoverMarkets = async (options) => {
     fetchImpl,
     useCache = true
   } = options;
-  if (!registry || !(0, import_solver_discovery.isNetwork)(network)) return [];
-  const cached = repository && await readMarketsCache(repository, network, registry);
+  if (!(0, import_solver_discovery.isNetwork)(network)) return [];
+  const registries = registry ? [registry] : void 0;
+  const registryKey = registries?.[0] ?? (0, import_solver_discovery.registryIndexUrl)(network);
+  const cached = repository && await readMarketsCache(repository, network, registryKey);
   if (useCache && cached && Date.now() - cached.fetchedAt < MARKETS_CACHE_TTL_MS)
     return cached.markets;
   const { markets, sources, warnings } = await (0, import_solver_discovery.discover)({
-    registries: [registry],
+    registries,
     localCards,
     network,
     fetchImpl
@@ -1079,7 +1087,7 @@ var discoverMarkets = async (options) => {
   if (!reachable && cached) return cached.markets;
   if (reachable && repository) {
     try {
-      await repository.saveCachedMarkets(network, registry, {
+      await repository.saveCachedMarkets(network, registryKey, {
         markets,
         fetchedAt: Date.now()
       });
@@ -1980,6 +1988,7 @@ function onchainSendProfile(result) {
     network: result.l1Network,
     htlcAddress: result.htlc.address,
     minConfirmations: result.minConfirmations,
+    expectedAmount: result.expectedAmount,
     payoutPkScript: import_base5.hex.encode(result.payoutPkScript)
   };
 }
@@ -1991,6 +2000,7 @@ var OnchainSendCorridor = {
   project: (swap) => {
     const send = swap;
     return {
+      expectedAmount: send.expectedAmount,
       ...send.funding ? { funding: send.funding } : {},
       ...send.claimTxid ? { claimTxid: send.claimTxid } : {}
     };
@@ -2007,6 +2017,11 @@ var OnchainSendCorridor = {
         `onchain_send record carries no usable minConfirmations (${String(profile.minConfirmations)}); the confirmation gate cannot be checked \u2014 refusing to restore a swap that would claim an unconfirmed fill`
       );
     }
+    if (!Number.isSafeInteger(profile.expectedAmount) || profile.expectedAmount <= 0) {
+      throw new Error(
+        `onchain_send record carries no usable expectedAmount (${String(profile.expectedAmount)}); the funded value cannot be checked \u2014 refusing to restore a swap that would claim an underfunded fill`
+      );
+    }
     const htlc = onchainHtlcScript(
       {
         // From the profile, not the covenant: the lockup commits to
@@ -2029,6 +2044,7 @@ var OnchainSendCorridor = {
       paymentHash,
       htlc,
       minConfirmations: profile.minConfirmations,
+      expectedAmount: profile.expectedAmount,
       // Optional here, required at the write: throwing on an older
       // record would strand the refund it is still owed.
       ...profile.payoutPkScript ? { payoutPkScript: import_base5.hex.decode(profile.payoutPkScript) } : {},
@@ -2419,6 +2435,12 @@ var solverHex = (value, field) => {
     throw new Error(`solver sent malformed hex for ${field}`);
   }
 };
+var quoteSats = (value, field) => {
+  if (typeof value !== "number" || !Number.isSafeInteger(value)) {
+    throw new Error(`HTLC quote carries a non-sats ${field}: ${String(value)}`);
+  }
+  return value;
+};
 var ARKADE_BTC = "arkade:BTC";
 var LIGHTNING_BTC = "lightning:BTC";
 var ONCHAIN_BTC = "onchain:BTC";
@@ -2530,12 +2552,12 @@ var lightningSendRequest = (input) => ({
 var arkadeSwapRequest = (input) => {
   if (!input.wantAsset && !input.offerAsset) {
     throw new Error(
-      "set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC) \u2014 with neither set both legs are BTC, which is not a swap"
+      "set at least one of wantAsset or offerAsset \u2014 with neither set both legs are BTC, which is not a swap"
     );
   }
-  if (input.wantAsset && input.offerAsset) {
+  if (input.amountSide !== void 0 && input.amountSide !== "from") {
     throw new Error(
-      "set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC) \u2014 asset->asset is nameable on the wire but no solver quotes it yet"
+      'arkade\u2194arkade quotes are exact-in only: use amountSide "from" with the deposit amount'
     );
   }
   const pair = rfqPair(
@@ -2548,16 +2570,59 @@ var arkadeSwapRequest = (input) => {
     type: "rfq_request",
     rfq_id: input.rfqId,
     pair,
-    amount_side: input.amountSide,
-    amount: input.amount,
-    // The pair is the only place the asset ids appear. Repeating them here
-    // would be a key the solver's `.strict()` profile schema does not
-    // declare, and an undeclared key is `unsupported_payload` — a refusal,
-    // not an ignored extra. Empty, not absent: `profile` is required on
-    // every other request shape this wire carries.
-    profile: {}
+    amount_side: "from",
+    amount: canonicalAssetAmount(input.amount),
+    // The pair names the assets; the profile names the trader. Both are
+    // covenant parameters, and the solver's `.strict()` schema refuses
+    // anything else — an undeclared key is `unsupported_payload`.
+    profile: {
+      maker_pk_script: normalizeMakerPkScript(input.makerPkScript),
+      maker_public_key: normalizeMakerPublicKey(input.makerPublicKey)
+    }
   };
 };
+var canonicalAssetAmount = (amount) => {
+  if (typeof amount === "bigint") {
+    if (amount <= 0n) throw new Error(`amount must be positive, got ${amount}`);
+    return amount.toString();
+  }
+  if (typeof amount === "number") {
+    if (!Number.isSafeInteger(amount) || amount <= 0) {
+      throw new Error(`amount must be a positive safe integer, got ${amount}`);
+    }
+    return String(amount);
+  }
+  if (!/^(0|[1-9][0-9]*)$/.test(amount) || BigInt(amount) <= 0n) {
+    throw new Error(`amount must be a canonical decimal string of atomic units, got ${amount}`);
+  }
+  return amount;
+};
+var normalizeHexBytes = (value, expectedBytes, label) => {
+  if (value === void 0 || value === null) {
+    throw new Error(`${label} is required`);
+  }
+  const bytes = typeof value === "string" ? solverHex(value, label) : value;
+  if (!(bytes instanceof Uint8Array) || bytes.length !== expectedBytes) {
+    const got = bytes instanceof Uint8Array ? bytes.length : typeof bytes;
+    throw new Error(`${label} must be ${expectedBytes} bytes, got ${got}`);
+  }
+  return import_base10.hex.encode(bytes);
+};
+var normalizeMakerPkScript = (value) => {
+  const encoded = normalizeHexBytes(value, 34, "maker_pk_script");
+  if (!encoded.startsWith("5100") && !encoded.startsWith("5120")) {
+    throw new Error("maker_pk_script must be a taproot scriptPubKey (OP_1 <32-byte program>)");
+  }
+  return encoded;
+};
+var normalizeMakerPublicKey = (value) => {
+  const raw = typeof value === "string" ? value : import_base10.hex.encode(value);
+  const bytes = solverHex(raw, "maker_public_key");
+  if (bytes.length === 33) {
+    throw new Error("maker_public_key must be x-only (32 bytes), not compressed (33 bytes)");
+  }
+  return normalizeHexBytes(bytes, 32, "maker_public_key");
+};
 var MIN_HEADROOM_SECONDS = 90 * 60;
 var gateError = (reason, message) => {
   const error = new Error(message);
@@ -2605,6 +2670,9 @@ var assertFundable = (input) => {
   }
   if (input.now >= input.quote.valid_until)
     fail("quote_expired", "quote expired \u2014 request a fresh one");
+  if (quoteSats(input.quote.from_amount, "from_amount") <= 0 || quoteSats(input.quote.to_amount, "to_amount") <= 0) {
+    fail("non_positive_amount", "quote carries a non-positive amount");
+  }
   if (input.quote.refund_locktime !== void 0 && input.quote.refund_locktime - input.now < MIN_HEADROOM_SECONDS) {
     fail("insufficient_headroom", "refund deadline headroom below 90 minutes");
   }
@@ -2634,13 +2702,12 @@ var assertFundable = (input) => {
         `maxFee.referenceRate must be a positive finite number, got ${referenceRate}`
       );
     }
-    const fee = sameAsset ? input.quote.from_amount - input.quote.to_amount : Math.ceil(
-      (input.quote.from_amount * referenceRate - input.quote.to_amount) / referenceRate
-    );
-    const allowed = Math.max(
-      sats ?? 0,
-      Math.floor(input.quote.from_amount * (bps ?? 0) / 1e4)
+    const fromSats = quoteSats(input.quote.from_amount, "from_amount");
+    const toSats = quoteSats(input.quote.to_amount, "to_amount");
+    const fee = sameAsset ? fromSats - toSats : Math.ceil(
+      (fromSats * referenceRate - toSats) / referenceRate
     );
+    const allowed = Math.max(sats ?? 0, Math.floor(fromSats * (bps ?? 0) / 1e4));
     if (fee > allowed) {
       fail("fee_too_high", `fee ${fee} exceeds the ${allowed} this client allows`);
     }
@@ -2844,7 +2911,7 @@ function lightningSendVtxoScript(params) {
     unilateralClaimDelay: seconds(params.claimDelay),
     unilateralRefundDelay: seconds(unilateralRefundDelay(params.claimDelay)),
     unilateralRefundWithoutReceiverDelay: seconds(
-      unilateralRefundWithoutReceiverDelay(params.claimDelay)
+      params.refundWithoutReceiverDelay ?? unilateralRefundWithoutReceiverDelay(params.claimDelay)
     ),
     nonInteractiveParameters: {
       receiverPkScript: params.receiverPkScript,
@@ -2866,16 +2933,28 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
   if (quote.refund_locktime === void 0) {
     throw new Error("lightning-send quote is missing refund_locktime");
   }
+  const now = Math.floor(Date.now() / 1e3);
+  const claimDelay = unilateralClaimDelay(Number(info.unilateralExitDelay));
+  const refundWithoutReceiverDelay = quote.profile?.refund_without_receiver_delay;
+  if (refundWithoutReceiverDelay === void 0) {
+    throw new Error("lightning-send quote is missing profile.refund_without_receiver_delay");
+  }
+  if (!Number.isSafeInteger(refundWithoutReceiverDelay) || refundWithoutReceiverDelay < claimDelay || refundWithoutReceiverDelay % SEQUENCE_GRANULARITY_SECONDS !== 0 || refundWithoutReceiverDelay > 65535 * SEQUENCE_GRANULARITY_SECONDS) {
+    throw new Error("lightning-send quote carries an invalid refund_without_receiver_delay");
+  }
+  if (refundWithoutReceiverDelay < quote.refund_locktime - now) {
+    throw new Error("lightning-send quote lets the solo refund open before refund_locktime");
+  }
   const receiverPkScriptHex = quote.profile?.receiver_pk_script;
   if (receiverPkScriptHex === void 0) {
     throw new Error("lightning-send quote is missing profile.receiver_pk_script");
   }
-  if (quote.to_amount !== params.invoice.amountSats) {
+  if (quoteSats(quote.to_amount, "to_amount") !== params.invoice.amountSats) {
     throw new Error(
       `quote to_amount ${quote.to_amount} does not match the invoice's ${params.invoice.amountSats}`
     );
   }
-  if (quote.from_amount < quote.to_amount) {
+  if (quoteSats(quote.from_amount, "from_amount") < quoteSats(quote.to_amount, "to_amount")) {
     throw new Error(
       `quote from_amount ${quote.from_amount} is below the invoice amount \u2014 a negative spread is not a quote`
     );
@@ -2887,7 +2966,8 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
     refundLocktime: quote.refund_locktime,
     serverPubkey,
     paymentHash: params.invoice.paymentHash,
-    claimDelay: unilateralClaimDelay(Number(info.unilateralExitDelay)),
+    claimDelay,
+    refundWithoutReceiverDelay,
     emulatorPubkey: (0, import_sdk10.toXOnly)(
       import_base10.hex.decode((0, import_sdk10.resolveEmulatorPubkey)(network, params.emulatorPubkey)),
       "emulator signer key"
@@ -2911,7 +2991,7 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
   assertFundable({
     quote,
     invoiceExpiresAt: params.invoice.expiresAt,
-    now: Math.floor(Date.now() / 1e3)
+    now
   });
   await registerLockupContract(await wallet.getContractManager(), script, address);
   return {
@@ -2920,7 +3000,7 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
     address,
     // What the lockup must carry: the quote's `from_amount` — the invoice
     // PLUS the corridor's fee, never the bare invoice amount.
-    fundAmount: quote.from_amount,
+    fundAmount: quoteSats(quote.from_amount, "from_amount"),
     swapPkScript: script.pkScript,
     script,
     refundAddress,
@@ -2930,11 +3010,91 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
   };
 }
 var offerTermsFromQuote = (quote, assets) => {
-  if (Boolean(assets.wantAsset) === Boolean(assets.offerAsset)) {
-    throw new Error("set exactly one of wantAsset or offerAsset");
+  if (!assets.wantAsset && !assets.offerAsset) {
+    throw new Error("set at least one of wantAsset or offerAsset");
+  }
+  const wantAmount = BigInt(quote.to_amount);
+  if (assets.wantAsset) return { wantAmount, wantAsset: assets.wantAsset };
+  return { wantAmount, offerAsset: assets.offerAsset };
+};
+var verifyOfferAddress = (quote, derived) => {
+  const quotedAddress = quote.profile?.offer_address;
+  const quotedScript = quote.profile?.offer_pk_script;
+  const derivedScript = import_base10.hex.encode(derived.swapPkScript);
+  if (quotedAddress !== derived.address || quotedScript !== derivedScript) {
+    throw new AddressMismatch([derived.address], quotedAddress);
+  }
+  return derived;
+};
+var assertArkadeFundable = (input) => {
+  const now = input.now ?? Math.floor(Date.now() / 1e3);
+  if (!Number.isSafeInteger(input.quote.valid_until)) {
+    throw gateError("quote_expired", "quote carries no valid_until");
+  }
+  if (now >= input.quote.valid_until) {
+    throw gateError("quote_expired", `quote lapsed at ${input.quote.valid_until} (now ${now})`);
+  }
+  if (BigInt(input.quote.from_amount) <= 0n || BigInt(input.quote.to_amount) <= 0n) {
+    throw gateError("quote_expired", "quote carries a non-positive amount");
   }
-  return { wantAmount: BigInt(quote.to_amount), ...assets };
 };
+async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
+  if (!params.wantAsset && !params.offerAsset) {
+    throw new Error("set at least one of wantAsset or offerAsset; BTC-to-BTC is not a swap");
+  }
+  const rfqId = params.rfqId ?? newRfqId();
+  const [makerAddress, makerPublicKey] = await Promise.all([
+    wallet.getAddress(),
+    wallet.identity.xOnlyPublicKey()
+  ]);
+  const makerPkScript = import_sdk10.ArkAddress.decode(makerAddress).pkScript;
+  const pair = rfqPair(
+    params.offerAsset ? arkadeAssetLeg(params.offerAsset) : ARKADE_BTC,
+    params.wantAsset ? arkadeAssetLeg(params.wantAsset) : ARKADE_BTC
+  );
+  const quote = await transport.requestQuote(
+    arkadeSwapRequest({
+      rfqId,
+      ...params.offerAsset !== void 0 ? { offerAsset: params.offerAsset } : {},
+      ...params.wantAsset !== void 0 ? { wantAsset: params.wantAsset } : {},
+      amount: params.amount,
+      makerPkScript,
+      makerPublicKey
+    })
+  );
+  if (quote.pair !== pair) {
+    throw new Error(`solver quoted ${JSON.stringify(quote.pair)}, not the requested ${pair}`);
+  }
+  assertArkadeFundable({ quote, ...params.now !== void 0 ? { now: params.now } : {} });
+  const terms = offerTermsFromQuote(quote, {
+    ...params.offerAsset !== void 0 ? { offerAsset: params.offerAsset } : {},
+    ...params.wantAsset !== void 0 ? { wantAsset: params.wantAsset } : {}
+  });
+  if (BigInt(quote.from_amount).toString() !== canonicalAssetAmount(params.amount)) {
+    throw new Error(
+      `quote from_amount ${quote.from_amount} does not match the requested ${canonicalAssetAmount(params.amount)}`
+    );
+  }
+  const offer = await createOffer(wallet, arkServerUrl, {
+    wantAmount: terms.wantAmount,
+    ...terms.wantAsset !== void 0 ? { wantAsset: terms.wantAsset } : {},
+    ...terms.offerAsset !== void 0 ? { offerAsset: terms.offerAsset } : {},
+    ...params.emulatorPubkey !== void 0 ? { emulatorPubkey: params.emulatorPubkey } : {}
+  });
+  verifyOfferAddress(quote, offer);
+  const fundAmount = BigInt(quote.from_amount);
+  return {
+    rfqId,
+    quote,
+    pair,
+    address: offer.address,
+    fundAmount,
+    carrierSats: params.offerAsset !== void 0 ? ASSET_CARRIER_SATS : 0n,
+    swapPkScript: offer.swapPkScript,
+    offerHex: offer.offerHex,
+    extension: offer.extension
+  };
+}
 var l1NetworkFromArk = (network) => network === "bitcoin" ? "bitcoin" : network === "regtest" ? "regtest" : "testnet";
 var onchainSendRequest = (input) => ({
   v: 1,
@@ -3025,7 +3185,8 @@ function deriveOnchainSend(input) {
     l1Network: input.l1Network,
     refundLocktime,
     htlcLocktime,
-    minConfirmations
+    minConfirmations,
+    expectedAmount: quoteSats(quote.to_amount, "to_amount")
   };
 }
 async function requestOnchainSend(wallet, arkServerUrl, transport, params) {
@@ -3088,7 +3249,8 @@ async function requestOnchainSend(wallet, arkServerUrl, transport, params) {
     rfqId,
     quote,
     address: derived.address,
-    fundAmount: quote.from_amount,
+    fundAmount: quoteSats(quote.from_amount, "from_amount"),
+    expectedAmount: quoteSats(quote.to_amount, "to_amount"),
     swapPkScript: derived.swapPkScript,
     script: derived.script,
     refundAddress,
@@ -3101,7 +3263,7 @@ async function requestOnchainSend(wallet, arkServerUrl, transport, params) {
   };
 }
 var assertQuotedAmount = (quote, amountSide, amount) => {
-  const quoted = amountSide === "from" ? quote.from_amount : quote.to_amount;
+  const quoted = amountSide === "from" ? quoteSats(quote.from_amount, "from_amount") : quoteSats(quote.to_amount, "to_amount");
   if (quoted !== amount) {
     throw new Error(
       `quote ${amountSide === "from" ? "from_amount" : "to_amount"} ${quoted} does not match the requested ${amount} \u2014 not this trade's quote`
@@ -3160,7 +3322,7 @@ var assertReceivable = (input) => {
       `a payment at the deadline would leave under ${minClaimWindow}s to claim before the solver's refund opens`
     );
   }
-  if (input.maxPayAmount !== void 0 && input.quote.from_amount > input.maxPayAmount) {
+  if (input.maxPayAmount !== void 0 && quoteSats(input.quote.from_amount, "from_amount") > input.maxPayAmount) {
     throw gateError(
       "price_too_high",
       `quote asks ${input.quote.from_amount} sats, above the ${input.maxPayAmount} ceiling`
@@ -3291,8 +3453,8 @@ async function requestLightningReceive(wallet, arkServerUrl, transport, params)
     rfqId,
     quote,
     invoice: derived.invoice,
-    payAmount: quote.from_amount,
-    expectedAmount: quote.to_amount,
+    payAmount: quoteSats(quote.from_amount, "from_amount"),
+    expectedAmount: quoteSats(quote.to_amount, "to_amount"),
     invoiceExpiresAt: payDeadline,
     address: derived.address,
     swapPkScript: derived.swapPkScript,
@@ -3418,8 +3580,8 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
     rfqId,
     quote,
     address: derived.address,
-    fundAmount: quote.from_amount,
-    expectedAmount: quote.to_amount,
+    fundAmount: quoteSats(quote.from_amount, "from_amount"),
+    expectedAmount: quoteSats(quote.to_amount, "to_amount"),
     swapPkScript: derived.swapPkScript,
     script: derived.script,
     htlc: derived.htlc,
@@ -5131,6 +5293,21 @@ var RfqSwapManager = class {
     });
     if (action === "claim" && phase.phase === "claimable") {
       if (swap.claimTxid) return "continue";
+      if (!Number.isSafeInteger(swap.expectedAmount) || swap.expectedAmount <= 0) {
+        this.block(
+          swap,
+          `expectedAmount is not a positive number of sats (${String(swap.expectedAmount)}), so the funded value cannot be checked \u2014 refusing to publish the preimage`
+        );
+        return "handled";
+      }
+      const filled = Number(phase.utxo.amount);
+      if (!Number.isFinite(filled) || filled < swap.expectedAmount) {
+        this.block(
+          swap,
+          `fill holds ${filled} sats, below the agreed ${swap.expectedAmount} \u2014 refusing to publish the preimage`
+        );
+        return "handled";
+      }
       if (this.callbacks && !this.callbacks.claimOnchain) {
         this.block(
           swap,
@@ -5184,6 +5361,8 @@ var RfqSwapManager = class {
       if (pushed) {
         swap.refundArkTxid = pushed.arkTxid;
         this.touch(swap);
+      } else if (now < swap.refundLocktime + REFUND_MTP_LAG_SECONDS) {
+        return;
       }
       this.setState(swap, "refunded");
       this.emitAction(swap, "refundArkade");
@@ -5552,6 +5731,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   arkadeAssetLeg,
   arkadeRefunder,
   arkadeSwapRequest,
+  assertArkadeFundable,
   assertFundable,
   assertReceivable,
   awaitLockupFunding,
@@ -5560,6 +5740,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   buildHtlcClaim,
   buildHtlcRefund,
   cancelOffer,
+  canonicalAssetAmount,
   chainSourceFrom,
   claimOnchainFill,
   claimPacketShape,
@@ -5600,6 +5781,8 @@ async function lockupTxids(indexer, record, wantFunding) {
   newPreimage,
   newRfqId,
   nextOnchainAction,
+  normalizeMakerPkScript,
+  normalizeMakerPublicKey,
   offerTermsFromQuote,
   offerVtxoScript,
   onchainHtlcScript,
@@ -5617,6 +5800,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   registerAssetSwapRestore,
   registerLockupContract,
   relayTransport,
+  requestArkadeSwap,
   requestLightningReceive,
   requestLightningSend,
   requestOnchainReceive,
@@ -5654,6 +5838,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   updateRfqSwapRecord,
   validatePlan,
   verifyLockupAddress,
+  verifyOfferAddress,
   verifyReceiveInvoice,
   watchOfferSwaps
 });

package/dist/index.d.cts

@@ -1,9 +1,9 @@
 import { ProvisionedKey, ProvisionedClaimSecret, ArkTxInput, asset, RelativeTimelock, IWallet, EmulatorProvider, arkade, RestIndexerProvider, Transaction, IContractManager, OnchainProvider, PaymentRail, Asset, VHTLC, Identity, ActivityResolver } from '@arkade-os/sdk';
-import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, c as RefundIndexer, L as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-rwU1Sv2-.cjs';
-export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-rwU1Sv2-.cjs';
+import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, c as RefundIndexer, L as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-BXIcmIIC.cjs';
+export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-BXIcmIIC.cjs';
 import { Network, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
-import { O as OnchainNetwork, a as OnchainHtlc, b as OnchainHtlcParams, C as ChainSource, R as RfqTransport, r as requestOnchainSend, I as InvoiceFacts, c as requestLightningSend } from './rfq-DirJn_4k.cjs';
-export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, f as ChainUtxo, H as HtlcUtxo, L as LIGHTNING_BTC, g as LIGHTNING_RECEIVE_PAIR, h as LIGHTNING_SEND_PAIR, i as LOCKTIME_THRESHOLD, j as LightningReceiveTreeParams, k as LightningSendTreeParams, M as MAX_MIN_CONFIRMATIONS, l as MIN_CLAIM_WINDOW_SECONDS, m as MIN_HEADROOM_SECONDS, n as ONCHAIN_BTC, o as ONCHAIN_CLAIM_MARGIN_SECONDS, p as ONCHAIN_DUST_SATS, q as ONCHAIN_ORDER_MARGIN_SECONDS, s as ONCHAIN_RECEIVE_PAIR, t as ONCHAIN_SECONDS_PER_BLOCK, u as ONCHAIN_SEND_PAIR, v as OnchainHtlcPhase, w as RFQ_REFUSAL_ERROR_CODES, x as RFQ_TERMINAL_STATES, y as RelaySocket, z as RfqQuote, B as RfqRefusalDetail, D as RfqRefusalErrorCode, E as RfqRefusalReason, F as RfqRefusalUnit, G as RfqStatus, S as SOLO_REFUND_HEADROOM_SECONDS, J as SwapRefusal, K as arkadeAssetLeg, N as arkadeSwapRequest, P as assertFundable, Q as assertReceivable, T as awaitOnchainFill, U as buildHtlcClaim, V as buildHtlcRefund, W as claimOnchainFill, X as classifyOnchainHtlc, Y as deriveLightningReceive, Z as deriveOnchainReceive, _ as deriveOnchainSend, $ as extractPreimage, a0 as httpTransport, a1 as isRfqRefusalErrorCode, a2 as l1ScriptForAddress, a3 as lightningReceiveRequest, a4 as lightningSendRequest, a5 as lightningSendVtxoScript, a6 as newPreimage, a7 as newRfqId, a8 as offerTermsFromQuote, a9 as onchainHtlcScript, aa as onchainReceiveRequest, ab as onchainSendRequest, ac as paymentHashOf, ad as receiveVtxoScript, ae as relayTransport, af as requestLightningReceive, ag as requestOnchainReceive, ah as rfqPair, ai as unilateralClaimDelay, aj as unilateralRefundDelay, ak as unilateralRefundWithoutReceiverDelay, al as verifyLockupAddress, am as verifyReceiveInvoice } from './rfq-DirJn_4k.cjs';
+import { O as OnchainNetwork, a as OnchainHtlc, b as OnchainHtlcParams, C as ChainSource, R as RfqTransport, r as requestOnchainSend, I as InvoiceFacts, c as requestLightningSend } from './rfq-D96aLvCA.cjs';
+export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, f as ChainUtxo, H as HtlcUtxo, L as LIGHTNING_BTC, g as LIGHTNING_RECEIVE_PAIR, h as LIGHTNING_SEND_PAIR, i as LOCKTIME_THRESHOLD, j as LightningReceiveTreeParams, k as LightningSendTreeParams, M as MAX_MIN_CONFIRMATIONS, l as MIN_CLAIM_WINDOW_SECONDS, m as MIN_HEADROOM_SECONDS, n as ONCHAIN_BTC, o as ONCHAIN_CLAIM_MARGIN_SECONDS, p as ONCHAIN_DUST_SATS, q as ONCHAIN_ORDER_MARGIN_SECONDS, s as ONCHAIN_RECEIVE_PAIR, t as ONCHAIN_SECONDS_PER_BLOCK, u as ONCHAIN_SEND_PAIR, v as OnchainHtlcPhase, w as RFQ_REFUSAL_ERROR_CODES, x as RFQ_TERMINAL_STATES, y as RelaySocket, z as RfqQuote, B as RfqRefusalDetail, D as RfqRefusalErrorCode, E as RfqRefusalReason, F as RfqRefusalUnit, G as RfqStatus, S as SOLO_REFUND_HEADROOM_SECONDS, J as SwapRefusal, K as arkadeAssetLeg, N as arkadeSwapRequest, P as assertArkadeFundable, Q as assertFundable, T as assertReceivable, U as awaitOnchainFill, V as buildHtlcClaim, W as buildHtlcRefund, X as canonicalAssetAmount, Y as claimOnchainFill, Z as classifyOnchainHtlc, _ as deriveLightningReceive, $ as deriveOnchainReceive, a0 as deriveOnchainSend, a1 as extractPreimage, a2 as httpTransport, a3 as isRfqRefusalErrorCode, a4 as l1ScriptForAddress, a5 as lightningReceiveRequest, a6 as lightningSendRequest, a7 as lightningSendVtxoScript, a8 as newPreimage, a9 as newRfqId, aa as normalizeMakerPkScript, ab as normalizeMakerPublicKey, ac as offerTermsFromQuote, ad as onchainHtlcScript, ae as onchainReceiveRequest, af as onchainSendRequest, ag as paymentHashOf, ah as receiveVtxoScript, ai as relayTransport, aj as requestArkadeSwap, ak as requestLightningReceive, al as requestOnchainReceive, am as rfqPair, an as unilateralClaimDelay, ao as unilateralRefundDelay, ap as unilateralRefundWithoutReceiverDelay, aq as verifyLockupAddress, ar as verifyOfferAddress, as as verifyReceiveInvoice } from './rfq-D96aLvCA.cjs';
 
 /**
  * Which wallet key signs this leg. Stored at `profile.signer`.
@@ -141,6 +141,7 @@ interface OnchainSendProfile extends Record<string, unknown> {
     htlcAddress: string;
     /** `profile.min_confirmations`; gates when the fill is claimable. */
     minConfirmations: number;
+    expectedAmount: number;
     /** Where the claim PAYS, hex. The spender's own choice, so nothing else
      * gives it back — and `buildHtlcClaim` needs it. */
     payoutPkScript: string;
@@ -183,6 +184,7 @@ declare function onchainSendProfile(result: {
     htlcParams: OnchainHtlcParams;
     l1Network: OnchainNetwork;
     minConfirmations: number;
+    expectedAmount: number;
     payoutPkScript: Uint8Array;
 }): Omit<OnchainSendProfile, "signer" | "hashlock">;
 
@@ -503,7 +505,11 @@ declare const QUOTE_OPTIONS: {
 declare const makeCachedFeedFetch: (ttlMs?: number, fetchImpl?: typeof fetch) => typeof fetch;
 interface DiscoverMarketsOptions {
     network: Network;
-    /** The network's solver registry index URL; no registry means no markets. */
+    /** Overrides the registry this network publishes by default. Omit (or pass
+     * `undefined`) to follow `@arkade-os/solver-discovery`'s per-network
+     * default index, which the library can move in a release without a client
+     * change; this package never hardcodes the URL. The markets cache is keyed
+     * by the URL actually followed, default included. */
     registryUrl: string | undefined;
     /** Backs the 1-hour markets cache and its stale fallback. Omit for a
      * one-shot discovery that always hits the registry. */
@@ -523,9 +529,11 @@ interface DiscoverMarketsOptions {
     useCache?: boolean;
 }
 /**
- * Markets from the network's solver registry; [] when none is configured.
- * Registry content changes rarely, so results are cached for an hour and a
- * stale cache backstops an unreachable registry (quotes stay live either way).
+ * Markets from this network's solver registry — the caller's `registryUrl` when
+ * given, else the network's published default. Only an unrecognised network
+ * yields []. Registry content changes rarely, so results are cached for an hour
+ * and a stale cache backstops an unreachable registry (quotes stay live either
+ * way).
  */
 declare const discoverMarkets: (options: DiscoverMarketsOptions) => Promise<DiscoveredMarket[]>;
 /** Best market for a from/to pair, in either orientation. `give` is the side

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { ProvisionedKey, ProvisionedClaimSecret, ArkTxInput, asset, RelativeTimelock, IWallet, EmulatorProvider, arkade, RestIndexerProvider, Transaction, IContractManager, OnchainProvider, PaymentRail, Asset, VHTLC, Identity, ActivityResolver } from '@arkade-os/sdk';
-import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, c as RefundIndexer, L as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-DH5zjdw4.js';
-export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-DH5zjdw4.js';
+import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, c as RefundIndexer, L as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-B6VPDGHC.js';
+export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-B6VPDGHC.js';
 import { Network, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
-import { O as OnchainNetwork, a as OnchainHtlc, b as OnchainHtlcParams, C as ChainSource, R as RfqTransport, r as requestOnchainSend, I as InvoiceFacts, c as requestLightningSend } from './rfq-DirJn_4k.js';
-export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, f as ChainUtxo, H as HtlcUtxo, L as LIGHTNING_BTC, g as LIGHTNING_RECEIVE_PAIR, h as LIGHTNING_SEND_PAIR, i as LOCKTIME_THRESHOLD, j as LightningReceiveTreeParams, k as LightningSendTreeParams, M as MAX_MIN_CONFIRMATIONS, l as MIN_CLAIM_WINDOW_SECONDS, m as MIN_HEADROOM_SECONDS, n as ONCHAIN_BTC, o as ONCHAIN_CLAIM_MARGIN_SECONDS, p as ONCHAIN_DUST_SATS, q as ONCHAIN_ORDER_MARGIN_SECONDS, s as ONCHAIN_RECEIVE_PAIR, t as ONCHAIN_SECONDS_PER_BLOCK, u as ONCHAIN_SEND_PAIR, v as OnchainHtlcPhase, w as RFQ_REFUSAL_ERROR_CODES, x as RFQ_TERMINAL_STATES, y as RelaySocket, z as RfqQuote, B as RfqRefusalDetail, D as RfqRefusalErrorCode, E as RfqRefusalReason, F as RfqRefusalUnit, G as RfqStatus, S as SOLO_REFUND_HEADROOM_SECONDS, J as SwapRefusal, K as arkadeAssetLeg, N as arkadeSwapRequest, P as assertFundable, Q as assertReceivable, T as awaitOnchainFill, U as buildHtlcClaim, V as buildHtlcRefund, W as claimOnchainFill, X as classifyOnchainHtlc, Y as deriveLightningReceive, Z as deriveOnchainReceive, _ as deriveOnchainSend, $ as extractPreimage, a0 as httpTransport, a1 as isRfqRefusalErrorCode, a2 as l1ScriptForAddress, a3 as lightningReceiveRequest, a4 as lightningSendRequest, a5 as lightningSendVtxoScript, a6 as newPreimage, a7 as newRfqId, a8 as offerTermsFromQuote, a9 as onchainHtlcScript, aa as onchainReceiveRequest, ab as onchainSendRequest, ac as paymentHashOf, ad as receiveVtxoScript, ae as relayTransport, af as requestLightningReceive, ag as requestOnchainReceive, ah as rfqPair, ai as unilateralClaimDelay, aj as unilateralRefundDelay, ak as unilateralRefundWithoutReceiverDelay, al as verifyLockupAddress, am as verifyReceiveInvoice } from './rfq-DirJn_4k.js';
+import { O as OnchainNetwork, a as OnchainHtlc, b as OnchainHtlcParams, C as ChainSource, R as RfqTransport, r as requestOnchainSend, I as InvoiceFacts, c as requestLightningSend } from './rfq-D96aLvCA.js';
+export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, f as ChainUtxo, H as HtlcUtxo, L as LIGHTNING_BTC, g as LIGHTNING_RECEIVE_PAIR, h as LIGHTNING_SEND_PAIR, i as LOCKTIME_THRESHOLD, j as LightningReceiveTreeParams, k as LightningSendTreeParams, M as MAX_MIN_CONFIRMATIONS, l as MIN_CLAIM_WINDOW_SECONDS, m as MIN_HEADROOM_SECONDS, n as ONCHAIN_BTC, o as ONCHAIN_CLAIM_MARGIN_SECONDS, p as ONCHAIN_DUST_SATS, q as ONCHAIN_ORDER_MARGIN_SECONDS, s as ONCHAIN_RECEIVE_PAIR, t as ONCHAIN_SECONDS_PER_BLOCK, u as ONCHAIN_SEND_PAIR, v as OnchainHtlcPhase, w as RFQ_REFUSAL_ERROR_CODES, x as RFQ_TERMINAL_STATES, y as RelaySocket, z as RfqQuote, B as RfqRefusalDetail, D as RfqRefusalErrorCode, E as RfqRefusalReason, F as RfqRefusalUnit, G as RfqStatus, S as SOLO_REFUND_HEADROOM_SECONDS, J as SwapRefusal, K as arkadeAssetLeg, N as arkadeSwapRequest, P as assertArkadeFundable, Q as assertFundable, T as assertReceivable, U as awaitOnchainFill, V as buildHtlcClaim, W as buildHtlcRefund, X as canonicalAssetAmount, Y as claimOnchainFill, Z as classifyOnchainHtlc, _ as deriveLightningReceive, $ as deriveOnchainReceive, a0 as deriveOnchainSend, a1 as extractPreimage, a2 as httpTransport, a3 as isRfqRefusalErrorCode, a4 as l1ScriptForAddress, a5 as lightningReceiveRequest, a6 as lightningSendRequest, a7 as lightningSendVtxoScript, a8 as newPreimage, a9 as newRfqId, aa as normalizeMakerPkScript, ab as normalizeMakerPublicKey, ac as offerTermsFromQuote, ad as onchainHtlcScript, ae as onchainReceiveRequest, af as onchainSendRequest, ag as paymentHashOf, ah as receiveVtxoScript, ai as relayTransport, aj as requestArkadeSwap, ak as requestLightningReceive, al as requestOnchainReceive, am as rfqPair, an as unilateralClaimDelay, ao as unilateralRefundDelay, ap as unilateralRefundWithoutReceiverDelay, aq as verifyLockupAddress, ar as verifyOfferAddress, as as verifyReceiveInvoice } from './rfq-D96aLvCA.js';
 
 /**
  * Which wallet key signs this leg. Stored at `profile.signer`.
@@ -141,6 +141,7 @@ interface OnchainSendProfile extends Record<string, unknown> {
     htlcAddress: string;
     /** `profile.min_confirmations`; gates when the fill is claimable. */
     minConfirmations: number;
+    expectedAmount: number;
     /** Where the claim PAYS, hex. The spender's own choice, so nothing else
      * gives it back — and `buildHtlcClaim` needs it. */
     payoutPkScript: string;
@@ -183,6 +184,7 @@ declare function onchainSendProfile(result: {
     htlcParams: OnchainHtlcParams;
     l1Network: OnchainNetwork;
     minConfirmations: number;
+    expectedAmount: number;
     payoutPkScript: Uint8Array;
 }): Omit<OnchainSendProfile, "signer" | "hashlock">;
 
@@ -503,7 +505,11 @@ declare const QUOTE_OPTIONS: {
 declare const makeCachedFeedFetch: (ttlMs?: number, fetchImpl?: typeof fetch) => typeof fetch;
 interface DiscoverMarketsOptions {
     network: Network;
-    /** The network's solver registry index URL; no registry means no markets. */
+    /** Overrides the registry this network publishes by default. Omit (or pass
+     * `undefined`) to follow `@arkade-os/solver-discovery`'s per-network
+     * default index, which the library can move in a release without a client
+     * change; this package never hardcodes the URL. The markets cache is keyed
+     * by the URL actually followed, default included. */
     registryUrl: string | undefined;
     /** Backs the 1-hour markets cache and its stale fallback. Omit for a
      * one-shot discovery that always hits the registry. */
@@ -523,9 +529,11 @@ interface DiscoverMarketsOptions {
     useCache?: boolean;
 }
 /**
- * Markets from the network's solver registry; [] when none is configured.
- * Registry content changes rarely, so results are cached for an hour and a
- * stale cache backstops an unreachable registry (quotes stay live either way).
+ * Markets from this network's solver registry — the caller's `registryUrl` when
+ * given, else the network's published default. Only an unrecognised network
+ * yields []. Registry content changes rarely, so results are cached for an hour
+ * and a stale cache backstops an unreachable registry (quotes stay live either
+ * way).
  */
 declare const discoverMarkets: (options: DiscoverMarketsOptions) => Promise<DiscoveredMarket[]>;
 /** Best market for a from/to pair, in either orientation. `give` is the side