@arkade-os/swap 0.1.0-rc.21 → 0.1.0-rc.23
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 +7 -2
- package/dist/advanced.cjs +875 -129
- package/dist/advanced.d.cts +158 -14
- package/dist/advanced.d.ts +158 -14
- package/dist/advanced.js +255 -4
- package/dist/{chunk-ITFCQWPG.js → chunk-DQ2DY2L2.js} +223 -11
- package/dist/{chunk-HUQQVBC4.js → chunk-MZX62KMU.js} +220 -12
- package/dist/{chunk-PVB7EBAM.js → chunk-UFJEO4VV.js} +47 -21
- package/dist/{errors-hm7aqnRM.d.cts → errors-5q4e3PnH.d.cts} +48 -16
- package/dist/{errors-C3h8ANmE.d.ts → errors-DQ35FKJf.d.ts} +48 -16
- package/dist/index.cjs +670 -185
- package/dist/index.d.cts +5 -5
- package/dist/index.d.ts +5 -5
- package/dist/index.js +5 -3
- package/dist/node/index.d.cts +26 -4
- package/dist/node/index.d.ts +26 -4
- package/dist/nostr.cjs +12 -9
- package/dist/nostr.d.cts +1 -1
- package/dist/nostr.d.ts +1 -1
- package/dist/nostr.js +3 -1
- package/dist/{offer-Bd9Yvd8Z.d.ts → offer--IpfzhIm.d.ts} +1 -1
- package/dist/{offer-F88rtL_I.d.cts → offer-DqTXQeP1.d.cts} +1 -1
- package/dist/protocol.cjs +395 -156
- package/dist/protocol.d.cts +45 -8
- package/dist/protocol.d.ts +45 -8
- package/dist/protocol.js +10 -3
- package/dist/repositories/realm/index.d.cts +2 -2
- package/dist/repositories/realm/index.d.ts +2 -2
- package/dist/repositories/sqlite/index.d.cts +2 -2
- package/dist/repositories/sqlite/index.d.ts +2 -2
- package/dist/{repository-DYnRLPt-.d.ts → repository-B4rQWmS2.d.cts} +88 -20
- package/dist/{repository-BuYWGAKz.d.cts → repository-D_qvJk1S.d.ts} +88 -20
- package/dist/{rfq-60PGpQ_x.d.cts → rfq-BgdgO9OO.d.cts} +16 -7
- package/dist/{rfq-60PGpQ_x.d.ts → rfq-BgdgO9OO.d.ts} +16 -7
- package/dist/{watch-BTyiBLSd.d.ts → watch-BkPz0vf8.d.ts} +1 -1
- package/dist/{watch-M_KY-5ho.d.cts → watch-RRhKuBkh.d.cts} +1 -1
- package/package.json +3 -3
package/dist/advanced.cjs
CHANGED
|
@@ -913,7 +913,7 @@ async function classifyOnchainHtlc(chain, input) {
|
|
|
913
913
|
if (mtp >= input.htlc.refundLocktime) return { phase: "refundable", utxo: best };
|
|
914
914
|
return { phase: "claimable", utxo: best };
|
|
915
915
|
}
|
|
916
|
-
var import_base4, import_sha22, import_legacy, btc, ONCHAIN_ORDER_MARGIN_SECONDS, ONCHAIN_CLAIM_MARGIN_SECONDS, MAX_MIN_CONFIRMATIONS, LOCKTIME_THRESHOLD, ONCHAIN_SECONDS_PER_BLOCK, ONCHAIN_DUST_SATS, ONCHAIN_CLAIM_VSIZE, paymentHashOf, h160FromPaymentHash, assertPreimageMatches, gateError, L1_NETWORKS, l1ScriptForAddress, buildLeafSpend, buildHtlcClaim;
|
|
916
|
+
var import_base4, import_sha22, import_legacy, btc, import_sdk5, ONCHAIN_ORDER_MARGIN_SECONDS, ONCHAIN_CLAIM_MARGIN_SECONDS, MAX_MIN_CONFIRMATIONS, LOCKTIME_THRESHOLD, ONCHAIN_SECONDS_PER_BLOCK, ONCHAIN_DUST_SATS, ONCHAIN_CLAIM_VSIZE, paymentHashOf, h160FromPaymentHash, assertPreimageMatches, gateError, L1_NETWORKS, l1ScriptForAddress, buildLeafSpend, buildHtlcClaim, buildHtlcRefund;
|
|
917
917
|
var init_onchainHtlc = __esm({
|
|
918
918
|
"src/onchainHtlc.ts"() {
|
|
919
919
|
"use strict";
|
|
@@ -921,6 +921,7 @@ var init_onchainHtlc = __esm({
|
|
|
921
921
|
import_sha22 = require("@noble/hashes/sha2.js");
|
|
922
922
|
import_legacy = require("@noble/hashes/legacy.js");
|
|
923
923
|
btc = __toESM(require("@scure/btc-signer"), 1);
|
|
924
|
+
import_sdk5 = require("@arkade-os/sdk");
|
|
924
925
|
ONCHAIN_ORDER_MARGIN_SECONDS = 2 * 60 * 60;
|
|
925
926
|
ONCHAIN_CLAIM_MARGIN_SECONDS = 90 * 60;
|
|
926
927
|
MAX_MIN_CONFIRMATIONS = 6;
|
|
@@ -1008,6 +1009,19 @@ var init_onchainHtlc = __esm({
|
|
|
1008
1009
|
sequence: 4294967293
|
|
1009
1010
|
});
|
|
1010
1011
|
};
|
|
1012
|
+
buildHtlcRefund = (input) => buildLeafSpend({
|
|
1013
|
+
htlc: input.htlc,
|
|
1014
|
+
utxo: input.utxo,
|
|
1015
|
+
leaf: input.htlc.leaves.refund,
|
|
1016
|
+
controlBlock: input.htlc.controlBlocks.refund,
|
|
1017
|
+
stackAboveSig: [],
|
|
1018
|
+
payoutPkScript: input.payoutPkScript,
|
|
1019
|
+
feeRateSatVb: input.feeRateSatVb,
|
|
1020
|
+
sign: input.sign,
|
|
1021
|
+
lockTime: input.htlc.refundLocktime,
|
|
1022
|
+
// any value below 0xffffffff enables nLockTime enforcement
|
|
1023
|
+
sequence: 4294967294
|
|
1024
|
+
});
|
|
1011
1025
|
}
|
|
1012
1026
|
});
|
|
1013
1027
|
|
|
@@ -1087,7 +1101,7 @@ function deriveLightningSend(input) {
|
|
|
1087
1101
|
throw new Error("lightning-send quote is missing profile.receiver_pk_script");
|
|
1088
1102
|
}
|
|
1089
1103
|
const contractParams = {
|
|
1090
|
-
solverPubkey: (0,
|
|
1104
|
+
solverPubkey: (0, import_sdk7.toXOnly)(import_base7.hex.decode(quote.solver_pubkey), "solver key"),
|
|
1091
1105
|
refundLocktime: quote.refund_locktime,
|
|
1092
1106
|
operatorPubkey: input.operatorPubkey,
|
|
1093
1107
|
paymentHash: input.paymentHash,
|
|
@@ -1128,7 +1142,7 @@ function deriveOnchainSend(input) {
|
|
|
1128
1142
|
throw new Error("onchain-send quote is missing a binding field");
|
|
1129
1143
|
}
|
|
1130
1144
|
const contractParams = {
|
|
1131
|
-
solverPubkey: (0,
|
|
1145
|
+
solverPubkey: (0, import_sdk7.toXOnly)(import_base7.hex.decode(quote.solver_pubkey), "solver key"),
|
|
1132
1146
|
refundLocktime,
|
|
1133
1147
|
operatorPubkey: input.operatorPubkey,
|
|
1134
1148
|
paymentHash: input.paymentHash,
|
|
@@ -1136,7 +1150,7 @@ function deriveOnchainSend(input) {
|
|
|
1136
1150
|
emulatorPubkey: input.emulatorPubkey,
|
|
1137
1151
|
senderPubkey: input.senderPubkey,
|
|
1138
1152
|
receiverPkScript: solverHex(receiverPkScriptHex, "profile.receiver_pk_script"),
|
|
1139
|
-
refundPkScript:
|
|
1153
|
+
refundPkScript: import_sdk7.ArkAddress.decode(input.refundAddress).pkScript
|
|
1140
1154
|
};
|
|
1141
1155
|
const { script, address } = matchQuotedLockup(
|
|
1142
1156
|
quote,
|
|
@@ -1147,7 +1161,7 @@ function deriveOnchainSend(input) {
|
|
|
1147
1161
|
const htlcParams = {
|
|
1148
1162
|
paymentHash: input.paymentHash,
|
|
1149
1163
|
claimKey: input.payoutPubkey,
|
|
1150
|
-
refundKey: (0,
|
|
1164
|
+
refundKey: (0, import_sdk7.toXOnly)(import_base7.hex.decode(htlcPubkey), "solver L1 htlc key"),
|
|
1151
1165
|
refundLocktime: htlcLocktime
|
|
1152
1166
|
};
|
|
1153
1167
|
const htlc = onchainHtlcScript(htlcParams, input.l1Network);
|
|
@@ -1199,17 +1213,53 @@ function deriveLightningReceive(input) {
|
|
|
1199
1213
|
}
|
|
1200
1214
|
};
|
|
1201
1215
|
}
|
|
1202
|
-
|
|
1216
|
+
function deriveOnchainReceive(input) {
|
|
1217
|
+
const { quote } = input;
|
|
1218
|
+
const profile = quote.profile ?? {};
|
|
1219
|
+
const refundLocktime = quote.refund_locktime;
|
|
1220
|
+
const claimPubkey = profile.claim_pubkey;
|
|
1221
|
+
const htlcLocktime = profile.htlc_locktime;
|
|
1222
|
+
const htlcAddress = profile.htlc_address;
|
|
1223
|
+
const minConfirmations = profile.min_confirmations;
|
|
1224
|
+
const solverRefundPkScriptHex = profile.solver_refund_pk_script;
|
|
1225
|
+
if (refundLocktime === void 0 || claimPubkey === void 0 || htlcLocktime === void 0 || minConfirmations === void 0 || solverRefundPkScriptHex === void 0) {
|
|
1226
|
+
throw new Error("onchain-receive quote is missing a binding field");
|
|
1227
|
+
}
|
|
1228
|
+
const { script, address } = matchReceiveLockup(
|
|
1229
|
+
input,
|
|
1230
|
+
refundLocktime,
|
|
1231
|
+
solverRefundPkScriptHex
|
|
1232
|
+
).matched;
|
|
1233
|
+
const htlcParams = {
|
|
1234
|
+
paymentHash: input.paymentHash,
|
|
1235
|
+
claimKey: (0, import_sdk7.toXOnly)(import_base7.hex.decode(claimPubkey), "solver L1 claim key"),
|
|
1236
|
+
refundKey: input.refundPubkey,
|
|
1237
|
+
refundLocktime: htlcLocktime
|
|
1238
|
+
};
|
|
1239
|
+
const htlc = onchainHtlcScript(htlcParams, input.l1Network);
|
|
1240
|
+
if (htlc.address !== htlcAddress) throw new AddressMismatch(htlc.address, htlcAddress);
|
|
1241
|
+
return {
|
|
1242
|
+
address,
|
|
1243
|
+
swapPkScript: script.pkScript,
|
|
1244
|
+
script,
|
|
1245
|
+
htlc,
|
|
1246
|
+
htlcParams,
|
|
1247
|
+
refundLocktime,
|
|
1248
|
+
htlcLocktime,
|
|
1249
|
+
minConfirmations
|
|
1250
|
+
};
|
|
1251
|
+
}
|
|
1252
|
+
var import_base7, import_solver_discovery, import_legacy2, import_sdk7, import_sdk8, solverHex, quoteSats, quoteAmountSats, quoteExpectedSats, ARKADE_BTC, LIGHTNING_BTC, ONCHAIN_BTC, arkadeAssetLeg, rfqPair, LIGHTNING_SEND_PAIR, LIGHTNING_RECEIVE_PAIR, ONCHAIN_SEND_PAIR, ONCHAIN_RECEIVE_PAIR, RFQ_REFUSAL_ERROR_CODES, isRfqRefusalErrorCode, REFUSAL_FIELDS, REFUSAL_UNITS, safeInteger, safeRefusalDetail, refusalMessage, SwapRefusal, AddressMismatch, newRfqId, lightningSendRequest, arkadeSwapRequest, canonicalAssetAmount, normalizeHexBytes, normalizeMakerPkScript, normalizeMakerPublicKey, MIN_HEADROOM_SECONDS, assertFinite, MAX_PAIR_LENGTH, assertPairLength, verifyLockupAddress, LOCKUP_SHAPE_VARIANTS, matchQuotedLockup, assertFundable, expectQuote, pairOf, SEQUENCE_GRANULARITY_SECONDS, SOLO_REFUND_HEADROOM_SECONDS, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, seconds, suiteVhtlc, offerTermsFromQuote, verifyOfferAddress, quoteCarrierSats, l1NetworkFromArk, onchainSendRequest, lightningReceiveRequest, onchainReceiveRequest, MIN_CLAIM_WINDOW_SECONDS, assertReceivable, matchReceiveLockup;
|
|
1203
1253
|
var init_rfq = __esm({
|
|
1204
1254
|
"src/rfq.ts"() {
|
|
1205
1255
|
"use strict";
|
|
1206
1256
|
import_base7 = require("@scure/base");
|
|
1207
1257
|
import_solver_discovery = require("@arkade-os/solver-discovery");
|
|
1208
1258
|
import_legacy2 = require("@noble/hashes/legacy.js");
|
|
1209
|
-
|
|
1259
|
+
import_sdk7 = require("@arkade-os/sdk");
|
|
1210
1260
|
init_onchainHtlc();
|
|
1211
1261
|
init_onchainHtlc();
|
|
1212
|
-
|
|
1262
|
+
import_sdk8 = require("@arkade-os/sdk");
|
|
1213
1263
|
init_claimPacket();
|
|
1214
1264
|
init_lockupContract();
|
|
1215
1265
|
init_offer();
|
|
@@ -1450,6 +1500,12 @@ var init_rfq = __esm({
|
|
|
1450
1500
|
const fail = (reason, message) => {
|
|
1451
1501
|
throw gateError(reason, message);
|
|
1452
1502
|
};
|
|
1503
|
+
if (input.quote.pair.split("->").some((leg) => leg.startsWith("ethereum:"))) {
|
|
1504
|
+
fail(
|
|
1505
|
+
"evm_funding_unavailable",
|
|
1506
|
+
"EVM funding is unavailable until local contract, finality, and deadline verification is implemented"
|
|
1507
|
+
);
|
|
1508
|
+
}
|
|
1453
1509
|
if (input.quote.valid_until === void 0) {
|
|
1454
1510
|
fail("quote_malformed", "quote carries no valid_until");
|
|
1455
1511
|
}
|
|
@@ -1567,7 +1623,7 @@ var init_rfq = __esm({
|
|
|
1567
1623
|
type: "seconds",
|
|
1568
1624
|
value: BigInt(value)
|
|
1569
1625
|
});
|
|
1570
|
-
suiteVhtlc = (params, roles) => new
|
|
1626
|
+
suiteVhtlc = (params, roles) => new import_sdk7.VHTLC.ScriptV2({
|
|
1571
1627
|
sender: roles.sender,
|
|
1572
1628
|
receiver: roles.receiver,
|
|
1573
1629
|
server: params.operatorPubkey,
|
|
@@ -1644,6 +1700,21 @@ var init_rfq = __esm({
|
|
|
1644
1700
|
...input.claimPacket === void 0 ? {} : { claim_packet: input.claimPacket }
|
|
1645
1701
|
}
|
|
1646
1702
|
});
|
|
1703
|
+
onchainReceiveRequest = (input) => ({
|
|
1704
|
+
v: 1,
|
|
1705
|
+
type: "rfq_request",
|
|
1706
|
+
rfq_id: input.rfqId,
|
|
1707
|
+
pair: ONCHAIN_RECEIVE_PAIR,
|
|
1708
|
+
amount_side: input.amountSide,
|
|
1709
|
+
amount: input.amount,
|
|
1710
|
+
profile: {
|
|
1711
|
+
payment_hash: input.paymentHash,
|
|
1712
|
+
...input.claimPacket === void 0 ? {} : { claim_packet: input.claimPacket },
|
|
1713
|
+
refund_pubkey: import_base7.hex.encode(input.refundPubkey),
|
|
1714
|
+
payout_address: input.payoutAddress,
|
|
1715
|
+
payout_pubkey: import_base7.hex.encode(input.payoutPubkey)
|
|
1716
|
+
}
|
|
1717
|
+
});
|
|
1647
1718
|
MIN_CLAIM_WINDOW_SECONDS = 30 * 60;
|
|
1648
1719
|
assertReceivable = (input) => {
|
|
1649
1720
|
assertFinite(input.payDeadline, "quote_malformed", "payDeadline");
|
|
@@ -1673,7 +1744,7 @@ var init_rfq = __esm({
|
|
|
1673
1744
|
};
|
|
1674
1745
|
matchReceiveLockup = (input, refundLocktime, solverRefundPkScriptHex) => {
|
|
1675
1746
|
const contractParams = {
|
|
1676
|
-
solverPubkey: (0,
|
|
1747
|
+
solverPubkey: (0, import_sdk7.toXOnly)(import_base7.hex.decode(input.quote.solver_pubkey), "solver key"),
|
|
1677
1748
|
refundLocktime,
|
|
1678
1749
|
operatorPubkey: input.operatorPubkey,
|
|
1679
1750
|
paymentHash: input.paymentHash,
|
|
@@ -1681,7 +1752,7 @@ var init_rfq = __esm({
|
|
|
1681
1752
|
emulatorPubkey: input.emulatorPubkey,
|
|
1682
1753
|
solverRefundPkScript: solverHex(solverRefundPkScriptHex, "profile.solver_refund_pk_script"),
|
|
1683
1754
|
payoutPubkey: input.payoutPubkey,
|
|
1684
|
-
payoutPkScript:
|
|
1755
|
+
payoutPkScript: import_sdk7.ArkAddress.decode(input.payoutAddress).pkScript
|
|
1685
1756
|
};
|
|
1686
1757
|
const matched = matchQuotedLockup(
|
|
1687
1758
|
input.quote,
|
|
@@ -1703,11 +1774,12 @@ __export(nostr_exports, {
|
|
|
1703
1774
|
TransportClosed: () => TransportClosed,
|
|
1704
1775
|
nostrRfqTransport: () => nostrRfqTransport
|
|
1705
1776
|
});
|
|
1706
|
-
var import_nostr_tools, RFQ_DIRECTED_KIND, RFQ_AD_KIND, DEFAULT_TIMEOUT_MS, RelayUnavailable, TransportClosed, closeReasons, nostrRfqTransport;
|
|
1777
|
+
var import_sdk32, import_nostr_tools, RFQ_DIRECTED_KIND, RFQ_AD_KIND, DEFAULT_TIMEOUT_MS, RelayUnavailable, TransportClosed, closeReasons, nostrRfqTransport;
|
|
1707
1778
|
var init_nostr = __esm({
|
|
1708
1779
|
"src/nostr.ts"() {
|
|
1709
1780
|
"use strict";
|
|
1710
1781
|
init_rfq();
|
|
1782
|
+
import_sdk32 = require("@arkade-os/sdk");
|
|
1711
1783
|
import_nostr_tools = require("nostr-tools");
|
|
1712
1784
|
RFQ_DIRECTED_KIND = 24859;
|
|
1713
1785
|
RFQ_AD_KIND = 38859;
|
|
@@ -1732,6 +1804,7 @@ var init_nostr = __esm({
|
|
|
1732
1804
|
return url ? `${url}: ${reason ?? "closed"}` : reason ?? "closed";
|
|
1733
1805
|
});
|
|
1734
1806
|
nostrRfqTransport = (options) => {
|
|
1807
|
+
(0, import_sdk32.assertTimerMs)("timeoutMs", options.timeoutMs);
|
|
1735
1808
|
const relays = options.relays;
|
|
1736
1809
|
const solverPubkey = options.solverPubkey;
|
|
1737
1810
|
const secretKey = options.secretKey ?? (0, import_nostr_tools.generateSecretKey)();
|
|
@@ -1845,7 +1918,9 @@ __export(advanced_exports, {
|
|
|
1845
1918
|
ClientDisposed: () => ClientDisposed,
|
|
1846
1919
|
CovclaimdRevealError: () => CovclaimdRevealError,
|
|
1847
1920
|
DEFAULT_INVOICE_EXPIRY_SECONDS: () => DEFAULT_INVOICE_EXPIRY_SECONDS,
|
|
1921
|
+
DEFAULT_MAX_REFUND_WINDOW_SECONDS: () => DEFAULT_MAX_REFUND_WINDOW_SECONDS,
|
|
1848
1922
|
DiscoverySnapshotUnavailable: () => DiscoverySnapshotUnavailable,
|
|
1923
|
+
EVM_CHAIN: () => EVM_CHAIN,
|
|
1849
1924
|
FEED_TTL_MS: () => FEED_TTL_MS,
|
|
1850
1925
|
INDEXED_NETWORKS: () => INDEXED_NETWORKS,
|
|
1851
1926
|
INVOICE_HRPS: () => INVOICE_HRPS,
|
|
@@ -1903,6 +1978,17 @@ __export(advanced_exports, {
|
|
|
1903
1978
|
enforceFeeCeiling: () => enforceFeeCeiling,
|
|
1904
1979
|
esploraChainSource: () => esploraChainSource,
|
|
1905
1980
|
esploraTip: () => esploraTip,
|
|
1981
|
+
evmAmountFromWire: () => evmAmountFromWire,
|
|
1982
|
+
evmAmountToWire: () => evmAmountToWire,
|
|
1983
|
+
evmDirectionOf: () => evmDirectionOf,
|
|
1984
|
+
evmQuoteSats: () => evmQuoteSats,
|
|
1985
|
+
evmQuoteTokenAmount: () => evmQuoteTokenAmount,
|
|
1986
|
+
evmReceivePair: () => evmReceivePair,
|
|
1987
|
+
evmReceiveRequest: () => evmReceiveRequest,
|
|
1988
|
+
evmSendPair: () => evmSendPair,
|
|
1989
|
+
evmSendRequest: () => evmSendRequest,
|
|
1990
|
+
evmTokenLeg: () => evmTokenLeg,
|
|
1991
|
+
evmTokenOf: () => evmTokenOf,
|
|
1906
1992
|
exchange: () => exchange,
|
|
1907
1993
|
familyOfSwapId: () => familyOfSwapId,
|
|
1908
1994
|
fateMoved: () => fateMoved,
|
|
@@ -1946,6 +2032,8 @@ __export(advanced_exports, {
|
|
|
1946
2032
|
quoteViaRfq: () => quoteViaRfq,
|
|
1947
2033
|
railOf: () => railOf,
|
|
1948
2034
|
railOfCorridor: () => railOfCorridor,
|
|
2035
|
+
readEvmReceiveQuote: () => readEvmReceiveQuote,
|
|
2036
|
+
readEvmSendQuote: () => readEvmSendQuote,
|
|
1949
2037
|
readableRecord: () => readableRecord,
|
|
1950
2038
|
readsChain: () => readsChain,
|
|
1951
2039
|
receive: () => receive,
|
|
@@ -1983,6 +2071,7 @@ __export(advanced_exports, {
|
|
|
1983
2071
|
verifyQuotedAmount: () => verifyQuotedAmount,
|
|
1984
2072
|
verifyReceiveInvoiceFacts: () => verifyReceiveInvoiceFacts,
|
|
1985
2073
|
verifyReceiveWindow: () => verifyReceiveWindow,
|
|
2074
|
+
verifyRefundWindow: () => verifyRefundWindow,
|
|
1986
2075
|
verifyResponder: () => verifyResponder,
|
|
1987
2076
|
verifySendInvoice: () => verifySendInvoice,
|
|
1988
2077
|
verifySendWindow: () => verifySendWindow,
|
|
@@ -1996,7 +2085,7 @@ module.exports = __toCommonJS(advanced_exports);
|
|
|
1996
2085
|
|
|
1997
2086
|
// src/client/accept.ts
|
|
1998
2087
|
var import_base8 = require("@scure/base");
|
|
1999
|
-
var
|
|
2088
|
+
var import_sdk11 = require("@arkade-os/sdk");
|
|
2000
2089
|
init_offer();
|
|
2001
2090
|
init_lockupContract();
|
|
2002
2091
|
|
|
@@ -2231,15 +2320,86 @@ var OnchainSendCorridor = {
|
|
|
2231
2320
|
// Our own L1 claim only: `funding` is the solver's tx, not a row this wallet made.
|
|
2232
2321
|
activityTxids: (profile) => profile.claimTxid ? [profile.claimTxid] : []
|
|
2233
2322
|
};
|
|
2323
|
+
function onchainReceiveProfile(result) {
|
|
2324
|
+
return {
|
|
2325
|
+
claimKey: import_base5.hex.encode(result.htlcParams.claimKey),
|
|
2326
|
+
refundKey: import_base5.hex.encode(result.htlcParams.refundKey),
|
|
2327
|
+
htlcLocktime: result.htlcParams.refundLocktime,
|
|
2328
|
+
network: result.l1Network,
|
|
2329
|
+
htlcAddress: result.htlc.address,
|
|
2330
|
+
minConfirmations: result.minConfirmations,
|
|
2331
|
+
refundPkScript: import_base5.hex.encode(result.refundPkScript),
|
|
2332
|
+
...result.refundDescriptor === void 0 ? {} : { refundDescriptor: result.refundDescriptor }
|
|
2333
|
+
};
|
|
2334
|
+
}
|
|
2335
|
+
var OnchainReceiveCorridor = {
|
|
2336
|
+
kind: "onchain_receive",
|
|
2337
|
+
project: (swap) => {
|
|
2338
|
+
const receive2 = swap;
|
|
2339
|
+
return {
|
|
2340
|
+
expectedAmount: receive2.expectedAmount,
|
|
2341
|
+
...receive2.claimTxid ? { claimTxid: receive2.claimTxid } : {},
|
|
2342
|
+
...receive2.funding ? { funding: receive2.funding } : {}
|
|
2343
|
+
};
|
|
2344
|
+
},
|
|
2345
|
+
hydrate(profile) {
|
|
2346
|
+
const { paymentHash } = hydrateHashlock(profile);
|
|
2347
|
+
if (typeof profile.expectedAmount !== "number" || !Number.isFinite(profile.expectedAmount)) {
|
|
2348
|
+
throw new Error("onchain_receive record carries no expectedAmount; it cannot claim");
|
|
2349
|
+
}
|
|
2350
|
+
if (!profile.claimKey || !profile.refundKey) {
|
|
2351
|
+
throw new Error(
|
|
2352
|
+
"onchain_receive record carries no L1 keys; its HTLC cannot be rebuilt and the trader's own funding could never be taken back"
|
|
2353
|
+
);
|
|
2354
|
+
}
|
|
2355
|
+
if (!Number.isInteger(profile.minConfirmations) || profile.minConfirmations < 1) {
|
|
2356
|
+
throw new Error(
|
|
2357
|
+
`onchain_receive record carries no usable minConfirmations (${String(profile.minConfirmations)}); the confirmation gate cannot be checked`
|
|
2358
|
+
);
|
|
2359
|
+
}
|
|
2360
|
+
if (!profile.refundPkScript) {
|
|
2361
|
+
throw new Error(
|
|
2362
|
+
"onchain_receive record carries no refundPkScript; its L1 refund could not be built, so the trader's funding would be stranded"
|
|
2363
|
+
);
|
|
2364
|
+
}
|
|
2365
|
+
const htlc = onchainHtlcScript(
|
|
2366
|
+
{
|
|
2367
|
+
paymentHash,
|
|
2368
|
+
claimKey: import_base5.hex.decode(profile.claimKey),
|
|
2369
|
+
refundKey: import_base5.hex.decode(profile.refundKey),
|
|
2370
|
+
refundLocktime: profile.htlcLocktime
|
|
2371
|
+
},
|
|
2372
|
+
profile.network
|
|
2373
|
+
);
|
|
2374
|
+
if (htlc.address !== profile.htlcAddress) {
|
|
2375
|
+
throw new Error(
|
|
2376
|
+
`onchain_receive record's L1 inputs derive ${htlc.address}, but the funding went to ${String(profile.htlcAddress)} \u2014 these are not this swap's`
|
|
2377
|
+
);
|
|
2378
|
+
}
|
|
2379
|
+
return {
|
|
2380
|
+
paymentHash,
|
|
2381
|
+
htlc,
|
|
2382
|
+
expectedAmount: profile.expectedAmount,
|
|
2383
|
+
minConfirmations: profile.minConfirmations,
|
|
2384
|
+
refundPkScript: import_base5.hex.decode(profile.refundPkScript),
|
|
2385
|
+
...profile.claimTxid ? { claimTxid: profile.claimTxid } : {},
|
|
2386
|
+
...profile.funding ? { funding: profile.funding } : {}
|
|
2387
|
+
};
|
|
2388
|
+
},
|
|
2389
|
+
claimSecret: (profile) => ({ ...profile.signer, ...profile.hashlock }),
|
|
2390
|
+
// The L1 refund is the record's own `refundTxid`, read by the activity resolver directly.
|
|
2391
|
+
activityTxids: (profile) => profile.claimTxid ? [profile.claimTxid] : []
|
|
2392
|
+
};
|
|
2234
2393
|
rfqCorridorHandlers.register(LightningSendCorridor);
|
|
2235
2394
|
rfqCorridorHandlers.register(LightningReceiveCorridor);
|
|
2236
2395
|
rfqCorridorHandlers.register(OnchainSendCorridor);
|
|
2396
|
+
rfqCorridorHandlers.register(OnchainReceiveCorridor);
|
|
2237
2397
|
|
|
2238
2398
|
// src/client/accept.ts
|
|
2239
2399
|
init_store();
|
|
2240
2400
|
|
|
2241
2401
|
// src/client/assetId.ts
|
|
2242
|
-
var
|
|
2402
|
+
var import_sdk6 = require("@arkade-os/sdk");
|
|
2243
2403
|
var RAILS = ["arkade", "bitcoin", "bolt11", "eip155"];
|
|
2244
2404
|
var BITCOIN_RAILS = ["arkade", "bitcoin", "bolt11"];
|
|
2245
2405
|
var BTC_ASSET_PART = "slip44:0";
|
|
@@ -2268,7 +2428,7 @@ var CHAIN_REFERENCE = /^[-_a-z0-9]{1,32}$/;
|
|
|
2268
2428
|
var CHAIN_ID = /^(0|[1-9][0-9]*)$/;
|
|
2269
2429
|
var ASSET_REFERENCE = /^[-.%a-z0-9]{1,128}$/;
|
|
2270
2430
|
var isRail = (value) => RAILS.includes(value);
|
|
2271
|
-
var isNetworkRef = (value) => Object.hasOwn(
|
|
2431
|
+
var isNetworkRef = (value) => Object.hasOwn(import_sdk6.networks, value);
|
|
2272
2432
|
var parseAssetId = (value) => {
|
|
2273
2433
|
if (/[A-Z]/.test(value)) {
|
|
2274
2434
|
throw new AssetIdError(
|
|
@@ -2333,7 +2493,7 @@ var parseAssetId = (value) => {
|
|
|
2333
2493
|
}
|
|
2334
2494
|
if (namespace === ARKADE_ASSET_NAMESPACE) {
|
|
2335
2495
|
try {
|
|
2336
|
-
|
|
2496
|
+
import_sdk6.asset.AssetId.fromString(assetReference);
|
|
2337
2497
|
} catch (cause) {
|
|
2338
2498
|
throw new AssetIdError(
|
|
2339
2499
|
"invalid_asset_reference",
|
|
@@ -2389,7 +2549,7 @@ var isBtcAssetLenient = (id) => {
|
|
|
2389
2549
|
var arkadeAsset = (network, id) => `arkade:${network}/${ARKADE_ASSET_NAMESPACE}:${id.toString()}`;
|
|
2390
2550
|
var issuanceOf = (id) => {
|
|
2391
2551
|
const { assetNamespace, assetReference } = parseAssetId(id);
|
|
2392
|
-
return assetNamespace === ARKADE_ASSET_NAMESPACE ?
|
|
2552
|
+
return assetNamespace === ARKADE_ASSET_NAMESPACE ? import_sdk6.asset.AssetId.fromString(assetReference) : void 0;
|
|
2393
2553
|
};
|
|
2394
2554
|
|
|
2395
2555
|
// src/client/aliases.ts
|
|
@@ -2629,7 +2789,7 @@ var canonicalAssetId = (input, table) => {
|
|
|
2629
2789
|
};
|
|
2630
2790
|
|
|
2631
2791
|
// src/client/corridors/lightning.ts
|
|
2632
|
-
var
|
|
2792
|
+
var import_sdk9 = require("@arkade-os/sdk");
|
|
2633
2793
|
var INVOICE_HRPS = [
|
|
2634
2794
|
["lnbcrt", ["regtest"]],
|
|
2635
2795
|
["lntbs", ["signet", "mutinynet"]],
|
|
@@ -2659,7 +2819,7 @@ var lightningCorridor = Object.assign(
|
|
|
2659
2819
|
deps,
|
|
2660
2820
|
drive: LIGHTNING_DRIVE,
|
|
2661
2821
|
matches(raw) {
|
|
2662
|
-
const invoice = (0,
|
|
2822
|
+
const invoice = (0, import_sdk9.invoiceTarget)(raw);
|
|
2663
2823
|
if (invoice === void 0) return void 0;
|
|
2664
2824
|
const networks2 = networksOfInvoiceHrp(invoice);
|
|
2665
2825
|
if (networks2 === void 0) {
|
|
@@ -2705,11 +2865,11 @@ var lightningCorridor = Object.assign(
|
|
|
2705
2865
|
};
|
|
2706
2866
|
}
|
|
2707
2867
|
}),
|
|
2708
|
-
{ target:
|
|
2868
|
+
{ target: import_sdk9.invoiceTarget }
|
|
2709
2869
|
);
|
|
2710
2870
|
|
|
2711
2871
|
// src/client/corridors/onchain.ts
|
|
2712
|
-
var
|
|
2872
|
+
var import_sdk10 = require("@arkade-os/sdk");
|
|
2713
2873
|
var btc2 = __toESM(require("@scure/btc-signer"), 1);
|
|
2714
2874
|
init_onchainHtlc();
|
|
2715
2875
|
init_rfq();
|
|
@@ -2721,6 +2881,14 @@ var ONCHAIN_DRIVE = {
|
|
|
2721
2881
|
],
|
|
2722
2882
|
actions: ["claimOnchain", "refundArkade"],
|
|
2723
2883
|
seams: ["indexer", "chain"]
|
|
2884
|
+
},
|
|
2885
|
+
give: {
|
|
2886
|
+
lockups: [
|
|
2887
|
+
{ covenant: "arkade_lockup", owner: "solver", deadline: "refund_locktime" },
|
|
2888
|
+
{ covenant: "onchain_htlc", owner: "trader", deadline: "htlc_refund_locktime" }
|
|
2889
|
+
],
|
|
2890
|
+
actions: ["claimLockup", "refundOnchain"],
|
|
2891
|
+
seams: ["indexer", "chain"]
|
|
2724
2892
|
}
|
|
2725
2893
|
};
|
|
2726
2894
|
var onchainCorridor = Object.assign(
|
|
@@ -2731,14 +2899,14 @@ var onchainCorridor = Object.assign(
|
|
|
2731
2899
|
deps,
|
|
2732
2900
|
drive: ONCHAIN_DRIVE,
|
|
2733
2901
|
matches(raw) {
|
|
2734
|
-
const target = (0,
|
|
2902
|
+
const target = (0, import_sdk10.btcTarget)(raw);
|
|
2735
2903
|
if (target === void 0) return void 0;
|
|
2736
2904
|
try {
|
|
2737
2905
|
btc2.Address(L1_NETWORKS[l1]).decode(target);
|
|
2738
2906
|
} catch {
|
|
2739
2907
|
return { refused: `this is not a ${l1} address` };
|
|
2740
2908
|
}
|
|
2741
|
-
const amount =
|
|
2909
|
+
const amount = import_sdk10.BIP21.amountSats(raw);
|
|
2742
2910
|
return {
|
|
2743
2911
|
claimed: {
|
|
2744
2912
|
kind: "address",
|
|
@@ -2749,19 +2917,21 @@ var onchainCorridor = Object.assign(
|
|
|
2749
2917
|
}
|
|
2750
2918
|
};
|
|
2751
2919
|
},
|
|
2752
|
-
{ target:
|
|
2920
|
+
{ target: import_sdk10.btcTarget }
|
|
2753
2921
|
);
|
|
2754
2922
|
|
|
2755
2923
|
// src/client/outcome.ts
|
|
2756
2924
|
var CORRIDOR_PASS = {
|
|
2757
2925
|
lightning_send: LIGHTNING_DRIVE.take,
|
|
2758
2926
|
lightning_receive: LIGHTNING_DRIVE.give,
|
|
2759
|
-
onchain_send: ONCHAIN_DRIVE.take
|
|
2927
|
+
onchain_send: ONCHAIN_DRIVE.take,
|
|
2928
|
+
onchain_receive: ONCHAIN_DRIVE.give
|
|
2760
2929
|
};
|
|
2761
2930
|
var LOCKUP_OWNER = {
|
|
2762
2931
|
lightning_send: CORRIDOR_PASS.lightning_send.lockups[0].owner,
|
|
2763
2932
|
lightning_receive: CORRIDOR_PASS.lightning_receive.lockups[0].owner,
|
|
2764
|
-
onchain_send: CORRIDOR_PASS.onchain_send.lockups[0].owner
|
|
2933
|
+
onchain_send: CORRIDOR_PASS.onchain_send.lockups[0].owner,
|
|
2934
|
+
onchain_receive: CORRIDOR_PASS.onchain_receive.lockups[0].owner
|
|
2765
2935
|
};
|
|
2766
2936
|
var readsChain = (kind) => CORRIDOR_PASS[kind].seams.includes("chain");
|
|
2767
2937
|
var at = (outcome) => () => outcome;
|
|
@@ -2783,8 +2953,9 @@ var CORRIDOR_OUTCOME = {
|
|
|
2783
2953
|
needs_counterparty: at("needs_recovery"),
|
|
2784
2954
|
// Matched by the hash, not our txid, so a claim that lands without us counts.
|
|
2785
2955
|
settled: at("claimed"),
|
|
2786
|
-
// The inversion: a receive lockup's non-claim leaves are all the solver's.
|
|
2787
|
-
refunded
|
|
2956
|
+
// The inversion: a receive lockup's non-claim leaves are all the solver's. On
|
|
2957
|
+
// `onchain_receive` the swap is `refunded` only once the trader's own L1 half is.
|
|
2958
|
+
refunded: (kind) => kind === "onchain_receive" ? "refunded" : "lapsed",
|
|
2788
2959
|
failed: at("failed")
|
|
2789
2960
|
}
|
|
2790
2961
|
};
|
|
@@ -3186,7 +3357,8 @@ var corridorRecord = (quote, preparation, now) => {
|
|
|
3186
3357
|
var KIND_OF = {
|
|
3187
3358
|
"arkade->lightning": "lightning_send",
|
|
3188
3359
|
"lightning->arkade": "lightning_receive",
|
|
3189
|
-
"arkade->onchain": "onchain_send"
|
|
3360
|
+
"arkade->onchain": "onchain_send",
|
|
3361
|
+
"onchain->arkade": "onchain_receive"
|
|
3190
3362
|
};
|
|
3191
3363
|
var profileOf = (preparation, paymentHash) => {
|
|
3192
3364
|
const secrets = rfqSecretsProfile(preparation.secrets, paymentHash);
|
|
@@ -3211,6 +3383,20 @@ var profileOf = (preparation, paymentHash) => {
|
|
|
3211
3383
|
payoutPkScript: preparation.payoutPkScript
|
|
3212
3384
|
})
|
|
3213
3385
|
};
|
|
3386
|
+
case "onchain->arkade":
|
|
3387
|
+
return {
|
|
3388
|
+
...secrets,
|
|
3389
|
+
expectedAmount: toSafeNumber(preparation.expectedAmount, "expectedAmount"),
|
|
3390
|
+
payoutAddress: preparation.payoutAddress,
|
|
3391
|
+
...onchainReceiveProfile({
|
|
3392
|
+
htlc: preparation.htlc,
|
|
3393
|
+
htlcParams: preparation.htlcParams,
|
|
3394
|
+
l1Network: preparation.l1Network,
|
|
3395
|
+
minConfirmations: preparation.minConfirmations,
|
|
3396
|
+
refundPkScript: preparation.refundPkScript,
|
|
3397
|
+
refundDescriptor: preparation.refundKey.descriptor
|
|
3398
|
+
})
|
|
3399
|
+
};
|
|
3214
3400
|
}
|
|
3215
3401
|
};
|
|
3216
3402
|
var acceptQuote = async (input) => runSerialized(input.quote.id, () => acceptQuoteBody(input));
|
|
@@ -3256,7 +3442,7 @@ var registeredOfferRecord = async (input, preparation) => {
|
|
|
3256
3442
|
const offer = await createOffer(wallet, {
|
|
3257
3443
|
// Keyed on the receive side: the covenant binds what the fill delivers.
|
|
3258
3444
|
wantAmount: plan.receive.atomic,
|
|
3259
|
-
...receiveIsBtc ? { offerAsset:
|
|
3445
|
+
...receiveIsBtc ? { offerAsset: import_sdk11.asset.AssetId.fromString(plan.deposit.asset.id) } : { wantAsset: import_sdk11.asset.AssetId.fromString(plan.receive.asset.id) },
|
|
3260
3446
|
emulatorPubkey: arkade2.emulatorPubkey
|
|
3261
3447
|
});
|
|
3262
3448
|
return {
|
|
@@ -3316,7 +3502,7 @@ var fund = async (input, record) => {
|
|
|
3316
3502
|
extensions: [offerExtensionOf(record)]
|
|
3317
3503
|
});
|
|
3318
3504
|
}
|
|
3319
|
-
if (record.kind === "lightning_receive") {
|
|
3505
|
+
if (record.kind === "lightning_receive" || record.kind === "onchain_receive") {
|
|
3320
3506
|
throw new Error(`receive swap ${record.id} funds nothing from this wallet`);
|
|
3321
3507
|
}
|
|
3322
3508
|
return wallet.send({
|
|
@@ -3332,7 +3518,7 @@ var reconcileFunding = async (input, record) => {
|
|
|
3332
3518
|
const script = record.family === "offer" ? record.swapPkScript : record.lockupPkScript;
|
|
3333
3519
|
const expected = BigInt(record.give.amount);
|
|
3334
3520
|
const reader = await input.wallet.getArkadeReader();
|
|
3335
|
-
const vtxos = await (0,
|
|
3521
|
+
const vtxos = await (0, import_sdk11.getAllNormalizedVtxos)(reader, [script]);
|
|
3336
3522
|
const deposit = vtxos.find((vtxo) => depositMatches(vtxo, record, expected));
|
|
3337
3523
|
return deposit?.txid;
|
|
3338
3524
|
};
|
|
@@ -3439,7 +3625,7 @@ init_repository();
|
|
|
3439
3625
|
// src/refund.ts
|
|
3440
3626
|
var import_base9 = require("@scure/base");
|
|
3441
3627
|
var import_sha24 = require("@noble/hashes/sha2.js");
|
|
3442
|
-
var
|
|
3628
|
+
var import_sdk12 = require("@arkade-os/sdk");
|
|
3443
3629
|
init_onchainHtlc();
|
|
3444
3630
|
init_rfq();
|
|
3445
3631
|
var walletOperator = (wallet) => {
|
|
@@ -3477,7 +3663,7 @@ async function findLockupVtxos(contracts, swapPkScript) {
|
|
|
3477
3663
|
const out = [];
|
|
3478
3664
|
for (const vtxo of row?.vtxos ?? []) {
|
|
3479
3665
|
if (vtxo.isUnrolled) continue;
|
|
3480
|
-
if ((0,
|
|
3666
|
+
if ((0, import_sdk12.isVtxoSpent)(vtxo)) continue;
|
|
3481
3667
|
const key = `${vtxo.txid}:${vtxo.vout}`;
|
|
3482
3668
|
if (seen.has(key)) continue;
|
|
3483
3669
|
seen.add(key);
|
|
@@ -3492,14 +3678,14 @@ async function findLockupVtxos(contracts, swapPkScript) {
|
|
|
3492
3678
|
}
|
|
3493
3679
|
var hashesTo = (candidate, paymentHash) => import_base9.hex.encode((0, import_sha24.sha256)(candidate)) === paymentHash;
|
|
3494
3680
|
var candidateWitnessItems = (tx, inputIndex) => [
|
|
3495
|
-
...(0,
|
|
3681
|
+
...(0, import_sdk12.getArkPsbtFields)(tx, inputIndex, import_sdk12.ConditionWitness).flat(),
|
|
3496
3682
|
...tx.getInput(inputIndex).finalScriptWitness ?? []
|
|
3497
3683
|
];
|
|
3498
3684
|
async function readLockupFate(indexer, input) {
|
|
3499
3685
|
const { vtxos } = await indexer.getVtxos({ scripts: [import_base9.hex.encode(input.swapPkScript)] });
|
|
3500
3686
|
const all = vtxos ?? [];
|
|
3501
3687
|
if (all.length === 0) return { fate: "unknown" };
|
|
3502
|
-
const exited = all.filter((vtxo) => vtxo.isUnrolled && !(0,
|
|
3688
|
+
const exited = all.filter((vtxo) => vtxo.isUnrolled && !(0, import_sdk12.isVtxoSpent)(vtxo));
|
|
3503
3689
|
if (exited.length > 0) {
|
|
3504
3690
|
return {
|
|
3505
3691
|
fate: "exited",
|
|
@@ -3509,7 +3695,7 @@ async function readLockupFate(indexer, input) {
|
|
|
3509
3695
|
const spentBy = /* @__PURE__ */ new Map();
|
|
3510
3696
|
let everySpendNamed = true;
|
|
3511
3697
|
for (const vtxo of all) {
|
|
3512
|
-
if (!(0,
|
|
3698
|
+
if (!(0, import_sdk12.isVtxoSpent)(vtxo)) return { fate: "open" };
|
|
3513
3699
|
if (vtxo.spentBy)
|
|
3514
3700
|
spentBy.set(vtxo.spentBy, {
|
|
3515
3701
|
checkpointTxid: vtxo.spentBy,
|
|
@@ -3523,7 +3709,7 @@ async function readLockupFate(indexer, input) {
|
|
|
3523
3709
|
for (const raw of txs) {
|
|
3524
3710
|
let tx;
|
|
3525
3711
|
try {
|
|
3526
|
-
tx =
|
|
3712
|
+
tx = import_sdk12.Transaction.fromPSBT(import_base9.base64.decode(raw));
|
|
3527
3713
|
} catch {
|
|
3528
3714
|
continue;
|
|
3529
3715
|
}
|
|
@@ -3553,10 +3739,10 @@ var assertNoneSwept = (vtxos, contract) => {
|
|
|
3553
3739
|
};
|
|
3554
3740
|
var operatorUnrollScript = async (operator, network) => {
|
|
3555
3741
|
const info = await operator.getInfo();
|
|
3556
|
-
return (0,
|
|
3742
|
+
return (0, import_sdk12.assertValidServerUnrollScript)(
|
|
3557
3743
|
info.checkpointTapscript,
|
|
3558
|
-
(0,
|
|
3559
|
-
advertisedForfeitPubkey: (0,
|
|
3744
|
+
(0, import_sdk12.resolveCheckpointExitDelayPolicy)(network ?? (0, import_sdk12.networkFromArkadeInfo)(info), {
|
|
3745
|
+
advertisedForfeitPubkey: (0, import_sdk12.toXOnly)(import_base9.hex.decode(info.forfeitPubkey), "forfeit key")
|
|
3560
3746
|
})
|
|
3561
3747
|
);
|
|
3562
3748
|
};
|
|
@@ -3582,7 +3768,7 @@ async function pushRefundWithoutReceiver(operator, input) {
|
|
|
3582
3768
|
const serverUnrollScript = await operatorUnrollScript(operator, input.network);
|
|
3583
3769
|
const leaf = input.contract.refundWithoutReceiver();
|
|
3584
3770
|
const amount = input.vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
|
|
3585
|
-
const { arkTx: tx, checkpoints } = (0,
|
|
3771
|
+
const { arkTx: tx, checkpoints } = (0, import_sdk12.buildOffchainTx)(
|
|
3586
3772
|
lockupInputs(input.vtxos, input.contract, leaf),
|
|
3587
3773
|
[{ script: refundPkScript, amount: BigInt(amount) }],
|
|
3588
3774
|
serverUnrollScript
|
|
@@ -3592,8 +3778,8 @@ async function pushRefundWithoutReceiver(operator, input) {
|
|
|
3592
3778
|
import_base9.base64.encode(signedTx.toPSBT()),
|
|
3593
3779
|
checkpoints.map((c) => import_base9.base64.encode(c.toPSBT()))
|
|
3594
3780
|
);
|
|
3595
|
-
(0,
|
|
3596
|
-
const matched = (0,
|
|
3781
|
+
(0, import_sdk12.assertSubmittedArkTxid)(submitted, signedTx, "refundWithoutReceiver");
|
|
3782
|
+
const matched = (0, import_sdk12.matchServerCheckpoints)(
|
|
3597
3783
|
submitted.signedCheckpointTxs,
|
|
3598
3784
|
checkpoints,
|
|
3599
3785
|
"refundWithoutReceiver"
|
|
@@ -3609,10 +3795,10 @@ async function pushRefundWithoutReceiver(operator, input) {
|
|
|
3609
3795
|
var REFUND_MTP_LAG_SECONDS = 2 * 60 * 60;
|
|
3610
3796
|
|
|
3611
3797
|
// src/client/corridors/registry.ts
|
|
3612
|
-
var
|
|
3798
|
+
var import_sdk16 = require("@arkade-os/sdk");
|
|
3613
3799
|
|
|
3614
3800
|
// src/client/corridors/arkade.ts
|
|
3615
|
-
var
|
|
3801
|
+
var import_sdk13 = require("@arkade-os/sdk");
|
|
3616
3802
|
var ARKADE_DRIVE = {};
|
|
3617
3803
|
var messageOf = (error) => error instanceof Error ? error.message : String(error);
|
|
3618
3804
|
var arkadeCorridor = Object.assign(
|
|
@@ -3621,11 +3807,11 @@ var arkadeCorridor = Object.assign(
|
|
|
3621
3807
|
deps,
|
|
3622
3808
|
drive: ARKADE_DRIVE,
|
|
3623
3809
|
matches(raw) {
|
|
3624
|
-
const target = (0,
|
|
3810
|
+
const target = (0, import_sdk13.arkTarget)(raw);
|
|
3625
3811
|
if (target === void 0) return void 0;
|
|
3626
3812
|
try {
|
|
3627
|
-
const address =
|
|
3628
|
-
(0,
|
|
3813
|
+
const address = import_sdk13.ArkAddress.decode(target);
|
|
3814
|
+
(0, import_sdk13.assertRecipientArkadeAddress)(target, address, {
|
|
3629
3815
|
hrp: deps.network.hrp,
|
|
3630
3816
|
signerSet: deps.signerSet
|
|
3631
3817
|
});
|
|
@@ -3635,11 +3821,11 @@ var arkadeCorridor = Object.assign(
|
|
|
3635
3821
|
return { claimed: { kind: "address", address: target } };
|
|
3636
3822
|
}
|
|
3637
3823
|
}),
|
|
3638
|
-
{ target:
|
|
3824
|
+
{ target: import_sdk13.arkTarget }
|
|
3639
3825
|
);
|
|
3640
3826
|
|
|
3641
3827
|
// src/client/corridors/deps.ts
|
|
3642
|
-
var
|
|
3828
|
+
var import_sdk15 = require("@arkade-os/sdk");
|
|
3643
3829
|
init_onchainHtlc();
|
|
3644
3830
|
init_rfq();
|
|
3645
3831
|
|
|
@@ -3672,7 +3858,7 @@ var decodeBolt11 = (invoice) => {
|
|
|
3672
3858
|
// src/client/corridors/chainSource.ts
|
|
3673
3859
|
var import_base10 = require("@scure/base");
|
|
3674
3860
|
var btc3 = __toESM(require("@scure/btc-signer"), 1);
|
|
3675
|
-
var
|
|
3861
|
+
var import_sdk14 = require("@arkade-os/sdk");
|
|
3676
3862
|
var addressOfScript = (script, network) => btc3.Address(network).encode(btc3.OutScript.decode(script));
|
|
3677
3863
|
var chainSourceOver = (backend, network) => {
|
|
3678
3864
|
const spenderFromVins = async (txid, vout, pkScript) => {
|
|
@@ -3734,7 +3920,7 @@ var esploraTip = async (esploraUrl, fetchImpl) => {
|
|
|
3734
3920
|
};
|
|
3735
3921
|
var esploraChainSource = (input) => chainSourceOver(
|
|
3736
3922
|
{
|
|
3737
|
-
provider: new
|
|
3923
|
+
provider: new import_sdk14.EsploraProvider(input.esploraUrl),
|
|
3738
3924
|
tip: () => esploraTip(input.esploraUrl, input.fetchImpl)
|
|
3739
3925
|
},
|
|
3740
3926
|
input.network
|
|
@@ -3760,10 +3946,10 @@ var refusedIfMalformed = (value, dep) => {
|
|
|
3760
3946
|
};
|
|
3761
3947
|
var emulatorPubkeyFor = (base) => {
|
|
3762
3948
|
if (base.emulatorPubkey !== void 0) {
|
|
3763
|
-
return (0,
|
|
3949
|
+
return (0, import_sdk15.resolveEmulatorPubkey)(base.network, base.emulatorPubkey);
|
|
3764
3950
|
}
|
|
3765
3951
|
try {
|
|
3766
|
-
return (0,
|
|
3952
|
+
return (0, import_sdk15.defaultEmulatorPubkey)(base.network);
|
|
3767
3953
|
} catch {
|
|
3768
3954
|
throw new MissingCorridorDep(
|
|
3769
3955
|
"arkade",
|
|
@@ -3799,6 +3985,11 @@ function resolveCorridorDeps(corridor, overrides, base) {
|
|
|
3799
3985
|
case "onchain": {
|
|
3800
3986
|
const chain = refusedIfNull(overrides?.onchain?.chain, "onchain", "chain source");
|
|
3801
3987
|
const claim = refusedIfNull(overrides?.onchain?.claim, "onchain", "L1 claim callback");
|
|
3988
|
+
const refund = refusedIfNull(
|
|
3989
|
+
overrides?.onchain?.refund,
|
|
3990
|
+
"onchain",
|
|
3991
|
+
"L1 refund callback"
|
|
3992
|
+
);
|
|
3802
3993
|
const feeRateOverride = refusedIfMalformed(
|
|
3803
3994
|
overrides?.onchain?.claimFeeRateSatVb,
|
|
3804
3995
|
"L1 claim fee rate"
|
|
@@ -3808,11 +3999,12 @@ function resolveCorridorDeps(corridor, overrides, base) {
|
|
|
3808
3999
|
return {
|
|
3809
4000
|
networkName: base.networkName,
|
|
3810
4001
|
chain: esploraChainSource({
|
|
3811
|
-
esploraUrl: chain?.esploraUrl ??
|
|
4002
|
+
esploraUrl: chain?.esploraUrl ?? import_sdk15.ESPLORA_URL[base.networkName],
|
|
3812
4003
|
network: L1_NETWORKS[l1NetworkFromArk(base.networkName)],
|
|
3813
4004
|
fetchImpl: base.fetchImpl
|
|
3814
4005
|
}),
|
|
3815
4006
|
...claim === void 0 ? {} : { claim },
|
|
4007
|
+
...refund === void 0 ? {} : { refund },
|
|
3816
4008
|
...claimFeeRateSatVb === void 0 ? {} : { claimFeeRateSatVb },
|
|
3817
4009
|
claimVsize
|
|
3818
4010
|
};
|
|
@@ -3837,8 +4029,8 @@ var resolveCorridorBase = async (input) => {
|
|
|
3837
4029
|
wallet: input.wallet,
|
|
3838
4030
|
operator: input.operator,
|
|
3839
4031
|
networkName,
|
|
3840
|
-
network: (0,
|
|
3841
|
-
signerSet: (0,
|
|
4032
|
+
network: (0, import_sdk15.getNetwork)(networkName),
|
|
4033
|
+
signerSet: (0, import_sdk15.signerSetFromInfo)(info),
|
|
3842
4034
|
emulatorPubkey: input.emulatorPubkey,
|
|
3843
4035
|
fetchImpl: input.fetchImpl,
|
|
3844
4036
|
repository: input.repository
|
|
@@ -3868,7 +4060,7 @@ var corridorSet = (base, overrides) => {
|
|
|
3868
4060
|
(corridor) => CORRIDOR_FACTORIES[corridor].target(raw) !== void 0
|
|
3869
4061
|
);
|
|
3870
4062
|
if (owners.length === 0) {
|
|
3871
|
-
if ((0,
|
|
4063
|
+
if ((0, import_sdk16.isLnurl)(raw)) return void 0;
|
|
3872
4064
|
throw new AmbiguousDestination(raw, "no corridor recognises this destination");
|
|
3873
4065
|
}
|
|
3874
4066
|
const claims = [];
|
|
@@ -3896,10 +4088,11 @@ var import_solver_discovery6 = require("@arkade-os/solver-discovery");
|
|
|
3896
4088
|
|
|
3897
4089
|
// src/markets.ts
|
|
3898
4090
|
var import_solver_discovery5 = require("@arkade-os/solver-discovery");
|
|
3899
|
-
var
|
|
4091
|
+
var import_sdk17 = require("@arkade-os/sdk");
|
|
3900
4092
|
init_store();
|
|
3901
4093
|
var QUOTE_OPTIONS = { safetyBps: 0 };
|
|
3902
4094
|
var makeCachedFeedFetch = (ttlMs = 3e4, fetchImpl = fetch) => {
|
|
4095
|
+
(0, import_sdk17.assertNonNegativeMs)("ttlMs", ttlMs);
|
|
3903
4096
|
const cache = /* @__PURE__ */ new Map();
|
|
3904
4097
|
const inflight = /* @__PURE__ */ new Map();
|
|
3905
4098
|
return async (input, init) => {
|
|
@@ -4077,13 +4270,13 @@ var discoveryIndex = (input) => {
|
|
|
4077
4270
|
|
|
4078
4271
|
// src/client/cancel.ts
|
|
4079
4272
|
var import_base14 = require("@scure/base");
|
|
4080
|
-
var
|
|
4273
|
+
var import_sdk21 = require("@arkade-os/sdk");
|
|
4081
4274
|
init_coverage();
|
|
4082
4275
|
init_offer();
|
|
4083
4276
|
|
|
4084
4277
|
// src/restore.ts
|
|
4085
4278
|
var import_base11 = require("@scure/base");
|
|
4086
|
-
var
|
|
4279
|
+
var import_sdk18 = require("@arkade-os/sdk");
|
|
4087
4280
|
init_offer();
|
|
4088
4281
|
init_store();
|
|
4089
4282
|
var TXS_PER_REQUEST = 50;
|
|
@@ -4108,7 +4301,7 @@ async function fetchParsedTxs(indexer, txids) {
|
|
|
4108
4301
|
if (result.status !== "fulfilled") continue;
|
|
4109
4302
|
for (const psbt of result.value) {
|
|
4110
4303
|
try {
|
|
4111
|
-
const parsed =
|
|
4304
|
+
const parsed = import_sdk18.Transaction.fromPSBT(import_base11.base64.decode(psbt));
|
|
4112
4305
|
parsedByTxid.set(parsed.id, parsed);
|
|
4113
4306
|
} catch {
|
|
4114
4307
|
}
|
|
@@ -4137,7 +4330,7 @@ function classifySpend(offer, operatorPubkey, spendTx, deposit) {
|
|
|
4137
4330
|
if (!input.txid || input.index !== deposit.vout) continue;
|
|
4138
4331
|
if (import_base11.hex.encode(input.txid) !== deposit.txid) continue;
|
|
4139
4332
|
for (const leaf of input.tapLeafScript ?? []) {
|
|
4140
|
-
const spent = import_base11.hex.encode((0,
|
|
4333
|
+
const spent = import_base11.hex.encode((0, import_sdk18.scriptFromTapLeafScript)(leaf));
|
|
4141
4334
|
if (leaves.returned.some((back) => spent === import_base11.hex.encode(back))) return "cancelled";
|
|
4142
4335
|
if (leaves.fulfill && spent === import_base11.hex.encode(leaves.fulfill)) return "fulfilled";
|
|
4143
4336
|
}
|
|
@@ -4191,7 +4384,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
|
|
|
4191
4384
|
if (!fundingTx) continue;
|
|
4192
4385
|
fetchedTxids.push(txid);
|
|
4193
4386
|
try {
|
|
4194
|
-
const packet =
|
|
4387
|
+
const packet = import_sdk18.Extension.fromTx(parsed).getPacketByType(OFFER_PACKET_TYPE);
|
|
4195
4388
|
if (!packet) continue;
|
|
4196
4389
|
const payload = packet.serialize();
|
|
4197
4390
|
found.push({
|
|
@@ -4308,7 +4501,7 @@ init_repository();
|
|
|
4308
4501
|
init_repository();
|
|
4309
4502
|
|
|
4310
4503
|
// src/rfqRecord.ts
|
|
4311
|
-
var
|
|
4504
|
+
var import_sdk19 = require("@arkade-os/sdk");
|
|
4312
4505
|
var import_base12 = require("@scure/base");
|
|
4313
4506
|
|
|
4314
4507
|
// src/rfqSwapState.ts
|
|
@@ -4363,7 +4556,7 @@ function assertSameSwap(origin, swap) {
|
|
|
4363
4556
|
`rfq swap record is a ${origin.kind} origin paired with a ${swap.kind} swap`
|
|
4364
4557
|
);
|
|
4365
4558
|
}
|
|
4366
|
-
const funded = import_base12.hex.encode(
|
|
4559
|
+
const funded = import_base12.hex.encode(import_sdk19.ArkAddress.decode(origin.lockupAddress).pkScript);
|
|
4367
4560
|
const watched = import_base12.hex.encode(swap.lockupPkScript);
|
|
4368
4561
|
if (funded !== watched) {
|
|
4369
4562
|
throw new Error(
|
|
@@ -4410,8 +4603,8 @@ function rfqSwapOriginOf(record) {
|
|
|
4410
4603
|
};
|
|
4411
4604
|
}
|
|
4412
4605
|
function lockupScript(params, lockupAddress) {
|
|
4413
|
-
const script =
|
|
4414
|
-
const funded =
|
|
4606
|
+
const script = import_sdk19.VHTLCV2ContractHandler.createScript(params);
|
|
4607
|
+
const funded = import_sdk19.ArkAddress.decode(lockupAddress).pkScript;
|
|
4415
4608
|
if (import_base12.hex.encode(funded) !== import_base12.hex.encode(script.pkScript)) {
|
|
4416
4609
|
throw new Error(
|
|
4417
4610
|
`rfq swap covenant params derive ${import_base12.hex.encode(script.pkScript)}, but the record's lockup address holds ${import_base12.hex.encode(funded)} \u2014 these params are not this swap's`
|
|
@@ -4448,7 +4641,7 @@ function shouldRetainRfqSwap(record, now) {
|
|
|
4448
4641
|
|
|
4449
4642
|
// src/client/driveRecords.ts
|
|
4450
4643
|
init_store();
|
|
4451
|
-
var
|
|
4644
|
+
var import_sdk20 = require("@arkade-os/sdk");
|
|
4452
4645
|
var import_sha25 = require("@noble/hashes/sha2.js");
|
|
4453
4646
|
var import_base13 = require("@scure/base");
|
|
4454
4647
|
var splitRecords = (records) => {
|
|
@@ -4503,7 +4696,7 @@ var pageRfqRecords = (records, filter, page) => {
|
|
|
4503
4696
|
).sort(
|
|
4504
4697
|
(a, b) => a.updatedAt - b.updatedAt || (a.rfqId < b.rfqId ? -1 : a.rfqId > b.rfqId ? 1 : 0)
|
|
4505
4698
|
).slice(0, page.limit + 1);
|
|
4506
|
-
return (0,
|
|
4699
|
+
return (0, import_sdk20.pageResult)(rows, page.limit, (record) => ({
|
|
4507
4700
|
updatedAt: record.updatedAt,
|
|
4508
4701
|
rfqId: record.rfqId
|
|
4509
4702
|
}));
|
|
@@ -4529,7 +4722,7 @@ var corridorRecordStore = (repository, onRecord = () => {
|
|
|
4529
4722
|
index,
|
|
4530
4723
|
quoteIdOf: (rfqId) => byRfqId.get(rfqId),
|
|
4531
4724
|
async getRfqSwapsPage(filter, page) {
|
|
4532
|
-
(0,
|
|
4725
|
+
(0, import_sdk20.assertPageRequest)(page);
|
|
4533
4726
|
assertRfqSwapPageFilter(filter);
|
|
4534
4727
|
const { corridor } = splitRecords(await collectSwapRecords(repository));
|
|
4535
4728
|
for (const record of corridor) index(record);
|
|
@@ -4638,11 +4831,12 @@ var restoredOfferRecord = (swap, network, now) => {
|
|
|
4638
4831
|
now
|
|
4639
4832
|
);
|
|
4640
4833
|
};
|
|
4641
|
-
var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", network) : arkadeAsset(network,
|
|
4834
|
+
var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", network) : arkadeAsset(network, import_sdk20.asset.AssetId.fromString(id));
|
|
4642
4835
|
var RESTORED_CORRIDORS = {
|
|
4643
4836
|
lightning_send: ["arkade", "lightning"],
|
|
4644
4837
|
lightning_receive: ["lightning", "arkade"],
|
|
4645
|
-
onchain_send: ["arkade", "onchain"]
|
|
4838
|
+
onchain_send: ["arkade", "onchain"],
|
|
4839
|
+
onchain_receive: ["onchain", "arkade"]
|
|
4646
4840
|
};
|
|
4647
4841
|
var restoredCorridorRecord = (stored, network, refundLocktime) => {
|
|
4648
4842
|
const v1 = normalizeRfqSwapRecord(stored);
|
|
@@ -4669,7 +4863,7 @@ var restoredCorridorRecord = (stored, network, refundLocktime) => {
|
|
|
4669
4863
|
kind: v1.kind,
|
|
4670
4864
|
rfqId: v1.rfqId,
|
|
4671
4865
|
lockupAddress: v1.lockupAddress,
|
|
4672
|
-
lockupPkScript: import_base13.hex.encode(
|
|
4866
|
+
lockupPkScript: import_base13.hex.encode(import_sdk20.ArkAddress.decode(v1.lockupAddress).pkScript),
|
|
4673
4867
|
lock: { hash },
|
|
4674
4868
|
refundLocktime,
|
|
4675
4869
|
profile: v1.profile,
|
|
@@ -4765,12 +4959,12 @@ var reconcileDepositSpend = async (record, indexer) => {
|
|
|
4765
4959
|
const { txs } = await indexer.getVirtualTxs(candidates);
|
|
4766
4960
|
const parsed = txs.map((psbt) => {
|
|
4767
4961
|
try {
|
|
4768
|
-
return
|
|
4962
|
+
return import_sdk21.Transaction.fromPSBT(import_base14.base64.decode(psbt));
|
|
4769
4963
|
} catch {
|
|
4770
4964
|
return void 0;
|
|
4771
4965
|
}
|
|
4772
4966
|
}).filter((tx) => tx !== void 0);
|
|
4773
|
-
const operatorPubkey =
|
|
4967
|
+
const operatorPubkey = import_sdk21.ArkAddress.decode(record.swapAddress).serverPubKey;
|
|
4774
4968
|
const kind = classifyDepositSpend(offer, operatorPubkey, parsed, {
|
|
4775
4969
|
txid: deposit.txid,
|
|
4776
4970
|
vout: deposit.vout
|
|
@@ -4808,11 +5002,11 @@ var retireOfferScripts = async (wallet, repository, record) => {
|
|
|
4808
5002
|
};
|
|
4809
5003
|
|
|
4810
5004
|
// src/client/drive.ts
|
|
4811
|
-
var
|
|
5005
|
+
var import_sdk27 = require("@arkade-os/sdk");
|
|
4812
5006
|
var import_base17 = require("@scure/base");
|
|
4813
5007
|
|
|
4814
5008
|
// src/claim.ts
|
|
4815
|
-
var
|
|
5009
|
+
var import_sdk22 = require("@arkade-os/sdk");
|
|
4816
5010
|
init_onchainHtlc();
|
|
4817
5011
|
var LockupAmountMismatchError = class extends Error {
|
|
4818
5012
|
name = "LockupAmountMismatchError";
|
|
@@ -4845,8 +5039,8 @@ async function pushClaim(operator, input) {
|
|
|
4845
5039
|
assertPreimageMatches(input.preimage, input.contract.options.preimageHash);
|
|
4846
5040
|
const serverUnrollScript = await operatorUnrollScript(operator, input.network);
|
|
4847
5041
|
const leaf = input.contract.claim();
|
|
4848
|
-
const txid = await (0,
|
|
4849
|
-
identity: (0,
|
|
5042
|
+
const txid = await (0, import_sdk22.signAndSubmitOffchainTx)({
|
|
5043
|
+
identity: (0, import_sdk22.claimWithPreimageIdentity)(input.receiver, input.preimage),
|
|
4850
5044
|
provider: operator,
|
|
4851
5045
|
inputs: lockupInputs(input.vtxos, input.contract, leaf),
|
|
4852
5046
|
// One aggregate output: this leaf inspects nothing about the output set.
|
|
@@ -4864,7 +5058,7 @@ init_offer();
|
|
|
4864
5058
|
init_lockupContract();
|
|
4865
5059
|
|
|
4866
5060
|
// src/refundBlocked.ts
|
|
4867
|
-
var
|
|
5061
|
+
var import_sdk23 = require("@arkade-os/sdk");
|
|
4868
5062
|
var RefundNotLocallyPossibleError = class extends Error {
|
|
4869
5063
|
constructor(reason, message, options) {
|
|
4870
5064
|
super(message, options);
|
|
@@ -4881,16 +5075,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
|
|
|
4881
5075
|
);
|
|
4882
5076
|
}
|
|
4883
5077
|
try {
|
|
4884
|
-
return await (0,
|
|
5078
|
+
return await (0, import_sdk23.contractSigner)(wallet, record.signingDescriptor);
|
|
4885
5079
|
} catch (cause) {
|
|
4886
|
-
if (cause instanceof
|
|
5080
|
+
if (cause instanceof import_sdk23.WalletCannotSignError) {
|
|
4887
5081
|
throw new RefundNotLocallyPossibleError(
|
|
4888
5082
|
"unsignable-wallet",
|
|
4889
5083
|
`this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
|
|
4890
5084
|
{ cause }
|
|
4891
5085
|
);
|
|
4892
5086
|
}
|
|
4893
|
-
if (cause instanceof
|
|
5087
|
+
if (cause instanceof import_sdk23.ForeignDescriptorError) {
|
|
4894
5088
|
throw new RefundNotLocallyPossibleError(
|
|
4895
5089
|
"foreign-descriptor",
|
|
4896
5090
|
`this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
|
|
@@ -4935,7 +5129,7 @@ init_repository();
|
|
|
4935
5129
|
|
|
4936
5130
|
// src/swapManager.ts
|
|
4937
5131
|
var import_base15 = require("@scure/base");
|
|
4938
|
-
var
|
|
5132
|
+
var import_sdk24 = require("@arkade-os/sdk");
|
|
4939
5133
|
init_onchainHtlc();
|
|
4940
5134
|
init_lockupContract();
|
|
4941
5135
|
init_repository();
|
|
@@ -4955,12 +5149,29 @@ function nextOnchainAction(input) {
|
|
|
4955
5149
|
return input.htlcLocktime - input.now >= ONCHAIN_CLAIM_MARGIN_SECONDS ? "claim" : "claim_window_closed";
|
|
4956
5150
|
}
|
|
4957
5151
|
}
|
|
5152
|
+
function nextOnchainReceiveAction(input) {
|
|
5153
|
+
switch (input.phase.phase) {
|
|
5154
|
+
case "unfunded":
|
|
5155
|
+
case "awaiting_confirmations":
|
|
5156
|
+
case "claimable":
|
|
5157
|
+
return "wait";
|
|
5158
|
+
case "claimed":
|
|
5159
|
+
return "taken";
|
|
5160
|
+
case "swept":
|
|
5161
|
+
return "refunded";
|
|
5162
|
+
case "refundable":
|
|
5163
|
+
return input.settled ? "taken" : "refund";
|
|
5164
|
+
}
|
|
5165
|
+
}
|
|
4958
5166
|
var RFQ_CONFIGURATION_REFUSAL = {
|
|
4959
5167
|
noClaimLockupCallback: "no claimLockup callback is wired, so this wallet cannot claim the lockup",
|
|
4960
5168
|
noCallbacksForClaim: "no callbacks are wired, so this wallet cannot claim the lockup",
|
|
4961
5169
|
noClaimOnchainCallback: "no claimOnchain callback is wired, so this wallet cannot claim the L1 fill",
|
|
4962
5170
|
autoActionsDisabled: "automatic actions are disabled, so this wallet will not push the refund",
|
|
4963
|
-
noCallbacksForRefund: "no callbacks are wired, so this wallet cannot push the refund"
|
|
5171
|
+
noCallbacksForRefund: "no callbacks are wired, so this wallet cannot push the refund",
|
|
5172
|
+
noRefundOnchainCallback: "no refundOnchain callback is wired, so this wallet cannot take the L1 funding back",
|
|
5173
|
+
noCallbacksForL1Refund: "no callbacks are wired, so this wallet cannot take the L1 funding back",
|
|
5174
|
+
autoActionsDisabledForL1Refund: "automatic actions are disabled, so this wallet will not push the L1 refund"
|
|
4964
5175
|
};
|
|
4965
5176
|
var RFQ_CONFIGURATION_REFUSALS = Object.values(RFQ_CONFIGURATION_REFUSAL);
|
|
4966
5177
|
var isRfqConfigurationRefusal = (reason) => reason !== void 0 && RFQ_CONFIGURATION_REFUSALS.includes(reason);
|
|
@@ -4975,6 +5186,16 @@ var RfqSwapOriginRequired = class extends Error {
|
|
|
4975
5186
|
this.rfqId = rfqId;
|
|
4976
5187
|
}
|
|
4977
5188
|
};
|
|
5189
|
+
var OnchainReceiveNeedsChainSource = class extends Error {
|
|
5190
|
+
rfqId;
|
|
5191
|
+
constructor(rfqId) {
|
|
5192
|
+
super(
|
|
5193
|
+
`rfq swap ${rfqId} is an onchain_receive swap and this manager has no ChainSource; its L1 refund could be neither seen nor made, so it is refused rather than monitored blind`
|
|
5194
|
+
);
|
|
5195
|
+
this.name = "OnchainReceiveNeedsChainSource";
|
|
5196
|
+
this.rfqId = rfqId;
|
|
5197
|
+
}
|
|
5198
|
+
};
|
|
4978
5199
|
var notify = (listeners, call) => {
|
|
4979
5200
|
for (const listener of listeners) {
|
|
4980
5201
|
try {
|
|
@@ -5039,6 +5260,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5039
5260
|
timer = null;
|
|
5040
5261
|
running = false;
|
|
5041
5262
|
constructor(deps, config = {}) {
|
|
5263
|
+
(0, import_sdk24.assertTimerMs)("pollIntervalMs", config.pollIntervalMs);
|
|
5042
5264
|
this.deps = deps;
|
|
5043
5265
|
this.config = {
|
|
5044
5266
|
enableAutoActions: config.enableAutoActions ?? true,
|
|
@@ -5094,6 +5316,9 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5094
5316
|
let swap;
|
|
5095
5317
|
try {
|
|
5096
5318
|
swap = rebuildRfqSwap(record, await params(record));
|
|
5319
|
+
if (swap.kind === "onchain_receive" && !this.deps.chain) {
|
|
5320
|
+
throw new OnchainReceiveNeedsChainSource(swap.rfqId);
|
|
5321
|
+
}
|
|
5097
5322
|
} catch (error) {
|
|
5098
5323
|
failed.push({
|
|
5099
5324
|
rfqId: record.rfqId,
|
|
@@ -5228,6 +5453,9 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5228
5453
|
* origin, one remembered from an earlier `addSwap`, or the stored record (one read).
|
|
5229
5454
|
*/
|
|
5230
5455
|
async admit(swap, origin) {
|
|
5456
|
+
if (swap.kind === "onchain_receive" && !this.deps.chain) {
|
|
5457
|
+
throw new OnchainReceiveNeedsChainSource(swap.rfqId);
|
|
5458
|
+
}
|
|
5231
5459
|
if (origin) {
|
|
5232
5460
|
assertSameSwap(origin, swap);
|
|
5233
5461
|
this.origins.set(swap.rfqId, origin);
|
|
@@ -5376,7 +5604,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5376
5604
|
});
|
|
5377
5605
|
return;
|
|
5378
5606
|
}
|
|
5379
|
-
if (!(0,
|
|
5607
|
+
if (!(0, import_sdk24.isContractVtxoEvent)(event)) return;
|
|
5380
5608
|
const swap = this.byLockupScript.get(event.contractScript);
|
|
5381
5609
|
if (!swap) return;
|
|
5382
5610
|
void this.pollSwap(swap).catch(() => {
|
|
@@ -5494,6 +5722,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5494
5722
|
} catch {
|
|
5495
5723
|
fate = { fate: "unknown" };
|
|
5496
5724
|
}
|
|
5725
|
+
if (swap.kind === "onchain_receive") return this.driveOnchainReceive(swap, fate);
|
|
5497
5726
|
if (fate.fate === "claimed" || fate.fate === "returned") {
|
|
5498
5727
|
this.stampLockupSpends(swap, fate.spends);
|
|
5499
5728
|
if (fate.fate === "claimed") this.stampSettlementPreimage(swap, fate.preimage);
|
|
@@ -5603,8 +5832,8 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5603
5832
|
this.setState(swap, "claimed");
|
|
5604
5833
|
this.emitAction(swap, "claimLockup");
|
|
5605
5834
|
} catch (error) {
|
|
5606
|
-
const ark = (0,
|
|
5607
|
-
if ((0,
|
|
5835
|
+
const ark = (0, import_sdk24.isArkError)(error) ? error : (0, import_sdk24.maybeArkError)(error);
|
|
5836
|
+
if ((0, import_sdk24.isArkError)(ark, import_sdk24.ArkErrorName.VTXO_ALREADY_SPENT)) {
|
|
5608
5837
|
if (swap.claimFailure !== void 0) {
|
|
5609
5838
|
delete swap.claimFailure;
|
|
5610
5839
|
this.touch(swap);
|
|
@@ -5616,6 +5845,94 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5616
5845
|
this.emitFailed(swap, error);
|
|
5617
5846
|
}
|
|
5618
5847
|
}
|
|
5848
|
+
/** `settled` ends the swap; `returned` does NOT, signalling their L1
|
|
5849
|
+
* funding is stranded. */
|
|
5850
|
+
async driveOnchainReceive(swap, fate) {
|
|
5851
|
+
const settled = fate.fate === "claimed";
|
|
5852
|
+
if (settled || fate.fate === "returned") this.stampLockupSpends(swap, fate.spends);
|
|
5853
|
+
if (settled) {
|
|
5854
|
+
this.setState(swap, "settled");
|
|
5855
|
+
return;
|
|
5856
|
+
}
|
|
5857
|
+
const l1 = await this.driveOnchainRefund(swap, swap.claimTxid !== void 0);
|
|
5858
|
+
if (fate.fate === "returned") {
|
|
5859
|
+
if (l1.verdict === "resolved") this.setState(swap, "refunded");
|
|
5860
|
+
else if (l1.blocked) this.block(swap, l1.blocked);
|
|
5861
|
+
return;
|
|
5862
|
+
}
|
|
5863
|
+
if (fate.fate === "exited") return this.blockExitedLockup(swap, fate);
|
|
5864
|
+
if (l1.verdict === "live" && this.config.now() >= swap.refundLocktime + REFUND_MTP_LAG_SECONDS) {
|
|
5865
|
+
return this.block(
|
|
5866
|
+
swap,
|
|
5867
|
+
l1.blocked ?? "the Arkade claim window closed unclaimed and the L1 HTLC is still funded \u2014 holding the swap open until its refund leaf opens"
|
|
5868
|
+
);
|
|
5869
|
+
}
|
|
5870
|
+
if (swap.refundTxid || l1.attempted) {
|
|
5871
|
+
return this.block(
|
|
5872
|
+
swap,
|
|
5873
|
+
"the L1 funding was refunded, so claiming the lockup too would take both sides of the trade \u2014 the solver's reclaim ends this swap"
|
|
5874
|
+
);
|
|
5875
|
+
}
|
|
5876
|
+
await this.driveReceiveClaim(swap);
|
|
5877
|
+
if (l1.blocked && !isRfqSwapTerminal(swap.state)) this.block(swap, l1.blocked);
|
|
5878
|
+
}
|
|
5879
|
+
/** `resolved`: the HTLC can hold nothing more. `blocked` is a refusal the
|
|
5880
|
+
* caller applies once the Arkade arm has run. No give-up branch. */
|
|
5881
|
+
async driveOnchainRefund(swap, claimSubmitted) {
|
|
5882
|
+
if (!this.deps.chain) return { verdict: "live" };
|
|
5883
|
+
let phase;
|
|
5884
|
+
try {
|
|
5885
|
+
phase = await classifyOnchainHtlc(this.deps.chain, {
|
|
5886
|
+
htlc: swap.htlc,
|
|
5887
|
+
minConfirmations: swap.minConfirmations,
|
|
5888
|
+
funding: swap.funding
|
|
5889
|
+
});
|
|
5890
|
+
} catch {
|
|
5891
|
+
return { verdict: "live" };
|
|
5892
|
+
}
|
|
5893
|
+
if ("utxo" in phase && !swap.funding) {
|
|
5894
|
+
swap.funding = { txid: phase.utxo.txid, vout: phase.utxo.vout };
|
|
5895
|
+
this.touch(swap);
|
|
5896
|
+
}
|
|
5897
|
+
if (phase.phase === "unfunded" && !swap.funding) return { verdict: "resolved" };
|
|
5898
|
+
switch (nextOnchainReceiveAction({ phase, settled: claimSubmitted })) {
|
|
5899
|
+
case "taken":
|
|
5900
|
+
return { verdict: "resolved" };
|
|
5901
|
+
case "refunded":
|
|
5902
|
+
if (phase.phase === "swept" && !swap.refundTxid) {
|
|
5903
|
+
swap.refundTxid = phase.txid;
|
|
5904
|
+
this.touch(swap);
|
|
5905
|
+
}
|
|
5906
|
+
return { verdict: "resolved" };
|
|
5907
|
+
case "wait":
|
|
5908
|
+
return { verdict: "live" };
|
|
5909
|
+
case "refund":
|
|
5910
|
+
break;
|
|
5911
|
+
}
|
|
5912
|
+
if (phase.phase !== "refundable") return { verdict: "live" };
|
|
5913
|
+
if (swap.refundTxid) return { verdict: "live" };
|
|
5914
|
+
if (!this.callbacks?.refundOnchain) {
|
|
5915
|
+
return {
|
|
5916
|
+
verdict: "live",
|
|
5917
|
+
blocked: this.callbacks ? RFQ_CONFIGURATION_REFUSAL.noRefundOnchainCallback : RFQ_CONFIGURATION_REFUSAL.noCallbacksForL1Refund
|
|
5918
|
+
};
|
|
5919
|
+
}
|
|
5920
|
+
if (!this.config.enableAutoActions) {
|
|
5921
|
+
return {
|
|
5922
|
+
verdict: "live",
|
|
5923
|
+
blocked: RFQ_CONFIGURATION_REFUSAL.autoActionsDisabledForL1Refund
|
|
5924
|
+
};
|
|
5925
|
+
}
|
|
5926
|
+
try {
|
|
5927
|
+
const { txid } = await this.callbacks.refundOnchain(swap, phase.utxo);
|
|
5928
|
+
swap.refundTxid = txid;
|
|
5929
|
+
this.touch(swap);
|
|
5930
|
+
this.emitAction(swap, "refundOnchain");
|
|
5931
|
+
} catch (error) {
|
|
5932
|
+
this.emitFailed(swap, error);
|
|
5933
|
+
}
|
|
5934
|
+
return { verdict: "live", attempted: true };
|
|
5935
|
+
}
|
|
5619
5936
|
/** `handled` ends the pass; `continue` falls through to the refund gate. */
|
|
5620
5937
|
async driveOnchain(swap) {
|
|
5621
5938
|
if (!this.deps.chain) {
|
|
@@ -5894,10 +6211,10 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5894
6211
|
this.waiters.delete(swap.rfqId);
|
|
5895
6212
|
}
|
|
5896
6213
|
};
|
|
5897
|
-
var traderClaimTxid = (swap) => swap.kind === "
|
|
6214
|
+
var traderClaimTxid = (swap) => swap.kind === "lightning_send" ? void 0 : swap.claimTxid;
|
|
5898
6215
|
var isPayoutDecided = (swap) => swap.state === "settled" || swap.state === "refunded" || swap.kind === "onchain_send" && swap.claimTxid !== void 0;
|
|
5899
6216
|
var outcomeOf = (swap) => {
|
|
5900
|
-
const lostReceive = swap.kind === "lightning_receive" && swap.state === "refunded";
|
|
6217
|
+
const lostReceive = (swap.kind === "lightning_receive" || swap.kind === "onchain_receive") && swap.state === "refunded";
|
|
5901
6218
|
return {
|
|
5902
6219
|
state: swap.state,
|
|
5903
6220
|
txid: lostReceive ? swap.refundTxid : traderClaimTxid(swap) ?? swap.refundTxid
|
|
@@ -5905,11 +6222,11 @@ var outcomeOf = (swap) => {
|
|
|
5905
6222
|
};
|
|
5906
6223
|
var outcomeOfRecord = (stored) => {
|
|
5907
6224
|
const record = normalizeRfqSwapRecord(stored);
|
|
5908
|
-
const profileClaim = record.kind === "
|
|
6225
|
+
const profileClaim = record.kind === "lightning_send" ? void 0 : record.profile.claimTxid;
|
|
5909
6226
|
const claimTxid = typeof profileClaim === "string" ? profileClaim : void 0;
|
|
5910
6227
|
return {
|
|
5911
6228
|
state: record.state,
|
|
5912
|
-
txid: record.kind === "lightning_receive" && record.state === "refunded" ? record.refundTxid : claimTxid ?? record.refundTxid
|
|
6229
|
+
txid: (record.kind === "lightning_receive" || record.kind === "onchain_receive") && record.state === "refunded" ? record.refundTxid : claimTxid ?? record.refundTxid
|
|
5913
6230
|
};
|
|
5914
6231
|
};
|
|
5915
6232
|
var errorMessage = (error) => error instanceof Error ? error.message : String(error);
|
|
@@ -5917,7 +6234,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
|
|
|
5917
6234
|
|
|
5918
6235
|
// src/watch.ts
|
|
5919
6236
|
var import_base16 = require("@scure/base");
|
|
5920
|
-
var
|
|
6237
|
+
var import_sdk25 = require("@arkade-os/sdk");
|
|
5921
6238
|
init_coverage();
|
|
5922
6239
|
init_offer();
|
|
5923
6240
|
init_store();
|
|
@@ -5952,7 +6269,7 @@ async function watchOfferSwaps({
|
|
|
5952
6269
|
wallet.getAddress(),
|
|
5953
6270
|
wallet.getArkadeReader()
|
|
5954
6271
|
]);
|
|
5955
|
-
const operatorPubkey =
|
|
6272
|
+
const operatorPubkey = import_sdk25.ArkAddress.decode(address).serverPubKey;
|
|
5956
6273
|
let queue = Promise.resolve();
|
|
5957
6274
|
const enqueue = (task) => {
|
|
5958
6275
|
queue = queue.then(task).catch(() => {
|
|
@@ -5967,7 +6284,7 @@ async function watchOfferSwaps({
|
|
|
5967
6284
|
return classifyDepositSpend(
|
|
5968
6285
|
decodeOffer(import_base16.hex.decode(swap.offerHex)),
|
|
5969
6286
|
operatorPubkey,
|
|
5970
|
-
txs.map((psbt) =>
|
|
6287
|
+
txs.map((psbt) => import_sdk25.Transaction.fromPSBT(import_base16.base64.decode(psbt))),
|
|
5971
6288
|
{ txid: vtxo.txid, vout: vtxo.vout }
|
|
5972
6289
|
);
|
|
5973
6290
|
} catch {
|
|
@@ -5995,7 +6312,7 @@ async function watchOfferSwaps({
|
|
|
5995
6312
|
}
|
|
5996
6313
|
};
|
|
5997
6314
|
const unsubscribe = manager.onContractEvent((event) => {
|
|
5998
|
-
if (!(0,
|
|
6315
|
+
if (!(0, import_sdk25.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
|
|
5999
6316
|
enqueue(() => handleSpend(event));
|
|
6000
6317
|
});
|
|
6001
6318
|
return {
|
|
@@ -6005,7 +6322,7 @@ async function watchOfferSwaps({
|
|
|
6005
6322
|
}
|
|
6006
6323
|
|
|
6007
6324
|
// src/client/legacyRecords.ts
|
|
6008
|
-
var
|
|
6325
|
+
var import_sdk26 = require("@arkade-os/sdk");
|
|
6009
6326
|
init_repository();
|
|
6010
6327
|
var readLegacyRfqSwaps = async (repository, filter = {}) => {
|
|
6011
6328
|
try {
|
|
@@ -6022,7 +6339,7 @@ var withLegacyRfqSwaps = (bridge, repository, admits) => {
|
|
|
6022
6339
|
index: bridge.index,
|
|
6023
6340
|
quoteIdOf: bridge.quoteIdOf,
|
|
6024
6341
|
async getRfqSwapsPage(filter, page) {
|
|
6025
|
-
(0,
|
|
6342
|
+
(0, import_sdk26.assertPageRequest)(page);
|
|
6026
6343
|
assertRfqSwapPageFilter(filter);
|
|
6027
6344
|
const v2 = await collectRfqSwaps(bridge, filter);
|
|
6028
6345
|
const held = new Set(
|
|
@@ -6261,7 +6578,7 @@ var createSwapDrive = (config) => {
|
|
|
6261
6578
|
const secret = rfqClaimSecretOf(record);
|
|
6262
6579
|
if (!secret) throw new Error(`rfq swap ${swap.rfqId} carries no claim secret`);
|
|
6263
6580
|
const preimage = await preimageForSwapRecord(wallet, secret);
|
|
6264
|
-
const signer = await (0,
|
|
6581
|
+
const signer = await (0, import_sdk27.contractSigner)(wallet, await (0, import_sdk27.identityDescriptor)(wallet.identity));
|
|
6265
6582
|
const claimKey = record.profile.claimKey;
|
|
6266
6583
|
if (typeof claimKey === "string") {
|
|
6267
6584
|
const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
|
|
@@ -6287,12 +6604,46 @@ var createSwapDrive = (config) => {
|
|
|
6287
6604
|
return { txid };
|
|
6288
6605
|
};
|
|
6289
6606
|
};
|
|
6607
|
+
const defaultOnchainRefund = (chain, feeRateSatVb) => {
|
|
6608
|
+
return async (swap, utxo) => {
|
|
6609
|
+
const record = await corridorStore().getRfqSwap(swap.rfqId);
|
|
6610
|
+
if (!record) {
|
|
6611
|
+
throw new Error(`rfq swap ${swap.rfqId} has no stored record to refund from`);
|
|
6612
|
+
}
|
|
6613
|
+
const descriptor = record.profile.refundDescriptor;
|
|
6614
|
+
if (typeof descriptor !== "string") {
|
|
6615
|
+
throw new Error(
|
|
6616
|
+
`rfq swap ${swap.rfqId} carries no refund descriptor; wire the onchain corridor's refund callback to take its L1 funding back`
|
|
6617
|
+
);
|
|
6618
|
+
}
|
|
6619
|
+
const signer = await (0, import_sdk27.contractSigner)(wallet, descriptor);
|
|
6620
|
+
const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
|
|
6621
|
+
if (held !== record.profile.refundKey) {
|
|
6622
|
+
throw new Error(
|
|
6623
|
+
`the key behind ${descriptor} is ${held}, not the refund key ${String(record.profile.refundKey)} rfq swap ${swap.rfqId}'s HTLC was derived with`
|
|
6624
|
+
);
|
|
6625
|
+
}
|
|
6626
|
+
const { txHex } = await buildHtlcRefund({
|
|
6627
|
+
htlc: swap.htlc,
|
|
6628
|
+
utxo,
|
|
6629
|
+
payoutPkScript: swap.refundPkScript,
|
|
6630
|
+
feeRateSatVb,
|
|
6631
|
+
sign: (sighash) => signer.signMessage(sighash, "schnorr")
|
|
6632
|
+
});
|
|
6633
|
+
return { txid: await track(chain.broadcast(txHex)) };
|
|
6634
|
+
};
|
|
6635
|
+
};
|
|
6290
6636
|
const resolveOnchain = async () => {
|
|
6291
6637
|
if (onchainSeams !== void 0) return onchainSeams !== null;
|
|
6292
6638
|
try {
|
|
6293
6639
|
const deps = (await corridors()).get("onchain").deps;
|
|
6294
6640
|
const claim = deps.claim ?? (deps.claimFeeRateSatVb === void 0 ? void 0 : defaultOnchainClaim(deps.chain, deps.claimFeeRateSatVb));
|
|
6295
|
-
|
|
6641
|
+
const refund = deps.refund ?? (deps.claimFeeRateSatVb === void 0 ? void 0 : defaultOnchainRefund(deps.chain, deps.claimFeeRateSatVb));
|
|
6642
|
+
onchainSeams = {
|
|
6643
|
+
chain: deps.chain,
|
|
6644
|
+
...claim ? { claim } : {},
|
|
6645
|
+
...refund ? { refund } : {}
|
|
6646
|
+
};
|
|
6296
6647
|
managerDeps.chain = deps.chain;
|
|
6297
6648
|
return true;
|
|
6298
6649
|
} catch (error) {
|
|
@@ -6305,7 +6656,7 @@ var createSwapDrive = (config) => {
|
|
|
6305
6656
|
}
|
|
6306
6657
|
};
|
|
6307
6658
|
const drivable = async (record) => !readsChain(record.kind) || await resolveOnchain();
|
|
6308
|
-
const pinnedNetwork = async () => (0,
|
|
6659
|
+
const pinnedNetwork = async () => (0, import_sdk27.getNetwork)(await config.network());
|
|
6309
6660
|
const claimLockup = async (swap, vtxos, { partiallyClaimed }) => {
|
|
6310
6661
|
const record = await corridorStore().getRfqSwap(swap.rfqId);
|
|
6311
6662
|
if (!record) throw new Error(`rfq swap ${swap.rfqId} has no stored record to claim from`);
|
|
@@ -6320,10 +6671,10 @@ var createSwapDrive = (config) => {
|
|
|
6320
6671
|
return track(
|
|
6321
6672
|
pushClaim(operator, {
|
|
6322
6673
|
contract: script,
|
|
6323
|
-
receiver: await (0,
|
|
6674
|
+
receiver: await (0, import_sdk27.contractSigner)(wallet, secret.signingDescriptor),
|
|
6324
6675
|
preimage: await preimageForSwapRecord(wallet, secret),
|
|
6325
6676
|
vtxos,
|
|
6326
|
-
destinationPkScript:
|
|
6677
|
+
destinationPkScript: import_sdk27.ArkAddress.decode(payoutAddress).pkScript,
|
|
6327
6678
|
// Passed through: `pushClaim`'s own value check decides whether `P` is published.
|
|
6328
6679
|
expectedAmount: swap.expectedAmount,
|
|
6329
6680
|
partiallyClaimed,
|
|
@@ -6376,7 +6727,8 @@ var createSwapDrive = (config) => {
|
|
|
6376
6727
|
},
|
|
6377
6728
|
canRefundArkade,
|
|
6378
6729
|
claimLockup,
|
|
6379
|
-
...onchainSeams?.claim ? { claimOnchain: onchainSeams.claim } : {}
|
|
6730
|
+
...onchainSeams?.claim ? { claimOnchain: onchainSeams.claim } : {},
|
|
6731
|
+
...onchainSeams?.refund ? { refundOnchain: onchainSeams.refund } : {}
|
|
6380
6732
|
});
|
|
6381
6733
|
};
|
|
6382
6734
|
let offerSource;
|
|
@@ -6390,7 +6742,7 @@ var createSwapDrive = (config) => {
|
|
|
6390
6742
|
config.network()
|
|
6391
6743
|
]);
|
|
6392
6744
|
const txs = history.map(toRestoreTx);
|
|
6393
|
-
const { hrp, serverPubKey: operatorPubkey } =
|
|
6745
|
+
const { hrp, serverPubKey: operatorPubkey } = import_sdk27.ArkAddress.decode(address);
|
|
6394
6746
|
const reopened = await legacyOfferDepositsToAdopt(store);
|
|
6395
6747
|
for (const txid of reopen) reopened.add(txid);
|
|
6396
6748
|
const cursor = reopened.size === 0 ? scanned : new Set([...scanned].filter((txid) => !reopened.has(txid)));
|
|
@@ -6829,7 +7181,8 @@ var SUPPORTED_PAIRS = [
|
|
|
6829
7181
|
"arkade->arkade",
|
|
6830
7182
|
"arkade->lightning",
|
|
6831
7183
|
"lightning->arkade",
|
|
6832
|
-
"arkade->onchain"
|
|
7184
|
+
"arkade->onchain",
|
|
7185
|
+
"onchain->arkade"
|
|
6833
7186
|
];
|
|
6834
7187
|
var isSupportedPair = (pair) => SUPPORTED_PAIRS.includes(pair);
|
|
6835
7188
|
var assembleRoute = (give, take) => {
|
|
@@ -6890,10 +7243,10 @@ var resolveRoute = async (input, deps) => {
|
|
|
6890
7243
|
}
|
|
6891
7244
|
const pair = `${giveLeg.corridor}->${takeLeg.corridor}`;
|
|
6892
7245
|
if (!isSupportedPair(pair)) {
|
|
6893
|
-
throw new UnsupportedRoute(
|
|
6894
|
-
|
|
6895
|
-
|
|
6896
|
-
);
|
|
7246
|
+
throw new UnsupportedRoute(`${pair} is not an implemented route`, {
|
|
7247
|
+
give: giveLeg.corridor,
|
|
7248
|
+
take: takeLeg.corridor
|
|
7249
|
+
});
|
|
6897
7250
|
}
|
|
6898
7251
|
const give = endpoint(
|
|
6899
7252
|
giveLeg.corridor,
|
|
@@ -6959,6 +7312,11 @@ var pinAmount = (input, takeInstrument) => {
|
|
|
6959
7312
|
|
|
6960
7313
|
// src/client/verify.ts
|
|
6961
7314
|
init_rfq();
|
|
7315
|
+
|
|
7316
|
+
// src/client/policy.ts
|
|
7317
|
+
var DEFAULT_MAX_REFUND_WINDOW_SECONDS = 30 * 24 * 3600;
|
|
7318
|
+
|
|
7319
|
+
// src/client/verify.ts
|
|
6962
7320
|
var reasonOf = (error) => error instanceof Error && typeof error.reason === "string" ? error.reason : void 0;
|
|
6963
7321
|
var CHECK_BY_REASON = {
|
|
6964
7322
|
invoice_expired: "invoice",
|
|
@@ -7109,6 +7467,22 @@ var verifyQuoteTtl = (input) => {
|
|
|
7109
7467
|
throw new QuoteExpired(input.quoteId, input.expiresAt, input.now);
|
|
7110
7468
|
}
|
|
7111
7469
|
};
|
|
7470
|
+
var CSV_GRANULARITY_SECONDS = 512;
|
|
7471
|
+
var verifyRefundWindow = (input) => {
|
|
7472
|
+
const max = input.maxSeconds ?? DEFAULT_MAX_REFUND_WINDOW_SECONDS;
|
|
7473
|
+
const window = input.refundLocktime - input.now;
|
|
7474
|
+
if (!(window <= max)) {
|
|
7475
|
+
throw new QuoteVerificationFailed("refund_window", `at most ${max}s`, `${window}s`);
|
|
7476
|
+
}
|
|
7477
|
+
const delay = input.refundWithoutReceiverDelay;
|
|
7478
|
+
if (delay !== void 0 && !(delay < max + CSV_GRANULARITY_SECONDS)) {
|
|
7479
|
+
throw new QuoteVerificationFailed(
|
|
7480
|
+
"refund_window",
|
|
7481
|
+
`a solo-refund delay of at most ${max}s`,
|
|
7482
|
+
`${delay}s`
|
|
7483
|
+
);
|
|
7484
|
+
}
|
|
7485
|
+
};
|
|
7112
7486
|
var verifyQuotedAmount = (input) => {
|
|
7113
7487
|
verifyPinnedAmount(input);
|
|
7114
7488
|
if (input.take > input.give) {
|
|
@@ -7243,7 +7617,7 @@ var verifyPlanLegs = (plan, legs, give) => {
|
|
|
7243
7617
|
|
|
7244
7618
|
// src/client/quoteRfq.ts
|
|
7245
7619
|
var import_base18 = require("@scure/base");
|
|
7246
|
-
var
|
|
7620
|
+
var import_sdk30 = require("@arkade-os/sdk");
|
|
7247
7621
|
var import_solver_discovery9 = require("@arkade-os/solver-discovery");
|
|
7248
7622
|
init_claimPacket();
|
|
7249
7623
|
init_offer();
|
|
@@ -7252,11 +7626,11 @@ init_onchainHtlc();
|
|
|
7252
7626
|
init_onchainHtlc();
|
|
7253
7627
|
|
|
7254
7628
|
// src/payment/onchainSwap.ts
|
|
7255
|
-
var
|
|
7629
|
+
var import_sdk29 = require("@arkade-os/sdk");
|
|
7256
7630
|
init_onchainHtlc();
|
|
7257
7631
|
|
|
7258
7632
|
// src/payment/swapRail.ts
|
|
7259
|
-
var
|
|
7633
|
+
var import_sdk28 = require("@arkade-os/sdk");
|
|
7260
7634
|
|
|
7261
7635
|
// src/client/sats.ts
|
|
7262
7636
|
var satsOf = (value, field) => {
|
|
@@ -7313,13 +7687,13 @@ var lockupOf = (derived) => ({
|
|
|
7313
7687
|
pkScript: derived.swapPkScript
|
|
7314
7688
|
});
|
|
7315
7689
|
var covenantInputs = (input) => {
|
|
7316
|
-
const network = (0,
|
|
7690
|
+
const network = (0, import_sdk30.networkFromArkadeInfo)(input.info);
|
|
7317
7691
|
const arkade2 = input.corridors.get("arkade").deps;
|
|
7318
7692
|
return {
|
|
7319
|
-
operatorPubkey: (0,
|
|
7693
|
+
operatorPubkey: (0, import_sdk30.toXOnly)(import_base18.hex.decode(input.info.signerPubkey), "ark signer key"),
|
|
7320
7694
|
// The resolved per-network pin, never operator-reported: it lands in a covenant leaf
|
|
7321
7695
|
// that decides who can move the funds.
|
|
7322
|
-
emulatorPubkey: (0,
|
|
7696
|
+
emulatorPubkey: (0, import_sdk30.toXOnly)(import_base18.hex.decode(arkade2.emulatorPubkey), "emulator signer key"),
|
|
7323
7697
|
claimDelay: unilateralClaimDelay(Number(input.info.unilateralExitDelay)),
|
|
7324
7698
|
hrp: network.hrp
|
|
7325
7699
|
};
|
|
@@ -7356,6 +7730,8 @@ var quoteViaRfq = async (input) => {
|
|
|
7356
7730
|
return quoteLightningReceive(input);
|
|
7357
7731
|
case "arkade->onchain":
|
|
7358
7732
|
return quoteOnchainSend(input);
|
|
7733
|
+
case "onchain->arkade":
|
|
7734
|
+
return quoteOnchainReceive(input);
|
|
7359
7735
|
}
|
|
7360
7736
|
};
|
|
7361
7737
|
var quoteArkadeAsset = async (input) => {
|
|
@@ -7456,14 +7832,14 @@ var assetSidesOf = (legs) => {
|
|
|
7456
7832
|
{ give: "arkade", take: "arkade" }
|
|
7457
7833
|
);
|
|
7458
7834
|
}
|
|
7459
|
-
return giveIsBtc ? { wantAsset:
|
|
7835
|
+
return giveIsBtc ? { wantAsset: import_sdk30.asset.AssetId.fromString(legs.take.assetId) } : { offerAsset: import_sdk30.asset.AssetId.fromString(legs.give.assetId) };
|
|
7460
7836
|
};
|
|
7461
7837
|
var makerPosition = async (wallet) => {
|
|
7462
7838
|
const [address, publicKey] = await Promise.all([
|
|
7463
7839
|
wallet.getAddress(),
|
|
7464
7840
|
wallet.identity.xOnlyPublicKey()
|
|
7465
7841
|
]);
|
|
7466
|
-
return { pkScript:
|
|
7842
|
+
return { pkScript: import_sdk30.ArkAddress.decode(address).pkScript, publicKey };
|
|
7467
7843
|
};
|
|
7468
7844
|
var quoteLightningSend = async (input) => {
|
|
7469
7845
|
const invoice = input.endpoints.take.instrument;
|
|
@@ -7472,7 +7848,7 @@ var quoteLightningSend = async (input) => {
|
|
|
7472
7848
|
}
|
|
7473
7849
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
7474
7850
|
const rfqId = newRfqId();
|
|
7475
|
-
const secrets = await (0,
|
|
7851
|
+
const secrets = await (0, import_sdk30.provisionRefundKey)(input.wallet);
|
|
7476
7852
|
const wire = await input.transport.requestQuote(
|
|
7477
7853
|
lightningSendRequest({
|
|
7478
7854
|
rfqId,
|
|
@@ -7501,6 +7877,12 @@ var quoteLightningSend = async (input) => {
|
|
|
7501
7877
|
now: input.now,
|
|
7502
7878
|
invoiceExpiresAt: invoice.expiresAt
|
|
7503
7879
|
});
|
|
7880
|
+
verifyRefundWindow({
|
|
7881
|
+
refundLocktime: derived.refundLocktime,
|
|
7882
|
+
refundWithoutReceiverDelay: derived.contractParams.refundWithoutReceiverDelay,
|
|
7883
|
+
now: input.now,
|
|
7884
|
+
maxSeconds: input.policy?.maxRefundWindowSeconds
|
|
7885
|
+
});
|
|
7504
7886
|
verifyQuoteTtl({
|
|
7505
7887
|
quoteId: input.quoteId,
|
|
7506
7888
|
expiresAt: parsed.validUntil,
|
|
@@ -7541,7 +7923,7 @@ var quoteLightningReceive = async (input) => {
|
|
|
7541
7923
|
const pinned = pinnedFor(input);
|
|
7542
7924
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
7543
7925
|
const rfqId = newRfqId();
|
|
7544
|
-
const secrets = await (0,
|
|
7926
|
+
const secrets = await (0, import_sdk30.provisionClaimSecret)(input.wallet);
|
|
7545
7927
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
7546
7928
|
const payoutAddress = await input.wallet.getAddress();
|
|
7547
7929
|
const lightning = input.corridors.get("lightning").deps;
|
|
@@ -7653,8 +8035,8 @@ var quoteOnchainSend = async (input) => {
|
|
|
7653
8035
|
claimVsize: onchain.claimVsize
|
|
7654
8036
|
}) : void 0;
|
|
7655
8037
|
const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
|
|
7656
|
-
const secrets = await (0,
|
|
7657
|
-
const payoutKey = await (0,
|
|
8038
|
+
const secrets = await (0, import_sdk30.provisionClaimSecret)(input.wallet);
|
|
8039
|
+
const payoutKey = await (0, import_sdk30.provisionRefundKey)(input.wallet);
|
|
7658
8040
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
7659
8041
|
const wire = await input.transport.requestQuote(
|
|
7660
8042
|
withCanonicalAmount(
|
|
@@ -7703,6 +8085,11 @@ var quoteOnchainSend = async (input) => {
|
|
|
7703
8085
|
direction: "send"
|
|
7704
8086
|
}
|
|
7705
8087
|
});
|
|
8088
|
+
verifyRefundWindow({
|
|
8089
|
+
refundLocktime: derived.refundLocktime,
|
|
8090
|
+
now: input.now,
|
|
8091
|
+
maxSeconds: input.policy?.maxRefundWindowSeconds
|
|
8092
|
+
});
|
|
7706
8093
|
verifyQuoteTtl({
|
|
7707
8094
|
quoteId: input.quoteId,
|
|
7708
8095
|
expiresAt: parsed.validUntil,
|
|
@@ -7749,9 +8136,121 @@ var quoteOnchainSend = async (input) => {
|
|
|
7749
8136
|
}
|
|
7750
8137
|
};
|
|
7751
8138
|
};
|
|
8139
|
+
var quoteOnchainReceive = async (input) => {
|
|
8140
|
+
const pinned = pinnedFor(input);
|
|
8141
|
+
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
8142
|
+
const rfqId = newRfqId();
|
|
8143
|
+
const l1Network = l1NetworkFromArk(input.info.network);
|
|
8144
|
+
const secrets = await (0, import_sdk30.provisionClaimSecret)(input.wallet);
|
|
8145
|
+
const refundKey = await (0, import_sdk30.provisionRefundKey)(input.wallet);
|
|
8146
|
+
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
8147
|
+
const payoutAddress = await input.wallet.getAddress();
|
|
8148
|
+
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
8149
|
+
const wire = await input.transport.requestQuote(
|
|
8150
|
+
withCanonicalAmount(
|
|
8151
|
+
onchainReceiveRequest({
|
|
8152
|
+
rfqId,
|
|
8153
|
+
paymentHash,
|
|
8154
|
+
payoutAddress,
|
|
8155
|
+
payoutPubkey: secrets.pubkey,
|
|
8156
|
+
refundPubkey: refundKey.pubkey,
|
|
8157
|
+
// Placeholder: `withCanonicalAmount` writes the canonical decimal string.
|
|
8158
|
+
amount: 0,
|
|
8159
|
+
amountSide: toRfqAmountSide(pinned.on)
|
|
8160
|
+
}),
|
|
8161
|
+
pinned.value
|
|
8162
|
+
)
|
|
8163
|
+
);
|
|
8164
|
+
verifyPair(wire.pair, pair);
|
|
8165
|
+
const parsed = parseRfqQuote(wire);
|
|
8166
|
+
verifyQuotedAmount({ pair, pinned, give: parsed.give, take: parsed.take });
|
|
8167
|
+
const covenant = covenantInputs(input);
|
|
8168
|
+
const derived = verifyingDerivation(
|
|
8169
|
+
() => deriveOnchainReceive({
|
|
8170
|
+
quote: wire,
|
|
8171
|
+
paymentHash,
|
|
8172
|
+
payoutPubkey: secrets.pubkey,
|
|
8173
|
+
payoutAddress,
|
|
8174
|
+
refundPubkey: refundKey.pubkey,
|
|
8175
|
+
...covenant,
|
|
8176
|
+
l1Network
|
|
8177
|
+
})
|
|
8178
|
+
);
|
|
8179
|
+
verifySendWindow({
|
|
8180
|
+
quote: wire,
|
|
8181
|
+
quoteId: input.quoteId,
|
|
8182
|
+
now: input.now,
|
|
8183
|
+
onchain: {
|
|
8184
|
+
htlcLocktime: derived.htlcLocktime,
|
|
8185
|
+
minConfirmations: derived.minConfirmations,
|
|
8186
|
+
direction: "receive"
|
|
8187
|
+
}
|
|
8188
|
+
});
|
|
8189
|
+
verifyRefundWindow({
|
|
8190
|
+
refundLocktime: derived.htlcLocktime,
|
|
8191
|
+
now: input.now,
|
|
8192
|
+
maxSeconds: input.policy?.maxRefundWindowSeconds
|
|
8193
|
+
});
|
|
8194
|
+
verifyQuoteTtl({
|
|
8195
|
+
quoteId: input.quoteId,
|
|
8196
|
+
expiresAt: parsed.validUntil,
|
|
8197
|
+
now: input.now,
|
|
8198
|
+
floorSeconds: input.policy?.quoteTtlFloorSeconds
|
|
8199
|
+
});
|
|
8200
|
+
const artifact = {
|
|
8201
|
+
kind: "deposit",
|
|
8202
|
+
corridor: "onchain",
|
|
8203
|
+
address: derived.htlc.address,
|
|
8204
|
+
asset: input.endpoints.give.asset,
|
|
8205
|
+
amount: parsed.give,
|
|
8206
|
+
expiresAt: parsed.validUntil
|
|
8207
|
+
};
|
|
8208
|
+
return {
|
|
8209
|
+
quote: {
|
|
8210
|
+
id: input.quoteId,
|
|
8211
|
+
route: assembleRoute(
|
|
8212
|
+
{
|
|
8213
|
+
...input.endpoints.give,
|
|
8214
|
+
instrument: {
|
|
8215
|
+
kind: "address",
|
|
8216
|
+
address: derived.htlc.address,
|
|
8217
|
+
amount: parsed.give
|
|
8218
|
+
}
|
|
8219
|
+
},
|
|
8220
|
+
{ ...input.endpoints.take, instrument: { kind: "wallet" } }
|
|
8221
|
+
),
|
|
8222
|
+
give: { asset: input.endpoints.give.asset, amount: parsed.give },
|
|
8223
|
+
take: { asset: input.endpoints.take.asset, amount: parsed.take },
|
|
8224
|
+
lock: { hash: paymentHash },
|
|
8225
|
+
market: input.market,
|
|
8226
|
+
solver: parsed.solver,
|
|
8227
|
+
expiresAt: parsed.validUntil,
|
|
8228
|
+
refundLocktime: derived.refundLocktime,
|
|
8229
|
+
artifact,
|
|
8230
|
+
fee: { amount: parsed.give - parsed.take, asset: input.endpoints.give.asset }
|
|
8231
|
+
},
|
|
8232
|
+
preparation: {
|
|
8233
|
+
backend: "rfq",
|
|
8234
|
+
route: "onchain->arkade",
|
|
8235
|
+
card: input.candidate.card,
|
|
8236
|
+
rfqId,
|
|
8237
|
+
wire: parsed,
|
|
8238
|
+
lockup: lockupOf(derived),
|
|
8239
|
+
secrets,
|
|
8240
|
+
payoutAddress,
|
|
8241
|
+
expectedAmount: parsed.take,
|
|
8242
|
+
refundKey,
|
|
8243
|
+
refundPkScript,
|
|
8244
|
+
htlc: derived.htlc,
|
|
8245
|
+
htlcParams: derived.htlcParams,
|
|
8246
|
+
l1Network,
|
|
8247
|
+
minConfirmations: derived.minConfirmations
|
|
8248
|
+
}
|
|
8249
|
+
};
|
|
8250
|
+
};
|
|
7752
8251
|
|
|
7753
8252
|
// src/client/verbs.ts
|
|
7754
|
-
var
|
|
8253
|
+
var import_sdk31 = require("@arkade-os/sdk");
|
|
7755
8254
|
var enforceFeeCeiling = (quote, call, policy) => {
|
|
7756
8255
|
let ceiling;
|
|
7757
8256
|
for (const [source, limit] of [
|
|
@@ -7776,9 +8275,9 @@ var settle = async (deps, input, maxFee) => {
|
|
|
7776
8275
|
return deps.accept(quote);
|
|
7777
8276
|
};
|
|
7778
8277
|
var pay = async (deps, destination, options = {}) => {
|
|
7779
|
-
const arkade2 = (0,
|
|
8278
|
+
const arkade2 = (0, import_sdk31.arkTarget)(destination);
|
|
7780
8279
|
if (arkade2 !== void 0) {
|
|
7781
|
-
const amount = (0,
|
|
8280
|
+
const amount = (0, import_sdk31.resolveSendAmount)(
|
|
7782
8281
|
"ark",
|
|
7783
8282
|
destination,
|
|
7784
8283
|
options.amount === void 0 ? void 0 : satsOf(options.amount, "amount")
|
|
@@ -8091,7 +8590,7 @@ var createSwapClient = (config) => {
|
|
|
8091
8590
|
|
|
8092
8591
|
// src/reveal.ts
|
|
8093
8592
|
var import_base20 = require("@scure/base");
|
|
8094
|
-
var
|
|
8593
|
+
var import_sdk33 = require("@arkade-os/sdk");
|
|
8095
8594
|
init_claimPacket();
|
|
8096
8595
|
init_onchainHtlc();
|
|
8097
8596
|
var CovclaimdRevealError = class extends Error {
|
|
@@ -8133,6 +8632,7 @@ var covclaimdClient = (baseUrl, options = {}) => {
|
|
|
8133
8632
|
const url = baseUrl.replace(/\/+$/, "");
|
|
8134
8633
|
const fetchImpl = options.fetchImpl ?? fetch;
|
|
8135
8634
|
const timeoutMs = options.timeoutMs ?? 3e4;
|
|
8635
|
+
(0, import_sdk33.assertTimerMs)("timeoutMs", timeoutMs);
|
|
8136
8636
|
const send = async (what, path, init) => {
|
|
8137
8637
|
let response;
|
|
8138
8638
|
try {
|
|
@@ -8197,7 +8697,7 @@ function revealFieldsFromScript(script) {
|
|
|
8197
8697
|
}
|
|
8198
8698
|
async function revealClaimPacket(client, input) {
|
|
8199
8699
|
const fields = revealFieldsFromScript(input.script);
|
|
8200
|
-
if (import_base20.hex.encode(
|
|
8700
|
+
if (import_base20.hex.encode(import_sdk33.ArkAddress.decode(input.address).pkScript) !== import_base20.hex.encode(input.script.pkScript)) {
|
|
8201
8701
|
throw new Error("address does not belong to this covenant");
|
|
8202
8702
|
}
|
|
8203
8703
|
assertPreimageMatches(input.preimage, input.script.options.preimageHash);
|
|
@@ -8208,6 +8708,236 @@ async function revealClaimPacket(client, input) {
|
|
|
8208
8708
|
await client.reveal({ swapAddress: input.address, ciphertext, ...fields });
|
|
8209
8709
|
return { ciphertext };
|
|
8210
8710
|
}
|
|
8711
|
+
|
|
8712
|
+
// src/evmRfq.ts
|
|
8713
|
+
var import_base21 = require("@scure/base");
|
|
8714
|
+
init_rfq();
|
|
8715
|
+
var EVM_CHAIN = "ethereum";
|
|
8716
|
+
var EVM_ADDRESS = /^0x[0-9a-fA-F]{40}$/;
|
|
8717
|
+
var TOKEN_AMOUNT = /^(0|[1-9][0-9]*)$/;
|
|
8718
|
+
var MAX_UINT256 = (1n << 256n) - 1n;
|
|
8719
|
+
var MAX_UINT256_DECIMAL = MAX_UINT256.toString();
|
|
8720
|
+
var SEND_PAIR = /^arkade:BTC->ethereum:0x[0-9a-f]{40}$/;
|
|
8721
|
+
var RECEIVE_PAIR = /^ethereum:0x[0-9a-f]{40}->arkade:BTC$/;
|
|
8722
|
+
var evmTokenLeg = (tokenAddress) => `${EVM_CHAIN}:${assertEvmAddress(tokenAddress, "token address").toLowerCase()}`;
|
|
8723
|
+
var evmSendPair = (tokenAddress) => {
|
|
8724
|
+
const pair = rfqPair(ARKADE_BTC, evmTokenLeg(tokenAddress));
|
|
8725
|
+
assertPairLength(pair);
|
|
8726
|
+
return pair;
|
|
8727
|
+
};
|
|
8728
|
+
var evmReceivePair = (tokenAddress) => {
|
|
8729
|
+
const pair = rfqPair(evmTokenLeg(tokenAddress), ARKADE_BTC);
|
|
8730
|
+
assertPairLength(pair);
|
|
8731
|
+
return pair;
|
|
8732
|
+
};
|
|
8733
|
+
var evmDirectionOf = (pair) => {
|
|
8734
|
+
if (SEND_PAIR.test(pair)) return "send";
|
|
8735
|
+
if (RECEIVE_PAIR.test(pair)) return "receive";
|
|
8736
|
+
return null;
|
|
8737
|
+
};
|
|
8738
|
+
var evmTokenOf = (pair) => {
|
|
8739
|
+
const direction = evmDirectionOf(pair);
|
|
8740
|
+
if (direction === null) return null;
|
|
8741
|
+
const [from, to] = pair.split("->");
|
|
8742
|
+
return (direction === "send" ? to : from).slice(EVM_CHAIN.length + 1);
|
|
8743
|
+
};
|
|
8744
|
+
var evmAmountToWire = (units) => {
|
|
8745
|
+
if (typeof units !== "bigint") throw new Error("token amount must be a bigint");
|
|
8746
|
+
if (units < 0n) throw new Error(`token amount may not be negative, got ${units}`);
|
|
8747
|
+
if (units > MAX_UINT256) throw new Error(`token amount must fit uint256, got ${units}`);
|
|
8748
|
+
return units.toString();
|
|
8749
|
+
};
|
|
8750
|
+
var evmAmountFromWire = (value, field) => {
|
|
8751
|
+
if (typeof value !== "string") {
|
|
8752
|
+
throw new Error(
|
|
8753
|
+
`${field} must be a decimal string of atomic units, not a JSON ${typeof value}`
|
|
8754
|
+
);
|
|
8755
|
+
}
|
|
8756
|
+
if (!TOKEN_AMOUNT.test(value)) {
|
|
8757
|
+
throw new Error(`${field} is not a canonical decimal amount: ${JSON.stringify(value)}`);
|
|
8758
|
+
}
|
|
8759
|
+
if (value.length > MAX_UINT256_DECIMAL.length || value.length === MAX_UINT256_DECIMAL.length && value > MAX_UINT256_DECIMAL) {
|
|
8760
|
+
throw new Error(`${field} exceeds uint256`);
|
|
8761
|
+
}
|
|
8762
|
+
return BigInt(value);
|
|
8763
|
+
};
|
|
8764
|
+
var evmSendRequest = (input) => {
|
|
8765
|
+
assertPositiveInteger(input.amountSats, "amountSats");
|
|
8766
|
+
assertHash32(input.paymentHash, "paymentHash");
|
|
8767
|
+
return {
|
|
8768
|
+
v: 1,
|
|
8769
|
+
type: "rfq_request",
|
|
8770
|
+
rfq_id: input.rfqId,
|
|
8771
|
+
pair: evmSendPair(input.tokenAddress),
|
|
8772
|
+
amount_side: "from",
|
|
8773
|
+
amount: input.amountSats,
|
|
8774
|
+
profile: {
|
|
8775
|
+
payment_hash: input.paymentHash,
|
|
8776
|
+
evm_claim_address: assertEvmAddress(input.evmClaimAddress, "evmClaimAddress"),
|
|
8777
|
+
refund_address: input.refundAddress,
|
|
8778
|
+
client_refund_pubkey: import_base21.hex.encode(input.senderPubkey)
|
|
8779
|
+
}
|
|
8780
|
+
};
|
|
8781
|
+
};
|
|
8782
|
+
var evmReceiveRequest = (input) => {
|
|
8783
|
+
assertPositiveInteger(input.evmTimeoutBlock, "evmTimeoutBlock");
|
|
8784
|
+
assertHash32(input.paymentHash, "paymentHash");
|
|
8785
|
+
if (input.evmAmount <= 0n) {
|
|
8786
|
+
throw new Error(
|
|
8787
|
+
`evmAmount must be a positive number of atomic units, got ${input.evmAmount}`
|
|
8788
|
+
);
|
|
8789
|
+
}
|
|
8790
|
+
return {
|
|
8791
|
+
v: 1,
|
|
8792
|
+
type: "rfq_request",
|
|
8793
|
+
rfq_id: input.rfqId,
|
|
8794
|
+
pair: evmReceivePair(input.tokenAddress),
|
|
8795
|
+
amount_side: "from",
|
|
8796
|
+
profile: {
|
|
8797
|
+
payment_hash: input.paymentHash,
|
|
8798
|
+
evm_amount: evmAmountToWire(input.evmAmount),
|
|
8799
|
+
evm_timeout_block: input.evmTimeoutBlock,
|
|
8800
|
+
evm_refund_address: assertEvmAddress(input.evmRefundAddress, "evmRefundAddress"),
|
|
8801
|
+
payout_address: input.payoutAddress,
|
|
8802
|
+
payout_pubkey: import_base21.hex.encode(input.payoutPubkey)
|
|
8803
|
+
}
|
|
8804
|
+
};
|
|
8805
|
+
};
|
|
8806
|
+
var readEvmSendQuote = (payload, expected) => {
|
|
8807
|
+
assertHash32(expected.paymentHash, "expected.paymentHash");
|
|
8808
|
+
assertPositiveInteger(expected.chainId, "expected.chainId");
|
|
8809
|
+
assertPositiveInteger(expected.amountSats, "expected.amountSats");
|
|
8810
|
+
const { quote, profile } = readEvmQuoteEnvelope(
|
|
8811
|
+
payload,
|
|
8812
|
+
evmSendPair(expected.tokenAddress),
|
|
8813
|
+
expected.rfqId
|
|
8814
|
+
);
|
|
8815
|
+
readCommonProfile(profile, expected.paymentHash, expected.chainId);
|
|
8816
|
+
assertHex(profile.receiver_pk_script, "profile.receiver_pk_script");
|
|
8817
|
+
assertEvmAddress(
|
|
8818
|
+
asString(profile.evm_refund_address, "profile.evm_refund_address"),
|
|
8819
|
+
"profile.evm_refund_address"
|
|
8820
|
+
);
|
|
8821
|
+
assertPositiveInteger(profile.evm_timeout_block, "profile.evm_timeout_block");
|
|
8822
|
+
assertPositiveTokenAmount(quote.to_amount, "to_amount");
|
|
8823
|
+
assertPositiveInteger(quote.from_amount, "from_amount");
|
|
8824
|
+
if (quote.from_amount !== expected.amountSats) {
|
|
8825
|
+
throw new Error("quote from_amount does not match the requested sats amount");
|
|
8826
|
+
}
|
|
8827
|
+
return quote;
|
|
8828
|
+
};
|
|
8829
|
+
var readEvmReceiveQuote = (payload, expected) => {
|
|
8830
|
+
assertHash32(expected.paymentHash, "expected.paymentHash");
|
|
8831
|
+
assertPositiveInteger(expected.chainId, "expected.chainId");
|
|
8832
|
+
if (expected.evmAmount <= 0n) throw new Error("expected.evmAmount must be positive");
|
|
8833
|
+
evmAmountToWire(expected.evmAmount);
|
|
8834
|
+
const { quote, profile } = readEvmQuoteEnvelope(
|
|
8835
|
+
payload,
|
|
8836
|
+
evmReceivePair(expected.tokenAddress),
|
|
8837
|
+
expected.rfqId
|
|
8838
|
+
);
|
|
8839
|
+
readCommonProfile(profile, expected.paymentHash, expected.chainId);
|
|
8840
|
+
assertHex(profile.solver_refund_pk_script, "profile.solver_refund_pk_script");
|
|
8841
|
+
assertEvmAddress(
|
|
8842
|
+
asString(profile.evm_claim_address, "profile.evm_claim_address"),
|
|
8843
|
+
"profile.evm_claim_address"
|
|
8844
|
+
);
|
|
8845
|
+
if (assertPositiveTokenAmount(quote.from_amount, "from_amount") !== expected.evmAmount) {
|
|
8846
|
+
throw new Error("quote from_amount does not match the requested token amount");
|
|
8847
|
+
}
|
|
8848
|
+
assertPositiveInteger(quote.to_amount, "to_amount");
|
|
8849
|
+
return quote;
|
|
8850
|
+
};
|
|
8851
|
+
var evmQuoteTokenAmount = (quote) => {
|
|
8852
|
+
const direction = evmDirectionOf(quote.pair);
|
|
8853
|
+
if (direction === null) throw new Error(`not an EVM pair: ${JSON.stringify(quote.pair)}`);
|
|
8854
|
+
return direction === "send" ? evmAmountFromWire(quote.to_amount, "to_amount") : evmAmountFromWire(quote.from_amount, "from_amount");
|
|
8855
|
+
};
|
|
8856
|
+
var evmQuoteSats = (quote) => {
|
|
8857
|
+
const direction = evmDirectionOf(quote.pair);
|
|
8858
|
+
if (direction === null) throw new Error(`not an EVM pair: ${JSON.stringify(quote.pair)}`);
|
|
8859
|
+
const field = direction === "send" ? "from_amount" : "to_amount";
|
|
8860
|
+
const sats = quote[field];
|
|
8861
|
+
assertPositiveInteger(sats, field);
|
|
8862
|
+
return sats;
|
|
8863
|
+
};
|
|
8864
|
+
var assertEvmAddress = (value, field) => {
|
|
8865
|
+
if (!EVM_ADDRESS.test(value)) {
|
|
8866
|
+
throw new Error(`${field} must be 0x then 40 hex, got ${JSON.stringify(value)}`);
|
|
8867
|
+
}
|
|
8868
|
+
return value;
|
|
8869
|
+
};
|
|
8870
|
+
var assertPositiveInteger = (value, field) => {
|
|
8871
|
+
if (typeof value !== "number" || !Number.isSafeInteger(value) || value <= 0) {
|
|
8872
|
+
throw new Error(`${field} must be a positive integer, got ${String(value)}`);
|
|
8873
|
+
}
|
|
8874
|
+
};
|
|
8875
|
+
var assertNonNegativeInteger = (value, field) => {
|
|
8876
|
+
if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) {
|
|
8877
|
+
throw new Error(`${field} must be a non-negative integer, got ${String(value)}`);
|
|
8878
|
+
}
|
|
8879
|
+
};
|
|
8880
|
+
var assertHex = (value, field) => {
|
|
8881
|
+
if (typeof value !== "string" || value.length === 0 || value.length % 2 !== 0 || !/^[0-9a-f]+$/.test(value)) {
|
|
8882
|
+
throw new Error(`${field} must be lowercase hex of whole bytes, got ${String(value)}`);
|
|
8883
|
+
}
|
|
8884
|
+
};
|
|
8885
|
+
var assertHash32 = (value, field) => {
|
|
8886
|
+
if (typeof value !== "string" || !/^[0-9a-f]{64}$/.test(value)) {
|
|
8887
|
+
throw new Error(`${field} must be 64 lowercase hex characters, got ${String(value)}`);
|
|
8888
|
+
}
|
|
8889
|
+
};
|
|
8890
|
+
var assertPositiveTokenAmount = (value, field) => {
|
|
8891
|
+
const amount = evmAmountFromWire(value, field);
|
|
8892
|
+
if (amount === 0n) throw new Error(`${field} must be positive`);
|
|
8893
|
+
return amount;
|
|
8894
|
+
};
|
|
8895
|
+
var asString = (value, field) => {
|
|
8896
|
+
if (typeof value !== "string") {
|
|
8897
|
+
throw new Error(`${field} must be a string, got ${String(value)}`);
|
|
8898
|
+
}
|
|
8899
|
+
return value;
|
|
8900
|
+
};
|
|
8901
|
+
var readEvmQuoteEnvelope = (payload, expectedPair, expectedRfqId) => {
|
|
8902
|
+
if (!payload || typeof payload !== "object") throw new Error("EVM quote is not an object");
|
|
8903
|
+
const quote = payload;
|
|
8904
|
+
if (quote.v !== 1) throw new Error(`expected EVM quote version 1, got ${String(quote.v)}`);
|
|
8905
|
+
if (quote.type !== "rfq_quote") {
|
|
8906
|
+
throw new Error(`expected an rfq_quote, got ${String(quote.type)}`);
|
|
8907
|
+
}
|
|
8908
|
+
if (quote.rfq_id !== expectedRfqId) {
|
|
8909
|
+
throw new Error(
|
|
8910
|
+
`quote is for rfq_id ${JSON.stringify(quote.rfq_id)}, not this negotiation's ${expectedRfqId}`
|
|
8911
|
+
);
|
|
8912
|
+
}
|
|
8913
|
+
if (quote.pair !== expectedPair) {
|
|
8914
|
+
throw new Error(`solver quoted ${JSON.stringify(quote.pair)}, not ${expectedPair}`);
|
|
8915
|
+
}
|
|
8916
|
+
asString(quote.solver_pubkey, "solver_pubkey");
|
|
8917
|
+
assertPositiveInteger(quote.valid_until, "valid_until");
|
|
8918
|
+
assertPositiveInteger(quote.refund_locktime, "refund_locktime");
|
|
8919
|
+
if (!quote.profile || typeof quote.profile !== "object") {
|
|
8920
|
+
throw new Error("EVM quote carries no profile");
|
|
8921
|
+
}
|
|
8922
|
+
return { quote, profile: quote.profile };
|
|
8923
|
+
};
|
|
8924
|
+
var readCommonProfile = (profile, paymentHash, chainId) => {
|
|
8925
|
+
assertHash32(profile.payment_hash, "profile.payment_hash");
|
|
8926
|
+
asString(profile.lockup_address, "profile.lockup_address");
|
|
8927
|
+
assertEvmAddress(
|
|
8928
|
+
asString(profile.evm_contract_address, "profile.evm_contract_address"),
|
|
8929
|
+
"profile.evm_contract_address"
|
|
8930
|
+
);
|
|
8931
|
+
assertPositiveInteger(profile.evm_chain_id, "profile.evm_chain_id");
|
|
8932
|
+
assertPositiveInteger(profile.min_confirmations, "profile.min_confirmations");
|
|
8933
|
+
assertNonNegativeInteger(profile.min_age_seconds, "profile.min_age_seconds");
|
|
8934
|
+
if (profile.payment_hash !== paymentHash) {
|
|
8935
|
+
throw new Error("quote payment_hash does not match the request");
|
|
8936
|
+
}
|
|
8937
|
+
if (profile.evm_chain_id !== chainId) {
|
|
8938
|
+
throw new Error("quote evm_chain_id does not match the expected chain");
|
|
8939
|
+
}
|
|
8940
|
+
};
|
|
8211
8941
|
// Annotate the CommonJS export names for ESM import in node:
|
|
8212
8942
|
0 && (module.exports = {
|
|
8213
8943
|
ACTIVITY_TOKEN,
|
|
@@ -8227,7 +8957,9 @@ async function revealClaimPacket(client, input) {
|
|
|
8227
8957
|
ClientDisposed,
|
|
8228
8958
|
CovclaimdRevealError,
|
|
8229
8959
|
DEFAULT_INVOICE_EXPIRY_SECONDS,
|
|
8960
|
+
DEFAULT_MAX_REFUND_WINDOW_SECONDS,
|
|
8230
8961
|
DiscoverySnapshotUnavailable,
|
|
8962
|
+
EVM_CHAIN,
|
|
8231
8963
|
FEED_TTL_MS,
|
|
8232
8964
|
INDEXED_NETWORKS,
|
|
8233
8965
|
INVOICE_HRPS,
|
|
@@ -8285,6 +9017,17 @@ async function revealClaimPacket(client, input) {
|
|
|
8285
9017
|
enforceFeeCeiling,
|
|
8286
9018
|
esploraChainSource,
|
|
8287
9019
|
esploraTip,
|
|
9020
|
+
evmAmountFromWire,
|
|
9021
|
+
evmAmountToWire,
|
|
9022
|
+
evmDirectionOf,
|
|
9023
|
+
evmQuoteSats,
|
|
9024
|
+
evmQuoteTokenAmount,
|
|
9025
|
+
evmReceivePair,
|
|
9026
|
+
evmReceiveRequest,
|
|
9027
|
+
evmSendPair,
|
|
9028
|
+
evmSendRequest,
|
|
9029
|
+
evmTokenLeg,
|
|
9030
|
+
evmTokenOf,
|
|
8288
9031
|
exchange,
|
|
8289
9032
|
familyOfSwapId,
|
|
8290
9033
|
fateMoved,
|
|
@@ -8328,6 +9071,8 @@ async function revealClaimPacket(client, input) {
|
|
|
8328
9071
|
quoteViaRfq,
|
|
8329
9072
|
railOf,
|
|
8330
9073
|
railOfCorridor,
|
|
9074
|
+
readEvmReceiveQuote,
|
|
9075
|
+
readEvmSendQuote,
|
|
8331
9076
|
readableRecord,
|
|
8332
9077
|
readsChain,
|
|
8333
9078
|
receive,
|
|
@@ -8365,6 +9110,7 @@ async function revealClaimPacket(client, input) {
|
|
|
8365
9110
|
verifyQuotedAmount,
|
|
8366
9111
|
verifyReceiveInvoiceFacts,
|
|
8367
9112
|
verifyReceiveWindow,
|
|
9113
|
+
verifyRefundWindow,
|
|
8368
9114
|
verifyResponder,
|
|
8369
9115
|
verifySendInvoice,
|
|
8370
9116
|
verifySendWindow,
|