@arkade-os/swap 0.1.1 → 0.1.2
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/dist/advanced.cjs +16 -9
- package/dist/advanced.js +3 -3
- package/dist/{chunk-T4FHBWZI.js → chunk-BLECLU5Q.js} +1 -1
- package/dist/{chunk-FMRAV77W.js → chunk-ICSREL7N.js} +14 -12
- package/dist/{chunk-YHESEL4I.js → chunk-J2PMAQP2.js} +18 -11
- package/dist/index.cjs +16 -9
- package/dist/index.js +3 -3
- package/dist/nostr.js +1 -1
- package/dist/protocol.cjs +16 -14
- package/dist/protocol.js +4 -4
- package/package.json +2 -2
package/dist/advanced.cjs
CHANGED
|
@@ -9707,7 +9707,7 @@ var assetSidesOf = (legs) => {
|
|
|
9707
9707
|
const giveIsBtc = legs.give.assetId === BTC_ASSET_ID;
|
|
9708
9708
|
const takeIsBtc = legs.take.assetId === BTC_ASSET_ID;
|
|
9709
9709
|
if (giveIsBtc && takeIsBtc) {
|
|
9710
|
-
throw new UnsupportedRoute("
|
|
9710
|
+
throw new UnsupportedRoute("give and take are both BTC, so the route swaps nothing", {
|
|
9711
9711
|
give: "arkade",
|
|
9712
9712
|
take: "arkade"
|
|
9713
9713
|
});
|
|
@@ -9809,9 +9809,11 @@ var quoteLightningReceive = async (input) => {
|
|
|
9809
9809
|
const pinned = pinnedFor(input);
|
|
9810
9810
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
9811
9811
|
const rfqId = newRfqId();
|
|
9812
|
-
const secrets = await
|
|
9812
|
+
const [secrets, payoutAddress] = await Promise.all([
|
|
9813
|
+
(0, import_sdk35.provisionClaimSecret)(input.wallet),
|
|
9814
|
+
input.wallet.getAddress()
|
|
9815
|
+
]);
|
|
9813
9816
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
9814
|
-
const payoutAddress = await input.wallet.getAddress();
|
|
9815
9817
|
const lightning = input.corridors.get("lightning").deps;
|
|
9816
9818
|
const sealTo = sealingKey(lightning);
|
|
9817
9819
|
const sealsAmount = pinned.on === "take" && input.legs.take.assetId === BTC_ASSET_ID;
|
|
@@ -9927,8 +9929,10 @@ var quoteOnchainSend = async (input) => {
|
|
|
9927
9929
|
claimVsize: onchain.claimVsize
|
|
9928
9930
|
}) : void 0;
|
|
9929
9931
|
const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
|
|
9930
|
-
const secrets = await
|
|
9931
|
-
|
|
9932
|
+
const [secrets, payoutKey] = await Promise.all([
|
|
9933
|
+
(0, import_sdk35.provisionClaimSecret)(input.wallet),
|
|
9934
|
+
(0, import_sdk35.provisionRefundKey)(input.wallet)
|
|
9935
|
+
]);
|
|
9932
9936
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
9933
9937
|
const wire = await input.transport.requestQuote(
|
|
9934
9938
|
withCanonicalAmount(
|
|
@@ -10034,11 +10038,14 @@ var quoteOnchainReceive = async (input) => {
|
|
|
10034
10038
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
10035
10039
|
const rfqId = newRfqId();
|
|
10036
10040
|
const l1Network = l1NetworkFromArk(input.info.network);
|
|
10037
|
-
const secrets = await
|
|
10038
|
-
|
|
10041
|
+
const [secrets, refundKey, payoutAddress, boardingAddress] = await Promise.all([
|
|
10042
|
+
(0, import_sdk35.provisionClaimSecret)(input.wallet),
|
|
10043
|
+
(0, import_sdk35.provisionRefundKey)(input.wallet),
|
|
10044
|
+
input.wallet.getAddress(),
|
|
10045
|
+
input.wallet.getBoardingAddress()
|
|
10046
|
+
]);
|
|
10039
10047
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
10040
|
-
const
|
|
10041
|
-
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
10048
|
+
const refundPkScript = l1ScriptForAddress(boardingAddress, l1Network);
|
|
10042
10049
|
const wire = await input.transport.requestQuote(
|
|
10043
10050
|
withCanonicalAmount(
|
|
10044
10051
|
onchainReceiveRequest({
|
package/dist/advanced.js
CHANGED
|
@@ -138,7 +138,7 @@ import {
|
|
|
138
138
|
withCanonicalAmount,
|
|
139
139
|
withDepositFate,
|
|
140
140
|
withRfqState
|
|
141
|
-
} from "./chunk-
|
|
141
|
+
} from "./chunk-J2PMAQP2.js";
|
|
142
142
|
import {
|
|
143
143
|
ACTIVITY_TOKEN,
|
|
144
144
|
Amount,
|
|
@@ -173,7 +173,7 @@ import {
|
|
|
173
173
|
recordOutcome,
|
|
174
174
|
swapOf,
|
|
175
175
|
toAtomicDecimal
|
|
176
|
-
} from "./chunk-
|
|
176
|
+
} from "./chunk-BLECLU5Q.js";
|
|
177
177
|
import {
|
|
178
178
|
ARKADE_BTC,
|
|
179
179
|
SwapRefusal,
|
|
@@ -182,7 +182,7 @@ import {
|
|
|
182
182
|
bindsClaimAmount,
|
|
183
183
|
rfqPair,
|
|
184
184
|
sealClaimPacket
|
|
185
|
-
} from "./chunk-
|
|
185
|
+
} from "./chunk-ICSREL7N.js";
|
|
186
186
|
import "./chunk-A3SHHRX4.js";
|
|
187
187
|
|
|
188
188
|
// src/reveal.ts
|
|
@@ -2260,10 +2260,12 @@ function deriveLightningSend(input) {
|
|
|
2260
2260
|
}
|
|
2261
2261
|
async function requestLightningSend(wallet, transport, params) {
|
|
2262
2262
|
const rfqId = params.rfqId ?? newRfqId();
|
|
2263
|
-
const secrets = await
|
|
2263
|
+
const [secrets, info] = await Promise.all([
|
|
2264
|
+
provisionRefundKey(wallet),
|
|
2265
|
+
wallet.getArkadeInfo({ requireLive: true })
|
|
2266
|
+
]);
|
|
2264
2267
|
const senderPubkey = secrets.pubkey;
|
|
2265
2268
|
const refundAddress = secrets.address;
|
|
2266
|
-
const info = await wallet.getArkadeInfo({ requireLive: true });
|
|
2267
2269
|
const quote = await transport.requestQuote(
|
|
2268
2270
|
lightningSendRequest({ rfqId, invoice: params.invoice.raw, refundAddress, senderPubkey })
|
|
2269
2271
|
);
|
|
@@ -2563,7 +2565,11 @@ function deriveOnchainSend(input) {
|
|
|
2563
2565
|
}
|
|
2564
2566
|
async function requestOnchainSend(wallet, transport, params) {
|
|
2565
2567
|
const rfqId = params.rfqId ?? newRfqId();
|
|
2566
|
-
const secrets = await
|
|
2568
|
+
const [secrets, info, refundAddress] = await Promise.all([
|
|
2569
|
+
provisionClaimSecret(wallet, { preimage: params.preimage }),
|
|
2570
|
+
wallet.getArkadeInfo({ requireLive: true }),
|
|
2571
|
+
wallet.getAddress()
|
|
2572
|
+
]);
|
|
2567
2573
|
if (secrets.mustPersistPreimage) {
|
|
2568
2574
|
console.warn(
|
|
2569
2575
|
"[swap] this swap's preimage cannot be re-derived from the seed and MUST be persisted with the record before funding"
|
|
@@ -2571,10 +2577,6 @@ async function requestOnchainSend(wallet, transport, params) {
|
|
|
2571
2577
|
}
|
|
2572
2578
|
const paymentHash = hex5.encode(secrets.paymentHash);
|
|
2573
2579
|
const senderPubkey = secrets.pubkey;
|
|
2574
|
-
const [info, refundAddress] = await Promise.all([
|
|
2575
|
-
wallet.getArkadeInfo({ requireLive: true }),
|
|
2576
|
-
wallet.getAddress()
|
|
2577
|
-
]);
|
|
2578
2580
|
const quote = await transport.requestQuote(
|
|
2579
2581
|
onchainSendRequest({
|
|
2580
2582
|
rfqId,
|
|
@@ -2751,7 +2753,11 @@ function deriveLightningReceive(input) {
|
|
|
2751
2753
|
};
|
|
2752
2754
|
}
|
|
2753
2755
|
var provisionReceive = async (wallet, params, persistBefore) => {
|
|
2754
|
-
const secrets = await
|
|
2756
|
+
const [secrets, info, payoutAddress] = await Promise.all([
|
|
2757
|
+
provisionClaimSecret(wallet),
|
|
2758
|
+
wallet.getArkadeInfo({ requireLive: true }),
|
|
2759
|
+
wallet.getAddress()
|
|
2760
|
+
]);
|
|
2755
2761
|
if (secrets.mustPersistPreimage) {
|
|
2756
2762
|
console.warn(
|
|
2757
2763
|
`[swap] this swap's preimage cannot be re-derived from the seed and MUST be persisted with the record before ${persistBefore}`
|
|
@@ -2760,10 +2766,6 @@ var provisionReceive = async (wallet, params, persistBefore) => {
|
|
|
2760
2766
|
const preimage = secrets.preimage;
|
|
2761
2767
|
const paymentHash = hex5.encode(secrets.paymentHash);
|
|
2762
2768
|
const payoutPubkey = secrets.pubkey;
|
|
2763
|
-
const [info, payoutAddress] = await Promise.all([
|
|
2764
|
-
wallet.getArkadeInfo({ requireLive: true }),
|
|
2765
|
-
wallet.getAddress()
|
|
2766
|
-
]);
|
|
2767
2769
|
const binds = bindsClaimAmount();
|
|
2768
2770
|
const claimPacket = params.covclaimdPubkey && (!binds || params.amountSide === "to") ? await sealClaimPacket({
|
|
2769
2771
|
preimage,
|
|
@@ -60,7 +60,7 @@ import {
|
|
|
60
60
|
undeliveredCarry,
|
|
61
61
|
walletOperator,
|
|
62
62
|
watchOfferSwaps
|
|
63
|
-
} from "./chunk-
|
|
63
|
+
} from "./chunk-BLECLU5Q.js";
|
|
64
64
|
import {
|
|
65
65
|
ARKADE_BTC,
|
|
66
66
|
ASSET_CARRIER_SATS,
|
|
@@ -125,7 +125,7 @@ import {
|
|
|
125
125
|
unilateralClaimDelay,
|
|
126
126
|
verifyOfferAddress,
|
|
127
127
|
withExitClosure
|
|
128
|
-
} from "./chunk-
|
|
128
|
+
} from "./chunk-ICSREL7N.js";
|
|
129
129
|
import {
|
|
130
130
|
assertRfqSwapPageFilter,
|
|
131
131
|
collectAssetSwaps,
|
|
@@ -3919,7 +3919,7 @@ var assetSidesOf = (legs) => {
|
|
|
3919
3919
|
const giveIsBtc = legs.give.assetId === BTC_ASSET_ID;
|
|
3920
3920
|
const takeIsBtc = legs.take.assetId === BTC_ASSET_ID;
|
|
3921
3921
|
if (giveIsBtc && takeIsBtc) {
|
|
3922
|
-
throw new UnsupportedRoute("
|
|
3922
|
+
throw new UnsupportedRoute("give and take are both BTC, so the route swaps nothing", {
|
|
3923
3923
|
give: "arkade",
|
|
3924
3924
|
take: "arkade"
|
|
3925
3925
|
});
|
|
@@ -4021,9 +4021,11 @@ var quoteLightningReceive = async (input) => {
|
|
|
4021
4021
|
const pinned = pinnedFor(input);
|
|
4022
4022
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
4023
4023
|
const rfqId = newRfqId();
|
|
4024
|
-
const secrets = await
|
|
4024
|
+
const [secrets, payoutAddress] = await Promise.all([
|
|
4025
|
+
provisionClaimSecret(input.wallet),
|
|
4026
|
+
input.wallet.getAddress()
|
|
4027
|
+
]);
|
|
4025
4028
|
const paymentHash = hex8.encode(secrets.paymentHash);
|
|
4026
|
-
const payoutAddress = await input.wallet.getAddress();
|
|
4027
4029
|
const lightning = input.corridors.get("lightning").deps;
|
|
4028
4030
|
const sealTo = sealingKey(lightning);
|
|
4029
4031
|
const sealsAmount = pinned.on === "take" && input.legs.take.assetId === BTC_ASSET_ID;
|
|
@@ -4139,8 +4141,10 @@ var quoteOnchainSend = async (input) => {
|
|
|
4139
4141
|
claimVsize: onchain.claimVsize
|
|
4140
4142
|
}) : void 0;
|
|
4141
4143
|
const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
|
|
4142
|
-
const secrets = await
|
|
4143
|
-
|
|
4144
|
+
const [secrets, payoutKey] = await Promise.all([
|
|
4145
|
+
provisionClaimSecret(input.wallet),
|
|
4146
|
+
provisionRefundKey(input.wallet)
|
|
4147
|
+
]);
|
|
4144
4148
|
const paymentHash = hex8.encode(secrets.paymentHash);
|
|
4145
4149
|
const wire = await input.transport.requestQuote(
|
|
4146
4150
|
withCanonicalAmount(
|
|
@@ -4246,11 +4250,14 @@ var quoteOnchainReceive = async (input) => {
|
|
|
4246
4250
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
4247
4251
|
const rfqId = newRfqId();
|
|
4248
4252
|
const l1Network = l1NetworkFromArk(input.info.network);
|
|
4249
|
-
const secrets = await
|
|
4250
|
-
|
|
4253
|
+
const [secrets, refundKey, payoutAddress, boardingAddress] = await Promise.all([
|
|
4254
|
+
provisionClaimSecret(input.wallet),
|
|
4255
|
+
provisionRefundKey(input.wallet),
|
|
4256
|
+
input.wallet.getAddress(),
|
|
4257
|
+
input.wallet.getBoardingAddress()
|
|
4258
|
+
]);
|
|
4251
4259
|
const paymentHash = hex8.encode(secrets.paymentHash);
|
|
4252
|
-
const
|
|
4253
|
-
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
4260
|
+
const refundPkScript = l1ScriptForAddress(boardingAddress, l1Network);
|
|
4254
4261
|
const wire = await input.transport.requestQuote(
|
|
4255
4262
|
withCanonicalAmount(
|
|
4256
4263
|
onchainReceiveRequest({
|
package/dist/index.cjs
CHANGED
|
@@ -9880,7 +9880,7 @@ var assetSidesOf = (legs) => {
|
|
|
9880
9880
|
const giveIsBtc = legs.give.assetId === BTC_ASSET_ID;
|
|
9881
9881
|
const takeIsBtc = legs.take.assetId === BTC_ASSET_ID;
|
|
9882
9882
|
if (giveIsBtc && takeIsBtc) {
|
|
9883
|
-
throw new UnsupportedRoute("
|
|
9883
|
+
throw new UnsupportedRoute("give and take are both BTC, so the route swaps nothing", {
|
|
9884
9884
|
give: "arkade",
|
|
9885
9885
|
take: "arkade"
|
|
9886
9886
|
});
|
|
@@ -9982,9 +9982,11 @@ var quoteLightningReceive = async (input) => {
|
|
|
9982
9982
|
const pinned = pinnedFor(input);
|
|
9983
9983
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
9984
9984
|
const rfqId = newRfqId();
|
|
9985
|
-
const secrets = await
|
|
9985
|
+
const [secrets, payoutAddress] = await Promise.all([
|
|
9986
|
+
(0, import_sdk35.provisionClaimSecret)(input.wallet),
|
|
9987
|
+
input.wallet.getAddress()
|
|
9988
|
+
]);
|
|
9986
9989
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
9987
|
-
const payoutAddress = await input.wallet.getAddress();
|
|
9988
9990
|
const lightning = input.corridors.get("lightning").deps;
|
|
9989
9991
|
const sealTo = sealingKey(lightning);
|
|
9990
9992
|
const sealsAmount = pinned.on === "take" && input.legs.take.assetId === BTC_ASSET_ID;
|
|
@@ -10100,8 +10102,10 @@ var quoteOnchainSend = async (input) => {
|
|
|
10100
10102
|
claimVsize: onchain.claimVsize
|
|
10101
10103
|
}) : void 0;
|
|
10102
10104
|
const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
|
|
10103
|
-
const secrets = await
|
|
10104
|
-
|
|
10105
|
+
const [secrets, payoutKey] = await Promise.all([
|
|
10106
|
+
(0, import_sdk35.provisionClaimSecret)(input.wallet),
|
|
10107
|
+
(0, import_sdk35.provisionRefundKey)(input.wallet)
|
|
10108
|
+
]);
|
|
10105
10109
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
10106
10110
|
const wire = await input.transport.requestQuote(
|
|
10107
10111
|
withCanonicalAmount(
|
|
@@ -10207,11 +10211,14 @@ var quoteOnchainReceive = async (input) => {
|
|
|
10207
10211
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
10208
10212
|
const rfqId = newRfqId();
|
|
10209
10213
|
const l1Network = l1NetworkFromArk(input.info.network);
|
|
10210
|
-
const secrets = await
|
|
10211
|
-
|
|
10214
|
+
const [secrets, refundKey, payoutAddress, boardingAddress] = await Promise.all([
|
|
10215
|
+
(0, import_sdk35.provisionClaimSecret)(input.wallet),
|
|
10216
|
+
(0, import_sdk35.provisionRefundKey)(input.wallet),
|
|
10217
|
+
input.wallet.getAddress(),
|
|
10218
|
+
input.wallet.getBoardingAddress()
|
|
10219
|
+
]);
|
|
10212
10220
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
10213
|
-
const
|
|
10214
|
-
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
10221
|
+
const refundPkScript = l1ScriptForAddress(boardingAddress, l1Network);
|
|
10215
10222
|
const wire = await input.transport.requestQuote(
|
|
10216
10223
|
withCanonicalAmount(
|
|
10217
10224
|
onchainReceiveRequest({
|
package/dist/index.js
CHANGED
|
@@ -62,7 +62,7 @@ import {
|
|
|
62
62
|
unsignedPsbtBytes,
|
|
63
63
|
verifyJointGraph,
|
|
64
64
|
verifyOfferFillPlan
|
|
65
|
-
} from "./chunk-
|
|
65
|
+
} from "./chunk-J2PMAQP2.js";
|
|
66
66
|
import {
|
|
67
67
|
Amount,
|
|
68
68
|
AmountFormatError,
|
|
@@ -73,7 +73,7 @@ import {
|
|
|
73
73
|
isRfqSwapTerminal,
|
|
74
74
|
quoteIdOfSwapId,
|
|
75
75
|
toAtomicDecimal
|
|
76
|
-
} from "./chunk-
|
|
76
|
+
} from "./chunk-BLECLU5Q.js";
|
|
77
77
|
import {
|
|
78
78
|
CLAIM_PACKET_TYPE,
|
|
79
79
|
LockupRegistrationFailed,
|
|
@@ -83,7 +83,7 @@ import {
|
|
|
83
83
|
appendArkadeScript,
|
|
84
84
|
claimPacketShape,
|
|
85
85
|
isRfqRefusalErrorCode
|
|
86
|
-
} from "./chunk-
|
|
86
|
+
} from "./chunk-ICSREL7N.js";
|
|
87
87
|
import {
|
|
88
88
|
InMemoryAssetSwapRepository,
|
|
89
89
|
assertRfqSwapPageFilter,
|
package/dist/nostr.js
CHANGED
package/dist/protocol.cjs
CHANGED
|
@@ -1709,10 +1709,12 @@ function deriveLightningSend(input) {
|
|
|
1709
1709
|
}
|
|
1710
1710
|
async function requestLightningSend(wallet, transport, params) {
|
|
1711
1711
|
const rfqId = params.rfqId ?? newRfqId();
|
|
1712
|
-
const secrets = await
|
|
1712
|
+
const [secrets, info] = await Promise.all([
|
|
1713
|
+
(0, import_sdk7.provisionRefundKey)(wallet),
|
|
1714
|
+
wallet.getArkadeInfo({ requireLive: true })
|
|
1715
|
+
]);
|
|
1713
1716
|
const senderPubkey = secrets.pubkey;
|
|
1714
1717
|
const refundAddress = secrets.address;
|
|
1715
|
-
const info = await wallet.getArkadeInfo({ requireLive: true });
|
|
1716
1718
|
const quote = await transport.requestQuote(
|
|
1717
1719
|
lightningSendRequest({ rfqId, invoice: params.invoice.raw, refundAddress, senderPubkey })
|
|
1718
1720
|
);
|
|
@@ -1914,7 +1916,11 @@ function deriveOnchainSend(input) {
|
|
|
1914
1916
|
}
|
|
1915
1917
|
async function requestOnchainSend(wallet, transport, params) {
|
|
1916
1918
|
const rfqId = params.rfqId ?? newRfqId();
|
|
1917
|
-
const secrets = await
|
|
1919
|
+
const [secrets, info, refundAddress] = await Promise.all([
|
|
1920
|
+
(0, import_sdk7.provisionClaimSecret)(wallet, { preimage: params.preimage }),
|
|
1921
|
+
wallet.getArkadeInfo({ requireLive: true }),
|
|
1922
|
+
wallet.getAddress()
|
|
1923
|
+
]);
|
|
1918
1924
|
if (secrets.mustPersistPreimage) {
|
|
1919
1925
|
console.warn(
|
|
1920
1926
|
"[swap] this swap's preimage cannot be re-derived from the seed and MUST be persisted with the record before funding"
|
|
@@ -1922,10 +1928,6 @@ async function requestOnchainSend(wallet, transport, params) {
|
|
|
1922
1928
|
}
|
|
1923
1929
|
const paymentHash = import_base6.hex.encode(secrets.paymentHash);
|
|
1924
1930
|
const senderPubkey = secrets.pubkey;
|
|
1925
|
-
const [info, refundAddress] = await Promise.all([
|
|
1926
|
-
wallet.getArkadeInfo({ requireLive: true }),
|
|
1927
|
-
wallet.getAddress()
|
|
1928
|
-
]);
|
|
1929
1931
|
const quote = await transport.requestQuote(
|
|
1930
1932
|
onchainSendRequest({
|
|
1931
1933
|
rfqId,
|
|
@@ -2870,7 +2872,11 @@ var init_rfq = __esm({
|
|
|
2870
2872
|
return { contractParams, matched };
|
|
2871
2873
|
};
|
|
2872
2874
|
provisionReceive = async (wallet, params, persistBefore) => {
|
|
2873
|
-
const secrets = await
|
|
2875
|
+
const [secrets, info, payoutAddress] = await Promise.all([
|
|
2876
|
+
(0, import_sdk7.provisionClaimSecret)(wallet),
|
|
2877
|
+
wallet.getArkadeInfo({ requireLive: true }),
|
|
2878
|
+
wallet.getAddress()
|
|
2879
|
+
]);
|
|
2874
2880
|
if (secrets.mustPersistPreimage) {
|
|
2875
2881
|
console.warn(
|
|
2876
2882
|
`[swap] this swap's preimage cannot be re-derived from the seed and MUST be persisted with the record before ${persistBefore}`
|
|
@@ -2879,10 +2885,6 @@ var init_rfq = __esm({
|
|
|
2879
2885
|
const preimage = secrets.preimage;
|
|
2880
2886
|
const paymentHash = import_base6.hex.encode(secrets.paymentHash);
|
|
2881
2887
|
const payoutPubkey = secrets.pubkey;
|
|
2882
|
-
const [info, payoutAddress] = await Promise.all([
|
|
2883
|
-
wallet.getArkadeInfo({ requireLive: true }),
|
|
2884
|
-
wallet.getAddress()
|
|
2885
|
-
]);
|
|
2886
2888
|
const binds = bindsClaimAmount();
|
|
2887
2889
|
const claimPacket = params.covclaimdPubkey && (!binds || params.amountSide === "to") ? await sealClaimPacket({
|
|
2888
2890
|
preimage,
|
|
@@ -6214,7 +6216,7 @@ function solverOnchainRail(deps) {
|
|
|
6214
6216
|
const rendezvous = await rendezvousFor(amount);
|
|
6215
6217
|
if (!rendezvous) {
|
|
6216
6218
|
throw new Error(
|
|
6217
|
-
`${SOLVER_ONCHAIN_RAIL}: no solver serves
|
|
6219
|
+
`${SOLVER_ONCHAIN_RAIL}: no solver serves onchain payments at ${amount} sats`
|
|
6218
6220
|
);
|
|
6219
6221
|
}
|
|
6220
6222
|
const negotiated = await deps.connect(
|
|
@@ -6317,7 +6319,7 @@ function solverLightningRail(deps) {
|
|
|
6317
6319
|
const rendezvous = await rendezvousFor(facts.amountSats);
|
|
6318
6320
|
if (!rendezvous) {
|
|
6319
6321
|
throw new Error(
|
|
6320
|
-
`${SOLVER_LIGHTNING_RAIL}: no solver serves
|
|
6322
|
+
`${SOLVER_LIGHTNING_RAIL}: no solver serves Lightning payments at ${facts.amountSats} sats`
|
|
6321
6323
|
);
|
|
6322
6324
|
}
|
|
6323
6325
|
const negotiated = await deps.connect(
|
package/dist/protocol.js
CHANGED
|
@@ -42,7 +42,7 @@ import {
|
|
|
42
42
|
validatePlan,
|
|
43
43
|
watchMarkets,
|
|
44
44
|
watchOfferSwaps
|
|
45
|
-
} from "./chunk-
|
|
45
|
+
} from "./chunk-BLECLU5Q.js";
|
|
46
46
|
import {
|
|
47
47
|
ARKADE_BTC,
|
|
48
48
|
ASSET_CARRIER_SATS,
|
|
@@ -128,7 +128,7 @@ import {
|
|
|
128
128
|
verifyLockupAddress,
|
|
129
129
|
verifyOfferAddress,
|
|
130
130
|
verifyReceiveInvoice
|
|
131
|
-
} from "./chunk-
|
|
131
|
+
} from "./chunk-ICSREL7N.js";
|
|
132
132
|
import {
|
|
133
133
|
collectRfqSwaps
|
|
134
134
|
} from "./chunk-A3SHHRX4.js";
|
|
@@ -450,7 +450,7 @@ function solverOnchainRail(deps) {
|
|
|
450
450
|
const rendezvous = await rendezvousFor(amount);
|
|
451
451
|
if (!rendezvous) {
|
|
452
452
|
throw new Error(
|
|
453
|
-
`${SOLVER_ONCHAIN_RAIL}: no solver serves
|
|
453
|
+
`${SOLVER_ONCHAIN_RAIL}: no solver serves onchain payments at ${amount} sats`
|
|
454
454
|
);
|
|
455
455
|
}
|
|
456
456
|
const negotiated = await deps.connect(
|
|
@@ -553,7 +553,7 @@ function solverLightningRail(deps) {
|
|
|
553
553
|
const rendezvous = await rendezvousFor(facts.amountSats);
|
|
554
554
|
if (!rendezvous) {
|
|
555
555
|
throw new Error(
|
|
556
|
-
`${SOLVER_LIGHTNING_RAIL}: no solver serves
|
|
556
|
+
`${SOLVER_LIGHTNING_RAIL}: no solver serves Lightning payments at ${facts.amountSats} sats`
|
|
557
557
|
);
|
|
558
558
|
}
|
|
559
559
|
const negotiated = await deps.connect(
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arkade-os/swap",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Client-side Arkade Intents asset swaps: state a route, get an outcome. Pay a bolt11 invoice, receive over Lightning, exchange assets, or withdraw onchain.",
|
|
6
6
|
"repository": {
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"@scure/base": "2.4.0",
|
|
105
105
|
"@scure/btc-signer": "2.4.1",
|
|
106
106
|
"light-bolt11-decoder": "3.2.0",
|
|
107
|
-
"@arkade-os/sdk": "0.5.
|
|
107
|
+
"@arkade-os/sdk": "0.5.2"
|
|
108
108
|
},
|
|
109
109
|
"peerDependencies": {
|
|
110
110
|
"nostr-tools": "2.24.1"
|