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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/README.md +45 -10
  2. package/dist/advanced.cjs +6429 -3083
  3. package/dist/advanced.d.cts +325 -282
  4. package/dist/advanced.d.ts +325 -282
  5. package/dist/advanced.js +343 -34
  6. package/dist/chunk-A3SHHRX4.js +104 -0
  7. package/dist/chunk-FMRAV77W.js +3065 -0
  8. package/dist/{chunk-HV7EIUE2.js → chunk-HRMWBULL.js} +1773 -634
  9. package/dist/chunk-WKJFXXSR.js +3382 -0
  10. package/dist/index.cjs +6868 -3837
  11. package/dist/index.d.cts +71 -243
  12. package/dist/index.d.ts +71 -243
  13. package/dist/index.js +139 -167
  14. package/dist/lockupContract-D7BNjksX.d.ts +148 -0
  15. package/dist/lockupContract-G-9CNRMq.d.cts +148 -0
  16. package/dist/node/index.cjs +61 -10
  17. package/dist/node/index.d.cts +310 -639
  18. package/dist/node/index.d.ts +310 -639
  19. package/dist/node/index.js +65 -10
  20. package/dist/nostr.cjs +428 -49
  21. package/dist/nostr.d.cts +59 -70
  22. package/dist/nostr.d.ts +59 -70
  23. package/dist/nostr.js +268 -36
  24. package/dist/offer-CcJfx5Fj.d.cts +269 -0
  25. package/dist/offer-DdB1M6FZ.d.ts +269 -0
  26. package/dist/offerFillPlan-BII0PW92.d.cts +1642 -0
  27. package/dist/offerFillPlan-CNTLVD7j.d.ts +1642 -0
  28. package/dist/protocol.cjs +5591 -4064
  29. package/dist/protocol.d.cts +258 -355
  30. package/dist/protocol.d.ts +258 -355
  31. package/dist/protocol.js +209 -228
  32. package/dist/repositories/realm/index.cjs +55 -11
  33. package/dist/repositories/realm/index.d.cts +18 -30
  34. package/dist/repositories/realm/index.d.ts +18 -30
  35. package/dist/repositories/realm/index.js +49 -12
  36. package/dist/repositories/sqlite/index.cjs +61 -10
  37. package/dist/repositories/sqlite/index.d.cts +7 -6
  38. package/dist/repositories/sqlite/index.d.ts +7 -6
  39. package/dist/repositories/sqlite/index.js +57 -11
  40. package/dist/repository-DmPzpbd7.d.ts +2342 -0
  41. package/dist/repository-DqdLVrVv.d.cts +2342 -0
  42. package/dist/rfq-C0tHOvn6.d.cts +983 -0
  43. package/dist/rfq-C0tHOvn6.d.ts +983 -0
  44. package/dist/watch-BonYT9af.d.cts +74 -0
  45. package/dist/watch-CmJQDtsy.d.ts +74 -0
  46. package/package.json +12 -12
  47. package/dist/chunk-4PATNGYQ.js +0 -3297
  48. package/dist/chunk-ARYFNDJY.js +0 -1432
  49. package/dist/chunk-U7VWWTL6.js +0 -66
  50. package/dist/errors-CSpOUdCN.d.ts +0 -2216
  51. package/dist/errors-DVn92LQd.d.cts +0 -2216
  52. package/dist/lockupContract-6TYZOBbn.d.ts +0 -490
  53. package/dist/lockupContract-aLCQQiSu.d.cts +0 -490
  54. package/dist/repository-D0gFF_GA.d.cts +0 -3491
  55. package/dist/repository-tDT8p-Nx.d.ts +0 -3491
  56. package/dist/rfq-DhkgiwQ7.d.cts +0 -1126
  57. package/dist/rfq-DhkgiwQ7.d.ts +0 -1126
  58. package/dist/watch-C4cMEeZT.d.cts +0 -96
  59. package/dist/watch-DbWXdpzm.d.ts +0 -96
