@arkade-os/swap 0.0.19 → 0.0.20

package/dist/{chunk-D7GDHZCG.js → chunk-QJKMTPRQ.js}

@@ -1283,11 +1283,6 @@ var arkadeSwapRequest = (input) => {
       "set at least one of wantAsset or offerAsset \u2014 with neither set both legs are BTC, which is not a swap"
     );
   }
-  if (input.amountSide !== void 0 && input.amountSide !== "from") {
-    throw new Error(
-      'arkade\u2194arkade quotes are exact-in only: use amountSide "from" with the deposit amount'
-    );
-  }
   const pair = rfqPair(
     input.offerAsset ? arkadeAssetLeg(input.offerAsset) : ARKADE_BTC,
     input.wantAsset ? arkadeAssetLeg(input.wantAsset) : ARKADE_BTC
@@ -1298,7 +1293,7 @@ var arkadeSwapRequest = (input) => {
     type: "rfq_request",
     rfq_id: input.rfqId,
     pair,
-    amount_side: "from",
+    amount_side: input.amountSide ?? "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
@@ -1766,11 +1761,16 @@ var assertArkadeFundable = (input) => {
     throw gateError("quote_expired", "quote carries a non-positive amount");
   }
 };
+var quoteCarrierSats = (quote) => {
+  const published = quote.carrier_sats === void 0 ? 0n : BigInt(quote.carrier_sats);
+  return published > 0n ? published : ASSET_CARRIER_SATS;
+};
 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 amountSide = params.amountSide ?? "from";
   const [makerAddress, makerPublicKey] = await Promise.all([
     wallet.getAddress(),
     wallet.identity.xOnlyPublicKey()
@@ -1786,6 +1786,7 @@ async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
       ...params.offerAsset !== void 0 ? { offerAsset: params.offerAsset } : {},
       ...params.wantAsset !== void 0 ? { wantAsset: params.wantAsset } : {},
       amount: params.amount,
+      amountSide,
       makerPkScript,
       makerPublicKey
     })
@@ -1798,11 +1799,30 @@ async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
     ...params.offerAsset !== void 0 ? { offerAsset: params.offerAsset } : {},
     ...params.wantAsset !== void 0 ? { wantAsset: params.wantAsset } : {}
   });
