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