package/dist/protocol.js CHANGED
@@ -1,73 +1,62 @@
1
1
  import {
2
2
  ACTIVITY_TOKEN,
3
- BTC_ASSET_ID,
4
3
  LockupAmountMismatchError,
5
4
  LockupNeedsRecoveryError,
6
- NoSpendableDepositError,
7
- OFFER_PACKET_TYPE,
8
- OfferCovenantMismatchError,
9
- PreimageNotRecoverableError,
5
+ OnchainReceiveNeedsChainSource,
10
6
  QUOTE_OPTIONS,
7
+ REFUND_MTP_LAG_SECONDS,
11
8
  RFQ_SWAP_RETENTION_SECONDS,
12
9
  RefundNotLocallyPossibleError,
13
10
  RfqSwapManager,
14
11
  RfqSwapOriginRequired,
15
- addAssetSwap,
16
12
  arkadeRefunder,
17
- awaitLockupFunding,
18
13
  awaitRfqResolution,
19
- cancelOffer,
20
- claimReceiveLockup,
14
+ chainSourceFrom,
21
15
  classifyDepositSpend,
22
16
  classifySpend,
23
17
  corridorOutcome,
24
- createOffer,
25
18
  createRfqSwapRecord,
26
- decodeOffer,
27
19
  discoverMarkets,
28
- encodeOffer,
29
20
  findLockupVtxos,
30
21
  findMarket,
31
- getAssetSwaps,
32
22
  isRfqSwapTerminal,
33
23
  isRfqTerminal,
34
24
  makeCachedFeedFetch,
25
+ marketAssetId,
26
+ marketCorridor,
35
27
  nextOnchainAction,
28
+ nextOnchainReceiveAction,
36
29
  normalizeRfqSwapRecord,
37
- offerContract,
30
+ onchainReceiveProfile,
38
31
  onchainSendProfile,
39
- preimageForSwapRecord,
40
32
  pushClaim,
41
33
  pushRefundWithoutReceiver,
42
34
  readLockupFate,
43
35
  rebuildRfqSwap,
44
- refundIfUnresolved,
45
36
  restoreAssetSwaps,
46
- rfqClaimSecretOf,
47
- rfqCorridorHandlers,
48
- rfqSecretsProfile,
49
- rfqSignerOf,
50
37
  rfqSwapOriginOf,
51
38
  senderIdentityForSwapRecord,
52
39
  shouldRetainRfqSwap,
53
40
  spendTxidsOf,
54
- swapPrograms,
55
- swapSecretsToRecord,
56
- updateAssetSwap,
57
41
  updateRfqSwapRecord,
58
42
  validatePlan,
43
+ watchMarkets,
59
44
  watchOfferSwaps
60
- } from "./chunk-4PATNGYQ.js";
45
+ } from "./chunk-WKJFXXSR.js";
61
46
  import {
62
47
  ARKADE_BTC,
48
+ ASSET_CARRIER_SATS,
63
49
  AddressMismatch,
64
- L1_NETWORKS,
50
+ BTC_ASSET_ID,
65
51
  LIGHTNING_BTC,
66
52
  LIGHTNING_RECEIVE_PAIR,
67
53
  LIGHTNING_SEND_PAIR,
68
54
  LOCKTIME_THRESHOLD,
69
55
  LockupContractMissing,
70
56
  MAX_MIN_CONFIRMATIONS,
57
+ MIN_CLAIM_WINDOW_SECONDS,
58
+ NoSpendableDepositError,
59
+ OFFER_PACKET_TYPE,
71
60
  ONCHAIN_BTC,
72
61
  ONCHAIN_CLAIM_MARGIN_SECONDS,
73
62
  ONCHAIN_DUST_SATS,
@@ -75,21 +64,32 @@ import {
75
64
  ONCHAIN_RECEIVE_PAIR,
76
65
  ONCHAIN_SECONDS_PER_BLOCK,
77
66
  ONCHAIN_SEND_PAIR,
67
+ OfferCovenantMismatchError,
68
+ PreimageNotRecoverableError,
78
69
  SWAP_LOCKUP_CONTRACT_KIND,
79
70
  SWAP_LOCKUP_CONTRACT_LABEL,
80
71
  SWAP_LOCKUP_CONTRACT_TYPE,
72
+ addAssetSwap,
81
73
  arkadeAssetLeg,
82
74
  arkadeSwapRequest,
75
+ assertArkadeFundable,
83
76
  assertFundable,
84
77
  awaitOnchainFill,
85
78
  buildHtlcClaim,
86
79
  buildHtlcRefund,
80
+ cancelOffer,
81
+ canonicalAssetAmount,
87
82
  claimOnchainFill,
88
83
  classifyOnchainHtlc,
84
+ createOffer,
85
+ decodeOffer,
89
86
  deriveLightningReceive,
90
87
  deriveOnchainReceive,
91
88
  deriveOnchainSend,
89
+ encodeOffer,
92
90
  extractPreimage,
91
+ fillOffer,
92
+ getAssetSwaps,
93
93
  httpTransport,
94
94
  l1ScriptForAddress,
95
95
  lightningReceiveContract,
@@ -98,23 +98,40 @@ import {
98
98
  lightningSendRequest,
99
99
  lockupContractParams,
100
100
  newPreimage,
101
+ normalizeMakerPkScript,
102
+ normalizeMakerPublicKey,
103
+ offerContract,
104
+ offerVtxoScript,
101
105
  onchainHtlcScript,
102
106
  onchainReceiveRequest,
103
107
  onchainSendRequest,
104
108
  paymentHashOf,
109
+ preimageForSwapRecord,
105
110
  registerLockupContract,
106
111
  relayTransport,
112
+ requestArkadeSwap,
107
113
  requestLightningReceive,
108
114
  requestLightningSend,
109
115
  requestOnchainReceive,
110
116
  requestOnchainSend,
117
+ rfqClaimSecretOf,
118
+ rfqCorridorHandlers,
119
+ rfqSecretsProfile,
120
+ rfqSignerOf,
111
121
  sealClaimPacket,
122
+ swapPrograms,
123
+ swapSecretsToRecord,
112
124
  unilateralClaimDelay,
113
125
  unilateralRefundDelay,
114
126
  unilateralRefundWithoutReceiverDelay,
127
+ updateAssetSwap,
115
128
  verifyLockupAddress,
129
+ verifyOfferAddress,
116
130
  verifyReceiveInvoice
117
- } from "./chunk-ARYFNDJY.js";
131
+ } from "./chunk-FMRAV77W.js";
132
+ import {
133
+ collectRfqSwaps
134
+ } from "./chunk-A3SHHRX4.js";
118
135
 
119
136
  // src/activity.ts
120
137
  import {
@@ -124,7 +141,8 @@ import { hex } from "@scure/base";
124
141
  var LABELS = {
125
142
  lightning_send: "Lightning send",
126
143
  lightning_receive: "Lightning receive",
127
- onchain_send: "Onchain send"
144
+ onchain_send: "Onchain send",
145
+ onchain_receive: "Onchain receive"
128
146
  };
129
147
  var outcomeToken = (kind, state) => ACTIVITY_TOKEN[corridorOutcome(kind, state)];
130
148
  function swapActivityResolver(deps) {
@@ -150,11 +168,6 @@ function swapActivityResolver(deps) {
150
168
  groupId: `swap:${swap.rfqId}`,
151
169
  label: LABELS[swap.kind],
152
170
  kind: "swap",
153
- // `"lost"` for a receive leg that ended `refunded` comes out
154
- // of the translation rather than out of a branch here: that
155
- // leg has no trader-side refund, every non-claim leaf of its
156
- // covenant is the solver's, and the client's `lapsed` is
157
- // that fact.
158
171
  outcome: outcomeToken(swap.kind, swap.state),
159
172
  metadata: { rfqId: swap.rfqId, swapKind: swap.kind }
160
173
  }
@@ -163,8 +176,16 @@ function swapActivityResolver(deps) {
163
176
  };
164
177
  }
165
178
  async function rfqSwapActivityInputs(deps) {
166
- const records = await deps.repository.getAllRfqSwaps();
167
- return Promise.all(records.map((record) => activityInputOf(record, deps.indexer)));
179
+ const records = await collectRfqSwaps(deps.repository);
180
+ const inputs = [];
181
+ for (let i = 0; i < records.length; i += 16) {
182
+ inputs.push(
183
+ ...await Promise.all(
184
+ records.slice(i, i + 16).map((record) => activityInputOf(record, deps.indexer))
185
+ )
186
+ );
187
+ }
188
+ return inputs;
168
189
  }
169
190
  async function activityInputOf(stored, indexer) {
170
191
  const record = normalizeRfqSwapRecord(stored);
@@ -202,51 +223,9 @@ async function lockupTxids(indexer, record, wantFunding) {
202
223
  }
203
224
  }
204
225
 
205
- // src/chainSource.ts
206
- import * as btc from "@scure/btc-signer";
207
- import { hex as hex2 } from "@scure/base";
208
- var addressOf = (pkScript, network) => btc.Address(L1_NETWORKS[network]).encode(btc.OutScript.decode(pkScript));
209
- var chainSourceFrom = (provider, network) => {
210
- const spenderFromHistory = async (txid, vout, pkScript) => {
211
- const txs = await provider.getTransactions(addressOf(pkScript, network));
212
- return txs.find((tx) => tx.vin?.some((i) => i.txid === txid && i.vout === vout))?.txid;
213
- };
214
- return {
215
- async getScriptUtxos(pkScript) {
216
- const address = addressOf(pkScript, network);
217
- const [coins, tip] = await Promise.all([
218
- provider.getCoins(address),
219
- provider.getChainTip()
220
- ]);
221
- return coins.map((coin) => ({
222
- txid: coin.txid,
223
- vout: coin.vout,
224
- amount: BigInt(coin.value),
225
- // Zero, not one: calling a mempool output "1 deep" would let a
226
- // 1-confirmation policy claim against a replaceable transaction.
227
- confirmations: coin.status.confirmed && typeof coin.status.block_height === "number" ? Math.max(0, tip.height - coin.status.block_height + 1) : 0
228
- }));
229
- },
230
- async getSpendingTx(txid, vout, pkScript) {
231
- const outspends = await provider.getTxOutspends(txid);
232
- const outspend = outspends[vout];
233
- if (!outspend?.spent) return null;
234
- const spender = outspend.txid || await spenderFromHistory(txid, vout, pkScript);
235
- if (!spender) return null;
236
- const raw = await provider.getRawTransaction(spender);
237
- return { txHex: hex2.encode(raw) };
238
- },
239
- broadcast(txHex) {
240
- return provider.broadcastTransaction(txHex);
241
- },
242
- async getMtp() {
243
- return (await provider.getChainTip()).time;
244
- }
245
- };
246
- };
247
-
248
226
  // src/payment/crossAsset.ts
249
227
  import {
228
+ ASSET_CARRIER_SATS as ASSET_CARRIER_SATS2,
250
229
  arkTarget,
251
230
  asset as assetExt,
252
231
  assetsOf,
@@ -254,7 +233,6 @@ import {
254
233
  resolveAssetAmount
255
234
  } from "@arkade-os/sdk";
256
235
  var CROSS_ASSET_RAIL = "cross-asset";
257
- var DEFAULT_CARRIER_SATS = 330;
258
236
  var parseAssetId = (assetId) => {
259
237
  try {
260
238
  return assetExt.AssetId.fromString(assetId);
@@ -311,7 +289,7 @@ function crossAssetRail(deps) {
311
289
  );
312
290
  }
313
291
  const depositSats = Number(plan.deposit.atomic);
314
- const carrier = deps.carrierSats ?? DEFAULT_CARRIER_SATS;
292
+ const carrier = deps.carrierSats ?? ASSET_CARRIER_SATS2;
315
293
  return {
316
294
  railId: CROSS_ASSET_RAIL,
317
295
  // OPEN QUESTION for review: `total = amount + fee` forces the
@@ -375,8 +353,8 @@ function crossAssetRail(deps) {
375
353
  }
376
354
 
377
355
  // src/payment/rendezvous.ts
378
- import { selectMarkets, sideLimits } from "@arkade-os/solver-discovery";
379
- import { hex as hex3 } from "@scure/base";
356
+ import { sideLimits } from "@arkade-os/solver-discovery";
357
+ import { hex as hex2 } from "@scure/base";
380
358
  var XONLY_HEX = /^[0-9a-f]{64}$/;
381
359
  var rendezvousOf = (market, pinned) => {
382
360
  const transports = { nostr: { relays: market.transports?.nostr?.relays ?? [] } };
@@ -395,15 +373,13 @@ var rendezvousOf = (market, pinned) => {
395
373
  };
396
374
  };
397
375
  var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPubkey) => {
398
- const encoded = fallbackEmulatorPubkey ? hex3.encode(fallbackEmulatorPubkey) : void 0;
399
- if (encoded !== void 0 && !XONLY_HEX.test(encoded)) return void 0;
400
- const pinned = encoded;
401
- const candidates = selectMarkets(markets, {
402
- baseId: BTC_ASSET_ID,
403
- quoteId: BTC_ASSET_ID,
404
- baseCorridor: "arkade",
405
- quoteCorridor: payoutCorridor
406
- });
376
+ const pinned = fallbackEmulatorPubkey ? hex2.encode(fallbackEmulatorPubkey) : void 0;
377
+ if (pinned !== void 0 && !XONLY_HEX.test(pinned)) return void 0;
378
+ const quoteCorridor = payoutCorridor === "lightning" ? "bolt11" : "bitcoin";
379
+ const isBtc = (id) => id === "btc" || /^(?:arkade|bolt11|bitcoin):[^/]+\/slip44:(?:0|1)$/.test(id ?? "");
380
+ const candidates = markets.filter(
381
+ (market) => marketCorridor(market, "base") === "arkade" && marketCorridor(market, "quote") === quoteCorridor && isBtc(marketAssetId(market, "base")) && isBtc(marketAssetId(market, "quote"))
382
+ );
407
383
  for (const market of candidates) {
408
384
  const rendezvous = rendezvousOf(market, pinned);
409
385
  if (!rendezvous) continue;
@@ -415,133 +391,46 @@ var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPub
415
391
  };
416
392
 
417
393
  // src/payment/solverLightning.ts
418
- import { assertNoAssets, assetsOf as assetsOf2, invoiceTarget, makeHandle as makeHandle2 } from "@arkade-os/sdk";
419
- var SOLVER_LIGHTNING_RAIL = "solver-lightning";
420
- var factsOf = (raw, decode, now) => {
421
- const invoice = invoiceTarget(raw);
422
- if (!invoice) return void 0;
423
- let facts;
424
- try {
425
- facts = decode(invoice);
426
- } catch {
427
- return void 0;
428
- }
429
- if (!Number.isInteger(facts.amountSats) || facts.amountSats <= 0) return void 0;
430
- if (facts.expiresAt <= now) return void 0;
431
- return facts;
432
- };
433
- var solverLightningRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "lightning", amountSats, fallbackEmulatorPubkey);
434
- function solverLightningRail(deps) {
435
- const rendezvousFor = async (amountSats) => solverLightningRendezvous(await deps.discover(), amountSats, deps.fallbackEmulatorPubkey);
436
- return {
437
- id: SOLVER_LIGHTNING_RAIL,
438
- match: (req) => invoiceTarget(req.raw) !== void 0,
439
- available: async (req) => {
440
- if (assetsOf2(req).length > 0) return false;
441
- const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
442
- if (!facts) return false;
443
- if (req.amount !== void 0 && req.amount !== facts.amountSats) return false;
444
- return await rendezvousFor(facts.amountSats) !== void 0;
445
- },
446
- quote: async (req, ctx) => {
447
- assertNoAssets(SOLVER_LIGHTNING_RAIL, req);
448
- const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
449
- if (!facts) {
450
- throw new Error(
451
- `${SOLVER_LIGHTNING_RAIL}: the request carries no payable BOLT11 invoice (amountless, expired, or undecodable)`
452
- );
453
- }
454
- if (req.amount !== void 0 && req.amount !== facts.amountSats) {
455
- throw new Error(
456
- `${SOLVER_LIGHTNING_RAIL}: the request names ${req.amount} sats but the invoice is for ${facts.amountSats} \u2014 the payee is paid the invoice`
457
- );
458
- }
459
- const rendezvous = await rendezvousFor(facts.amountSats);
460
- if (!rendezvous) {
461
- throw new Error(
462
- `${SOLVER_LIGHTNING_RAIL}: no solver serves arkade:BTC -> lightning:BTC at ${facts.amountSats} sats`
463
- );
464
- }
465
- const negotiated = await deps.connect(
466
- rendezvous,
467
- (transport) => requestLightningSend(ctx.wallet, transport, {
468
- invoice: facts,
469
- ...deps.emulatorPubkey ? { emulatorPubkey: deps.emulatorPubkey } : {}
470
- })
471
- );
472
- const swap = { ...negotiated, invoice: facts, rendezvous };
473
- return {
474
- railId: SOLVER_LIGHTNING_RAIL,
475
- // `requestLightningSend` refuses a quote that reprices the
476
- // invoice, so the spread is a fee on top.
477
- amount: facts.amountSats,
478
- fee: swap.fundAmount - facts.amountSats,
479
- total: swap.fundAmount,
480
- // The invoice can lapse before the quote does; the earlier bound
481
- // is the one a holder must observe.
482
- validUntil: Math.min(swap.quote.valid_until, facts.expiresAt),
483
- meta: {
484
- rfqId: swap.rfqId,
485
- validUntil: swap.quote.valid_until,
486
- paymentHash: facts.paymentHash,
487
- invoiceExpiresAt: facts.expiresAt,
488
- solverPubkey: rendezvous.solverPubkey
489
- },
490
- send: async () => makeHandle2(SOLVER_LIGHTNING_RAIL, async (emit) => {
491
- assertFundable({
492
- quote: swap.quote,
493
- invoiceExpiresAt: facts.expiresAt,
494
- now: Math.floor(Date.now() / 1e3)
495
- });
496
- await deps.persist(swap);
497
- await ctx.wallet.send({
498
- address: swap.address,
499
- amount: swap.fundAmount
500
- });
501
- emit({ status: "sent" });
502
- const result = { railId: SOLVER_LIGHTNING_RAIL, swapId: swap.rfqId };
503
- if (!deps.awaitSettlement) return result;
504
- let preimage;
505
- try {
506
- ({ preimage } = await deps.awaitSettlement(swap));
507
- } catch (e) {
508
- console.warn(
509
- `${SOLVER_LIGHTNING_RAIL}: settlement watch failed; the payment is sent`,
510
- e
511
- );
512
- return result;
513
- }
514
- const settled = { ...result, ...preimage !== void 0 && { preimage } };
515
- emit({ status: "settled", result: settled });
516
- return settled;
517
- })
518
- };
519
- }
520
- };
521
- }
394
+ import { assertNoAssets as assertNoAssets2, assetsOf as assetsOf3, BIP21, invoiceTarget, makeHandle as makeHandle3 } from "@arkade-os/sdk";
522
395
 
523
396
  // src/payment/solverOnchain.ts
524
397
  import {
525
- assertNoAssets as assertNoAssets2,
526
- assetsOf as assetsOf3,
398
+ assertNoAssets,
399
+ assetsOf as assetsOf2,
527
400
  btcTarget,
528
- makeHandle as makeHandle3,
401
+ makeHandle as makeHandle2,
529
402
  resolveSendAmount,
530
403
  tryResolveSendAmount
531
404
  } from "@arkade-os/sdk";
532
405
  var SOLVER_ONCHAIN_RAIL = "solver-onchain";
533
406
  var solverOnchainRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "onchain", amountSats, fallbackEmulatorPubkey);
407
+ async function fundSolverSend(railId, ctx, emit, deps, swap, settledFields) {
408
+ await deps.persist(swap);
409
+ await ctx.wallet.send({
410
+ address: swap.address,
411
+ amount: swap.fundAmount
412
+ });
413
+ emit({ status: "sent" });
414
+ const result = { railId, swapId: swap.rfqId };
415
+ if (!deps.awaitSettlement) return result;
416
+ let fields;
417
+ try {
418
+ fields = settledFields(await deps.awaitSettlement(swap));
419
+ } catch (e) {
420
+ console.warn(`${railId}: settlement watch failed; the payment is sent`, e);
421
+ return result;
422
+ }
423
+ const settled = { ...result, ...fields };
424
+ emit({ status: "settled", result: settled });
425
+ return settled;
426
+ }
534
427
  function solverOnchainRail(deps) {
535
- const rendezvousFor = async (amount) => {
536
- if (amount === void 0) return void 0;
537
- const markets = await deps.discover();
538
- return solverOnchainRendezvous(markets, amount, deps.fallbackEmulatorPubkey);
539
- };
428
+ const rendezvousFor = async (amount) => solverOnchainRendezvous(await deps.discover(), amount, deps.fallbackEmulatorPubkey);
540
429
  return {
541
430
  id: SOLVER_ONCHAIN_RAIL,
542
431
  match: (req) => btcTarget(req.raw) !== void 0,
543
432
  available: async (req) => {
544
- if (assetsOf3(req).length > 0) return false;
433
+ if (assetsOf2(req).length > 0) return false;
545
434
  const address = btcTarget(req.raw);
546
435
  if (!address) return false;
547
436
  try {
@@ -555,7 +444,7 @@ function solverOnchainRail(deps) {
555
444
  },
556
445
  quote: async (req, ctx) => {
557
446
  const address = btcTarget(req.raw);
558
- assertNoAssets2(SOLVER_ONCHAIN_RAIL, req);
447
+ assertNoAssets(SOLVER_ONCHAIN_RAIL, req);
559
448
  const amount = resolveSendAmount(SOLVER_ONCHAIN_RAIL, req.raw, req.amount);
560
449
  const payoutPkScript = l1ScriptForAddress(address, deps.l1Network);
561
450
  const rendezvous = await rendezvousFor(amount);
@@ -595,7 +484,7 @@ function solverOnchainRail(deps) {
595
484
  // not knowable now, so `amount` is the payout, not the net.
596
485
  claimFeeDeductedFromPayout: true
597
486
  },
598
- send: async () => makeHandle3(SOLVER_ONCHAIN_RAIL, async (emit) => {
487
+ send: async () => makeHandle2(SOLVER_ONCHAIN_RAIL, async (emit) => {
599
488
  assertFundable({
600
489
  quote: swap.quote,
601
490
  now: Math.floor(Date.now() / 1e3),
@@ -605,27 +494,107 @@ function solverOnchainRail(deps) {
605
494
  direction: "send"
606
495
  }
607
496
  });
608
- await deps.persist(swap);
609
- await ctx.wallet.send({
610
- address: swap.address,
611
- amount: swap.fundAmount
497
+ return fundSolverSend(
498
+ SOLVER_ONCHAIN_RAIL,
499
+ ctx,
500
+ emit,
501
+ deps,
502
+ swap,
503
+ ({ txid }) => ({ txid })
504
+ );
505
+ })
506
+ };
507
+ }
508
+ };
509
+ }
510
+
511
+ // src/payment/solverLightning.ts
512
+ var SOLVER_LIGHTNING_RAIL = "solver-lightning";
513
+ var factsOf = (raw, decode, now) => {
514
+ const invoice = invoiceTarget(raw);
515
+ if (!invoice) return void 0;
516
+ let facts;
517
+ try {
518
+ facts = decode(invoice);
519
+ } catch {
520
+ return void 0;
521
+ }
522
+ if (!Number.isInteger(facts.amountSats) || facts.amountSats <= 0) return void 0;
523
+ if (facts.expiresAt <= now) return void 0;
524
+ return facts;
525
+ };
526
+ var contradicts = (req, facts) => req.amount !== void 0 && req.amount !== facts.amountSats && req.amount !== BIP21.amountSats(req.raw);
527
+ var solverLightningRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "lightning", amountSats, fallbackEmulatorPubkey);
528
+ function solverLightningRail(deps) {
529
+ const rendezvousFor = async (amountSats) => solverLightningRendezvous(await deps.discover(), amountSats, deps.fallbackEmulatorPubkey);
530
+ return {
531
+ id: SOLVER_LIGHTNING_RAIL,
532
+ match: (req) => invoiceTarget(req.raw) !== void 0,
533
+ available: async (req) => {
534
+ if (assetsOf3(req).length > 0) return false;
535
+ const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
536
+ if (!facts) return false;
537
+ if (contradicts(req, facts)) return false;
538
+ return await rendezvousFor(facts.amountSats) !== void 0;
539
+ },
540
+ quote: async (req, ctx) => {
541
+ assertNoAssets2(SOLVER_LIGHTNING_RAIL, req);
542
+ const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
543
+ if (!facts) {
544
+ throw new Error(
545
+ `${SOLVER_LIGHTNING_RAIL}: the request carries no payable BOLT11 invoice (amountless, expired, or undecodable)`
546
+ );
547
+ }
548
+ if (contradicts(req, facts)) {
549
+ throw new Error(
550
+ `${SOLVER_LIGHTNING_RAIL}: the request names ${req.amount} sats but the invoice is for ${facts.amountSats} \u2014 the payee is paid the invoice`
551
+ );
552
+ }
553
+ const rendezvous = await rendezvousFor(facts.amountSats);
554
+ if (!rendezvous) {
555
+ throw new Error(
556
+ `${SOLVER_LIGHTNING_RAIL}: no solver serves arkade:BTC -> lightning:BTC at ${facts.amountSats} sats`
557
+ );
558
+ }
559
+ const negotiated = await deps.connect(
560
+ rendezvous,
561
+ (transport) => requestLightningSend(ctx.wallet, transport, {
562
+ invoice: facts,
563
+ ...deps.emulatorPubkey ? { emulatorPubkey: deps.emulatorPubkey } : {}
564
+ })
565
+ );
566
+ const swap = { ...negotiated, invoice: facts, rendezvous };
567
+ return {
568
+ railId: SOLVER_LIGHTNING_RAIL,
569
+ // `requestLightningSend` refuses a quote that reprices the
570
+ // invoice, so the spread is a fee on top.
571
+ amount: facts.amountSats,
572
+ fee: swap.fundAmount - facts.amountSats,
573
+ total: swap.fundAmount,
574
+ // The invoice can lapse before the quote does; the earlier bound
575
+ // is the one a holder must observe.
576
+ validUntil: Math.min(swap.quote.valid_until, facts.expiresAt),
577
+ meta: {
578
+ rfqId: swap.rfqId,
579
+ validUntil: swap.quote.valid_until,
580
+ paymentHash: facts.paymentHash,
581
+ invoiceExpiresAt: facts.expiresAt,
582
+ solverPubkey: rendezvous.solverPubkey
583
+ },
584
+ send: async () => makeHandle3(SOLVER_LIGHTNING_RAIL, async (emit) => {
585
+ assertFundable({
586
+ quote: swap.quote,
587
+ invoiceExpiresAt: facts.expiresAt,
588
+ now: Math.floor(Date.now() / 1e3)
612
589
  });
613
- emit({ status: "sent" });
614
- const result = { railId: SOLVER_ONCHAIN_RAIL, swapId: swap.rfqId };
615
- if (!deps.awaitSettlement) return result;
616
- let txid;
617
- try {
618
- ({ txid } = await deps.awaitSettlement(swap));
619
- } catch (e) {
620
- console.warn(
621
- `${SOLVER_ONCHAIN_RAIL}: settlement watch failed; the payment is sent`,
622
- e
623
- );
624
- return result;
625
- }
626
- const settled = { ...result, txid };
627
- emit({ status: "settled", result: settled });
628
- return settled;
590
+ return fundSolverSend(
591
+ SOLVER_LIGHTNING_RAIL,
592
+ ctx,
593
+ emit,
594
+ deps,
595
+ swap,
596
+ ({ preimage }) => ({ ...preimage !== void 0 && { preimage } })
597
+ );
629
598
  })
630
599
  };
631
600
  }
@@ -633,6 +602,7 @@ function solverOnchainRail(deps) {
633
602
  }
634
603
  export {
635
604
  ARKADE_BTC,
605
+ ASSET_CARRIER_SATS,
636
606
  AddressMismatch,
637
607
  BTC_ASSET_ID,
638
608
  CROSS_ASSET_RAIL,
@@ -644,6 +614,7 @@ export {
644
614
  LockupContractMissing,
645
615
  LockupNeedsRecoveryError,
646
616
  MAX_MIN_CONFIRMATIONS,
617
+ MIN_CLAIM_WINDOW_SECONDS,
647
618
  NoSpendableDepositError,
648
619
  OFFER_PACKET_TYPE,
649
620
  ONCHAIN_BTC,
@@ -654,8 +625,10 @@ export {
654
625
  ONCHAIN_SECONDS_PER_BLOCK,
655
626
  ONCHAIN_SEND_PAIR,
656
627
  OfferCovenantMismatchError,
628
+ OnchainReceiveNeedsChainSource,
657
629
  PreimageNotRecoverableError,
658
630
  QUOTE_OPTIONS,
631
+ REFUND_MTP_LAG_SECONDS,
659
632
  RFQ_SWAP_RETENTION_SECONDS,
660
633
  RefundNotLocallyPossibleError,
661
634
  RfqSwapManager,
@@ -669,15 +642,15 @@ export {
669
642
  arkadeAssetLeg,
670
643
  arkadeRefunder,
671
644
  arkadeSwapRequest,
672
- awaitLockupFunding,
645
+ assertArkadeFundable,
673
646
  awaitOnchainFill,
674
647
  awaitRfqResolution,
675
648
  buildHtlcClaim,
676
649
  buildHtlcRefund,
677
650
  cancelOffer,
651
+ canonicalAssetAmount,
678
652
  chainSourceFrom,
679
653
  claimOnchainFill,
680
- claimReceiveLockup,
681
654
  classifyDepositSpend,
682
655
  classifyOnchainHtlc,
683
656
  classifySpend,
@@ -691,6 +664,7 @@ export {
691
664
  discoverMarkets,
692
665
  encodeOffer,
693
666
  extractPreimage,
667
+ fillOffer,
694
668
  findLockupVtxos,
695
669
  findMarket,
696
670
  getAssetSwaps,
@@ -705,9 +679,14 @@ export {
705
679
  makeCachedFeedFetch,
706
680
  newPreimage,
707
681
  nextOnchainAction,
682
+ nextOnchainReceiveAction,
683
+ normalizeMakerPkScript,
684
+ normalizeMakerPublicKey,
708
685
  normalizeRfqSwapRecord,
709
686
  offerContract,
687
+ offerVtxoScript,
710
688
  onchainHtlcScript,
689
+ onchainReceiveProfile,
711
690
  onchainReceiveRequest,
712
691
  onchainSendProfile,
713
692
  onchainSendRequest,
@@ -717,9 +696,9 @@ export {
717
696
  pushRefundWithoutReceiver,
718
697
  readLockupFate,
719
698
  rebuildRfqSwap,
720
- refundIfUnresolved,
721
699
  registerLockupContract,
722
700
  relayTransport,
701
+ requestArkadeSwap,
723
702
  requestLightningReceive,
724
703
  requestLightningSend,
725
704
  requestOnchainReceive,
@@ -749,6 +728,8 @@ export {
749
728
  updateRfqSwapRecord,
750
729
  validatePlan,
751
730
  verifyLockupAddress,
731
+ verifyOfferAddress,
752
732
  verifyReceiveInvoice,
733
+ watchMarkets,
753
734
  watchOfferSwaps
754
735
  };