@arkade-os/swap 0.0.6 → 0.0.7

package/README.md

@@ -290,7 +290,9 @@ message anywhere: **acceptance is funding**.
   offline. The solver observes the funding on-chain, pays the invoice, and claims with the
   preimage — which lands publicly in the claim witness as the receipt. A failed swap refunds by
   covenant to the trader's address, pushable by anyone, no trader keys or state.
-- **Arkade ↔ arkade** (BTC↔asset, asset↔asset): the trader accepts a quote by creating and funding
+- **Arkade ↔ arkade** (BTC↔asset, asset↔asset): an arkade asset leg names the asset id itself —
+  `arkade:<68-hex>`, built with `arkadeAssetLeg` (the deprecated coarse `ARKADE_ASSET` is served by
+  no solver). The trader accepts a quote by creating and funding
   an **offer** (layer 1) bound to the quoted terms before `valid_until`. The offer covenant only
   releases the deposit to a fill that delivers the quoted amount, so the solver fills or nothing
   moves; an unfilled offer is cancelled cooperatively. The quote wire shape ships here; the

package/dist/{chunk-Q4FAYBXS.js → chunk-ZDTRQZE2.js}

@@ -311,9 +311,10 @@ var solverHex = (value, field) => {
   }
 };
 var ARKADE_BTC = "arkade:BTC";
-var ARKADE_ASSET = "arkade:ASSET";
 var LIGHTNING_BTC = "lightning:BTC";
 var ONCHAIN_BTC = "onchain:BTC";
+var arkadeAssetLeg = (id) => `arkade:${id.toString()}`;
+var ARKADE_ASSET = "arkade:ASSET";
 var rfqPair = (from, to) => `${from}->${to}`;
 var LIGHTNING_SEND_PAIR = rfqPair(ARKADE_BTC, LIGHTNING_BTC);
 var LIGHTNING_RECEIVE_PAIR = rfqPair(LIGHTNING_BTC, ARKADE_BTC);
@@ -354,23 +355,34 @@ var lightningSendRequest = (input) => ({
   }
 });
 var arkadeSwapRequest = (input) => {
-  if (Boolean(input.wantAsset) === Boolean(input.offerAsset)) {
-    throw new Error("set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC)");
+  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"
+    );
   }
+  if (input.wantAsset && input.offerAsset) {
+    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"
+    );
+  }
+  const pair = rfqPair(
+    input.offerAsset ? arkadeAssetLeg(input.offerAsset) : ARKADE_BTC,
+    input.wantAsset ? arkadeAssetLeg(input.wantAsset) : ARKADE_BTC
+  );
+  assertPairLength(pair);
   return {
     v: 1,
     type: "rfq_request",
     rfq_id: input.rfqId,
-    pair: rfqPair(
-      input.offerAsset ? ARKADE_ASSET : ARKADE_BTC,
-      input.wantAsset ? ARKADE_ASSET : ARKADE_BTC
-    ),
+    pair,
     amount_side: input.amountSide,
     amount: input.amount,
-    profile: {
-      ...input.offerAsset && { offer_asset: hex3.encode(input.offerAsset.serialize()) },
-      ...input.wantAsset && { want_asset: hex3.encode(input.wantAsset.serialize()) }
-    }
+    // 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: {}
   };
 };
 var MIN_HEADROOM_SECONDS = 90 * 60;
@@ -384,6 +396,14 @@ var assertFinite = (value, reason, label) => {
     throw gateError(reason, `${label} is not a finite number (${String(value)})`);
   }
 };
+var MAX_PAIR_LENGTH = 158;
+var assertPairLength = (pair) => {
+  if (pair.length > MAX_PAIR_LENGTH) {
+    throw new Error(
+      `pair is ${pair.length} characters, over the wire's ${MAX_PAIR_LENGTH}-character limit`
+    );
+  }
+};
 var verifyLockupAddress = (quote, derivedAddress) => {
   const quoted = quote.profile?.lockup_address;
   if (derivedAddress !== quoted) throw new AddressMismatch(derivedAddress, quoted);
@@ -423,14 +443,20 @@ var assertFundable = (input) => {
     }
   }
 };
-var expectQuote = (payload, rfqId) => {
+var 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_quote" || p.rfq_id !== rfqId) {
     throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
   }
+  if (requestedPair !== void 0 && p.pair !== requestedPair) {
+    throw new Error(
+      `solver quoted ${JSON.stringify(p.pair)}, not the requested ${requestedPair}`
+    );
+  }
   return payload;
 };
