@arkade-os/swap 0.1.0-rc.2 → 0.1.0-rc.21
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.
- package/README.md +52 -2
- package/dist/advanced.cjs +8376 -0
- package/dist/advanced.d.cts +550 -0
- package/dist/advanced.d.ts +550 -0
- package/dist/advanced.js +451 -0
- package/dist/chunk-A3SHHRX4.js +104 -0
- package/dist/chunk-HUQQVBC4.js +4262 -0
- package/dist/{chunk-EOYGUCDM.js → chunk-ITFCQWPG.js} +755 -1382
- package/dist/chunk-PVB7EBAM.js +2517 -0
- package/dist/errors-C3h8ANmE.d.ts +1560 -0
- package/dist/errors-hm7aqnRM.d.cts +1560 -0
- package/dist/index.cjs +4861 -3988
- package/dist/index.d.cts +69 -2812
- package/dist/index.d.ts +69 -2812
- package/dist/index.js +179 -3719
- package/dist/lockupContract-5r5RlgOJ.d.cts +137 -0
- package/dist/lockupContract-5r5RlgOJ.d.ts +137 -0
- package/dist/node/index.cjs +61 -10
- package/dist/node/index.d.cts +249 -591
- package/dist/node/index.d.ts +249 -591
- package/dist/node/index.js +65 -10
- package/dist/nostr.cjs +191 -11
- package/dist/nostr.d.cts +23 -68
- package/dist/nostr.d.ts +23 -68
- package/dist/nostr.js +3 -4
- package/dist/offer-Bd9Yvd8Z.d.ts +261 -0
- package/dist/offer-F88rtL_I.d.cts +261 -0
- package/dist/protocol.cjs +4086 -3706
- package/dist/protocol.d.cts +163 -768
- package/dist/protocol.d.ts +163 -768
- package/dist/protocol.js +190 -173
- package/dist/repositories/realm/index.cjs +55 -11
- package/dist/repositories/realm/index.d.cts +18 -30
- package/dist/repositories/realm/index.d.ts +18 -30
- package/dist/repositories/realm/index.js +49 -12
- package/dist/repositories/sqlite/index.cjs +61 -10
- package/dist/repositories/sqlite/index.d.cts +7 -6
- package/dist/repositories/sqlite/index.d.ts +7 -6
- package/dist/repositories/sqlite/index.js +57 -11
- package/dist/repository-BuYWGAKz.d.cts +2261 -0
- package/dist/repository-DYnRLPt-.d.ts +2261 -0
- package/dist/rfq-60PGpQ_x.d.cts +950 -0
- package/dist/rfq-60PGpQ_x.d.ts +950 -0
- package/dist/watch-BTyiBLSd.d.ts +74 -0
- package/dist/watch-M_KY-5ho.d.cts +74 -0
- package/package.json +20 -10
- package/dist/chunk-LYCMM3VB.js +0 -1357
- package/dist/chunk-U7VWWTL6.js +0 -66
- package/dist/repository-_zU9_pM3.d.cts +0 -3426
- package/dist/repository-kO95noyv.d.ts +0 -3426
- package/dist/rfq-DdBV4JO5.d.cts +0 -1097
- package/dist/rfq-DdBV4JO5.d.ts +0 -1097
- package/dist/watch-CQqvwgwY.d.cts +0 -96
- package/dist/watch-wMbmfN4p.d.ts +0 -96
package/dist/protocol.js
CHANGED
|
@@ -1,42 +1,31 @@
|
|
|
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,
|
|
10
5
|
QUOTE_OPTIONS,
|
|
11
6
|
RFQ_SWAP_RETENTION_SECONDS,
|
|
12
7
|
RefundNotLocallyPossibleError,
|
|
13
8
|
RfqSwapManager,
|
|
14
9
|
RfqSwapOriginRequired,
|
|
15
|
-
addAssetSwap,
|
|
16
10
|
arkadeRefunder,
|
|
17
11
|
awaitLockupFunding,
|
|
18
12
|
awaitRfqResolution,
|
|
19
|
-
cancelOffer,
|
|
20
13
|
claimReceiveLockup,
|
|
21
14
|
classifyDepositSpend,
|
|
22
15
|
classifySpend,
|
|
23
16
|
corridorOutcome,
|
|
24
|
-
createOffer,
|
|
25
17
|
createRfqSwapRecord,
|
|
26
|
-
decodeOffer,
|
|
27
18
|
discoverMarkets,
|
|
28
|
-
encodeOffer,
|
|
29
19
|
findLockupVtxos,
|
|
30
20
|
findMarket,
|
|
31
|
-
getAssetSwaps,
|
|
32
21
|
isRfqSwapTerminal,
|
|
33
22
|
isRfqTerminal,
|
|
34
23
|
makeCachedFeedFetch,
|
|
24
|
+
marketAssetId,
|
|
25
|
+
marketCorridor,
|
|
35
26
|
nextOnchainAction,
|
|
36
27
|
normalizeRfqSwapRecord,
|
|
37
|
-
offerContract,
|
|
38
28
|
onchainSendProfile,
|
|
39
|
-
preimageForSwapRecord,
|
|
40
29
|
pushClaim,
|
|
41
30
|
pushRefundWithoutReceiver,
|
|
42
31
|
readLockupFate,
|
|
@@ -51,24 +40,24 @@ import {
|
|
|
51
40
|
senderIdentityForSwapRecord,
|
|
52
41
|
shouldRetainRfqSwap,
|
|
53
42
|
spendTxidsOf,
|
|
54
|
-
swapPrograms,
|
|
55
|
-
swapSecretsToRecord,
|
|
56
|
-
updateAssetSwap,
|
|
57
43
|
updateRfqSwapRecord,
|
|
58
44
|
validatePlan,
|
|
59
45
|
watchOfferSwaps
|
|
60
|
-
} from "./chunk-
|
|
46
|
+
} from "./chunk-ITFCQWPG.js";
|
|
61
47
|
import {
|
|
62
48
|
ARKADE_BTC,
|
|
49
|
+
ASSET_CARRIER_SATS,
|
|
63
50
|
AddressMismatch,
|
|
51
|
+
BTC_ASSET_ID,
|
|
64
52
|
L1_NETWORKS,
|
|
65
53
|
LIGHTNING_BTC,
|
|
66
54
|
LIGHTNING_RECEIVE_PAIR,
|
|
67
55
|
LIGHTNING_SEND_PAIR,
|
|
68
56
|
LOCKTIME_THRESHOLD,
|
|
69
57
|
LockupContractMissing,
|
|
70
|
-
LockupRegistrationFailed,
|
|
71
58
|
MAX_MIN_CONFIRMATIONS,
|
|
59
|
+
NoSpendableDepositError,
|
|
60
|
+
OFFER_PACKET_TYPE,
|
|
72
61
|
ONCHAIN_BTC,
|
|
73
62
|
ONCHAIN_CLAIM_MARGIN_SECONDS,
|
|
74
63
|
ONCHAIN_DUST_SATS,
|
|
@@ -76,21 +65,32 @@ import {
|
|
|
76
65
|
ONCHAIN_RECEIVE_PAIR,
|
|
77
66
|
ONCHAIN_SECONDS_PER_BLOCK,
|
|
78
67
|
ONCHAIN_SEND_PAIR,
|
|
68
|
+
OfferCovenantMismatchError,
|
|
69
|
+
PreimageNotRecoverableError,
|
|
79
70
|
SWAP_LOCKUP_CONTRACT_KIND,
|
|
80
71
|
SWAP_LOCKUP_CONTRACT_LABEL,
|
|
81
72
|
SWAP_LOCKUP_CONTRACT_TYPE,
|
|
73
|
+
addAssetSwap,
|
|
82
74
|
arkadeAssetLeg,
|
|
83
75
|
arkadeSwapRequest,
|
|
76
|
+
assertArkadeFundable,
|
|
84
77
|
assertFundable,
|
|
85
78
|
awaitOnchainFill,
|
|
86
79
|
buildHtlcClaim,
|
|
87
80
|
buildHtlcRefund,
|
|
81
|
+
cancelOffer,
|
|
82
|
+
canonicalAssetAmount,
|
|
88
83
|
claimOnchainFill,
|
|
89
84
|
classifyOnchainHtlc,
|
|
85
|
+
createOffer,
|
|
86
|
+
decodeOffer,
|
|
90
87
|
deriveLightningReceive,
|
|
91
88
|
deriveOnchainReceive,
|
|
92
89
|
deriveOnchainSend,
|
|
90
|
+
encodeOffer,
|
|
93
91
|
extractPreimage,
|
|
92
|
+
fillOffer,
|
|
93
|
+
getAssetSwaps,
|
|
94
94
|
httpTransport,
|
|
95
95
|
l1ScriptForAddress,
|
|
96
96
|
lightningReceiveContract,
|
|
@@ -99,23 +99,35 @@ import {
|
|
|
99
99
|
lightningSendRequest,
|
|
100
100
|
lockupContractParams,
|
|
101
101
|
newPreimage,
|
|
102
|
+
normalizeMakerPkScript,
|
|
103
|
+
normalizeMakerPublicKey,
|
|
104
|
+
offerContract,
|
|
102
105
|
onchainHtlcScript,
|
|
103
106
|
onchainReceiveRequest,
|
|
104
107
|
onchainSendRequest,
|
|
105
108
|
paymentHashOf,
|
|
109
|
+
preimageForSwapRecord,
|
|
106
110
|
registerLockupContract,
|
|
107
111
|
relayTransport,
|
|
112
|
+
requestArkadeSwap,
|
|
108
113
|
requestLightningReceive,
|
|
109
114
|
requestLightningSend,
|
|
110
115
|
requestOnchainReceive,
|
|
111
116
|
requestOnchainSend,
|
|
112
117
|
sealClaimPacket,
|
|
118
|
+
swapPrograms,
|
|
119
|
+
swapSecretsToRecord,
|
|
113
120
|
unilateralClaimDelay,
|
|
114
121
|
unilateralRefundDelay,
|
|
115
122
|
unilateralRefundWithoutReceiverDelay,
|
|
123
|
+
updateAssetSwap,
|
|
116
124
|
verifyLockupAddress,
|
|
125
|
+
verifyOfferAddress,
|
|
117
126
|
verifyReceiveInvoice
|
|
118
|
-
} from "./chunk-
|
|
127
|
+
} from "./chunk-PVB7EBAM.js";
|
|
128
|
+
import {
|
|
129
|
+
collectRfqSwaps
|
|
130
|
+
} from "./chunk-A3SHHRX4.js";
|
|
119
131
|
|
|
120
132
|
// src/activity.ts
|
|
121
133
|
import {
|
|
@@ -151,11 +163,6 @@ function swapActivityResolver(deps) {
|
|
|
151
163
|
groupId: `swap:${swap.rfqId}`,
|
|
152
164
|
label: LABELS[swap.kind],
|
|
153
165
|
kind: "swap",
|
|
154
|
-
// `"lost"` for a receive leg that ended `refunded` comes out
|
|
155
|
-
// of the translation rather than out of a branch here: that
|
|
156
|
-
// leg has no trader-side refund, every non-claim leaf of its
|
|
157
|
-
// covenant is the solver's, and the client's `lapsed` is
|
|
158
|
-
// that fact.
|
|
159
166
|
outcome: outcomeToken(swap.kind, swap.state),
|
|
160
167
|
metadata: { rfqId: swap.rfqId, swapKind: swap.kind }
|
|
161
168
|
}
|
|
@@ -164,8 +171,16 @@ function swapActivityResolver(deps) {
|
|
|
164
171
|
};
|
|
165
172
|
}
|
|
166
173
|
async function rfqSwapActivityInputs(deps) {
|
|
167
|
-
const records = await deps.repository
|
|
168
|
-
|
|
174
|
+
const records = await collectRfqSwaps(deps.repository);
|
|
175
|
+
const inputs = [];
|
|
176
|
+
for (let i = 0; i < records.length; i += 16) {
|
|
177
|
+
inputs.push(
|
|
178
|
+
...await Promise.all(
|
|
179
|
+
records.slice(i, i + 16).map((record) => activityInputOf(record, deps.indexer))
|
|
180
|
+
)
|
|
181
|
+
);
|
|
182
|
+
}
|
|
183
|
+
return inputs;
|
|
169
184
|
}
|
|
170
185
|
async function activityInputOf(stored, indexer) {
|
|
171
186
|
const record = normalizeRfqSwapRecord(stored);
|
|
@@ -248,6 +263,7 @@ var chainSourceFrom = (provider, network) => {
|
|
|
248
263
|
|
|
249
264
|
// src/payment/crossAsset.ts
|
|
250
265
|
import {
|
|
266
|
+
ASSET_CARRIER_SATS as ASSET_CARRIER_SATS2,
|
|
251
267
|
arkTarget,
|
|
252
268
|
asset as assetExt,
|
|
253
269
|
assetsOf,
|
|
@@ -255,7 +271,6 @@ import {
|
|
|
255
271
|
resolveAssetAmount
|
|
256
272
|
} from "@arkade-os/sdk";
|
|
257
273
|
var CROSS_ASSET_RAIL = "cross-asset";
|
|
258
|
-
var DEFAULT_CARRIER_SATS = 330;
|
|
259
274
|
var parseAssetId = (assetId) => {
|
|
260
275
|
try {
|
|
261
276
|
return assetExt.AssetId.fromString(assetId);
|
|
@@ -263,6 +278,7 @@ var parseAssetId = (assetId) => {
|
|
|
263
278
|
return void 0;
|
|
264
279
|
}
|
|
265
280
|
};
|
|
281
|
+
var marketLabel = (market) => `${market.base_asset.ticker || market.base_asset.id}/${market.quote_asset.ticker || market.quote_asset.id}`;
|
|
266
282
|
function crossAssetRail(deps) {
|
|
267
283
|
const planFor = async (asset) => {
|
|
268
284
|
const markets = await deps.discover();
|
|
@@ -311,7 +327,7 @@ function crossAssetRail(deps) {
|
|
|
311
327
|
);
|
|
312
328
|
}
|
|
313
329
|
const depositSats = Number(plan.deposit.atomic);
|
|
314
|
-
const carrier = deps.carrierSats ??
|
|
330
|
+
const carrier = deps.carrierSats ?? ASSET_CARRIER_SATS2;
|
|
315
331
|
return {
|
|
316
332
|
railId: CROSS_ASSET_RAIL,
|
|
317
333
|
// OPEN QUESTION for review: `total = amount + fee` forces the
|
|
@@ -325,7 +341,7 @@ function crossAssetRail(deps) {
|
|
|
325
341
|
spent: { assetId: BTC_ASSET_ID, amount: plan.deposit.atomic }
|
|
326
342
|
},
|
|
327
343
|
meta: {
|
|
328
|
-
market: plan.market
|
|
344
|
+
market: marketLabel(plan.market),
|
|
329
345
|
priceDisplay: plan.priceDisplay,
|
|
330
346
|
give: plan.give
|
|
331
347
|
},
|
|
@@ -375,7 +391,7 @@ function crossAssetRail(deps) {
|
|
|
375
391
|
}
|
|
376
392
|
|
|
377
393
|
// src/payment/rendezvous.ts
|
|
378
|
-
import {
|
|
394
|
+
import { sideLimits } from "@arkade-os/solver-discovery";
|
|
379
395
|
import { hex as hex3 } from "@scure/base";
|
|
380
396
|
var XONLY_HEX = /^[0-9a-f]{64}$/;
|
|
381
397
|
var rendezvousOf = (market, pinned) => {
|
|
@@ -395,15 +411,13 @@ var rendezvousOf = (market, pinned) => {
|
|
|
395
411
|
};
|
|
396
412
|
};
|
|
397
413
|
var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPubkey) => {
|
|
398
|
-
const
|
|
399
|
-
if (
|
|
400
|
-
const
|
|
401
|
-
const
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
quoteCorridor: payoutCorridor
|
|
406
|
-
});
|
|
414
|
+
const pinned = fallbackEmulatorPubkey ? hex3.encode(fallbackEmulatorPubkey) : void 0;
|
|
415
|
+
if (pinned !== void 0 && !XONLY_HEX.test(pinned)) return void 0;
|
|
416
|
+
const quoteCorridor = payoutCorridor === "lightning" ? "bolt11" : "bitcoin";
|
|
417
|
+
const isBtc = (id) => id === "btc" || /^(?:arkade|bolt11|bitcoin):[^/]+\/slip44:(?:0|1)$/.test(id ?? "");
|
|
418
|
+
const candidates = markets.filter(
|
|
419
|
+
(market) => marketCorridor(market, "base") === "arkade" && marketCorridor(market, "quote") === quoteCorridor && isBtc(marketAssetId(market, "base")) && isBtc(marketAssetId(market, "quote"))
|
|
420
|
+
);
|
|
407
421
|
for (const market of candidates) {
|
|
408
422
|
const rendezvous = rendezvousOf(market, pinned);
|
|
409
423
|
if (!rendezvous) continue;
|
|
@@ -415,130 +429,46 @@ var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPub
|
|
|
415
429
|
};
|
|
416
430
|
|
|
417
431
|
// src/payment/solverLightning.ts
|
|
418
|
-
import { assertNoAssets, assetsOf as
|
|
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
|
-
meta: {
|
|
481
|
-
rfqId: swap.rfqId,
|
|
482
|
-
validUntil: swap.quote.valid_until,
|
|
483
|
-
paymentHash: facts.paymentHash,
|
|
484
|
-
invoiceExpiresAt: facts.expiresAt,
|
|
485
|
-
solverPubkey: rendezvous.solverPubkey
|
|
486
|
-
},
|
|
487
|
-
send: async () => makeHandle2(SOLVER_LIGHTNING_RAIL, async (emit) => {
|
|
488
|
-
assertFundable({
|
|
489
|
-
quote: swap.quote,
|
|
490
|
-
invoiceExpiresAt: facts.expiresAt,
|
|
491
|
-
now: Math.floor(Date.now() / 1e3)
|
|
492
|
-
});
|
|
493
|
-
await deps.persist(swap);
|
|
494
|
-
await ctx.wallet.send({
|
|
495
|
-
address: swap.address,
|
|
496
|
-
amount: swap.fundAmount
|
|
497
|
-
});
|
|
498
|
-
emit({ status: "sent" });
|
|
499
|
-
const result = { railId: SOLVER_LIGHTNING_RAIL, swapId: swap.rfqId };
|
|
500
|
-
if (!deps.awaitSettlement) return result;
|
|
501
|
-
let preimage;
|
|
502
|
-
try {
|
|
503
|
-
({ preimage } = await deps.awaitSettlement(swap));
|
|
504
|
-
} catch (e) {
|
|
505
|
-
console.warn(
|
|
506
|
-
`${SOLVER_LIGHTNING_RAIL}: settlement watch failed; the payment is sent`,
|
|
507
|
-
e
|
|
508
|
-
);
|
|
509
|
-
return result;
|
|
510
|
-
}
|
|
511
|
-
const settled = { ...result, ...preimage !== void 0 && { preimage } };
|
|
512
|
-
emit({ status: "settled", result: settled });
|
|
513
|
-
return settled;
|
|
514
|
-
})
|
|
515
|
-
};
|
|
516
|
-
}
|
|
517
|
-
};
|
|
518
|
-
}
|
|
432
|
+
import { assertNoAssets as assertNoAssets2, assetsOf as assetsOf3, BIP21, invoiceTarget, makeHandle as makeHandle3 } from "@arkade-os/sdk";
|
|
519
433
|
|
|
520
434
|
// src/payment/solverOnchain.ts
|
|
521
435
|
import {
|
|
522
|
-
assertNoAssets
|
|
523
|
-
assetsOf as
|
|
436
|
+
assertNoAssets,
|
|
437
|
+
assetsOf as assetsOf2,
|
|
524
438
|
btcTarget,
|
|
525
|
-
makeHandle as
|
|
439
|
+
makeHandle as makeHandle2,
|
|
526
440
|
resolveSendAmount,
|
|
527
441
|
tryResolveSendAmount
|
|
528
442
|
} from "@arkade-os/sdk";
|
|
529
443
|
var SOLVER_ONCHAIN_RAIL = "solver-onchain";
|
|
530
444
|
var solverOnchainRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "onchain", amountSats, fallbackEmulatorPubkey);
|
|
445
|
+
async function fundSolverSend(railId, ctx, emit, deps, swap, settledFields) {
|
|
446
|
+
await deps.persist(swap);
|
|
447
|
+
await ctx.wallet.send({
|
|
448
|
+
address: swap.address,
|
|
449
|
+
amount: swap.fundAmount
|
|
450
|
+
});
|
|
451
|
+
emit({ status: "sent" });
|
|
452
|
+
const result = { railId, swapId: swap.rfqId };
|
|
453
|
+
if (!deps.awaitSettlement) return result;
|
|
454
|
+
let fields;
|
|
455
|
+
try {
|
|
456
|
+
fields = settledFields(await deps.awaitSettlement(swap));
|
|
457
|
+
} catch (e) {
|
|
458
|
+
console.warn(`${railId}: settlement watch failed; the payment is sent`, e);
|
|
459
|
+
return result;
|
|
460
|
+
}
|
|
461
|
+
const settled = { ...result, ...fields };
|
|
462
|
+
emit({ status: "settled", result: settled });
|
|
463
|
+
return settled;
|
|
464
|
+
}
|
|
531
465
|
function solverOnchainRail(deps) {
|
|
532
|
-
const rendezvousFor = async (amount) =>
|
|
533
|
-
if (amount === void 0) return void 0;
|
|
534
|
-
const markets = await deps.discover();
|
|
535
|
-
return solverOnchainRendezvous(markets, amount, deps.fallbackEmulatorPubkey);
|
|
536
|
-
};
|
|
466
|
+
const rendezvousFor = async (amount) => solverOnchainRendezvous(await deps.discover(), amount, deps.fallbackEmulatorPubkey);
|
|
537
467
|
return {
|
|
538
468
|
id: SOLVER_ONCHAIN_RAIL,
|
|
539
469
|
match: (req) => btcTarget(req.raw) !== void 0,
|
|
540
470
|
available: async (req) => {
|
|
541
|
-
if (
|
|
471
|
+
if (assetsOf2(req).length > 0) return false;
|
|
542
472
|
const address = btcTarget(req.raw);
|
|
543
473
|
if (!address) return false;
|
|
544
474
|
try {
|
|
@@ -552,7 +482,7 @@ function solverOnchainRail(deps) {
|
|
|
552
482
|
},
|
|
553
483
|
quote: async (req, ctx) => {
|
|
554
484
|
const address = btcTarget(req.raw);
|
|
555
|
-
|
|
485
|
+
assertNoAssets(SOLVER_ONCHAIN_RAIL, req);
|
|
556
486
|
const amount = resolveSendAmount(SOLVER_ONCHAIN_RAIL, req.raw, req.amount);
|
|
557
487
|
const payoutPkScript = l1ScriptForAddress(address, deps.l1Network);
|
|
558
488
|
const rendezvous = await rendezvousFor(amount);
|
|
@@ -581,6 +511,7 @@ function solverOnchainRail(deps) {
|
|
|
581
511
|
amount,
|
|
582
512
|
fee: swap.fundAmount - amount,
|
|
583
513
|
total: swap.fundAmount,
|
|
514
|
+
validUntil: swap.quote.valid_until,
|
|
584
515
|
meta: {
|
|
585
516
|
rfqId: swap.rfqId,
|
|
586
517
|
validUntil: swap.quote.valid_until,
|
|
@@ -591,7 +522,7 @@ function solverOnchainRail(deps) {
|
|
|
591
522
|
// not knowable now, so `amount` is the payout, not the net.
|
|
592
523
|
claimFeeDeductedFromPayout: true
|
|
593
524
|
},
|
|
594
|
-
send: async () =>
|
|
525
|
+
send: async () => makeHandle2(SOLVER_ONCHAIN_RAIL, async (emit) => {
|
|
595
526
|
assertFundable({
|
|
596
527
|
quote: swap.quote,
|
|
597
528
|
now: Math.floor(Date.now() / 1e3),
|
|
@@ -601,27 +532,107 @@ function solverOnchainRail(deps) {
|
|
|
601
532
|
direction: "send"
|
|
602
533
|
}
|
|
603
534
|
});
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
535
|
+
return fundSolverSend(
|
|
536
|
+
SOLVER_ONCHAIN_RAIL,
|
|
537
|
+
ctx,
|
|
538
|
+
emit,
|
|
539
|
+
deps,
|
|
540
|
+
swap,
|
|
541
|
+
({ txid }) => ({ txid })
|
|
542
|
+
);
|
|
543
|
+
})
|
|
544
|
+
};
|
|
545
|
+
}
|
|
546
|
+
};
|
|
547
|
+
}
|
|
548
|
+
|
|
549
|
+
// src/payment/solverLightning.ts
|
|
550
|
+
var SOLVER_LIGHTNING_RAIL = "solver-lightning";
|
|
551
|
+
var factsOf = (raw, decode, now) => {
|
|
552
|
+
const invoice = invoiceTarget(raw);
|
|
553
|
+
if (!invoice) return void 0;
|
|
554
|
+
let facts;
|
|
555
|
+
try {
|
|
556
|
+
facts = decode(invoice);
|
|
557
|
+
} catch {
|
|
558
|
+
return void 0;
|
|
559
|
+
}
|
|
560
|
+
if (!Number.isInteger(facts.amountSats) || facts.amountSats <= 0) return void 0;
|
|
561
|
+
if (facts.expiresAt <= now) return void 0;
|
|
562
|
+
return facts;
|
|
563
|
+
};
|
|
564
|
+
var contradicts = (req, facts) => req.amount !== void 0 && req.amount !== facts.amountSats && req.amount !== BIP21.amountSats(req.raw);
|
|
565
|
+
var solverLightningRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "lightning", amountSats, fallbackEmulatorPubkey);
|
|
566
|
+
function solverLightningRail(deps) {
|
|
567
|
+
const rendezvousFor = async (amountSats) => solverLightningRendezvous(await deps.discover(), amountSats, deps.fallbackEmulatorPubkey);
|
|
568
|
+
return {
|
|
569
|
+
id: SOLVER_LIGHTNING_RAIL,
|
|
570
|
+
match: (req) => invoiceTarget(req.raw) !== void 0,
|
|
571
|
+
available: async (req) => {
|
|
572
|
+
if (assetsOf3(req).length > 0) return false;
|
|
573
|
+
const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
|
|
574
|
+
if (!facts) return false;
|
|
575
|
+
if (contradicts(req, facts)) return false;
|
|
576
|
+
return await rendezvousFor(facts.amountSats) !== void 0;
|
|
577
|
+
},
|
|
578
|
+
quote: async (req, ctx) => {
|
|
579
|
+
assertNoAssets2(SOLVER_LIGHTNING_RAIL, req);
|
|
580
|
+
const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
|
|
581
|
+
if (!facts) {
|
|
582
|
+
throw new Error(
|
|
583
|
+
`${SOLVER_LIGHTNING_RAIL}: the request carries no payable BOLT11 invoice (amountless, expired, or undecodable)`
|
|
584
|
+
);
|
|
585
|
+
}
|
|
586
|
+
if (contradicts(req, facts)) {
|
|
587
|
+
throw new Error(
|
|
588
|
+
`${SOLVER_LIGHTNING_RAIL}: the request names ${req.amount} sats but the invoice is for ${facts.amountSats} \u2014 the payee is paid the invoice`
|
|
589
|
+
);
|
|
590
|
+
}
|
|
591
|
+
const rendezvous = await rendezvousFor(facts.amountSats);
|
|
592
|
+
if (!rendezvous) {
|
|
593
|
+
throw new Error(
|
|
594
|
+
`${SOLVER_LIGHTNING_RAIL}: no solver serves arkade:BTC -> lightning:BTC at ${facts.amountSats} sats`
|
|
595
|
+
);
|
|
596
|
+
}
|
|
597
|
+
const negotiated = await deps.connect(
|
|
598
|
+
rendezvous,
|
|
599
|
+
(transport) => requestLightningSend(ctx.wallet, transport, {
|
|
600
|
+
invoice: facts,
|
|
601
|
+
...deps.emulatorPubkey ? { emulatorPubkey: deps.emulatorPubkey } : {}
|
|
602
|
+
})
|
|
603
|
+
);
|
|
604
|
+
const swap = { ...negotiated, invoice: facts, rendezvous };
|
|
605
|
+
return {
|
|
606
|
+
railId: SOLVER_LIGHTNING_RAIL,
|
|
607
|
+
// `requestLightningSend` refuses a quote that reprices the
|
|
608
|
+
// invoice, so the spread is a fee on top.
|
|
609
|
+
amount: facts.amountSats,
|
|
610
|
+
fee: swap.fundAmount - facts.amountSats,
|
|
611
|
+
total: swap.fundAmount,
|
|
612
|
+
// The invoice can lapse before the quote does; the earlier bound
|
|
613
|
+
// is the one a holder must observe.
|
|
614
|
+
validUntil: Math.min(swap.quote.valid_until, facts.expiresAt),
|
|
615
|
+
meta: {
|
|
616
|
+
rfqId: swap.rfqId,
|
|
617
|
+
validUntil: swap.quote.valid_until,
|
|
618
|
+
paymentHash: facts.paymentHash,
|
|
619
|
+
invoiceExpiresAt: facts.expiresAt,
|
|
620
|
+
solverPubkey: rendezvous.solverPubkey
|
|
621
|
+
},
|
|
622
|
+
send: async () => makeHandle3(SOLVER_LIGHTNING_RAIL, async (emit) => {
|
|
623
|
+
assertFundable({
|
|
624
|
+
quote: swap.quote,
|
|
625
|
+
invoiceExpiresAt: facts.expiresAt,
|
|
626
|
+
now: Math.floor(Date.now() / 1e3)
|
|
608
627
|
});
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
`${SOLVER_ONCHAIN_RAIL}: settlement watch failed; the payment is sent`,
|
|
618
|
-
e
|
|
619
|
-
);
|
|
620
|
-
return result;
|
|
621
|
-
}
|
|
622
|
-
const settled = { ...result, txid };
|
|
623
|
-
emit({ status: "settled", result: settled });
|
|
624
|
-
return settled;
|
|
628
|
+
return fundSolverSend(
|
|
629
|
+
SOLVER_LIGHTNING_RAIL,
|
|
630
|
+
ctx,
|
|
631
|
+
emit,
|
|
632
|
+
deps,
|
|
633
|
+
swap,
|
|
634
|
+
({ preimage }) => ({ ...preimage !== void 0 && { preimage } })
|
|
635
|
+
);
|
|
625
636
|
})
|
|
626
637
|
};
|
|
627
638
|
}
|
|
@@ -629,6 +640,7 @@ function solverOnchainRail(deps) {
|
|
|
629
640
|
}
|
|
630
641
|
export {
|
|
631
642
|
ARKADE_BTC,
|
|
643
|
+
ASSET_CARRIER_SATS,
|
|
632
644
|
AddressMismatch,
|
|
633
645
|
BTC_ASSET_ID,
|
|
634
646
|
CROSS_ASSET_RAIL,
|
|
@@ -639,7 +651,6 @@ export {
|
|
|
639
651
|
LockupAmountMismatchError,
|
|
640
652
|
LockupContractMissing,
|
|
641
653
|
LockupNeedsRecoveryError,
|
|
642
|
-
LockupRegistrationFailed,
|
|
643
654
|
MAX_MIN_CONFIRMATIONS,
|
|
644
655
|
NoSpendableDepositError,
|
|
645
656
|
OFFER_PACKET_TYPE,
|
|
@@ -666,12 +677,14 @@ export {
|
|
|
666
677
|
arkadeAssetLeg,
|
|
667
678
|
arkadeRefunder,
|
|
668
679
|
arkadeSwapRequest,
|
|
680
|
+
assertArkadeFundable,
|
|
669
681
|
awaitLockupFunding,
|
|
670
682
|
awaitOnchainFill,
|
|
671
683
|
awaitRfqResolution,
|
|
672
684
|
buildHtlcClaim,
|
|
673
685
|
buildHtlcRefund,
|
|
674
686
|
cancelOffer,
|
|
687
|
+
canonicalAssetAmount,
|
|
675
688
|
chainSourceFrom,
|
|
676
689
|
claimOnchainFill,
|
|
677
690
|
claimReceiveLockup,
|
|
@@ -688,11 +701,11 @@ export {
|
|
|
688
701
|
discoverMarkets,
|
|
689
702
|
encodeOffer,
|
|
690
703
|
extractPreimage,
|
|
704
|
+
fillOffer,
|
|
691
705
|
findLockupVtxos,
|
|
692
706
|
findMarket,
|
|
693
707
|
getAssetSwaps,
|
|
694
708
|
httpTransport,
|
|
695
|
-
isRfqSwapTerminal,
|
|
696
709
|
isRfqTerminal,
|
|
697
710
|
l1ScriptForAddress,
|
|
698
711
|
lightningReceiveContract,
|
|
@@ -703,6 +716,8 @@ export {
|
|
|
703
716
|
makeCachedFeedFetch,
|
|
704
717
|
newPreimage,
|
|
705
718
|
nextOnchainAction,
|
|
719
|
+
normalizeMakerPkScript,
|
|
720
|
+
normalizeMakerPublicKey,
|
|
706
721
|
normalizeRfqSwapRecord,
|
|
707
722
|
offerContract,
|
|
708
723
|
onchainHtlcScript,
|
|
@@ -718,6 +733,7 @@ export {
|
|
|
718
733
|
refundIfUnresolved,
|
|
719
734
|
registerLockupContract,
|
|
720
735
|
relayTransport,
|
|
736
|
+
requestArkadeSwap,
|
|
721
737
|
requestLightningReceive,
|
|
722
738
|
requestLightningSend,
|
|
723
739
|
requestOnchainReceive,
|
|
@@ -747,6 +763,7 @@ export {
|
|
|
747
763
|
updateRfqSwapRecord,
|
|
748
764
|
validatePlan,
|
|
749
765
|
verifyLockupAddress,
|
|
766
|
+
verifyOfferAddress,
|
|
750
767
|
verifyReceiveInvoice,
|
|
751
768
|
watchOfferSwaps
|
|
752
769
|
};
|