@arkade-os/swap 0.1.0-rc.32 → 0.1.0-rc.34
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 +265 -74
- package/dist/advanced.d.cts +13 -9
- package/dist/advanced.d.ts +13 -9
- package/dist/advanced.js +24 -6
- package/dist/{chunk-75YNMBFR.js → chunk-GBQX3FJV.js} +29 -8
- package/dist/{chunk-JKTIGGFR.js → chunk-JJINMVWB.js} +166 -11
- package/dist/{chunk-2CAOQFSK.js → chunk-RDAQR6LV.js} +3 -5
- package/dist/index.cjs +271 -98
- package/dist/index.d.cts +6 -6
- package/dist/index.d.ts +6 -6
- package/dist/index.js +3 -3
- package/dist/{lockupContract-uj-o9rLJ.d.ts → lockupContract-BlUEw4Ry.d.ts} +6 -2
- package/dist/{lockupContract-CSIUio9d.d.cts → lockupContract-DGQkMEl3.d.cts} +6 -2
- package/dist/nostr.d.cts +1 -1
- package/dist/nostr.d.ts +1 -1
- package/dist/nostr.js +1 -1
- package/dist/{offer-DmfRrycC.d.cts → offer-DLruA4Bf.d.cts} +1 -1
- package/dist/{offer-C3nyUS9S.d.ts → offer-gSQxAA2I.d.ts} +1 -1
- package/dist/{offerFillPlan-BGO7-K8C.d.cts → offerFillPlan-BLBaR8B9.d.cts} +5 -4
- package/dist/{offerFillPlan-Y1M-7i7T.d.ts → offerFillPlan-CA9dMjDg.d.ts} +5 -4
- package/dist/protocol.cjs +35 -12
- package/dist/protocol.d.cts +8 -8
- package/dist/protocol.d.ts +8 -8
- package/dist/protocol.js +2 -2
- 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-CJx_AEvo.d.cts → repository-KjoxTB5l.d.ts} +1 -1
- package/dist/{repository-DgwOJVx0.d.ts → repository-UCY_eoQx.d.cts} +1 -1
- package/dist/{rfq-BJ8SC_Gp.d.cts → rfq-DS8_IMU9.d.cts} +8 -5
- package/dist/{rfq-BJ8SC_Gp.d.ts → rfq-DS8_IMU9.d.ts} +8 -5
- package/dist/{watch-DlkKUJou.d.ts → watch-fL2WVy3J.d.ts} +1 -1
- package/dist/{watch-BAyo3_bk.d.cts → watch-lFnfGaqA.d.cts} +1 -1
- package/package.json +2 -2
package/dist/advanced.cjs
CHANGED
|
@@ -1576,6 +1576,15 @@ var init_onchainHtlc = __esm({
|
|
|
1576
1576
|
}
|
|
1577
1577
|
});
|
|
1578
1578
|
|
|
1579
|
+
// src/claimAmountGate.ts
|
|
1580
|
+
var bindsClaimAmount;
|
|
1581
|
+
var init_claimAmountGate = __esm({
|
|
1582
|
+
"src/claimAmountGate.ts"() {
|
|
1583
|
+
"use strict";
|
|
1584
|
+
bindsClaimAmount = () => false;
|
|
1585
|
+
}
|
|
1586
|
+
});
|
|
1587
|
+
|
|
1579
1588
|
// src/claimPacket.ts
|
|
1580
1589
|
async function sealClaimPacket(input) {
|
|
1581
1590
|
return sealWithEntropy(
|
|
@@ -1589,23 +1598,31 @@ async function sealWithEntropy(input, ephemeralKey, nonce) {
|
|
|
1589
1598
|
if (input.covclaimdPubkey.length !== 33) {
|
|
1590
1599
|
throw new Error("covclaimd pubkey must be 33-byte compressed");
|
|
1591
1600
|
}
|
|
1601
|
+
const { minAmount } = input;
|
|
1602
|
+
if (minAmount !== void 0 && (typeof minAmount !== "bigint" || minAmount < 1n || minAmount >= 1n << 64n)) {
|
|
1603
|
+
throw new Error("minAmount must be a bigint in [1, 2^64-1]");
|
|
1604
|
+
}
|
|
1592
1605
|
const ephemeralPub = import_secp256k1.secp256k1.getPublicKey(ephemeralKey, true);
|
|
1593
1606
|
const sharedX = import_secp256k1.secp256k1.getSharedSecret(ephemeralKey, input.covclaimdPubkey, true).subarray(1);
|
|
1594
1607
|
const key = (0, import_hkdf.hkdf)(import_sha23.sha256, sharedX, ephemeralPub, HKDF_INFO, 32);
|
|
1595
1608
|
if (nonce.length !== 12) throw new Error("nonce must be 12 bytes");
|
|
1596
|
-
const
|
|
1609
|
+
const amount = new Uint8Array(8);
|
|
1610
|
+
if (minAmount !== void 0) new DataView(amount.buffer).setBigUint64(0, minAmount, false);
|
|
1611
|
+
const additionalData = minAmount === void 0 ? ephemeralPub : (0, import_utils2.concatBytes)(ephemeralPub, amount);
|
|
1612
|
+
const sealed = (0, import_aes.gcm)(key, nonce, additionalData).encrypt(input.preimage);
|
|
1597
1613
|
const ciphertext = (0, import_utils2.concatBytes)(ephemeralPub, nonce, sealed);
|
|
1598
1614
|
return {
|
|
1599
1615
|
ciphertext: import_base6.base64.encode(ciphertext),
|
|
1600
1616
|
packet: import_base6.base64.encode(
|
|
1601
1617
|
(0, import_utils2.concatBytes)(
|
|
1602
1618
|
tlv2(TLV_CIPHERTEXT, ciphertext),
|
|
1603
|
-
tlv2(TLV_COVCLAIMD_PUBKEY, input.covclaimdPubkey)
|
|
1619
|
+
tlv2(TLV_COVCLAIMD_PUBKEY, input.covclaimdPubkey),
|
|
1620
|
+
minAmount === void 0 ? new Uint8Array() : tlv2(TLV_MIN_AMOUNT, amount)
|
|
1604
1621
|
)
|
|
1605
1622
|
)
|
|
1606
1623
|
};
|
|
1607
1624
|
}
|
|
1608
|
-
var import_base6, import_utils2, import_aes, import_secp256k1, import_hkdf, import_sha23, HKDF_INFO, TLV_CIPHERTEXT, TLV_COVCLAIMD_PUBKEY, tlv2;
|
|
1625
|
+
var import_base6, import_utils2, import_aes, import_secp256k1, import_hkdf, import_sha23, HKDF_INFO, TLV_CIPHERTEXT, TLV_COVCLAIMD_PUBKEY, TLV_MIN_AMOUNT, tlv2;
|
|
1609
1626
|
var init_claimPacket = __esm({
|
|
1610
1627
|
"src/claimPacket.ts"() {
|
|
1611
1628
|
"use strict";
|
|
@@ -1618,6 +1635,7 @@ var init_claimPacket = __esm({
|
|
|
1618
1635
|
HKDF_INFO = new TextEncoder().encode("covclaimd/preimage/v1");
|
|
1619
1636
|
TLV_CIPHERTEXT = 1;
|
|
1620
1637
|
TLV_COVCLAIMD_PUBKEY = 3;
|
|
1638
|
+
TLV_MIN_AMOUNT = 4;
|
|
1621
1639
|
tlv2 = (type, value) => Uint8Array.from([type, value.length >> 8 & 255, value.length & 255, ...value]);
|
|
1622
1640
|
}
|
|
1623
1641
|
});
|
|
@@ -1811,6 +1829,7 @@ var init_rfq = __esm({
|
|
|
1811
1829
|
init_onchainHtlc();
|
|
1812
1830
|
init_onchainHtlc();
|
|
1813
1831
|
import_sdk8 = require("@arkade-os/sdk");
|
|
1832
|
+
init_claimAmountGate();
|
|
1814
1833
|
init_claimPacket();
|
|
1815
1834
|
init_lockupContract();
|
|
1816
1835
|
init_offer();
|
|
@@ -4482,7 +4501,7 @@ var acceptQuoteBody = async (input) => {
|
|
|
4482
4501
|
var registeredOfferRecord = async (input, preparation) => {
|
|
4483
4502
|
const { quote, wallet, corridors, now } = input;
|
|
4484
4503
|
const { plan } = preparation;
|
|
4485
|
-
const
|
|
4504
|
+
const arkade3 = corridors.get("arkade").deps;
|
|
4486
4505
|
const receiveIsBtc = plan.receive.asset.id === BTC_ASSET_ID;
|
|
4487
4506
|
const offer = await createOffer(
|
|
4488
4507
|
wallet,
|
|
@@ -4490,7 +4509,7 @@ var registeredOfferRecord = async (input, preparation) => {
|
|
|
4490
4509
|
// Keyed on the receive side: the covenant binds what the fill delivers.
|
|
4491
4510
|
wantAmount: plan.receive.atomic,
|
|
4492
4511
|
...receiveIsBtc ? { offerAsset: import_sdk13.asset.AssetId.fromString(plan.deposit.asset.id) } : { wantAsset: import_sdk13.asset.AssetId.fromString(plan.receive.asset.id) },
|
|
4493
|
-
emulatorPubkey:
|
|
4512
|
+
emulatorPubkey: arkade3.emulatorPubkey
|
|
4494
4513
|
},
|
|
4495
4514
|
{ coverageId: quote.id }
|
|
4496
4515
|
);
|
|
@@ -4724,7 +4743,7 @@ var scopedToRail = (table, rail) => ({
|
|
|
4724
4743
|
|
|
4725
4744
|
// src/client/client.ts
|
|
4726
4745
|
var import_base22 = require("@scure/base");
|
|
4727
|
-
var
|
|
4746
|
+
var import_sdk37 = require("@arkade-os/sdk");
|
|
4728
4747
|
init_repository();
|
|
4729
4748
|
|
|
4730
4749
|
// src/refund.ts
|
|
@@ -4869,9 +4888,8 @@ var operatorUnrollScript = async (operator, network) => {
|
|
|
4869
4888
|
const info = await operator.getInfo();
|
|
4870
4889
|
return (0, import_sdk14.assertValidServerUnrollScript)(
|
|
4871
4890
|
info.checkpointTapscript,
|
|
4872
|
-
|
|
4873
|
-
|
|
4874
|
-
})
|
|
4891
|
+
network ?? (0, import_sdk14.networkFromArkadeInfo)(info),
|
|
4892
|
+
(0, import_sdk14.toXOnly)(import_base10.hex.decode(info.forfeitPubkey), "forfeit key")
|
|
4875
4893
|
);
|
|
4876
4894
|
};
|
|
4877
4895
|
var MAX_LOCKUP_SPEND_INPUTS = 16;
|
|
@@ -6289,7 +6307,7 @@ var retireOfferScripts = async (wallet, repository, record) => {
|
|
|
6289
6307
|
};
|
|
6290
6308
|
|
|
6291
6309
|
// src/client/drive.ts
|
|
6292
|
-
var
|
|
6310
|
+
var import_sdk31 = require("@arkade-os/sdk");
|
|
6293
6311
|
var import_base19 = require("@scure/base");
|
|
6294
6312
|
|
|
6295
6313
|
// src/claim.ts
|
|
@@ -6344,11 +6362,147 @@ async function pushClaim(operator, input) {
|
|
|
6344
6362
|
// src/client/drive.ts
|
|
6345
6363
|
init_onchainHtlc();
|
|
6346
6364
|
init_coverage();
|
|
6365
|
+
|
|
6366
|
+
// src/migrateOfferRows.ts
|
|
6367
|
+
var import_sdk26 = require("@arkade-os/sdk");
|
|
6368
|
+
|
|
6369
|
+
// src/legacy/swap-want-asset.program.v0.json
|
|
6370
|
+
var swap_want_asset_program_v0_default = {
|
|
6371
|
+
version: 0,
|
|
6372
|
+
name: "banco-btc-to-asset",
|
|
6373
|
+
params: [
|
|
6374
|
+
{ name: "makerWP", type: "pubkey" },
|
|
6375
|
+
{ name: "wantAmount", type: "int" },
|
|
6376
|
+
{ name: "wantAssetTxid", type: "hash" },
|
|
6377
|
+
{ name: "wantAssetGroupIndex", type: "int" },
|
|
6378
|
+
{ name: "server", type: "pubkey" },
|
|
6379
|
+
{ name: "user", type: "pubkey" }
|
|
6380
|
+
],
|
|
6381
|
+
functions: {
|
|
6382
|
+
fulfill: {
|
|
6383
|
+
tapscript: { signers: ["$server"] },
|
|
6384
|
+
arkadeScript: {
|
|
6385
|
+
asm: [
|
|
6386
|
+
0,
|
|
6387
|
+
"$wantAssetTxid",
|
|
6388
|
+
"$wantAssetGroupIndex",
|
|
6389
|
+
"INSPECTOUTASSETLOOKUP",
|
|
6390
|
+
"VERIFY",
|
|
6391
|
+
"$wantAmount",
|
|
6392
|
+
"GREATERTHANOREQUAL",
|
|
6393
|
+
"VERIFY",
|
|
6394
|
+
0,
|
|
6395
|
+
"INSPECTOUTPUTSCRIPTPUBKEY",
|
|
6396
|
+
1,
|
|
6397
|
+
"EQUALVERIFY",
|
|
6398
|
+
"$makerWP",
|
|
6399
|
+
"EQUAL"
|
|
6400
|
+
]
|
|
6401
|
+
}
|
|
6402
|
+
},
|
|
6403
|
+
cancel: {
|
|
6404
|
+
tapscript: { signers: ["$user", "$server"] }
|
|
6405
|
+
}
|
|
6406
|
+
}
|
|
6407
|
+
};
|
|
6408
|
+
|
|
6409
|
+
// src/legacy/swap-want-btc.program.v0.json
|
|
6410
|
+
var swap_want_btc_program_v0_default = {
|
|
6411
|
+
version: 0,
|
|
6412
|
+
name: "banco-asset-to-btc",
|
|
6413
|
+
params: [
|
|
6414
|
+
{ name: "makerWP", type: "pubkey" },
|
|
6415
|
+
{ name: "wantAmount", type: "int" },
|
|
6416
|
+
{ name: "server", type: "pubkey" },
|
|
6417
|
+
{ name: "user", type: "pubkey" }
|
|
6418
|
+
],
|
|
6419
|
+
functions: {
|
|
6420
|
+
fulfill: {
|
|
6421
|
+
tapscript: { signers: ["$server"] },
|
|
6422
|
+
arkadeScript: {
|
|
6423
|
+
asm: [
|
|
6424
|
+
0,
|
|
6425
|
+
"INSPECTOUTPUTVALUE",
|
|
6426
|
+
"$wantAmount",
|
|
6427
|
+
"GREATERTHANOREQUAL",
|
|
6428
|
+
"VERIFY",
|
|
6429
|
+
0,
|
|
6430
|
+
"INSPECTOUTPUTSCRIPTPUBKEY",
|
|
6431
|
+
1,
|
|
6432
|
+
"EQUALVERIFY",
|
|
6433
|
+
"$makerWP",
|
|
6434
|
+
"EQUAL"
|
|
6435
|
+
]
|
|
6436
|
+
}
|
|
6437
|
+
},
|
|
6438
|
+
cancel: {
|
|
6439
|
+
tapscript: { signers: ["$user", "$server"] }
|
|
6440
|
+
}
|
|
6441
|
+
}
|
|
6442
|
+
};
|
|
6443
|
+
|
|
6444
|
+
// src/migrateOfferRows.ts
|
|
6445
|
+
init_offer();
|
|
6446
|
+
function withExitV0(program, exit) {
|
|
6447
|
+
if (!exit) return program;
|
|
6448
|
+
return {
|
|
6449
|
+
...program,
|
|
6450
|
+
params: [...program.params, { name: "exitDelay", type: "int" }],
|
|
6451
|
+
functions: {
|
|
6452
|
+
...program.functions,
|
|
6453
|
+
exit: { tapscript: { signers: ["$user"], csv: { type: exit, value: "$exitDelay" } } }
|
|
6454
|
+
}
|
|
6455
|
+
};
|
|
6456
|
+
}
|
|
6457
|
+
var V0_TO_V1 = /* @__PURE__ */ new Map();
|
|
6458
|
+
for (const [v0, v1] of [
|
|
6459
|
+
[swap_want_btc_program_v0_default, swapPrograms.wantBtc],
|
|
6460
|
+
[swap_want_asset_program_v0_default, swapPrograms.wantAsset]
|
|
6461
|
+
]) {
|
|
6462
|
+
for (const exit of [void 0, "blocks", "seconds"]) {
|
|
6463
|
+
const timelock = exit && { type: exit, value: BigInt(0) };
|
|
6464
|
+
V0_TO_V1.set(
|
|
6465
|
+
JSON.stringify(withExitV0(v0, exit)),
|
|
6466
|
+
import_sdk26.arkade.stringifyArtifact(withExitClosure(v1, timelock))
|
|
6467
|
+
);
|
|
6468
|
+
}
|
|
6469
|
+
}
|
|
6470
|
+
async function migrateV0OfferRows(contractManager) {
|
|
6471
|
+
const migrated = [];
|
|
6472
|
+
const skipped = [];
|
|
6473
|
+
for (const row of await contractManager.getUnsupportedContracts()) {
|
|
6474
|
+
if (row.type !== "arkade" || row.metadata?.kind !== OFFER_CONTRACT_KIND) continue;
|
|
6475
|
+
const program = V0_TO_V1.get(row.params.program);
|
|
6476
|
+
if (!program) {
|
|
6477
|
+
skipped.push({ script: row.script, reason: "not a bundled Program v0 offer" });
|
|
6478
|
+
continue;
|
|
6479
|
+
}
|
|
6480
|
+
try {
|
|
6481
|
+
await contractManager.createContract({
|
|
6482
|
+
type: row.type,
|
|
6483
|
+
script: row.script,
|
|
6484
|
+
address: row.address,
|
|
6485
|
+
params: { ...row.params, program },
|
|
6486
|
+
label: row.label,
|
|
6487
|
+
metadata: row.metadata
|
|
6488
|
+
});
|
|
6489
|
+
migrated.push(row.script);
|
|
6490
|
+
} catch (error) {
|
|
6491
|
+
skipped.push({
|
|
6492
|
+
script: row.script,
|
|
6493
|
+
reason: error instanceof Error ? error.message : String(error)
|
|
6494
|
+
});
|
|
6495
|
+
}
|
|
6496
|
+
}
|
|
6497
|
+
return { migrated, skipped };
|
|
6498
|
+
}
|
|
6499
|
+
|
|
6500
|
+
// src/client/drive.ts
|
|
6347
6501
|
init_offer();
|
|
6348
6502
|
init_lockupContract();
|
|
6349
6503
|
|
|
6350
6504
|
// src/refundBlocked.ts
|
|
6351
|
-
var
|
|
6505
|
+
var import_sdk27 = require("@arkade-os/sdk");
|
|
6352
6506
|
var RefundNotLocallyPossibleError = class extends Error {
|
|
6353
6507
|
constructor(reason, message, options) {
|
|
6354
6508
|
super(message, options);
|
|
@@ -6365,16 +6519,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
|
|
|
6365
6519
|
);
|
|
6366
6520
|
}
|
|
6367
6521
|
try {
|
|
6368
|
-
return await (0,
|
|
6522
|
+
return await (0, import_sdk27.contractSigner)(wallet, record.signingDescriptor);
|
|
6369
6523
|
} catch (cause) {
|
|
6370
|
-
if (cause instanceof
|
|
6524
|
+
if (cause instanceof import_sdk27.WalletCannotSignError) {
|
|
6371
6525
|
throw new RefundNotLocallyPossibleError(
|
|
6372
6526
|
"unsignable-wallet",
|
|
6373
6527
|
`this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
|
|
6374
6528
|
{ cause }
|
|
6375
6529
|
);
|
|
6376
6530
|
}
|
|
6377
|
-
if (cause instanceof
|
|
6531
|
+
if (cause instanceof import_sdk27.ForeignDescriptorError) {
|
|
6378
6532
|
throw new RefundNotLocallyPossibleError(
|
|
6379
6533
|
"foreign-descriptor",
|
|
6380
6534
|
`this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
|
|
@@ -6430,7 +6584,7 @@ init_repository();
|
|
|
6430
6584
|
|
|
6431
6585
|
// src/swapManager.ts
|
|
6432
6586
|
var import_base17 = require("@scure/base");
|
|
6433
|
-
var
|
|
6587
|
+
var import_sdk28 = require("@arkade-os/sdk");
|
|
6434
6588
|
init_onchainHtlc();
|
|
6435
6589
|
init_lockupContract();
|
|
6436
6590
|
init_repository();
|
|
@@ -6561,7 +6715,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
6561
6715
|
timer = null;
|
|
6562
6716
|
running = false;
|
|
6563
6717
|
constructor(deps, config = {}) {
|
|
6564
|
-
(0,
|
|
6718
|
+
(0, import_sdk28.assertTimerMs)("pollIntervalMs", config.pollIntervalMs);
|
|
6565
6719
|
this.deps = deps;
|
|
6566
6720
|
this.config = {
|
|
6567
6721
|
enableAutoActions: config.enableAutoActions ?? true,
|
|
@@ -6905,7 +7059,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
6905
7059
|
});
|
|
6906
7060
|
return;
|
|
6907
7061
|
}
|
|
6908
|
-
if (!(0,
|
|
7062
|
+
if (!(0, import_sdk28.isContractVtxoEvent)(event)) return;
|
|
6909
7063
|
const swap = this.byLockupScript.get(event.contractScript);
|
|
6910
7064
|
if (!swap) return;
|
|
6911
7065
|
void this.pollSwap(swap).catch(() => {
|
|
@@ -7140,8 +7294,8 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
7140
7294
|
this.setState(swap, "claimed");
|
|
7141
7295
|
this.emitAction(swap, "claimLockup");
|
|
7142
7296
|
} catch (error) {
|
|
7143
|
-
const ark = (0,
|
|
7144
|
-
if ((0,
|
|
7297
|
+
const ark = (0, import_sdk28.isArkError)(error) ? error : (0, import_sdk28.maybeArkError)(error);
|
|
7298
|
+
if ((0, import_sdk28.isArkError)(ark, import_sdk28.ArkErrorName.VTXO_ALREADY_SPENT)) {
|
|
7145
7299
|
if (swap.claimFailure !== void 0) {
|
|
7146
7300
|
delete swap.claimFailure;
|
|
7147
7301
|
this.touch(swap);
|
|
@@ -7432,8 +7586,8 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
7432
7586
|
this.refundRefused.add(swap.rfqId);
|
|
7433
7587
|
return this.block(swap, error.message);
|
|
7434
7588
|
}
|
|
7435
|
-
const ark = (0,
|
|
7436
|
-
if ((0,
|
|
7589
|
+
const ark = (0, import_sdk28.isArkError)(error) ? error : (0, import_sdk28.maybeArkError)(error);
|
|
7590
|
+
if ((0, import_sdk28.isArkError)(ark, import_sdk28.ArkErrorName.VTXO_ALREADY_SPENT)) return;
|
|
7437
7591
|
this.emitFailed(swap, error);
|
|
7438
7592
|
if (now >= swap.refundLocktime + REFUND_MTP_LAG_SECONDS) {
|
|
7439
7593
|
swap.failure = errorMessage(error);
|
|
@@ -7626,7 +7780,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
|
|
|
7626
7780
|
|
|
7627
7781
|
// src/watch.ts
|
|
7628
7782
|
var import_base18 = require("@scure/base");
|
|
7629
|
-
var
|
|
7783
|
+
var import_sdk29 = require("@arkade-os/sdk");
|
|
7630
7784
|
init_coverage();
|
|
7631
7785
|
init_offer();
|
|
7632
7786
|
init_store();
|
|
@@ -7661,7 +7815,7 @@ async function watchOfferSwaps({
|
|
|
7661
7815
|
wallet.getAddress(),
|
|
7662
7816
|
wallet.getArkadeReader()
|
|
7663
7817
|
]);
|
|
7664
|
-
const operatorPubkey =
|
|
7818
|
+
const operatorPubkey = import_sdk29.ArkAddress.decode(address).serverPubKey;
|
|
7665
7819
|
let queue = Promise.resolve();
|
|
7666
7820
|
const enqueue = (task) => {
|
|
7667
7821
|
queue = queue.then(task).catch(() => {
|
|
@@ -7676,7 +7830,7 @@ async function watchOfferSwaps({
|
|
|
7676
7830
|
return classifyDepositSpend(
|
|
7677
7831
|
decodeOffer(import_base18.hex.decode(swap.offerHex)),
|
|
7678
7832
|
operatorPubkey,
|
|
7679
|
-
txs.map((psbt) =>
|
|
7833
|
+
txs.map((psbt) => import_sdk29.Transaction.fromPSBT(import_base18.base64.decode(psbt))),
|
|
7680
7834
|
{ txid: vtxo.txid, vout: vtxo.vout }
|
|
7681
7835
|
);
|
|
7682
7836
|
} catch {
|
|
@@ -7704,7 +7858,7 @@ async function watchOfferSwaps({
|
|
|
7704
7858
|
}
|
|
7705
7859
|
};
|
|
7706
7860
|
const unsubscribe = manager.onContractEvent((event) => {
|
|
7707
|
-
if (!(0,
|
|
7861
|
+
if (!(0, import_sdk29.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
|
|
7708
7862
|
enqueue(() => handleSpend(event));
|
|
7709
7863
|
});
|
|
7710
7864
|
return {
|
|
@@ -7714,7 +7868,7 @@ async function watchOfferSwaps({
|
|
|
7714
7868
|
}
|
|
7715
7869
|
|
|
7716
7870
|
// src/client/legacyRecords.ts
|
|
7717
|
-
var
|
|
7871
|
+
var import_sdk30 = require("@arkade-os/sdk");
|
|
7718
7872
|
init_repository();
|
|
7719
7873
|
var readLegacyRfqSwaps = async (repository, filter = {}) => {
|
|
7720
7874
|
try {
|
|
@@ -7731,7 +7885,7 @@ var withLegacyRfqSwaps = (bridge, repository, admits) => {
|
|
|
7731
7885
|
index: bridge.index,
|
|
7732
7886
|
quoteIdOf: bridge.quoteIdOf,
|
|
7733
7887
|
async getRfqSwapsPage(filter, page) {
|
|
7734
|
-
(0,
|
|
7888
|
+
(0, import_sdk30.assertPageRequest)(page);
|
|
7735
7889
|
assertRfqSwapPageFilter(filter);
|
|
7736
7890
|
const v2 = await collectRfqSwaps(bridge, filter);
|
|
7737
7891
|
const held = new Set(
|
|
@@ -7985,7 +8139,7 @@ var createSwapDrive = (config) => {
|
|
|
7985
8139
|
const secret = rfqClaimSecretOf(record);
|
|
7986
8140
|
if (!secret) throw new Error(`rfq swap ${swap.rfqId} carries no claim secret`);
|
|
7987
8141
|
const preimage = await preimageForSwapRecord(wallet, secret);
|
|
7988
|
-
const signer = await (0,
|
|
8142
|
+
const signer = await (0, import_sdk31.contractSigner)(wallet, await (0, import_sdk31.identityDescriptor)(wallet.identity));
|
|
7989
8143
|
const claimKey = record.profile.claimKey;
|
|
7990
8144
|
if (typeof claimKey === "string") {
|
|
7991
8145
|
const held = import_base19.hex.encode(await signer.xOnlyPublicKey());
|
|
@@ -8031,7 +8185,7 @@ var createSwapDrive = (config) => {
|
|
|
8031
8185
|
`rfq swap ${swap.rfqId} carries no refund descriptor; wire the onchain corridor's refund callback to take its L1 funding back`
|
|
8032
8186
|
);
|
|
8033
8187
|
}
|
|
8034
|
-
const signer = await (0,
|
|
8188
|
+
const signer = await (0, import_sdk31.contractSigner)(wallet, descriptor);
|
|
8035
8189
|
const held = import_base19.hex.encode(await signer.xOnlyPublicKey());
|
|
8036
8190
|
if (held !== record.profile.refundKey) {
|
|
8037
8191
|
throw new Error(
|
|
@@ -8071,7 +8225,7 @@ var createSwapDrive = (config) => {
|
|
|
8071
8225
|
}
|
|
8072
8226
|
};
|
|
8073
8227
|
const drivable = async (record) => !readsChain(record.kind) || await resolveOnchain();
|
|
8074
|
-
const pinnedNetwork = async () => (0,
|
|
8228
|
+
const pinnedNetwork = async () => (0, import_sdk31.getNetwork)(await config.network());
|
|
8075
8229
|
const claimLockup = async (swap, vtxos, { partiallyClaimed }) => {
|
|
8076
8230
|
const record = await corridorStore().getRfqSwap(swap.rfqId);
|
|
8077
8231
|
if (!record) throw new Error(`rfq swap ${swap.rfqId} has no stored record to claim from`);
|
|
@@ -8086,10 +8240,10 @@ var createSwapDrive = (config) => {
|
|
|
8086
8240
|
return track(
|
|
8087
8241
|
pushClaim(operator, {
|
|
8088
8242
|
contract: script,
|
|
8089
|
-
receiver: await (0,
|
|
8243
|
+
receiver: await (0, import_sdk31.contractSigner)(wallet, secret.signingDescriptor),
|
|
8090
8244
|
preimage: await preimageForSwapRecord(wallet, secret),
|
|
8091
8245
|
vtxos,
|
|
8092
|
-
destinationPkScript:
|
|
8246
|
+
destinationPkScript: import_sdk31.ArkAddress.decode(payoutAddress).pkScript,
|
|
8093
8247
|
// Passed through: `pushClaim`'s own value check decides whether `P` is published.
|
|
8094
8248
|
expectedAmount: swap.expectedAmount,
|
|
8095
8249
|
partiallyClaimed,
|
|
@@ -8157,7 +8311,7 @@ var createSwapDrive = (config) => {
|
|
|
8157
8311
|
config.network()
|
|
8158
8312
|
]);
|
|
8159
8313
|
const txs = history.map(toRestoreTx);
|
|
8160
|
-
const { hrp, serverPubKey: operatorPubkey } =
|
|
8314
|
+
const { hrp, serverPubKey: operatorPubkey } = import_sdk31.ArkAddress.decode(address);
|
|
8161
8315
|
const reopened = await legacyOfferDepositsToAdopt(store);
|
|
8162
8316
|
for (const txid of reopen) reopened.add(txid);
|
|
8163
8317
|
const cursor = reopened.size === 0 ? scanned : new Set([...scanned].filter((txid) => !reopened.has(txid)));
|
|
@@ -8295,7 +8449,19 @@ var createSwapDrive = (config) => {
|
|
|
8295
8449
|
console.warn("[swap] v1 rfq swap adoption did not complete", error);
|
|
8296
8450
|
}
|
|
8297
8451
|
};
|
|
8452
|
+
const migrateOfferRows = async () => {
|
|
8453
|
+
if (mode === "readonly") return;
|
|
8454
|
+
try {
|
|
8455
|
+
const { skipped } = await migrateV0OfferRows(await wallet.getContractManager());
|
|
8456
|
+
for (const { script, reason } of skipped) {
|
|
8457
|
+
console.warn(`[swap] could not migrate Program v0 offer row ${script}: ${reason}`);
|
|
8458
|
+
}
|
|
8459
|
+
} catch (error) {
|
|
8460
|
+
console.warn("[swap] Program v0 offer row migration did not complete", error);
|
|
8461
|
+
}
|
|
8462
|
+
};
|
|
8298
8463
|
const restore = async () => {
|
|
8464
|
+
void track(migrateOfferRows());
|
|
8299
8465
|
if (!repository) return;
|
|
8300
8466
|
await adoptLegacyRfqSwaps(repository);
|
|
8301
8467
|
const all = await collectSwapRecords(repository);
|
|
@@ -9055,13 +9221,13 @@ var verifyPlanLegs = (plan, legs, give) => {
|
|
|
9055
9221
|
|
|
9056
9222
|
// src/client/quoteRfq.ts
|
|
9057
9223
|
var import_base21 = require("@scure/base");
|
|
9058
|
-
var
|
|
9224
|
+
var import_sdk35 = require("@arkade-os/sdk");
|
|
9059
9225
|
var import_solver_discovery12 = require("@arkade-os/solver-discovery");
|
|
9060
9226
|
|
|
9061
9227
|
// src/jointGraph.ts
|
|
9062
9228
|
var import_base20 = require("@scure/base");
|
|
9063
9229
|
var import_sha26 = require("@noble/hashes/sha2.js");
|
|
9064
|
-
var
|
|
9230
|
+
var import_sdk32 = require("@arkade-os/sdk");
|
|
9065
9231
|
function digestJointGraph(plan, template) {
|
|
9066
9232
|
const parts = [];
|
|
9067
9233
|
const pushU32 = (value) => {
|
|
@@ -9123,7 +9289,7 @@ function verifyJointGraph(plan, template) {
|
|
|
9123
9289
|
}
|
|
9124
9290
|
}
|
|
9125
9291
|
function parseGraphTx(psbt) {
|
|
9126
|
-
return
|
|
9292
|
+
return import_sdk32.Transaction.fromPSBT(import_base20.base64.decode(psbt));
|
|
9127
9293
|
}
|
|
9128
9294
|
function deepFreeze(value) {
|
|
9129
9295
|
if (value !== null && typeof value === "object") {
|
|
@@ -9141,6 +9307,7 @@ function unsignedPsbtBytes(tx) {
|
|
|
9141
9307
|
}
|
|
9142
9308
|
|
|
9143
9309
|
// src/client/quoteRfq.ts
|
|
9310
|
+
init_claimAmountGate();
|
|
9144
9311
|
init_claimPacket();
|
|
9145
9312
|
init_offer();
|
|
9146
9313
|
init_store();
|
|
@@ -9148,11 +9315,11 @@ init_onchainHtlc();
|
|
|
9148
9315
|
init_onchainHtlc();
|
|
9149
9316
|
|
|
9150
9317
|
// src/payment/onchainSwap.ts
|
|
9151
|
-
var
|
|
9318
|
+
var import_sdk34 = require("@arkade-os/sdk");
|
|
9152
9319
|
init_onchainHtlc();
|
|
9153
9320
|
|
|
9154
9321
|
// src/payment/swapRail.ts
|
|
9155
|
-
var
|
|
9322
|
+
var import_sdk33 = require("@arkade-os/sdk");
|
|
9156
9323
|
|
|
9157
9324
|
// src/client/sats.ts
|
|
9158
9325
|
var satsOf = (value, field) => {
|
|
@@ -9209,13 +9376,13 @@ var lockupOf = (derived) => ({
|
|
|
9209
9376
|
pkScript: derived.swapPkScript
|
|
9210
9377
|
});
|
|
9211
9378
|
var covenantInputs = (input) => {
|
|
9212
|
-
const network = (0,
|
|
9213
|
-
const
|
|
9379
|
+
const network = (0, import_sdk35.networkFromArkadeInfo)(input.info);
|
|
9380
|
+
const arkade3 = input.corridors.get("arkade").deps;
|
|
9214
9381
|
return {
|
|
9215
|
-
operatorPubkey: (0,
|
|
9382
|
+
operatorPubkey: (0, import_sdk35.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key"),
|
|
9216
9383
|
// The resolved per-network pin, never operator-reported: it lands in a covenant leaf
|
|
9217
9384
|
// that decides who can move the funds.
|
|
9218
|
-
emulatorPubkey: (0,
|
|
9385
|
+
emulatorPubkey: (0, import_sdk35.toXOnly)(import_base21.hex.decode(arkade3.emulatorPubkey), "emulator signer key"),
|
|
9219
9386
|
claimDelay: unilateralClaimDelay(Number(input.info.unilateralExitDelay)),
|
|
9220
9387
|
hrp: network.hrp
|
|
9221
9388
|
};
|
|
@@ -9279,8 +9446,8 @@ var quoteArkadeAsset = async (input) => {
|
|
|
9279
9446
|
const receivePkScript = resolveReceivePkScript(
|
|
9280
9447
|
receiveAddress,
|
|
9281
9448
|
maker.pkScript,
|
|
9282
|
-
(0,
|
|
9283
|
-
(0,
|
|
9449
|
+
(0, import_sdk35.networkFromArkadeInfo)(input.info).hrp,
|
|
9450
|
+
(0, import_sdk35.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key")
|
|
9284
9451
|
);
|
|
9285
9452
|
const choice = payment?.carrier;
|
|
9286
9453
|
const carrierRequest = choice === void 0 ? void 0 : choice.mode === "purchase" ? { mode: "purchase" } : {
|
|
@@ -9344,10 +9511,10 @@ var quoteArkadeAsset = async (input) => {
|
|
|
9344
9511
|
) - 30;
|
|
9345
9512
|
if (input.now >= validUntil) throw new Error("asset payment terms lapsed before funding");
|
|
9346
9513
|
assetPayment = {
|
|
9347
|
-
receiveAddress: receiveAddress ?? new
|
|
9348
|
-
(0,
|
|
9514
|
+
receiveAddress: receiveAddress ?? new import_sdk35.ArkAddress(
|
|
9515
|
+
(0, import_sdk35.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key"),
|
|
9349
9516
|
maker.pkScript.slice(2),
|
|
9350
|
-
(0,
|
|
9517
|
+
(0, import_sdk35.networkFromArkadeInfo)(input.info).hrp
|
|
9351
9518
|
).encode(),
|
|
9352
9519
|
validUntil,
|
|
9353
9520
|
...carrier === void 0 ? {} : { carrier },
|
|
@@ -9427,14 +9594,14 @@ var assetSidesOf = (legs) => {
|
|
|
9427
9594
|
{ give: "arkade", take: "arkade" }
|
|
9428
9595
|
);
|
|
9429
9596
|
}
|
|
9430
|
-
return giveIsBtc ? { wantAsset:
|
|
9597
|
+
return giveIsBtc ? { wantAsset: import_sdk35.asset.AssetId.fromString(legs.take.assetId) } : { offerAsset: import_sdk35.asset.AssetId.fromString(legs.give.assetId) };
|
|
9431
9598
|
};
|
|
9432
9599
|
var makerPosition = async (wallet) => {
|
|
9433
9600
|
const [address, publicKey] = await Promise.all([
|
|
9434
9601
|
wallet.getAddress(),
|
|
9435
9602
|
wallet.identity.xOnlyPublicKey()
|
|
9436
9603
|
]);
|
|
9437
|
-
return { pkScript:
|
|
9604
|
+
return { pkScript: import_sdk35.ArkAddress.decode(address).pkScript, publicKey };
|
|
9438
9605
|
};
|
|
9439
9606
|
var quoteLightningSend = async (input) => {
|
|
9440
9607
|
const invoice = input.endpoints.take.instrument;
|
|
@@ -9443,7 +9610,7 @@ var quoteLightningSend = async (input) => {
|
|
|
9443
9610
|
}
|
|
9444
9611
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
9445
9612
|
const rfqId = newRfqId();
|
|
9446
|
-
const secrets = await (0,
|
|
9613
|
+
const secrets = await (0, import_sdk35.provisionRefundKey)(input.wallet);
|
|
9447
9614
|
const wire = await input.transport.requestQuote(
|
|
9448
9615
|
lightningSendRequest({
|
|
9449
9616
|
rfqId,
|
|
@@ -9518,12 +9685,18 @@ var quoteLightningReceive = async (input) => {
|
|
|
9518
9685
|
const pinned = pinnedFor(input);
|
|
9519
9686
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
9520
9687
|
const rfqId = newRfqId();
|
|
9521
|
-
const secrets = await (0,
|
|
9688
|
+
const secrets = await (0, import_sdk35.provisionClaimSecret)(input.wallet);
|
|
9522
9689
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
9523
9690
|
const payoutAddress = await input.wallet.getAddress();
|
|
9524
9691
|
const lightning = input.corridors.get("lightning").deps;
|
|
9525
9692
|
const sealTo = sealingKey(lightning);
|
|
9526
|
-
const
|
|
9693
|
+
const sealsAmount = pinned.on === "take" && input.legs.take.assetId === BTC_ASSET_ID;
|
|
9694
|
+
const binds = bindsClaimAmount();
|
|
9695
|
+
const claimPacket = sealTo !== void 0 && (!binds || sealsAmount) ? await sealClaimPacket({
|
|
9696
|
+
preimage: secrets.preimage,
|
|
9697
|
+
covclaimdPubkey: sealTo,
|
|
9698
|
+
minAmount: binds ? pinned.value : void 0
|
|
9699
|
+
}) : void 0;
|
|
9527
9700
|
const wire = await input.transport.requestQuote(
|
|
9528
9701
|
withCanonicalAmount(
|
|
9529
9702
|
lightningReceiveRequest({
|
|
@@ -9630,8 +9803,8 @@ var quoteOnchainSend = async (input) => {
|
|
|
9630
9803
|
claimVsize: onchain.claimVsize
|
|
9631
9804
|
}) : void 0;
|
|
9632
9805
|
const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
|
|
9633
|
-
const secrets = await (0,
|
|
9634
|
-
const payoutKey = await (0,
|
|
9806
|
+
const secrets = await (0, import_sdk35.provisionClaimSecret)(input.wallet);
|
|
9807
|
+
const payoutKey = await (0, import_sdk35.provisionRefundKey)(input.wallet);
|
|
9635
9808
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
9636
9809
|
const wire = await input.transport.requestQuote(
|
|
9637
9810
|
withCanonicalAmount(
|
|
@@ -9736,8 +9909,8 @@ var quoteOnchainReceive = async (input) => {
|
|
|
9736
9909
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
9737
9910
|
const rfqId = newRfqId();
|
|
9738
9911
|
const l1Network = l1NetworkFromArk(input.info.network);
|
|
9739
|
-
const secrets = await (0,
|
|
9740
|
-
const refundKey = await (0,
|
|
9912
|
+
const secrets = await (0, import_sdk35.provisionClaimSecret)(input.wallet);
|
|
9913
|
+
const refundKey = await (0, import_sdk35.provisionRefundKey)(input.wallet);
|
|
9741
9914
|
const paymentHash = import_base21.hex.encode(secrets.paymentHash);
|
|
9742
9915
|
const payoutAddress = await input.wallet.getAddress();
|
|
9743
9916
|
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
@@ -9845,7 +10018,7 @@ var quoteOnchainReceive = async (input) => {
|
|
|
9845
10018
|
};
|
|
9846
10019
|
|
|
9847
10020
|
// src/client/verbs.ts
|
|
9848
|
-
var
|
|
10021
|
+
var import_sdk36 = require("@arkade-os/sdk");
|
|
9849
10022
|
var enforceFeeCeiling = (quote, call, policy) => {
|
|
9850
10023
|
let ceiling;
|
|
9851
10024
|
for (const [source, limit] of [
|
|
@@ -9870,14 +10043,14 @@ var settle = async (deps, input, maxFee) => {
|
|
|
9870
10043
|
return deps.accept(quote);
|
|
9871
10044
|
};
|
|
9872
10045
|
var pay = async (deps, destination, options = {}) => {
|
|
9873
|
-
const
|
|
9874
|
-
if (
|
|
9875
|
-
const amount = (0,
|
|
10046
|
+
const arkade3 = (0, import_sdk36.arkTarget)(destination);
|
|
10047
|
+
if (arkade3 !== void 0) {
|
|
10048
|
+
const amount = (0, import_sdk36.resolveSendAmount)(
|
|
9876
10049
|
"ark",
|
|
9877
10050
|
destination,
|
|
9878
10051
|
options.amount === void 0 ? void 0 : satsOf(options.amount, "amount")
|
|
9879
10052
|
);
|
|
9880
|
-
return { kind: "payment", txid: await deps.wallet.send({ address:
|
|
10053
|
+
return { kind: "payment", txid: await deps.wallet.send({ address: arkade3, amount }) };
|
|
9881
10054
|
}
|
|
9882
10055
|
const swap = await settle(
|
|
9883
10056
|
deps,
|
|
@@ -10083,7 +10256,7 @@ var createSwapClient = (config) => {
|
|
|
10083
10256
|
}
|
|
10084
10257
|
},
|
|
10085
10258
|
accept: async (quote, options) => {
|
|
10086
|
-
const validUntil = (0,
|
|
10259
|
+
const validUntil = (0, import_sdk37.captureSendDeadline)(options?.validUntil);
|
|
10087
10260
|
ensureLive("accept");
|
|
10088
10261
|
const { corridors } = await resolved();
|
|
10089
10262
|
const drive2 = driving();
|
|
@@ -10195,7 +10368,8 @@ var createSwapClient = (config) => {
|
|
|
10195
10368
|
|
|
10196
10369
|
// src/reveal.ts
|
|
10197
10370
|
var import_base23 = require("@scure/base");
|
|
10198
|
-
var
|
|
10371
|
+
var import_sdk38 = require("@arkade-os/sdk");
|
|
10372
|
+
init_claimAmountGate();
|
|
10199
10373
|
init_claimPacket();
|
|
10200
10374
|
init_onchainHtlc();
|
|
10201
10375
|
var CovclaimdRevealError = class extends Error {
|
|
@@ -10210,6 +10384,13 @@ var CovclaimdRevealError = class extends Error {
|
|
|
10210
10384
|
this.retryable = status === 0 || status === 429 || status >= 500;
|
|
10211
10385
|
}
|
|
10212
10386
|
};
|
|
10387
|
+
var assertRevealAmount = (minAmount) => {
|
|
10388
|
+
if (typeof minAmount !== "bigint" || minAmount < 1n || minAmount > BigInt(Number.MAX_SAFE_INTEGER)) {
|
|
10389
|
+
throw new Error(
|
|
10390
|
+
`min_amount ${minAmount} is missing, not positive, or past what a JSON number carries`
|
|
10391
|
+
);
|
|
10392
|
+
}
|
|
10393
|
+
};
|
|
10213
10394
|
var decodeKey = (value, field) => {
|
|
10214
10395
|
if (typeof value !== "string") throw new Error(`covclaimd info: ${field} is not a string`);
|
|
10215
10396
|
let bytes;
|
|
@@ -10237,7 +10418,7 @@ var covclaimdClient = (baseUrl, options = {}) => {
|
|
|
10237
10418
|
const url = baseUrl.replace(/\/+$/, "");
|
|
10238
10419
|
const fetchImpl = options.fetchImpl ?? fetch;
|
|
10239
10420
|
const timeoutMs = options.timeoutMs ?? 3e4;
|
|
10240
|
-
(0,
|
|
10421
|
+
(0, import_sdk38.assertTimerMs)("timeoutMs", timeoutMs);
|
|
10241
10422
|
const send = async (what, path, init) => {
|
|
10242
10423
|
let response;
|
|
10243
10424
|
try {
|
|
@@ -10279,12 +10460,19 @@ var covclaimdClient = (baseUrl, options = {}) => {
|
|
|
10279
10460
|
};
|
|
10280
10461
|
},
|
|
10281
10462
|
async reveal(params) {
|
|
10463
|
+
const { minAmount } = params;
|
|
10464
|
+
if (minAmount !== void 0) assertRevealAmount(minAmount);
|
|
10282
10465
|
await send("reveal", "/v1/reveal", {
|
|
10283
10466
|
method: "POST",
|
|
10284
10467
|
headers: { "content-type": "application/json" },
|
|
10285
10468
|
body: JSON.stringify({
|
|
10286
10469
|
swap_address: params.swapAddress,
|
|
10287
|
-
packet: {
|
|
10470
|
+
packet: {
|
|
10471
|
+
ciphertext: params.ciphertext,
|
|
10472
|
+
arkade_script: params.arkadeScript,
|
|
10473
|
+
// covclaimd reads an absent field as unbound
|
|
10474
|
+
min_amount: minAmount === void 0 ? void 0 : Number(minAmount)
|
|
10475
|
+
},
|
|
10288
10476
|
taptree: params.taptree
|
|
10289
10477
|
})
|
|
10290
10478
|
});
|
|
@@ -10302,21 +10490,24 @@ function revealFieldsFromScript(script) {
|
|
|
10302
10490
|
}
|
|
10303
10491
|
async function revealClaimPacket(client, input) {
|
|
10304
10492
|
const fields = revealFieldsFromScript(input.script);
|
|
10305
|
-
if (import_base23.hex.encode(
|
|
10493
|
+
if (import_base23.hex.encode(import_sdk38.ArkAddress.decode(input.address).pkScript) !== import_base23.hex.encode(input.script.pkScript)) {
|
|
10306
10494
|
throw new Error("address does not belong to this covenant");
|
|
10307
10495
|
}
|
|
10308
10496
|
assertPreimageMatches(input.preimage, input.script.options.preimageHash);
|
|
10497
|
+
assertRevealAmount(input.minAmount);
|
|
10498
|
+
const minAmount = bindsClaimAmount() ? input.minAmount : void 0;
|
|
10309
10499
|
const { ciphertext } = await sealClaimPacket({
|
|
10310
10500
|
preimage: input.preimage,
|
|
10311
|
-
covclaimdPubkey: (await client.info()).covclaimdPubkey
|
|
10501
|
+
covclaimdPubkey: (await client.info()).covclaimdPubkey,
|
|
10502
|
+
minAmount
|
|
10312
10503
|
});
|
|
10313
|
-
await client.reveal({ swapAddress: input.address, ciphertext, ...fields });
|
|
10504
|
+
await client.reveal({ swapAddress: input.address, ciphertext, minAmount, ...fields });
|
|
10314
10505
|
return { ciphertext };
|
|
10315
10506
|
}
|
|
10316
10507
|
|
|
10317
10508
|
// src/offerFillPlan.ts
|
|
10318
10509
|
var import_base24 = require("@scure/base");
|
|
10319
|
-
var
|
|
10510
|
+
var import_sdk39 = require("@arkade-os/sdk");
|
|
10320
10511
|
init_offer();
|
|
10321
10512
|
var OFFER_FILL_TEMPLATE = "offer-fill/1";
|
|
10322
10513
|
var OFFER_FILL_OWNERS = [null, "solver", "sponsor"];
|
|
@@ -10334,7 +10525,7 @@ async function buildOfferFillPlan(wallet, arkServerUrl, offerHex, opts) {
|
|
|
10334
10525
|
const contract = await connectFillContract(wallet, arkServerUrl, offer, { swapAddress });
|
|
10335
10526
|
const vtxos = await contract.getUtxos();
|
|
10336
10527
|
const vtxo = resolveDeposit(vtxos, { fundingTxid, fundingOutpoint });
|
|
10337
|
-
const solverPayout = payoutScript ??
|
|
10528
|
+
const solverPayout = payoutScript ?? import_sdk39.ArkAddress.decode(await wallet.getAddress()).pkScript;
|
|
10338
10529
|
const sponsorLeg = sponsor !== void 0 ? normalizeSponsor(sponsor, assetCarrierSats) : void 0;
|
|
10339
10530
|
const fill = contract.functions.fulfill();
|
|
10340
10531
|
const layout = assembleOfferFill(fill, {
|
|
@@ -10401,14 +10592,14 @@ function toJointGraph(arkTx, checkpoints, layout, wantedAssetId) {
|
|
|
10401
10592
|
}
|
|
10402
10593
|
});
|
|
10403
10594
|
const ext = arkTx.getOutput(payments);
|
|
10404
|
-
if (!ext?.script || !
|
|
10595
|
+
if (!ext?.script || !import_sdk39.Extension.isExtension(ext.script)) {
|
|
10405
10596
|
throw new Error(`fill plan output ${payments} is not the extension packet`);
|
|
10406
10597
|
}
|
|
10407
10598
|
const anchor = arkTx.getOutput(payments + 1);
|
|
10408
|
-
if (!anchor?.script || import_base24.hex.encode(anchor.script) !== import_base24.hex.encode(
|
|
10599
|
+
if (!anchor?.script || import_base24.hex.encode(anchor.script) !== import_base24.hex.encode(import_sdk39.P2A.script) || anchor.amount !== import_sdk39.P2A.amount) {
|
|
10409
10600
|
throw new Error(`fill plan output ${payments + 1} is not the anchor`);
|
|
10410
10601
|
}
|
|
10411
|
-
const packet =
|
|
10602
|
+
const packet = import_sdk39.Extension.fromTx(arkTx).getAssetPacket();
|
|
10412
10603
|
for (const group of packet?.groups ?? []) {
|
|
10413
10604
|
if (group.assetId === null) throw new Error("fill plan carries an issuance group");
|
|
10414
10605
|
const assetId = group.assetId.toString();
|
|
@@ -10419,7 +10610,7 @@ function toJointGraph(arkTx, checkpoints, layout, wantedAssetId) {
|
|
|
10419
10610
|
}
|
|
10420
10611
|
for (const output of group.outputs) {
|
|
10421
10612
|
const hosted = arkTx.getOutput(output.vout);
|
|
10422
|
-
if (output.vout >= payments || !hosted?.script ||
|
|
10613
|
+
if (output.vout >= payments || !hosted?.script || import_sdk39.Extension.isExtension(hosted.script)) {
|
|
10423
10614
|
throw new Error(
|
|
10424
10615
|
`fill plan asset ${assetId} pays nonexistent output ${output.vout}`
|
|
10425
10616
|
);
|