@arkade-os/swap 0.0.16 → 0.0.17

package/dist/{chunk-7N7XO4PY.js → chunk-IRDBAAJZ.js}

@@ -222,6 +222,7 @@ async function classifyOnchainHtlc(chain, input) {
 
 // src/claimPacket.ts
 import { base64 } from "@scure/base";
+import { concatBytes } from "@scure/btc-signer/utils.js";
 import { gcm } from "@noble/ciphers/aes.js";
 import { secp256k1 } from "@noble/curves/secp256k1.js";
 import { hkdf } from "@noble/hashes/hkdf.js";
@@ -244,12 +245,74 @@ async function sealWithEntropy(input, ephemeralKey, nonce) {
   const key = hkdf(sha2562, sharedX, ephemeralPub, HKDF_INFO, 32);
   if (nonce.length !== 12) throw new Error("nonce must be 12 bytes");
   const sealed = gcm(key, nonce, ephemeralPub).encrypt(input.preimage);
-  const packet = new Uint8Array(33 + 12 + sealed.length);
-  packet.set(ephemeralPub, 0);
-  packet.set(nonce, 33);
-  packet.set(sealed, 45);
-  return { ciphertext: base64.encode(packet) };
+  const ciphertext = new Uint8Array(33 + 12 + sealed.length);
+  ciphertext.set(ephemeralPub, 0);
+  ciphertext.set(nonce, 33);
+  ciphertext.set(sealed, 45);
+  return {
+    ciphertext: base64.encode(ciphertext),
+    packet: base64.encode(
+      concatBytes(
+        tlv(TLV_CIPHERTEXT, ciphertext),
+        tlv(TLV_COVCLAIMD_PUBKEY, input.covclaimdPubkey)
+      )
+    )
+  };
 }
+var TLV_CIPHERTEXT = 1;
+var TLV_ARKADE_SCRIPT = 2;
+var TLV_COVCLAIMD_PUBKEY = 3;
+var COMPRESSED_PUBKEY_LENGTH = 33;
+var SEALED_CIPHERTEXT_LENGTH = 93;
+var CLAIM_PACKET_TYPE = 4;
+var tlv = (type, value) => Uint8Array.from([type, value.length >> 8 & 255, value.length & 255, ...value]);
+var appendArkadeScript = (body, arkadeScript) => Uint8Array.from([...body, ...tlv(TLV_ARKADE_SCRIPT, arkadeScript)]);
+var parseTlv = (data) => {
+  let ciphertextLength;
+  let hasArkadeScript = false;
+  let pubkey;
+  let offset = 0;
+  while (offset < data.length) {
+    if (offset + 3 > data.length) throw new Error("truncated TLV header");
+    const type = data[offset];
+    const length = data[offset + 1] << 8 | data[offset + 2];
+    offset += 3;
+    if (offset + length > data.length) {
+      throw new Error(`TLV type 0x${type.toString(16)} overruns the buffer`);
+    }
+    const value = data.subarray(offset, offset + length);
+    offset += length;
+    if (type === TLV_CIPHERTEXT) ciphertextLength = value.length;
+    else if (type === TLV_ARKADE_SCRIPT) hasArkadeScript = true;
+    else if (type === TLV_COVCLAIMD_PUBKEY) {
+      if (value.length !== COMPRESSED_PUBKEY_LENGTH) {
+        throw new Error(
+          `covclaimd_pub_key TLV is ${value.length} bytes, want ${COMPRESSED_PUBKEY_LENGTH}`
+        );
+      }
+      pubkey = value;
+    }
+  }
+  return { ciphertextLength, hasArkadeScript, pubkey };
+};
+var claimPacketShape = (b64) => {
+  try {
+    const raw = base64.decode(b64);
+    if (raw.length === SEALED_CIPHERTEXT_LENGTH) return { kind: "ciphertext" };
+    const { ciphertextLength, hasArkadeScript, pubkey } = parseTlv(raw);
+    if (ciphertextLength !== SEALED_CIPHERTEXT_LENGTH || pubkey === void 0) {
+      return { kind: "ciphertext" };
+    }
+    return {
+      kind: "packet",
+      body: raw,
+      needsArkadeScript: !hasArkadeScript,
+      ...pubkey ? { covclaimdPubkey: pubkey } : {}
+    };
+  } catch {
+    return { kind: "ciphertext" };
+  }
+};
 
 // src/lockupContract.ts
 import { hex as hex2 } from "@scure/base";
@@ -1166,7 +1229,7 @@ async function requestLightningReceive(wallet, arkServerUrl, transport, params)
       paymentHash,
       payoutAddress,
       payoutPubkey,
-      claimPacket: claimPacket?.ciphertext,
+      claimPacket: claimPacket?.packet,
       amount: params.amount,
       amountSide: params.amountSide
     })