+var pairOf = (payload) => typeof payload.pair === "string" ? payload.pair : void 0;
 var httpTransport = (baseUrl, options = {}) => {
   const fetchImpl = options.fetchImpl ?? fetch;
   const readJson = async (response, what) => {
@@ -450,7 +476,11 @@ var httpTransport = (baseUrl, options = {}) => {
         headers: { "content-type": "application/json" },
         body: JSON.stringify(payload)
       });
-      return expectQuote(await readJson(response, "quote request"), String(payload.rfq_id));
+      return expectQuote(
+        await readJson(response, "quote request"),
+        String(payload.rfq_id),
+        pairOf(payload)
+      );
     },
     async status(rfqId) {
       const response = await fetchImpl(`${baseUrl}/v1/rfq/${rfqId}`, { method: "GET" });
@@ -527,7 +557,8 @@ var relayTransport = (relayUrl, options) => {
     async requestQuote(payload) {
       return expectQuote(
         await roundTrip(payload, String(payload.rfq_id)),
-        String(payload.rfq_id)
+        String(payload.rfq_id),
+        pairOf(payload)
       );
     },
     async status(rfqId) {
@@ -1151,9 +1182,10 @@ export {
   LockupRegistrationFailed,
   registerLockupContract,
   ARKADE_BTC,
-  ARKADE_ASSET,
   LIGHTNING_BTC,
   ONCHAIN_BTC,
+  arkadeAssetLeg,
+  ARKADE_ASSET,
   rfqPair,
   LIGHTNING_SEND_PAIR,
   LIGHTNING_RECEIVE_PAIR,
@@ -1168,6 +1200,8 @@ export {
   MIN_HEADROOM_SECONDS,
   verifyLockupAddress,
   assertFundable,
+  expectQuote,
+  pairOf,
   httpTransport,
   relayTransport,
   SOLO_REFUND_HEADROOM_SECONDS,

package/dist/index.cjs

@@ -67,6 +67,7 @@ __export(index_exports, {
   SWAP_LOCKUP_CONTRACT_TYPE: () => SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal: () => SwapRefusal,
   addAssetSwap: () => addAssetSwap,
+  arkadeAssetLeg: () => arkadeAssetLeg,
   arkadeSwapRequest: () => arkadeSwapRequest,
   assertFundable: () => assertFundable,
   assertReceivable: () => assertReceivable,
@@ -1446,9 +1447,10 @@ var solverHex = (value, field) => {
   }
 };
 var ARKADE_BTC = "arkade:BTC";
-var ARKADE_ASSET = "arkade:ASSET";
 var LIGHTNING_BTC = "lightning:BTC";
 var ONCHAIN_BTC = "onchain:BTC";
+var arkadeAssetLeg = (id) => `arkade:${id.toString()}`;
+var ARKADE_ASSET = "arkade:ASSET";
 var rfqPair = (from, to) => `${from}->${to}`;
 var LIGHTNING_SEND_PAIR = rfqPair(ARKADE_BTC, LIGHTNING_BTC);
 var LIGHTNING_RECEIVE_PAIR = rfqPair(LIGHTNING_BTC, ARKADE_BTC);
@@ -1489,23 +1491,34 @@ var lightningSendRequest = (input) => ({
   }
 });
 var arkadeSwapRequest = (input) => {
-  if (Boolean(input.wantAsset) === Boolean(input.offerAsset)) {
-    throw new Error("set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC)");
+  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"
+    );
   }
+  if (input.wantAsset && input.offerAsset) {
+    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"
+    );
+  }
+  const pair = rfqPair(
+    input.offerAsset ? arkadeAssetLeg(input.offerAsset) : ARKADE_BTC,
+    input.wantAsset ? arkadeAssetLeg(input.wantAsset) : ARKADE_BTC
+  );
+  assertPairLength(pair);
   return {
     v: 1,
     type: "rfq_request",
     rfq_id: input.rfqId,
-    pair: rfqPair(
-      input.offerAsset ? ARKADE_ASSET : ARKADE_BTC,
-      input.wantAsset ? ARKADE_ASSET : ARKADE_BTC
-    ),
+    pair,
     amount_side: input.amountSide,
     amount: input.amount,
-    profile: {
-      ...input.offerAsset && { offer_asset: import_base8.hex.encode(input.offerAsset.serialize()) },
-      ...input.wantAsset && { want_asset: import_base8.hex.encode(input.wantAsset.serialize()) }
-    }
+    // 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: {}
   };
 };
 var MIN_HEADROOM_SECONDS = 90 * 60;
@@ -1519,6 +1532,14 @@ var assertFinite = (value, reason, label) => {
     throw gateError(reason, `${label} is not a finite number (${String(value)})`);
   }
 };
+var MAX_PAIR_LENGTH = 158;
+var assertPairLength = (pair) => {
+  if (pair.length > MAX_PAIR_LENGTH) {
+    throw new Error(
+      `pair is ${pair.length} characters, over the wire's ${MAX_PAIR_LENGTH}-character limit`
+    );
+  }
+};
 var verifyLockupAddress = (quote, derivedAddress) => {
   const quoted = quote.profile?.lockup_address;
   if (derivedAddress !== quoted) throw new AddressMismatch(derivedAddress, quoted);
@@ -1558,14 +1579,20 @@ var assertFundable = (input) => {
     }
   }
 };
-var expectQuote = (payload, rfqId) => {
+var 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_quote" || p.rfq_id !== rfqId) {
     throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
   }
+  if (requestedPair !== void 0 && p.pair !== requestedPair) {
+    throw new Error(
+      `solver quoted ${JSON.stringify(p.pair)}, not the requested ${requestedPair}`
+    );
+  }
   return payload;
 };