-  if (BigInt(quote.from_amount).toString() !== canonicalAssetAmount(params.amount)) {
+  const quoted = amountSide === "from" ? quote.from_amount : quote.to_amount;
+  if (BigInt(quoted).toString() !== canonicalAssetAmount(params.amount)) {
     throw new Error(
-      `quote from_amount ${quote.from_amount} does not match the requested ${canonicalAssetAmount(params.amount)}`
+      `quote ${amountSide}_amount ${quoted} does not match the requested ${canonicalAssetAmount(params.amount)}`
     );
   }
+  if (params.maxFromAmount !== void 0) {
+    const cap = BigInt(canonicalAssetAmount(params.maxFromAmount));
+    if (BigInt(quote.from_amount) > cap) {
+      throw gateError(
+        "quote_amount_rejected",
+        `quote from_amount ${quote.from_amount} exceeds maxFromAmount ${cap}`
+      );
+    }
+  }
+  if (params.minToAmount !== void 0) {
+    const floorAmount = BigInt(canonicalAssetAmount(params.minToAmount));
+    if (BigInt(quote.to_amount) < floorAmount) {
+      throw gateError(
+        "quote_amount_rejected",
+        `quote to_amount ${quote.to_amount} is under minToAmount ${floorAmount}`
+      );
+    }
+  }
   const offer = await createOffer(wallet, arkServerUrl, {
     wantAmount: terms.wantAmount,
     ...terms.wantAsset !== void 0 ? { wantAsset: terms.wantAsset } : {},
@@ -1817,7 +1837,7 @@ async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
     pair,
     address: offer.address,
     fundAmount,
-    carrierSats: params.offerAsset !== void 0 ? ASSET_CARRIER_SATS : 0n,
+    carrierSats: params.offerAsset !== void 0 ? quoteCarrierSats(quote) : 0n,
     swapPkScript: offer.swapPkScript,
     offerHex: offer.offerHex,
     extension: offer.extension

package/dist/index.cjs

@@ -2555,11 +2555,6 @@ var arkadeSwapRequest = (input) => {
       "set at least one of wantAsset or offerAsset \u2014 with neither set both legs are BTC, which is not a swap"
     );
   }
-  if (input.amountSide !== void 0 && input.amountSide !== "from") {
-    throw new Error(
-      'arkade\u2194arkade quotes are exact-in only: use amountSide "from" with the deposit amount'
-    );
-  }
   const pair = rfqPair(
     input.offerAsset ? arkadeAssetLeg(input.offerAsset) : ARKADE_BTC,
     input.wantAsset ? arkadeAssetLeg(input.wantAsset) : ARKADE_BTC
@@ -2570,7 +2565,7 @@ var arkadeSwapRequest = (input) => {
     type: "rfq_request",
     rfq_id: input.rfqId,
     pair,
-    amount_side: "from",
+    amount_side: input.amountSide ?? "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
@@ -3038,11 +3033,16 @@ var assertArkadeFundable = (input) => {
     throw gateError("quote_expired", "quote carries a non-positive amount");
   }
 };
+var quoteCarrierSats = (quote) => {
+  const published = quote.carrier_sats === void 0 ? 0n : BigInt(quote.carrier_sats);
+  return published > 0n ? published : ASSET_CARRIER_SATS;
+};
 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 amountSide = params.amountSide ?? "from";
   const [makerAddress, makerPublicKey] = await Promise.all([
     wallet.getAddress(),
     wallet.identity.xOnlyPublicKey()
@@ -3058,6 +3058,7 @@ async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
       ...params.offerAsset !== void 0 ? { offerAsset: params.offerAsset } : {},
       ...params.wantAsset !== void 0 ? { wantAsset: params.wantAsset } : {},
       amount: params.amount,
+      amountSide,
       makerPkScript,
       makerPublicKey
     })
@@ -3070,11 +3071,30 @@ async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
     ...params.offerAsset !== void 0 ? { offerAsset: params.offerAsset } : {},
     ...params.wantAsset !== void 0 ? { wantAsset: params.wantAsset } : {}
   });
-  if (BigInt(quote.from_amount).toString() !== canonicalAssetAmount(params.amount)) {
+  const quoted = amountSide === "from" ? quote.from_amount : quote.to_amount;
+  if (BigInt(quoted).toString() !== canonicalAssetAmount(params.amount)) {
     throw new Error(
-      `quote from_amount ${quote.from_amount} does not match the requested ${canonicalAssetAmount(params.amount)}`
+      `quote ${amountSide}_amount ${quoted} does not match the requested ${canonicalAssetAmount(params.amount)}`
     );
   }
+  if (params.maxFromAmount !== void 0) {
+    const cap = BigInt(canonicalAssetAmount(params.maxFromAmount));
+    if (BigInt(quote.from_amount) > cap) {
+      throw gateError(
+        "quote_amount_rejected",
+        `quote from_amount ${quote.from_amount} exceeds maxFromAmount ${cap}`
+      );
+    }
+  }
+  if (params.minToAmount !== void 0) {
+    const floorAmount = BigInt(canonicalAssetAmount(params.minToAmount));
+    if (BigInt(quote.to_amount) < floorAmount) {
+      throw gateError(
+        "quote_amount_rejected",
+        `quote to_amount ${quote.to_amount} is under minToAmount ${floorAmount}`
+      );
+    }
+  }
   const offer = await createOffer(wallet, arkServerUrl, {
     wantAmount: terms.wantAmount,
     ...terms.wantAsset !== void 0 ? { wantAsset: terms.wantAsset } : {},
@@ -3089,7 +3109,7 @@ async function requestArkadeSwap(wallet, arkServerUrl, transport, params) {
     pair,
     address: offer.address,
     fundAmount,
-    carrierSats: params.offerAsset !== void 0 ? ASSET_CARRIER_SATS : 0n,
+    carrierSats: params.offerAsset !== void 0 ? quoteCarrierSats(quote) : 0n,
     swapPkScript: offer.swapPkScript,
     offerHex: offer.offerHex,
     extension: offer.extension

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-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 { 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-Cop29z0c.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-Cop29z0c.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-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';
+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-B95nPfaa.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-B95nPfaa.cjs';
 
 /**
  * Which wallet key signs this leg. Stored at `profile.signer`.

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-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 { 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-BrTpVPLy.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-BrTpVPLy.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-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';
+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-B95nPfaa.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-B95nPfaa.js';
 
 /**
  * Which wallet key signs this leg. Stored at `profile.signer`.

package/dist/index.js

@@ -100,7 +100,7 @@ import {
   verifyLockupAddress,
   verifyOfferAddress,
   verifyReceiveInvoice
-} from "./chunk-D7GDHZCG.js";
+} from "./chunk-QJKMTPRQ.js";
 import {
   InMemoryAssetSwapRepository,
   marketsCacheKey

package/dist/nostr.d.cts

@@ -1,4 +1,4 @@
-import { R as RfqTransport } from './rfq-D96aLvCA.cjs';
+import { R as RfqTransport } from './rfq-B95nPfaa.cjs';
 import { SimplePool } from 'nostr-tools';
 import '@arkade-os/sdk';
 

package/dist/nostr.d.ts

@@ -1,4 +1,4 @@
-import { R as RfqTransport } from './rfq-D96aLvCA.js';
+import { R as RfqTransport } from './rfq-B95nPfaa.js';
 import { SimplePool } from 'nostr-tools';
 import '@arkade-os/sdk';
 

package/dist/nostr.js

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

package/dist/repositories/realm/index.d.cts

@@ -1,8 +1,8 @@
 import { RealmLike } from '@arkade-os/sdk/repositories/realm';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-BXIcmIIC.cjs';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-Cop29z0c.cjs';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
-import '../../rfq-D96aLvCA.cjs';
+import '../../rfq-B95nPfaa.cjs';
 
 /**
  * Realm backend for React Native.

package/dist/repositories/realm/index.d.ts

@@ -1,8 +1,8 @@
 import { RealmLike } from '@arkade-os/sdk/repositories/realm';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-B6VPDGHC.js';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-BrTpVPLy.js';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
-import '../../rfq-D96aLvCA.js';
+import '../../rfq-B95nPfaa.js';
 
 /**
  * Realm backend for React Native.

package/dist/repositories/sqlite/index.d.cts

@@ -1,8 +1,8 @@
 import { SQLExecutor } from '@arkade-os/sdk/repositories/sqlite';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-BXIcmIIC.cjs';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-Cop29z0c.cjs';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
-import '../../rfq-D96aLvCA.cjs';
+import '../../rfq-B95nPfaa.cjs';
 
 /**
  * SQLite backend over the SDK's `SQLExecutor`, so any driver plugs in

package/dist/repositories/sqlite/index.d.ts

@@ -1,8 +1,8 @@
 import { SQLExecutor } from '@arkade-os/sdk/repositories/sqlite';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-B6VPDGHC.js';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-BrTpVPLy.js';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
-import '../../rfq-D96aLvCA.js';
+import '../../rfq-B95nPfaa.js';
 
 /**
  * SQLite backend over the SDK's `SQLExecutor`, so any driver plugs in

package/dist/{repository-B6VPDGHC.d.ts → repository-BrTpVPLy.d.ts}

@@ -1,6 +1,6 @@
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
 import { IWallet, ProvisionedKey, ProvisionedClaimSecret, RestArkProvider, RestIndexerProvider, VHTLC, Identity, IContractManager } from '@arkade-os/sdk';
-import { G as RfqStatus, R as RfqTransport, a as OnchainHtlc, f as ChainUtxo, C as ChainSource, v as OnchainHtlcPhase } from './rfq-D96aLvCA.js';
+import { G as RfqStatus, R as RfqTransport, a as OnchainHtlc, f as ChainUtxo, C as ChainSource, v as OnchainHtlcPhase } from './rfq-B95nPfaa.js';
 
 type AssetSwapStatus = "pending" | "cancelling" | "fulfilled" | "cancelled" | "recoverable" | "awaiting_fill" | "claimable" | "claimed" | "refunded_l1";
 /** The sentinel asset id for BTC itself, as opposed to a 68-hex asset id.

package/dist/{repository-BXIcmIIC.d.cts → repository-Cop29z0c.d.cts}

@@ -1,6 +1,6 @@
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
 import { IWallet, ProvisionedKey, ProvisionedClaimSecret, RestArkProvider, RestIndexerProvider, VHTLC, Identity, IContractManager } from '@arkade-os/sdk';
-import { G as RfqStatus, R as RfqTransport, a as OnchainHtlc, f as ChainUtxo, C as ChainSource, v as OnchainHtlcPhase } from './rfq-D96aLvCA.cjs';
+import { G as RfqStatus, R as RfqTransport, a as OnchainHtlc, f as ChainUtxo, C as ChainSource, v as OnchainHtlcPhase } from './rfq-B95nPfaa.cjs';
 
 type AssetSwapStatus = "pending" | "cancelling" | "fulfilled" | "cancelled" | "recoverable" | "awaiting_fill" | "claimable" | "claimed" | "refunded_l1";
 /** The sentinel asset id for BTC itself, as opposed to a 68-hex asset id.

package/dist/{rfq-D96aLvCA.d.ts → rfq-B95nPfaa.d.cts}

@@ -303,6 +303,8 @@ interface RfqQuote {
      * solver). */
     from_amount: number | string;
     to_amount: number | string;
+    /** Dust an asset rides on. NOT a fee — already netted into the amounts above. */
+    carrier_sats?: number | string;
     solver_pubkey: string;
     valid_until: number;
     /** HTLC-class quotes only; absent for arkade↔arkade. */
@@ -348,8 +350,8 @@ declare const lightningSendRequest: (input: {
  * Wire-compatible with the reference solver (`AssetRfqRequest`, strict):
  * `amount` is a canonical decimal string of atomic units (never a JSON
  * number — an Arkade asset's precision is not knowable client-side, so the
- * losslessness carve-out cannot be checked), `amount_side` is exact-in only
- * (`"from"`), and `profile` carries the trader's own covenant position
+ * losslessness carve-out cannot be checked), `amount_side` is `"from"` or
+ * `"to"`, and `profile` carries the trader's own covenant position
  * (`maker_pk_script`, `maker_public_key`) — the fill pays that script, and
  * `cancel` is signed by that key. */
 declare const arkadeSwapRequest: (input: {
@@ -358,8 +360,6 @@ declare const arkadeSwapRequest: (input: {
     offerAsset?: asset.AssetId;
     /** Asset the trader wants; omit when wanting BTC. */
     wantAsset?: asset.AssetId;
-    /** Exact-in only. `"to"` is refused client-side: the solver answers
-     * `exact_out_unsupported`, since the two legs are different assets. */
     amountSide?: "from" | "to";
     /** Atomic units of the deposit (`from`) leg. bigint-safe: encoded as a
      * canonical decimal string on the wire. */
@@ -710,8 +710,13 @@ declare function requestArkadeSwap(wallet: IWallet, arkServerUrl: string, transp
     offerAsset?: asset.AssetId;
     /** Asset the trader wants; omit when wanting BTC. */
     wantAsset?: asset.AssetId;
-    /** Deposit amount, in atomic units of the `from` leg. */
+    /** Atomic units of whichever leg `amountSide` names. */
     amount: bigint | number | string;
+    amountSide?: "from" | "to";
+    /** Bounds the side the SOLVER chose — the named side is echoed back verbatim,
+     * so asserting it proves nothing and an unbounded caller funds what it is asked. */
+    maxFromAmount?: bigint | number | string;
+    minToAmount?: bigint | number | string;
     rfqId?: string;
     /** Co-signer key override (33-byte compressed hex); see `createOffer`. */
     emulatorPubkey?: string;
@@ -725,7 +730,7 @@ declare function requestArkadeSwap(wallet: IWallet, arkServerUrl: string, transp
     /** What the deposit must carry: the quote's `from_amount`. Sats for a BTC
      * deposit, asset units for an asset deposit (plus a dust carrier). */
     fundAmount: bigint;
-    /** Dust sats carrier for an asset deposit; 0n for a BTC deposit. */
+    /** Dust sats to attach to an asset deposit; 0n for a BTC deposit. */
     carrierSats: bigint;
     /** The covenant's scriptPubKey, for watching the deposit and its spend. */
     swapPkScript: Uint8Array;

package/dist/{rfq-D96aLvCA.d.cts → rfq-B95nPfaa.d.ts}

@@ -303,6 +303,8 @@ interface RfqQuote {
      * solver). */
     from_amount: number | string;
     to_amount: number | string;
+    /** Dust an asset rides on. NOT a fee — already netted into the amounts above. */
+    carrier_sats?: number | string;
     solver_pubkey: string;
     valid_until: number;
     /** HTLC-class quotes only; absent for arkade↔arkade. */
@@ -348,8 +350,8 @@ declare const lightningSendRequest: (input: {
  * Wire-compatible with the reference solver (`AssetRfqRequest`, strict):
  * `amount` is a canonical decimal string of atomic units (never a JSON
  * number — an Arkade asset's precision is not knowable client-side, so the
- * losslessness carve-out cannot be checked), `amount_side` is exact-in only
- * (`"from"`), and `profile` carries the trader's own covenant position
+ * losslessness carve-out cannot be checked), `amount_side` is `"from"` or
+ * `"to"`, and `profile` carries the trader's own covenant position
  * (`maker_pk_script`, `maker_public_key`) — the fill pays that script, and
  * `cancel` is signed by that key. */
 declare const arkadeSwapRequest: (input: {
@@ -358,8 +360,6 @@ declare const arkadeSwapRequest: (input: {
     offerAsset?: asset.AssetId;
     /** Asset the trader wants; omit when wanting BTC. */
     wantAsset?: asset.AssetId;
-    /** Exact-in only. `"to"` is refused client-side: the solver answers
-     * `exact_out_unsupported`, since the two legs are different assets. */
     amountSide?: "from" | "to";
     /** Atomic units of the deposit (`from`) leg. bigint-safe: encoded as a
      * canonical decimal string on the wire. */
@@ -710,8 +710,13 @@ declare function requestArkadeSwap(wallet: IWallet, arkServerUrl: string, transp
     offerAsset?: asset.AssetId;
     /** Asset the trader wants; omit when wanting BTC. */
     wantAsset?: asset.AssetId;
-    /** Deposit amount, in atomic units of the `from` leg. */
+    /** Atomic units of whichever leg `amountSide` names. */
     amount: bigint | number | string;
+    amountSide?: "from" | "to";
+    /** Bounds the side the SOLVER chose — the named side is echoed back verbatim,
+     * so asserting it proves nothing and an unbounded caller funds what it is asked. */
+    maxFromAmount?: bigint | number | string;
+    minToAmount?: bigint | number | string;
     rfqId?: string;
     /** Co-signer key override (33-byte compressed hex); see `createOffer`. */
     emulatorPubkey?: string;
@@ -725,7 +730,7 @@ declare function requestArkadeSwap(wallet: IWallet, arkServerUrl: string, transp
     /** What the deposit must carry: the quote's `from_amount`. Sats for a BTC
      * deposit, asset units for an asset deposit (plus a dust carrier). */
     fundAmount: bigint;
-    /** Dust sats carrier for an asset deposit; 0n for a BTC deposit. */
+    /** Dust sats to attach to an asset deposit; 0n for a BTC deposit. */
     carrierSats: bigint;
     /** The covenant's scriptPubKey, for watching the deposit and its spend. */
     swapPkScript: Uint8Array;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/swap",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "type": "module",
   "description": "Client-side Arkade Intents asset swaps: discover markets, quote, create/track/cancel offers, restore from chain.",
   "repository": {
@@ -64,13 +64,13 @@
   "author": "Arkade-OS",
   "license": "MIT",
   "dependencies": {
-    "@arkade-os/solver-discovery": "0.2.5",
+    "@arkade-os/solver-discovery": "0.2.7",
     "@noble/ciphers": "2.1.1",
     "@noble/curves": "2.0.1",
     "@noble/hashes": "2.0.1",
     "@scure/base": "2.0.0",
     "@scure/btc-signer": "2.0.1",
-    "@arkade-os/sdk": "0.4.73"
+    "@arkade-os/sdk": "0.4.74"
   },
   "peerDependencies": {
     "nostr-tools": "^2.12.0"