@@ -1290,7 +1353,7 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
       payoutAddress,
       payoutPubkey,
       refundPubkey: params.refundPubkey,
-      claimPacket: claimPacket?.ciphertext,
+      claimPacket: claimPacket?.packet,
       amount: params.amount,
       amountSide: params.amountSide
     })
@@ -1360,6 +1423,10 @@ export {
   claimOnchainFill,
   classifyOnchainHtlc,
   sealClaimPacket,
+  SEALED_CIPHERTEXT_LENGTH,
+  CLAIM_PACKET_TYPE,
+  appendArkadeScript,
+  claimPacketShape,
   SWAP_LOCKUP_CONTRACT_TYPE,
   SWAP_LOCKUP_CONTRACT_LABEL,
   SWAP_LOCKUP_CONTRACT_KIND,

package/dist/index.cjs

@@ -35,6 +35,7 @@ __export(index_exports, {
   ASSET_CARRIER_SATS: () => ASSET_CARRIER_SATS,
   AddressMismatch: () => AddressMismatch,
   BTC_ASSET_ID: () => BTC_ASSET_ID,
+  CLAIM_PACKET_TYPE: () => CLAIM_PACKET_TYPE,
   CROSS_ASSET_RAIL: () => CROSS_ASSET_RAIL,
   CovclaimdRevealError: () => CovclaimdRevealError,
   InMemoryAssetSwapRepository: () => InMemoryAssetSwapRepository,
@@ -70,6 +71,7 @@ __export(index_exports, {
   RefundNotLocallyPossibleError: () => RefundNotLocallyPossibleError,
   RfqSwapManager: () => RfqSwapManager,
   RfqSwapOriginRequired: () => RfqSwapOriginRequired,
+  SEALED_CIPHERTEXT_LENGTH: () => SEALED_CIPHERTEXT_LENGTH,
   SOLO_REFUND_HEADROOM_SECONDS: () => SOLO_REFUND_HEADROOM_SECONDS,
   SOLVER_LIGHTNING_RAIL: () => SOLVER_LIGHTNING_RAIL,
   SOLVER_ONCHAIN_RAIL: () => SOLVER_ONCHAIN_RAIL,
@@ -78,6 +80,7 @@ __export(index_exports, {
   SWAP_LOCKUP_CONTRACT_TYPE: () => SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal: () => SwapRefusal,
   addAssetSwap: () => addAssetSwap,
+  appendArkadeScript: () => appendArkadeScript,
   arkadeAssetLeg: () => arkadeAssetLeg,
   arkadeRefunder: () => arkadeRefunder,
   arkadeSwapRequest: () => arkadeSwapRequest,
@@ -91,6 +94,7 @@ __export(index_exports, {
   cancelOffer: () => cancelOffer,
   chainSourceFrom: () => chainSourceFrom,
   claimOnchainFill: () => claimOnchainFill,
+  claimPacketShape: () => claimPacketShape,
   claimReceiveLockup: () => claimReceiveLockup,
   classifyDepositSpend: () => classifyDepositSpend,
   classifyOnchainHtlc: () => classifyOnchainHtlc,
@@ -1090,11 +1094,11 @@ var findMarket = (markets, fromId, toId) => {
     for (const market of markets) {
       for (const side of ["base", "quote"]) {
         const asset3 = side === "base" ? market.base_asset : market.quote_asset;
-        if (asset3.id === id) return id;
+        if (asset3.id === id) return (0, import_solver_discovery.marketLegKey)(market, side);
         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 asset3.id === "string") return asset3.id;
+        if (matchesBtc || matchesAsset) return (0, import_solver_discovery.marketLegKey)(market, side);
       }
     }
     return id;
@@ -2260,6 +2264,7 @@ var import_sdk11 = require("@arkade-os/sdk");
 
 // src/claimPacket.ts
 var import_base8 = require("@scure/base");
+var import_utils2 = require("@scure/btc-signer/utils.js");
 var import_aes = require("@noble/ciphers/aes.js");
 var import_secp256k1 = require("@noble/curves/secp256k1.js");
 var import_hkdf = require("@noble/hashes/hkdf.js");
@@ -2282,12 +2287,74 @@ async function sealWithEntropy(input, ephemeralKey, nonce) {
   const key = (0, import_hkdf.hkdf)(import_sha23.sha256, sharedX, ephemeralPub, HKDF_INFO, 32);
   if (nonce.length !== 12) throw new Error("nonce must be 12 bytes");
   const sealed = (0, import_aes.gcm)(key, nonce, ephemeralPub).encrypt(input.preimage);
-  const packet = new Uint8Array(33 + 12 + sealed.length);
-  packet.set(ephemeralPub, 0);
-  packet.set(nonce, 33);
-  packet.set(sealed, 45);
-  return { ciphertext: import_base8.base64.encode(packet) };
+  const ciphertext = new Uint8Array(33 + 12 + sealed.length);
+  ciphertext.set(ephemeralPub, 0);
+  ciphertext.set(nonce, 33);
+  ciphertext.set(sealed, 45);
+  return {
+    ciphertext: import_base8.base64.encode(ciphertext),
+    packet: import_base8.base64.encode(
+      (0, import_utils2.concatBytes)(
+        tlv2(TLV_CIPHERTEXT, ciphertext),
+        tlv2(TLV_COVCLAIMD_PUBKEY, input.covclaimdPubkey)
+      )
+    )
+  };
 }
+var TLV_CIPHERTEXT = 1;
+var TLV_ARKADE_SCRIPT = 2;
+var TLV_COVCLAIMD_PUBKEY = 3;
+var COMPRESSED_PUBKEY_LENGTH = 33;
+var SEALED_CIPHERTEXT_LENGTH = 93;
+var CLAIM_PACKET_TYPE = 4;
+var tlv2 = (type, value) => Uint8Array.from([type, value.length >> 8 & 255, value.length & 255, ...value]);
+var appendArkadeScript = (body, arkadeScript) => Uint8Array.from([...body, ...tlv2(TLV_ARKADE_SCRIPT, arkadeScript)]);
+var parseTlv = (data) => {
+  let ciphertextLength;
+  let hasArkadeScript = false;
+  let pubkey;
+  let offset = 0;
+  while (offset < data.length) {
+    if (offset + 3 > data.length) throw new Error("truncated TLV header");
+    const type = data[offset];
+    const length = data[offset + 1] << 8 | data[offset + 2];
+    offset += 3;
+    if (offset + length > data.length) {
+      throw new Error(`TLV type 0x${type.toString(16)} overruns the buffer`);
+    }
+    const value = data.subarray(offset, offset + length);
+    offset += length;
+    if (type === TLV_CIPHERTEXT) ciphertextLength = value.length;
+    else if (type === TLV_ARKADE_SCRIPT) hasArkadeScript = true;
+    else if (type === TLV_COVCLAIMD_PUBKEY) {
+      if (value.length !== COMPRESSED_PUBKEY_LENGTH) {
+        throw new Error(
+          `covclaimd_pub_key TLV is ${value.length} bytes, want ${COMPRESSED_PUBKEY_LENGTH}`
+        );
+      }
+      pubkey = value;
+    }
+  }
+  return { ciphertextLength, hasArkadeScript, pubkey };
+};
+var claimPacketShape = (b64) => {
+  try {
+    const raw = import_base8.base64.decode(b64);
+    if (raw.length === SEALED_CIPHERTEXT_LENGTH) return { kind: "ciphertext" };
+    const { ciphertextLength, hasArkadeScript, pubkey } = parseTlv(raw);
+    if (ciphertextLength !== SEALED_CIPHERTEXT_LENGTH || pubkey === void 0) {
+      return { kind: "ciphertext" };
+    }
+    return {
+      kind: "packet",
+      body: raw,
+      needsArkadeScript: !hasArkadeScript,
+      ...pubkey ? { covclaimdPubkey: pubkey } : {}
+    };
+  } catch {
+    return { kind: "ciphertext" };
+  }
+};
 
 // src/lockupContract.ts
 var import_base9 = require("@scure/base");
@@ -3187,7 +3254,7 @@ async function requestLightningReceive(wallet, arkServerUrl, transport, params)
       paymentHash,
       payoutAddress,
       payoutPubkey,
-      claimPacket: claimPacket?.ciphertext,
+      claimPacket: claimPacket?.packet,
       amount: params.amount,
       amountSide: params.amountSide
     })
@@ -3311,7 +3378,7 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
       payoutAddress,
       payoutPubkey,
       refundPubkey: params.refundPubkey,
-      claimPacket: claimPacket?.ciphertext,
+      claimPacket: claimPacket?.packet,
       amount: params.amount,
       amountSide: params.amountSide
     })
@@ -3429,12 +3496,11 @@ var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPub
   const encoded = fallbackEmulatorPubkey ? import_base12.hex.encode(fallbackEmulatorPubkey) : void 0;
   if (encoded !== void 0 && !XONLY_HEX.test(encoded)) return void 0;
   const pinned = encoded;
-  const candidates = (0, import_solver_discovery2.selectMarkets)(markets, {
-    baseId: BTC_ASSET_ID,
-    quoteId: BTC_ASSET_ID,
-    baseCorridor: "arkade",
-    quoteCorridor: payoutCorridor
-  });
+  const quoteCorridor = payoutCorridor === "lightning" ? "bolt11" : "bitcoin";
+  const isBtc = (id) => id === "btc" || /^\w+:[^/]+\/slip44:(?:0|1)$/.test(id ?? "");
+  const candidates = markets.filter(
+    (market) => marketCorridor(market, "base") === "arkade" && marketCorridor(market, "quote") === quoteCorridor && isBtc(marketAssetId(market, "base")) && isBtc(marketAssetId(market, "quote"))
+  );
   for (const market of candidates) {
     const rendezvous = rendezvousOf(market, pinned);
     if (!rendezvous) continue;
@@ -5437,6 +5503,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   ASSET_CARRIER_SATS,
   AddressMismatch,
   BTC_ASSET_ID,
+  CLAIM_PACKET_TYPE,
   CROSS_ASSET_RAIL,
   CovclaimdRevealError,
   InMemoryAssetSwapRepository,
@@ -5472,6 +5539,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   RefundNotLocallyPossibleError,
   RfqSwapManager,
   RfqSwapOriginRequired,
+  SEALED_CIPHERTEXT_LENGTH,
   SOLO_REFUND_HEADROOM_SECONDS,
   SOLVER_LIGHTNING_RAIL,
   SOLVER_ONCHAIN_RAIL,
@@ -5480,6 +5548,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal,
   addAssetSwap,
+  appendArkadeScript,
   arkadeAssetLeg,
   arkadeRefunder,
   arkadeSwapRequest,
@@ -5493,6 +5562,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   cancelOffer,
   chainSourceFrom,
   claimOnchainFill,
+  claimPacketShape,
   claimReceiveLockup,
   classifyDepositSpend,
   classifyOnchainHtlc,

package/dist/index.d.cts

@@ -1014,10 +1014,28 @@ interface CrossAssetRailDeps {
 declare function crossAssetRail(deps: CrossAssetRailDeps): PaymentRail;
 
 interface SealedClaimPacket {
-    /** `ephPub(33) ‖ nonce(12) ‖ ciphertext`, base64 — wire-ready. This is
-     * the whole packet: the RFQ request's `claim_packet` field carries
-     * exactly this string. */
+    /** `ephPub(33) ‖ nonce(12) ‖ ciphertext`, base64 — the bare sealed bytes,
+     * 93 decoded. The older of the two `claim_packet` shapes: a solver holding
+     * it can only hand it to covclaimd over the Reveal API, which needs both
+     * sides pointed at the SAME covclaimd — an agreement nothing on the wire
+     * expresses. Prefer {@link SealedClaimPacket.packet}. */
     ciphertext: string;
+    /**
+     * covclaimd's serialised `ClaimPacket` body, base64 — TLV `0x01` ciphertext
+     * and `0x03` covclaimd_pub_key. **This is what `claim_packet` should
+     * carry** (§ 7.1.2: senders SHOULD prefer the packet shape).
+     *
+     * It is what lets the solver stamp the funding transaction as Arkade
+     * extension packet `0x04`, which covclaimd finds on the arkd stream by
+     * itself. The `0x03` TLV is what its filter selects on, so the client alone
+     * chooses which covclaimd — the solver needs none configured or reachable.
+     *
+     * `0x02` arkade_script is deliberately absent: the covenant commits to
+     * `taggedHash("ArkScriptHash", script)`, so the funder holds the only copy
+     * guaranteed to match and appends it. A client deriving its own would add a
+     * way for the two to disagree and strand the claim.
+     */
+    packet: string;
 }
 interface ClaimPacketInput {
     preimage: Uint8Array;
@@ -1035,6 +1053,38 @@ interface ClaimPacketInput {
  * helper, where no consumer reaches it by accident.
  */
 declare function sealClaimPacket(input: ClaimPacketInput): Promise<SealedClaimPacket>;
+/** `ephPub(33) ‖ nonce(12) ‖ preimage(32) ‖ GCM tag(16)` — fixed by the sealing
+ * scheme, and what tells the two `claim_packet` shapes apart: a TLV body needs
+ * 96 bytes to carry this much, so the two lengths cannot collide. */
+declare const SEALED_CIPHERTEXT_LENGTH = 93;
+/** The Arkade extension packet type covclaimd scans the arkd tx stream for. */
+declare const CLAIM_PACKET_TYPE = 4;
+/**
+ * Stamp the covenant script into a client's packet — the solver's half.
+ *
+ * The covenant commits to `taggedHash("ArkScriptHash", script)`, so its funder
+ * holds the only copy guaranteed to match, which is why a client never sends
+ * `0x02`. Appending rather than rebuilding is safe because covclaimd's
+ * `DeserializeClaim` is an order-agnostic switch: the `0x01, 0x03, 0x02` this
+ * produces and its own `Serialize`'s `0x01, 0x02, 0x03` read back identically.
+ */
+declare const appendArkadeScript: (body: Uint8Array, arkadeScript: Uint8Array) => Uint8Array;
+type ClaimPacketShape = {
+    kind: "ciphertext";
+} | {
+    kind: "packet";
+    body: Uint8Array;
+    covclaimdPubkey?: Uint8Array;
+    needsArkadeScript: boolean;
+};
+/**
+ * Which of the two `claim_packet` shapes a base64 field carries.
+ *
+ * Never throws: anything not unambiguously a packet reads as the legacy bare
+ * ciphertext, which keeps the older Reveal-API path rather than failing a swap
+ * over a field this side may simply not understand.
+ */
+declare const claimPacketShape: (b64: string) => ClaimPacketShape;
 
 /**
  * `retryable` is the point of the type: a 400 says the packet does not bind to
@@ -1441,4 +1491,4 @@ interface RfqSwapActivityDeps {
  */
 declare function rfqSwapActivityInputs(deps: RfqSwapActivityDeps): Promise<SwapActivityInput[]>;
 
-export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundIndexer, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };
+export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CLAIM_PACKET_TYPE, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type ClaimPacketShape, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundIndexer, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SEALED_CIPHERTEXT_LENGTH, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, appendArkadeScript, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimPacketShape, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };

package/dist/index.d.ts

@@ -1014,10 +1014,28 @@ interface CrossAssetRailDeps {
 declare function crossAssetRail(deps: CrossAssetRailDeps): PaymentRail;
 
 interface SealedClaimPacket {
-    /** `ephPub(33) ‖ nonce(12) ‖ ciphertext`, base64 — wire-ready. This is
-     * the whole packet: the RFQ request's `claim_packet` field carries
-     * exactly this string. */
+    /** `ephPub(33) ‖ nonce(12) ‖ ciphertext`, base64 — the bare sealed bytes,
+     * 93 decoded. The older of the two `claim_packet` shapes: a solver holding
+     * it can only hand it to covclaimd over the Reveal API, which needs both
+     * sides pointed at the SAME covclaimd — an agreement nothing on the wire
+     * expresses. Prefer {@link SealedClaimPacket.packet}. */
     ciphertext: string;
+    /**
+     * covclaimd's serialised `ClaimPacket` body, base64 — TLV `0x01` ciphertext
+     * and `0x03` covclaimd_pub_key. **This is what `claim_packet` should
+     * carry** (§ 7.1.2: senders SHOULD prefer the packet shape).
+     *
+     * It is what lets the solver stamp the funding transaction as Arkade
+     * extension packet `0x04`, which covclaimd finds on the arkd stream by
+     * itself. The `0x03` TLV is what its filter selects on, so the client alone
+     * chooses which covclaimd — the solver needs none configured or reachable.
+     *
+     * `0x02` arkade_script is deliberately absent: the covenant commits to
+     * `taggedHash("ArkScriptHash", script)`, so the funder holds the only copy
+     * guaranteed to match and appends it. A client deriving its own would add a
+     * way for the two to disagree and strand the claim.
+     */
+    packet: string;
 }
 interface ClaimPacketInput {
     preimage: Uint8Array;
@@ -1035,6 +1053,38 @@ interface ClaimPacketInput {
  * helper, where no consumer reaches it by accident.
  */
 declare function sealClaimPacket(input: ClaimPacketInput): Promise<SealedClaimPacket>;
+/** `ephPub(33) ‖ nonce(12) ‖ preimage(32) ‖ GCM tag(16)` — fixed by the sealing
+ * scheme, and what tells the two `claim_packet` shapes apart: a TLV body needs
+ * 96 bytes to carry this much, so the two lengths cannot collide. */
+declare const SEALED_CIPHERTEXT_LENGTH = 93;
+/** The Arkade extension packet type covclaimd scans the arkd tx stream for. */
+declare const CLAIM_PACKET_TYPE = 4;
+/**
+ * Stamp the covenant script into a client's packet — the solver's half.
+ *
+ * The covenant commits to `taggedHash("ArkScriptHash", script)`, so its funder
+ * holds the only copy guaranteed to match, which is why a client never sends
+ * `0x02`. Appending rather than rebuilding is safe because covclaimd's
+ * `DeserializeClaim` is an order-agnostic switch: the `0x01, 0x03, 0x02` this
+ * produces and its own `Serialize`'s `0x01, 0x02, 0x03` read back identically.
+ */
+declare const appendArkadeScript: (body: Uint8Array, arkadeScript: Uint8Array) => Uint8Array;
+type ClaimPacketShape = {
+    kind: "ciphertext";
+} | {
+    kind: "packet";
+    body: Uint8Array;
+    covclaimdPubkey?: Uint8Array;
+    needsArkadeScript: boolean;
+};
+/**
+ * Which of the two `claim_packet` shapes a base64 field carries.
+ *
+ * Never throws: anything not unambiguously a packet reads as the legacy bare
+ * ciphertext, which keeps the older Reveal-API path rather than failing a swap
+ * over a field this side may simply not understand.
+ */
+declare const claimPacketShape: (b64: string) => ClaimPacketShape;
 
 /**
  * `retryable` is the point of the type: a 400 says the packet does not bind to
@@ -1441,4 +1491,4 @@ interface RfqSwapActivityDeps {
  */
 declare function rfqSwapActivityInputs(deps: RfqSwapActivityDeps): Promise<SwapActivityInput[]>;
 
-export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundIndexer, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };
+export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CLAIM_PACKET_TYPE, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type ClaimPacketShape, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundIndexer, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SEALED_CIPHERTEXT_LENGTH, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, appendArkadeScript, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimPacketShape, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };

package/dist/index.js

@@ -2,6 +2,7 @@ import {
   ARKADE_ASSET,
   ARKADE_BTC,
   AddressMismatch,
+  CLAIM_PACKET_TYPE,
   L1_NETWORKS,
   LIGHTNING_BTC,
   LIGHTNING_RECEIVE_PAIR,
@@ -21,11 +22,13 @@ import {
   ONCHAIN_SEND_PAIR,
   RFQ_REFUSAL_ERROR_CODES,
   RFQ_TERMINAL_STATES,
+  SEALED_CIPHERTEXT_LENGTH,
   SOLO_REFUND_HEADROOM_SECONDS,
   SWAP_LOCKUP_CONTRACT_KIND,
   SWAP_LOCKUP_CONTRACT_LABEL,
   SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal,
+  appendArkadeScript,
   arkadeAssetLeg,
   arkadeSwapRequest,
   assertFundable,
@@ -34,6 +37,7 @@ import {
   buildHtlcClaim,
   buildHtlcRefund,
   claimOnchainFill,
+  claimPacketShape,
   classifyOnchainHtlc,
   deriveLightningReceive,
   deriveOnchainReceive,
@@ -67,7 +71,7 @@ import {
   unilateralRefundWithoutReceiverDelay,
   verifyLockupAddress,
   verifyReceiveInvoice
-} from "./chunk-7N7XO4PY.js";
+} from "./chunk-IRDBAAJZ.js";
 import {
   InMemoryAssetSwapRepository,
   marketsCacheKey
@@ -847,6 +851,7 @@ import {
   bestMarket,
   discover,
   isNetwork,
+  marketLegKey,
   sideLimits
 } from "@arkade-os/solver-discovery";
 import { isSubdust } from "@arkade-os/sdk";
@@ -992,11 +997,11 @@ var findMarket = (markets, fromId, toId) => {
     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;
+        if (asset2.id === id) return marketLegKey(market, side);
         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;
+        if (matchesBtc || matchesAsset) return marketLegKey(market, side);
       }
     }
     return id;
@@ -1941,7 +1946,7 @@ var chainSourceFrom = (provider, network) => {
 };
 
 // src/payment/rendezvous.ts
-import { selectMarkets, sideLimits as sideLimits2 } from "@arkade-os/solver-discovery";
+import { sideLimits as sideLimits2 } from "@arkade-os/solver-discovery";
 import { hex as hex8 } from "@scure/base";
 var XONLY_HEX = /^[0-9a-f]{64}$/;
 var rendezvousOf = (market, pinned) => {
@@ -1964,12 +1969,11 @@ var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPub
   const encoded = fallbackEmulatorPubkey ? hex8.encode(fallbackEmulatorPubkey) : void 0;
   if (encoded !== void 0 && !XONLY_HEX.test(encoded)) return void 0;
   const pinned = encoded;
-  const candidates = selectMarkets(markets, {
-    baseId: BTC_ASSET_ID,
-    quoteId: BTC_ASSET_ID,
-    baseCorridor: "arkade",
-    quoteCorridor: payoutCorridor
-  });
+  const quoteCorridor = payoutCorridor === "lightning" ? "bolt11" : "bitcoin";
+  const isBtc = (id) => id === "btc" || /^\w+:[^/]+\/slip44:(?:0|1)$/.test(id ?? "");
+  const candidates = markets.filter(
+    (market) => marketCorridor(market, "base") === "arkade" && marketCorridor(market, "quote") === quoteCorridor && isBtc(marketAssetId(market, "base")) && isBtc(marketAssetId(market, "quote"))
+  );
   for (const market of candidates) {
     const rendezvous = rendezvousOf(market, pinned);
     if (!rendezvous) continue;
@@ -4005,6 +4009,7 @@ export {
   ASSET_CARRIER_SATS,
   AddressMismatch,
   BTC_ASSET_ID,
+  CLAIM_PACKET_TYPE,
   CROSS_ASSET_RAIL,
   CovclaimdRevealError,
   InMemoryAssetSwapRepository,
@@ -4040,6 +4045,7 @@ export {
   RefundNotLocallyPossibleError,
   RfqSwapManager,
   RfqSwapOriginRequired,
+  SEALED_CIPHERTEXT_LENGTH,
   SOLO_REFUND_HEADROOM_SECONDS,
   SOLVER_LIGHTNING_RAIL,
   SOLVER_ONCHAIN_RAIL,
@@ -4048,6 +4054,7 @@ export {
   SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal,
   addAssetSwap,
+  appendArkadeScript,
   arkadeAssetLeg,
   arkadeRefunder,
   arkadeSwapRequest,
@@ -4061,6 +4068,7 @@ export {
   cancelOffer,
   chainSourceFrom,
   claimOnchainFill,
+  claimPacketShape,
   claimReceiveLockup,
   classifyDepositSpend,
   classifyOnchainHtlc,

package/dist/nostr.cjs

@@ -62,6 +62,7 @@ var import_sdk3 = require("@arkade-os/sdk");
 
 // src/claimPacket.ts
 var import_base2 = require("@scure/base");
+var import_utils = require("@scure/btc-signer/utils.js");
 var import_aes = require("@noble/ciphers/aes.js");
 var import_secp256k1 = require("@noble/curves/secp256k1.js");
 var import_hkdf = require("@noble/hashes/hkdf.js");

package/dist/nostr.js

@@ -1,7 +1,7 @@
 import {
   expectQuote,
   pairOf
-} from "./chunk-7N7XO4PY.js";
+} from "./chunk-IRDBAAJZ.js";
 
 // src/nostr.ts
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/swap",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "type": "module",
   "description": "Client-side Arkade Intents asset swaps: discover markets, quote, create/track/cancel offers, restore from chain.",
   "repository": {
@@ -64,7 +64,7 @@
   "author": "Arkade-OS",
   "license": "MIT",
   "dependencies": {
-    "@arkade-os/solver-discovery": "0.2.3",
+    "@arkade-os/solver-discovery": "0.2.4",
     "@noble/ciphers": "2.1.1",
     "@noble/curves": "2.0.1",
     "@noble/hashes": "2.0.1",
@@ -95,8 +95,8 @@
     "lint": "biome format src test",
     "test": "vitest run --exclude test/e2e",
     "test:unit": "vitest run --exclude test/e2e",
-    "test:integration": "vitest run test/e2e/** --exclude test/e2e/rfq*.test.ts",
-    "test:integration:rfq": "vitest run test/e2e/rfq*.test.ts",
+    "test:integration": "vitest run --exclude \"test/e2e/rfq*.test.ts\" test/e2e/",
+    "test:integration:rfq": "vitest run test/e2e/rfq",
     "smoke:dist": "node scripts/smoke-dist.mjs"
   }
 }