+var pairOf = (payload) => typeof payload.pair === "string" ? payload.pair : void 0;
 var httpTransport = (baseUrl, options = {}) => {
   const fetchImpl = options.fetchImpl ?? fetch;
   const readJson = async (response, what) => {
@@ -1585,7 +1612,11 @@ var httpTransport = (baseUrl, options = {}) => {
         headers: { "content-type": "application/json" },
         body: JSON.stringify(payload)
       });
-      return expectQuote(await readJson(response, "quote request"), String(payload.rfq_id));
+      return expectQuote(
+        await readJson(response, "quote request"),
+        String(payload.rfq_id),
+        pairOf(payload)
+      );
     },
     async status(rfqId) {
       const response = await fetchImpl(`${baseUrl}/v1/rfq/${rfqId}`, { method: "GET" });
@@ -1662,7 +1693,8 @@ var relayTransport = (relayUrl, options) => {
     async requestQuote(payload) {
       return expectQuote(
         await roundTrip(payload, String(payload.rfq_id)),
-        String(payload.rfq_id)
+        String(payload.rfq_id),
+        pairOf(payload)
       );
     },
     async status(rfqId) {
@@ -3470,6 +3502,7 @@ function swapActivityResolver(deps) {
   SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal,
   addAssetSwap,
+  arkadeAssetLeg,
   arkadeSwapRequest,
   assertFundable,
   assertReceivable,

package/dist/index.d.cts

@@ -2,8 +2,8 @@ import { asset, IWallet, arkade, RestIndexerProvider, Transaction, IContractMana
 import { A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry } from './repository-BwnZ8N62.cjs';
 export { b as AssetSwapStatus, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, P as PreimageBlockedReason, c as PreimageNotRecoverableError, S as SwapSecretsProjection, d as addAssetSwap, g as getAssetSwaps, e as getAssetSwapsOrThrow, p as preimageForSwapRecord, s as swapSecretsToRecord, u as updateAssetSwap, f as updateAssetSwapBestEffort } from './repository-BwnZ8N62.cjs';
 import { Network, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
-import { R as RfqStatus, a as RfqTransport, O as OnchainHtlc, C as ChainSource, b as ChainUtxo, c as OnchainHtlcPhase } from './rfq-3jWha5xA.cjs';
-export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, H as HtlcUtxo, I as InvoiceFacts, L as LIGHTNING_BTC, f as LIGHTNING_RECEIVE_PAIR, g as LIGHTNING_SEND_PAIR, M as MAX_MIN_CONFIRMATIONS, h as MIN_CLAIM_WINDOW_SECONDS, i as MIN_HEADROOM_SECONDS, j as ONCHAIN_BTC, k as ONCHAIN_CLAIM_MARGIN_SECONDS, l as ONCHAIN_DUST_SATS, m as ONCHAIN_ORDER_MARGIN_SECONDS, n as ONCHAIN_RECEIVE_PAIR, o as ONCHAIN_SECONDS_PER_BLOCK, p as ONCHAIN_SEND_PAIR, q as OnchainHtlcParams, r as OnchainNetwork, s as RFQ_TERMINAL_STATES, t as RelaySocket, u as RfqQuote, v as RfqRefusalReason, S as SOLO_REFUND_HEADROOM_SECONDS, w as SwapRefusal, x as arkadeSwapRequest, y as assertFundable, z as assertReceivable, B as awaitOnchainFill, D as buildHtlcClaim, E as buildHtlcRefund, F as claimOnchainFill, G as classifyOnchainHtlc, J as deriveLightningReceive, K as deriveOnchainReceive, N as deriveOnchainSend, P as extractPreimage, Q as httpTransport, T as lightningReceiveRequest, U as lightningSendRequest, V as lightningSendVtxoScript, W as newPreimage, X as newRfqId, Y as offerTermsFromQuote, Z as onchainHtlcScript, _ as onchainReceiveRequest, $ as onchainSendRequest, a0 as paymentHashOf, a1 as receiveVtxoScript, a2 as relayTransport, a3 as requestLightningReceive, a4 as requestLightningSend, a5 as requestOnchainReceive, a6 as requestOnchainSend, a7 as rfqPair, a8 as unilateralClaimDelay, a9 as unilateralRefundDelay, aa as unilateralRefundWithoutReceiverDelay, ab as verifyLockupAddress, ac as verifyReceiveInvoice } from './rfq-3jWha5xA.cjs';
+import { R as RfqStatus, a as RfqTransport, O as OnchainHtlc, C as ChainSource, b as ChainUtxo, c as OnchainHtlcPhase } from './rfq-DfT9dAss.cjs';
+export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, H as HtlcUtxo, I as InvoiceFacts, L as LIGHTNING_BTC, f as LIGHTNING_RECEIVE_PAIR, g as LIGHTNING_SEND_PAIR, M as MAX_MIN_CONFIRMATIONS, h as MIN_CLAIM_WINDOW_SECONDS, i as MIN_HEADROOM_SECONDS, j as ONCHAIN_BTC, k as ONCHAIN_CLAIM_MARGIN_SECONDS, l as ONCHAIN_DUST_SATS, m as ONCHAIN_ORDER_MARGIN_SECONDS, n as ONCHAIN_RECEIVE_PAIR, o as ONCHAIN_SECONDS_PER_BLOCK, p as ONCHAIN_SEND_PAIR, q as OnchainHtlcParams, r as OnchainNetwork, s as RFQ_TERMINAL_STATES, t as RelaySocket, u as RfqQuote, v as RfqRefusalReason, S as SOLO_REFUND_HEADROOM_SECONDS, w as SwapRefusal, x as arkadeAssetLeg, y as arkadeSwapRequest, z as assertFundable, B as assertReceivable, D as awaitOnchainFill, E as buildHtlcClaim, F as buildHtlcRefund, G as claimOnchainFill, J as classifyOnchainHtlc, K as deriveLightningReceive, N as deriveOnchainReceive, P as deriveOnchainSend, Q as extractPreimage, T as httpTransport, U as lightningReceiveRequest, V as lightningSendRequest, W as lightningSendVtxoScript, X as newPreimage, Y as newRfqId, Z as offerTermsFromQuote, _ as onchainHtlcScript, $ as onchainReceiveRequest, a0 as onchainSendRequest, a1 as paymentHashOf, a2 as receiveVtxoScript, a3 as relayTransport, a4 as requestLightningReceive, a5 as requestLightningSend, a6 as requestOnchainReceive, a7 as requestOnchainSend, a8 as rfqPair, a9 as unilateralClaimDelay, aa as unilateralRefundDelay, ab as unilateralRefundWithoutReceiverDelay, ac as verifyLockupAddress, ad as verifyReceiveInvoice } from './rfq-DfT9dAss.cjs';
 
 /** The contracts — pure data, shared verbatim with any other implementation. */
 declare const swapPrograms: Record<"wantAsset" | "wantBtc", ReturnType<typeof arkade.parseArtifact>>;

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { asset, IWallet, arkade, RestIndexerProvider, Transaction, IContractMana
 import { A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry } from './repository-BwnZ8N62.js';
 export { b as AssetSwapStatus, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, P as PreimageBlockedReason, c as PreimageNotRecoverableError, S as SwapSecretsProjection, d as addAssetSwap, g as getAssetSwaps, e as getAssetSwapsOrThrow, p as preimageForSwapRecord, s as swapSecretsToRecord, u as updateAssetSwap, f as updateAssetSwapBestEffort } from './repository-BwnZ8N62.js';
 import { Network, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
-import { R as RfqStatus, a as RfqTransport, O as OnchainHtlc, C as ChainSource, b as ChainUtxo, c as OnchainHtlcPhase } from './rfq-3jWha5xA.js';
-export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, H as HtlcUtxo, I as InvoiceFacts, L as LIGHTNING_BTC, f as LIGHTNING_RECEIVE_PAIR, g as LIGHTNING_SEND_PAIR, M as MAX_MIN_CONFIRMATIONS, h as MIN_CLAIM_WINDOW_SECONDS, i as MIN_HEADROOM_SECONDS, j as ONCHAIN_BTC, k as ONCHAIN_CLAIM_MARGIN_SECONDS, l as ONCHAIN_DUST_SATS, m as ONCHAIN_ORDER_MARGIN_SECONDS, n as ONCHAIN_RECEIVE_PAIR, o as ONCHAIN_SECONDS_PER_BLOCK, p as ONCHAIN_SEND_PAIR, q as OnchainHtlcParams, r as OnchainNetwork, s as RFQ_TERMINAL_STATES, t as RelaySocket, u as RfqQuote, v as RfqRefusalReason, S as SOLO_REFUND_HEADROOM_SECONDS, w as SwapRefusal, x as arkadeSwapRequest, y as assertFundable, z as assertReceivable, B as awaitOnchainFill, D as buildHtlcClaim, E as buildHtlcRefund, F as claimOnchainFill, G as classifyOnchainHtlc, J as deriveLightningReceive, K as deriveOnchainReceive, N as deriveOnchainSend, P as extractPreimage, Q as httpTransport, T as lightningReceiveRequest, U as lightningSendRequest, V as lightningSendVtxoScript, W as newPreimage, X as newRfqId, Y as offerTermsFromQuote, Z as onchainHtlcScript, _ as onchainReceiveRequest, $ as onchainSendRequest, a0 as paymentHashOf, a1 as receiveVtxoScript, a2 as relayTransport, a3 as requestLightningReceive, a4 as requestLightningSend, a5 as requestOnchainReceive, a6 as requestOnchainSend, a7 as rfqPair, a8 as unilateralClaimDelay, a9 as unilateralRefundDelay, aa as unilateralRefundWithoutReceiverDelay, ab as verifyLockupAddress, ac as verifyReceiveInvoice } from './rfq-3jWha5xA.js';
+import { R as RfqStatus, a as RfqTransport, O as OnchainHtlc, C as ChainSource, b as ChainUtxo, c as OnchainHtlcPhase } from './rfq-DfT9dAss.js';
+export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, H as HtlcUtxo, I as InvoiceFacts, L as LIGHTNING_BTC, f as LIGHTNING_RECEIVE_PAIR, g as LIGHTNING_SEND_PAIR, M as MAX_MIN_CONFIRMATIONS, h as MIN_CLAIM_WINDOW_SECONDS, i as MIN_HEADROOM_SECONDS, j as ONCHAIN_BTC, k as ONCHAIN_CLAIM_MARGIN_SECONDS, l as ONCHAIN_DUST_SATS, m as ONCHAIN_ORDER_MARGIN_SECONDS, n as ONCHAIN_RECEIVE_PAIR, o as ONCHAIN_SECONDS_PER_BLOCK, p as ONCHAIN_SEND_PAIR, q as OnchainHtlcParams, r as OnchainNetwork, s as RFQ_TERMINAL_STATES, t as RelaySocket, u as RfqQuote, v as RfqRefusalReason, S as SOLO_REFUND_HEADROOM_SECONDS, w as SwapRefusal, x as arkadeAssetLeg, y as arkadeSwapRequest, z as assertFundable, B as assertReceivable, D as awaitOnchainFill, E as buildHtlcClaim, F as buildHtlcRefund, G as claimOnchainFill, J as classifyOnchainHtlc, K as deriveLightningReceive, N as deriveOnchainReceive, P as deriveOnchainSend, Q as extractPreimage, T as httpTransport, U as lightningReceiveRequest, V as lightningSendRequest, W as lightningSendVtxoScript, X as newPreimage, Y as newRfqId, Z as offerTermsFromQuote, _ as onchainHtlcScript, $ as onchainReceiveRequest, a0 as onchainSendRequest, a1 as paymentHashOf, a2 as receiveVtxoScript, a3 as relayTransport, a4 as requestLightningReceive, a5 as requestLightningSend, a6 as requestOnchainReceive, a7 as requestOnchainSend, a8 as rfqPair, a9 as unilateralClaimDelay, aa as unilateralRefundDelay, ab as unilateralRefundWithoutReceiverDelay, ac as verifyLockupAddress, ad as verifyReceiveInvoice } from './rfq-DfT9dAss.js';
 
 /** The contracts — pure data, shared verbatim with any other implementation. */
 declare const swapPrograms: Record<"wantAsset" | "wantBtc", ReturnType<typeof arkade.parseArtifact>>;

package/dist/index.js

@@ -22,6 +22,7 @@ import {
   SWAP_LOCKUP_CONTRACT_LABEL,
   SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal,
+  arkadeAssetLeg,
   arkadeSwapRequest,
   assertFundable,
   assertReceivable,
@@ -59,7 +60,7 @@ import {
   unilateralRefundWithoutReceiverDelay,
   verifyLockupAddress,
   verifyReceiveInvoice
-} from "./chunk-Q4FAYBXS.js";
+} from "./chunk-ZDTRQZE2.js";
 import {
   InMemoryAssetSwapRepository,
   marketsCacheKey
@@ -2269,6 +2270,7 @@ export {
   SWAP_LOCKUP_CONTRACT_TYPE,
   SwapRefusal,
   addAssetSwap,
+  arkadeAssetLeg,
   arkadeSwapRequest,
   assertFundable,
   assertReceivable,

package/dist/nostr.cjs

@@ -91,6 +91,20 @@ var SwapRefusal = class extends Error {
   }
 };
 var MIN_HEADROOM_SECONDS = 90 * 60;
+var 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_quote" || p.rfq_id !== rfqId) {
+    throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
+  }
+  if (requestedPair !== void 0 && p.pair !== requestedPair) {
+    throw new Error(
+      `solver quoted ${JSON.stringify(p.pair)}, not the requested ${requestedPair}`
+    );
+  }
+  return payload;
+};
+var pairOf = (payload) => typeof payload.pair === "string" ? payload.pair : void 0;
 var SEQUENCE_GRANULARITY_SECONDS = 512;
 var SOLO_REFUND_HEADROOM_SECONDS = 8 * SEQUENCE_GRANULARITY_SECONDS;
 var MIN_CLAIM_WINDOW_SECONDS = 30 * 60;
@@ -119,14 +133,6 @@ var closeReasons = (raw) => raw.map((entry) => {
   const { url, reason } = entry ?? {};
   return url ? `${url}: ${reason ?? "closed"}` : reason ?? "closed";
 });
-var asQuote = (payload, rfqId) => {
-  const p = payload;
-  if (p?.type === "rfq_refusal") throw new SwapRefusal(p.reason ?? "unknown", p.rfq_id ?? rfqId);
-  if (p?.type !== "rfq_quote" || p.rfq_id !== rfqId) {
-    throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
-  }
-  return payload;
-};
 var nostrRfqTransport = (options) => {
   const relays = options.relays;
   const solverPubkey = options.solverPubkey;
@@ -202,7 +208,7 @@ var nostrRfqTransport = (options) => {
       const rfqId = String(payload.rfq_id);
       const reply = awaitReply(rfqId);
       await send(payload);
-      return asQuote(await reply, rfqId);
+      return expectQuote(await reply, rfqId, pairOf(payload));
     },
     async status(rfqId) {
       const reply = awaitReply(rfqId);

package/dist/nostr.d.cts

@@ -1,4 +1,4 @@
-import { a as RfqTransport } from './rfq-3jWha5xA.cjs';
+import { a as RfqTransport } from './rfq-DfT9dAss.cjs';
 import { SimplePool } from 'nostr-tools';
 import '@arkade-os/sdk';
 

package/dist/nostr.d.ts

@@ -1,4 +1,4 @@
-import { a as RfqTransport } from './rfq-3jWha5xA.js';
+import { a as RfqTransport } from './rfq-DfT9dAss.js';
 import { SimplePool } from 'nostr-tools';
 import '@arkade-os/sdk';
 

package/dist/nostr.js

@@ -1,6 +1,7 @@
 import {
-  SwapRefusal
-} from "./chunk-Q4FAYBXS.js";
+  expectQuote,
+  pairOf
+} from "./chunk-ZDTRQZE2.js";
 
 // src/nostr.ts
 import {
@@ -32,14 +33,6 @@ var closeReasons = (raw) => raw.map((entry) => {
   const { url, reason } = entry ?? {};
   return url ? `${url}: ${reason ?? "closed"}` : reason ?? "closed";
 });
-var asQuote = (payload, rfqId) => {
-  const p = payload;
-  if (p?.type === "rfq_refusal") throw new SwapRefusal(p.reason ?? "unknown", p.rfq_id ?? rfqId);
-  if (p?.type !== "rfq_quote" || p.rfq_id !== rfqId) {
-    throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
-  }
-  return payload;
-};
 var nostrRfqTransport = (options) => {
   const relays = options.relays;
   const solverPubkey = options.solverPubkey;
@@ -115,7 +108,7 @@ var nostrRfqTransport = (options) => {
       const rfqId = String(payload.rfq_id);
       const reply = awaitReply(rfqId);
       await send(payload);
-      return asQuote(await reply, rfqId);
+      return expectQuote(await reply, rfqId, pairOf(payload));
     },
     async status(rfqId) {
       const reply = awaitReply(rfqId);

package/dist/{rfq-3jWha5xA.d.cts → rfq-DfT9dAss.d.cts}

@@ -210,13 +210,25 @@ declare function classifyOnchainHtlc(chain: ChainSource, input: {
     };
 }): Promise<OnchainHtlcPhase>;
 
-/** Legs are `<corridor>:<asset>`; a pair is directional, `from->to`. Arkade
- * asset legs stay coarse (`arkade:ASSET`) — the exact asset ids ride the
- * request profile, mirroring how the offer TLV identifies assets. */
+/** Legs are `<corridor>:<asset>`; a pair is directional, `from->to`. */
 declare const ARKADE_BTC = "arkade:BTC";
-declare const ARKADE_ASSET = "arkade:ASSET";
 declare const LIGHTNING_BTC = "lightning:BTC";
 declare const ONCHAIN_BTC = "onchain:BTC";
+/** The arkade leg for an asset: the asset id itself, 68 lowercase hex. The id
+ * lives in the pair rather than the profile because the pair is the field both
+ * sides route and subscribe on, and a coarse leg cannot say which asset a
+ * market key is for.
+ *
+ * Taking an `AssetId` rather than a string is what enforces the case rule:
+ * `hex.decode` accepts uppercase while `hex.encode` only emits lowercase, so a
+ * value that reached us as `A1B2…` leaves here as `a1b2…`. Solvers compare pair
+ * strings byte for byte — a sender that normalised only in its key derivation
+ * would reach the right subscription and then be skipped as an unserved pair. */
+declare const arkadeAssetLeg: (id: asset.AssetId) => string;
+/** @deprecated The coarse asset leg. No solver serves it: `ASSET` is neither a
+ * registered ticker nor a 68-hex asset id, so a solver's market-key derivation
+ * throws on it. Use {@link arkadeAssetLeg}. Removed next major. */
+declare const ARKADE_ASSET = "arkade:ASSET";
 declare const rfqPair: (from: string, to: string) => string;
 /** The implemented pair: pay a BOLT11 invoice out of an Arkade balance. */
 declare const LIGHTNING_SEND_PAIR: string;
@@ -287,9 +299,9 @@ declare const lightningSendRequest: (input: {
     senderPubkey: Uint8Array;
 }) => Record<string, unknown>;
 /** The rfq_request for an arkade↔arkade swap. Exactly one side may name an
- * asset id per direction (BTC has none); the pair string stays coarse and the
- * ids ride the profile, like the offer TLV. Forward-looking: the wire shape is
- * specified, the reference solver does not serve it yet. */
+ * asset id per direction (BTC has none), and the id is the leg itself — see
+ * {@link arkadeAssetLeg}. Forward-looking: the wire shape is specified, the
+ * reference solver does not serve it yet. */
 declare const arkadeSwapRequest: (input: {
     rfqId: string;
     /** Asset the trader deposits; omit when depositing BTC. */
@@ -920,4 +932,4 @@ declare function requestOnchainReceive(wallet: IWallet, arkServerUrl: string, tr
     secrets: ProvisionedClaimSecret;
 }>;
 
-export { onchainSendRequest as $, ARKADE_ASSET as A, awaitOnchainFill as B, type ChainSource as C, buildHtlcClaim as D, buildHtlcRefund as E, claimOnchainFill as F, classifyOnchainHtlc as G, type HtlcUtxo as H, type InvoiceFacts as I, deriveLightningReceive as J, deriveOnchainReceive as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, deriveOnchainSend as N, type OnchainHtlc as O, extractPreimage as P, httpTransport as Q, type RfqStatus as R, SOLO_REFUND_HEADROOM_SECONDS as S, lightningReceiveRequest as T, lightningSendRequest as U, lightningSendVtxoScript as V, newPreimage as W, newRfqId as X, offerTermsFromQuote as Y, onchainHtlcScript as Z, onchainReceiveRequest as _, type RfqTransport as a, paymentHashOf as a0, receiveVtxoScript as a1, relayTransport as a2, requestLightningReceive as a3, requestLightningSend as a4, requestOnchainReceive as a5, requestOnchainSend as a6, rfqPair as a7, unilateralClaimDelay as a8, unilateralRefundDelay as a9, unilateralRefundWithoutReceiverDelay as aa, verifyLockupAddress as ab, verifyReceiveInvoice as ac, type ChainUtxo as b, type OnchainHtlcPhase as c, ARKADE_BTC as d, AddressMismatch as e, LIGHTNING_RECEIVE_PAIR as f, LIGHTNING_SEND_PAIR as g, MIN_CLAIM_WINDOW_SECONDS as h, MIN_HEADROOM_SECONDS as i, ONCHAIN_BTC as j, ONCHAIN_CLAIM_MARGIN_SECONDS as k, ONCHAIN_DUST_SATS as l, ONCHAIN_ORDER_MARGIN_SECONDS as m, ONCHAIN_RECEIVE_PAIR as n, ONCHAIN_SECONDS_PER_BLOCK as o, ONCHAIN_SEND_PAIR as p, type OnchainHtlcParams as q, type OnchainNetwork as r, RFQ_TERMINAL_STATES as s, type RelaySocket as t, type RfqQuote as u, type RfqRefusalReason as v, SwapRefusal as w, arkadeSwapRequest as x, assertFundable as y, assertReceivable as z };
+export { onchainReceiveRequest as $, ARKADE_ASSET as A, assertReceivable as B, type ChainSource as C, awaitOnchainFill as D, buildHtlcClaim as E, buildHtlcRefund as F, claimOnchainFill as G, type HtlcUtxo as H, type InvoiceFacts as I, classifyOnchainHtlc as J, deriveLightningReceive as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, deriveOnchainReceive as N, type OnchainHtlc as O, deriveOnchainSend as P, extractPreimage as Q, type RfqStatus as R, SOLO_REFUND_HEADROOM_SECONDS as S, httpTransport as T, lightningReceiveRequest as U, lightningSendRequest as V, lightningSendVtxoScript as W, newPreimage as X, newRfqId as Y, offerTermsFromQuote as Z, onchainHtlcScript as _, type RfqTransport as a, onchainSendRequest as a0, paymentHashOf as a1, receiveVtxoScript as a2, relayTransport as a3, requestLightningReceive as a4, requestLightningSend as a5, requestOnchainReceive as a6, requestOnchainSend as a7, rfqPair as a8, unilateralClaimDelay as a9, unilateralRefundDelay as aa, unilateralRefundWithoutReceiverDelay as ab, verifyLockupAddress as ac, verifyReceiveInvoice as ad, type ChainUtxo as b, type OnchainHtlcPhase as c, ARKADE_BTC as d, AddressMismatch as e, LIGHTNING_RECEIVE_PAIR as f, LIGHTNING_SEND_PAIR as g, MIN_CLAIM_WINDOW_SECONDS as h, MIN_HEADROOM_SECONDS as i, ONCHAIN_BTC as j, ONCHAIN_CLAIM_MARGIN_SECONDS as k, ONCHAIN_DUST_SATS as l, ONCHAIN_ORDER_MARGIN_SECONDS as m, ONCHAIN_RECEIVE_PAIR as n, ONCHAIN_SECONDS_PER_BLOCK as o, ONCHAIN_SEND_PAIR as p, type OnchainHtlcParams as q, type OnchainNetwork as r, RFQ_TERMINAL_STATES as s, type RelaySocket as t, type RfqQuote as u, type RfqRefusalReason as v, SwapRefusal as w, arkadeAssetLeg as x, arkadeSwapRequest as y, assertFundable as z };

package/dist/{rfq-3jWha5xA.d.ts → rfq-DfT9dAss.d.ts}

@@ -210,13 +210,25 @@ declare function classifyOnchainHtlc(chain: ChainSource, input: {
     };
 }): Promise<OnchainHtlcPhase>;
 
-/** Legs are `<corridor>:<asset>`; a pair is directional, `from->to`. Arkade
- * asset legs stay coarse (`arkade:ASSET`) — the exact asset ids ride the
- * request profile, mirroring how the offer TLV identifies assets. */
+/** Legs are `<corridor>:<asset>`; a pair is directional, `from->to`. */
 declare const ARKADE_BTC = "arkade:BTC";
-declare const ARKADE_ASSET = "arkade:ASSET";
 declare const LIGHTNING_BTC = "lightning:BTC";
 declare const ONCHAIN_BTC = "onchain:BTC";
+/** The arkade leg for an asset: the asset id itself, 68 lowercase hex. The id
+ * lives in the pair rather than the profile because the pair is the field both
+ * sides route and subscribe on, and a coarse leg cannot say which asset a
+ * market key is for.
+ *
+ * Taking an `AssetId` rather than a string is what enforces the case rule:
+ * `hex.decode` accepts uppercase while `hex.encode` only emits lowercase, so a
+ * value that reached us as `A1B2…` leaves here as `a1b2…`. Solvers compare pair
+ * strings byte for byte — a sender that normalised only in its key derivation
+ * would reach the right subscription and then be skipped as an unserved pair. */
+declare const arkadeAssetLeg: (id: asset.AssetId) => string;
+/** @deprecated The coarse asset leg. No solver serves it: `ASSET` is neither a
+ * registered ticker nor a 68-hex asset id, so a solver's market-key derivation
+ * throws on it. Use {@link arkadeAssetLeg}. Removed next major. */
+declare const ARKADE_ASSET = "arkade:ASSET";
 declare const rfqPair: (from: string, to: string) => string;
 /** The implemented pair: pay a BOLT11 invoice out of an Arkade balance. */
 declare const LIGHTNING_SEND_PAIR: string;
@@ -287,9 +299,9 @@ declare const lightningSendRequest: (input: {
     senderPubkey: Uint8Array;
 }) => Record<string, unknown>;
 /** The rfq_request for an arkade↔arkade swap. Exactly one side may name an
- * asset id per direction (BTC has none); the pair string stays coarse and the
- * ids ride the profile, like the offer TLV. Forward-looking: the wire shape is
- * specified, the reference solver does not serve it yet. */
+ * asset id per direction (BTC has none), and the id is the leg itself — see
+ * {@link arkadeAssetLeg}. Forward-looking: the wire shape is specified, the
+ * reference solver does not serve it yet. */
 declare const arkadeSwapRequest: (input: {
     rfqId: string;
     /** Asset the trader deposits; omit when depositing BTC. */
@@ -920,4 +932,4 @@ declare function requestOnchainReceive(wallet: IWallet, arkServerUrl: string, tr
     secrets: ProvisionedClaimSecret;
 }>;
 
-export { onchainSendRequest as $, ARKADE_ASSET as A, awaitOnchainFill as B, type ChainSource as C, buildHtlcClaim as D, buildHtlcRefund as E, claimOnchainFill as F, classifyOnchainHtlc as G, type HtlcUtxo as H, type InvoiceFacts as I, deriveLightningReceive as J, deriveOnchainReceive as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, deriveOnchainSend as N, type OnchainHtlc as O, extractPreimage as P, httpTransport as Q, type RfqStatus as R, SOLO_REFUND_HEADROOM_SECONDS as S, lightningReceiveRequest as T, lightningSendRequest as U, lightningSendVtxoScript as V, newPreimage as W, newRfqId as X, offerTermsFromQuote as Y, onchainHtlcScript as Z, onchainReceiveRequest as _, type RfqTransport as a, paymentHashOf as a0, receiveVtxoScript as a1, relayTransport as a2, requestLightningReceive as a3, requestLightningSend as a4, requestOnchainReceive as a5, requestOnchainSend as a6, rfqPair as a7, unilateralClaimDelay as a8, unilateralRefundDelay as a9, unilateralRefundWithoutReceiverDelay as aa, verifyLockupAddress as ab, verifyReceiveInvoice as ac, type ChainUtxo as b, type OnchainHtlcPhase as c, ARKADE_BTC as d, AddressMismatch as e, LIGHTNING_RECEIVE_PAIR as f, LIGHTNING_SEND_PAIR as g, MIN_CLAIM_WINDOW_SECONDS as h, MIN_HEADROOM_SECONDS as i, ONCHAIN_BTC as j, ONCHAIN_CLAIM_MARGIN_SECONDS as k, ONCHAIN_DUST_SATS as l, ONCHAIN_ORDER_MARGIN_SECONDS as m, ONCHAIN_RECEIVE_PAIR as n, ONCHAIN_SECONDS_PER_BLOCK as o, ONCHAIN_SEND_PAIR as p, type OnchainHtlcParams as q, type OnchainNetwork as r, RFQ_TERMINAL_STATES as s, type RelaySocket as t, type RfqQuote as u, type RfqRefusalReason as v, SwapRefusal as w, arkadeSwapRequest as x, assertFundable as y, assertReceivable as z };
+export { onchainReceiveRequest as $, ARKADE_ASSET as A, assertReceivable as B, type ChainSource as C, awaitOnchainFill as D, buildHtlcClaim as E, buildHtlcRefund as F, claimOnchainFill as G, type HtlcUtxo as H, type InvoiceFacts as I, classifyOnchainHtlc as J, deriveLightningReceive as K, LIGHTNING_BTC as L, MAX_MIN_CONFIRMATIONS as M, deriveOnchainReceive as N, type OnchainHtlc as O, deriveOnchainSend as P, extractPreimage as Q, type RfqStatus as R, SOLO_REFUND_HEADROOM_SECONDS as S, httpTransport as T, lightningReceiveRequest as U, lightningSendRequest as V, lightningSendVtxoScript as W, newPreimage as X, newRfqId as Y, offerTermsFromQuote as Z, onchainHtlcScript as _, type RfqTransport as a, onchainSendRequest as a0, paymentHashOf as a1, receiveVtxoScript as a2, relayTransport as a3, requestLightningReceive as a4, requestLightningSend as a5, requestOnchainReceive as a6, requestOnchainSend as a7, rfqPair as a8, unilateralClaimDelay as a9, unilateralRefundDelay as aa, unilateralRefundWithoutReceiverDelay as ab, verifyLockupAddress as ac, verifyReceiveInvoice as ad, type ChainUtxo as b, type OnchainHtlcPhase as c, ARKADE_BTC as d, AddressMismatch as e, LIGHTNING_RECEIVE_PAIR as f, LIGHTNING_SEND_PAIR as g, MIN_CLAIM_WINDOW_SECONDS as h, MIN_HEADROOM_SECONDS as i, ONCHAIN_BTC as j, ONCHAIN_CLAIM_MARGIN_SECONDS as k, ONCHAIN_DUST_SATS as l, ONCHAIN_ORDER_MARGIN_SECONDS as m, ONCHAIN_RECEIVE_PAIR as n, ONCHAIN_SECONDS_PER_BLOCK as o, ONCHAIN_SEND_PAIR as p, type OnchainHtlcParams as q, type OnchainNetwork as r, RFQ_TERMINAL_STATES as s, type RelaySocket as t, type RfqQuote as u, type RfqRefusalReason as v, SwapRefusal as w, arkadeAssetLeg as x, arkadeSwapRequest as y, assertFundable as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/swap",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "description": "Client-side Arkade Intents asset swaps: discover markets, quote, create/track/cancel offers, restore from chain.",
   "repository": {
@@ -69,7 +69,7 @@
     "@noble/hashes": "2.0.1",
     "@scure/base": "2.0.0",
     "@scure/btc-signer": "2.0.1",
-    "@arkade-os/sdk": "0.4.63"
+    "@arkade-os/sdk": "0.4.64"
   },
   "peerDependencies": {
     "nostr-tools": "^2.12.0"