@arkade-os/swap 0.1.0-rc.33 → 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 CHANGED
@@ -4501,7 +4501,7 @@ var acceptQuoteBody = async (input) => {
4501
4501
  var registeredOfferRecord = async (input, preparation) => {
4502
4502
  const { quote, wallet, corridors, now } = input;
4503
4503
  const { plan } = preparation;
4504
- const arkade2 = corridors.get("arkade").deps;
4504
+ const arkade3 = corridors.get("arkade").deps;
4505
4505
  const receiveIsBtc = plan.receive.asset.id === BTC_ASSET_ID;
4506
4506
  const offer = await createOffer(
4507
4507
  wallet,
@@ -4509,7 +4509,7 @@ var registeredOfferRecord = async (input, preparation) => {
4509
4509
  // Keyed on the receive side: the covenant binds what the fill delivers.
4510
4510
  wantAmount: plan.receive.atomic,
4511
4511
  ...receiveIsBtc ? { offerAsset: import_sdk13.asset.AssetId.fromString(plan.deposit.asset.id) } : { wantAsset: import_sdk13.asset.AssetId.fromString(plan.receive.asset.id) },
4512
- emulatorPubkey: arkade2.emulatorPubkey
4512
+ emulatorPubkey: arkade3.emulatorPubkey
4513
4513
  },
4514
4514
  { coverageId: quote.id }
4515
4515
  );
@@ -4743,7 +4743,7 @@ var scopedToRail = (table, rail) => ({
4743
4743
 
4744
4744
  // src/client/client.ts
4745
4745
  var import_base22 = require("@scure/base");
4746
- var import_sdk36 = require("@arkade-os/sdk");
4746
+ var import_sdk37 = require("@arkade-os/sdk");
4747
4747
  init_repository();
4748
4748
 
4749
4749
  // src/refund.ts
@@ -6307,7 +6307,7 @@ var retireOfferScripts = async (wallet, repository, record) => {
6307
6307
  };
6308
6308
 
6309
6309
  // src/client/drive.ts
6310
- var import_sdk30 = require("@arkade-os/sdk");
6310
+ var import_sdk31 = require("@arkade-os/sdk");
6311
6311
  var import_base19 = require("@scure/base");
6312
6312
 
6313
6313
  // src/claim.ts
@@ -6362,11 +6362,147 @@ async function pushClaim(operator, input) {
6362
6362
  // src/client/drive.ts
6363
6363
  init_onchainHtlc();
6364
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
6365
6501
  init_offer();
6366
6502
  init_lockupContract();
6367
6503
 
6368
6504
  // src/refundBlocked.ts
6369
- var import_sdk26 = require("@arkade-os/sdk");
6505
+ var import_sdk27 = require("@arkade-os/sdk");
6370
6506
  var RefundNotLocallyPossibleError = class extends Error {
6371
6507
  constructor(reason, message, options) {
6372
6508
  super(message, options);
@@ -6383,16 +6519,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
6383
6519
  );
6384
6520
  }
6385
6521
  try {
6386
- return await (0, import_sdk26.contractSigner)(wallet, record.signingDescriptor);
6522
+ return await (0, import_sdk27.contractSigner)(wallet, record.signingDescriptor);
6387
6523
  } catch (cause) {
6388
- if (cause instanceof import_sdk26.WalletCannotSignError) {
6524
+ if (cause instanceof import_sdk27.WalletCannotSignError) {
6389
6525
  throw new RefundNotLocallyPossibleError(
6390
6526
  "unsignable-wallet",
6391
6527
  `this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
6392
6528
  { cause }
6393
6529
  );
6394
6530
  }
6395
- if (cause instanceof import_sdk26.ForeignDescriptorError) {
6531
+ if (cause instanceof import_sdk27.ForeignDescriptorError) {
6396
6532
  throw new RefundNotLocallyPossibleError(
6397
6533
  "foreign-descriptor",
6398
6534
  `this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
@@ -6448,7 +6584,7 @@ init_repository();
6448
6584
 
6449
6585
  // src/swapManager.ts
6450
6586
  var import_base17 = require("@scure/base");
6451
- var import_sdk27 = require("@arkade-os/sdk");
6587
+ var import_sdk28 = require("@arkade-os/sdk");
6452
6588
  init_onchainHtlc();
6453
6589
  init_lockupContract();
6454
6590
  init_repository();
@@ -6579,7 +6715,7 @@ var RfqSwapManager = class _RfqSwapManager {
6579
6715
  timer = null;
6580
6716
  running = false;
6581
6717
  constructor(deps, config = {}) {
6582
- (0, import_sdk27.assertTimerMs)("pollIntervalMs", config.pollIntervalMs);
6718
+ (0, import_sdk28.assertTimerMs)("pollIntervalMs", config.pollIntervalMs);
6583
6719
  this.deps = deps;
6584
6720
  this.config = {
6585
6721
  enableAutoActions: config.enableAutoActions ?? true,
@@ -6923,7 +7059,7 @@ var RfqSwapManager = class _RfqSwapManager {
6923
7059
  });
6924
7060
  return;
6925
7061
  }
6926
- if (!(0, import_sdk27.isContractVtxoEvent)(event)) return;
7062
+ if (!(0, import_sdk28.isContractVtxoEvent)(event)) return;
6927
7063
  const swap = this.byLockupScript.get(event.contractScript);
6928
7064
  if (!swap) return;
6929
7065
  void this.pollSwap(swap).catch(() => {
@@ -7158,8 +7294,8 @@ var RfqSwapManager = class _RfqSwapManager {
7158
7294
  this.setState(swap, "claimed");
7159
7295
  this.emitAction(swap, "claimLockup");
7160
7296
  } catch (error) {
7161
- const ark = (0, import_sdk27.isArkError)(error) ? error : (0, import_sdk27.maybeArkError)(error);
7162
- if ((0, import_sdk27.isArkError)(ark, import_sdk27.ArkErrorName.VTXO_ALREADY_SPENT)) {
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)) {
7163
7299
  if (swap.claimFailure !== void 0) {
7164
7300
  delete swap.claimFailure;
7165
7301
  this.touch(swap);
@@ -7450,8 +7586,8 @@ var RfqSwapManager = class _RfqSwapManager {
7450
7586
  this.refundRefused.add(swap.rfqId);
7451
7587
  return this.block(swap, error.message);
7452
7588
  }
7453
- const ark = (0, import_sdk27.isArkError)(error) ? error : (0, import_sdk27.maybeArkError)(error);
7454
- if ((0, import_sdk27.isArkError)(ark, import_sdk27.ArkErrorName.VTXO_ALREADY_SPENT)) return;
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;
7455
7591
  this.emitFailed(swap, error);
7456
7592
  if (now >= swap.refundLocktime + REFUND_MTP_LAG_SECONDS) {
7457
7593
  swap.failure = errorMessage(error);
@@ -7644,7 +7780,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
7644
7780
 
7645
7781
  // src/watch.ts
7646
7782
  var import_base18 = require("@scure/base");
7647
- var import_sdk28 = require("@arkade-os/sdk");
7783
+ var import_sdk29 = require("@arkade-os/sdk");
7648
7784
  init_coverage();
7649
7785
  init_offer();
7650
7786
  init_store();
@@ -7679,7 +7815,7 @@ async function watchOfferSwaps({
7679
7815
  wallet.getAddress(),
7680
7816
  wallet.getArkadeReader()
7681
7817
  ]);
7682
- const operatorPubkey = import_sdk28.ArkAddress.decode(address).serverPubKey;
7818
+ const operatorPubkey = import_sdk29.ArkAddress.decode(address).serverPubKey;
7683
7819
  let queue = Promise.resolve();
7684
7820
  const enqueue = (task) => {
7685
7821
  queue = queue.then(task).catch(() => {
@@ -7694,7 +7830,7 @@ async function watchOfferSwaps({
7694
7830
  return classifyDepositSpend(
7695
7831
  decodeOffer(import_base18.hex.decode(swap.offerHex)),
7696
7832
  operatorPubkey,
7697
- txs.map((psbt) => import_sdk28.Transaction.fromPSBT(import_base18.base64.decode(psbt))),
7833
+ txs.map((psbt) => import_sdk29.Transaction.fromPSBT(import_base18.base64.decode(psbt))),
7698
7834
  { txid: vtxo.txid, vout: vtxo.vout }
7699
7835
  );
7700
7836
  } catch {
@@ -7722,7 +7858,7 @@ async function watchOfferSwaps({
7722
7858
  }
7723
7859
  };
7724
7860
  const unsubscribe = manager.onContractEvent((event) => {
7725
- if (!(0, import_sdk28.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
7861
+ if (!(0, import_sdk29.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
7726
7862
  enqueue(() => handleSpend(event));
7727
7863
  });
7728
7864
  return {
@@ -7732,7 +7868,7 @@ async function watchOfferSwaps({
7732
7868
  }
7733
7869
 
7734
7870
  // src/client/legacyRecords.ts
7735
- var import_sdk29 = require("@arkade-os/sdk");
7871
+ var import_sdk30 = require("@arkade-os/sdk");
7736
7872
  init_repository();
7737
7873
  var readLegacyRfqSwaps = async (repository, filter = {}) => {
7738
7874
  try {
@@ -7749,7 +7885,7 @@ var withLegacyRfqSwaps = (bridge, repository, admits) => {
7749
7885
  index: bridge.index,
7750
7886
  quoteIdOf: bridge.quoteIdOf,
7751
7887
  async getRfqSwapsPage(filter, page) {
7752
- (0, import_sdk29.assertPageRequest)(page);
7888
+ (0, import_sdk30.assertPageRequest)(page);
7753
7889
  assertRfqSwapPageFilter(filter);
7754
7890
  const v2 = await collectRfqSwaps(bridge, filter);
7755
7891
  const held = new Set(
@@ -8003,7 +8139,7 @@ var createSwapDrive = (config) => {
8003
8139
  const secret = rfqClaimSecretOf(record);
8004
8140
  if (!secret) throw new Error(`rfq swap ${swap.rfqId} carries no claim secret`);
8005
8141
  const preimage = await preimageForSwapRecord(wallet, secret);
8006
- const signer = await (0, import_sdk30.contractSigner)(wallet, await (0, import_sdk30.identityDescriptor)(wallet.identity));
8142
+ const signer = await (0, import_sdk31.contractSigner)(wallet, await (0, import_sdk31.identityDescriptor)(wallet.identity));
8007
8143
  const claimKey = record.profile.claimKey;
8008
8144
  if (typeof claimKey === "string") {
8009
8145
  const held = import_base19.hex.encode(await signer.xOnlyPublicKey());
@@ -8049,7 +8185,7 @@ var createSwapDrive = (config) => {
8049
8185
  `rfq swap ${swap.rfqId} carries no refund descriptor; wire the onchain corridor's refund callback to take its L1 funding back`
8050
8186
  );
8051
8187
  }
8052
- const signer = await (0, import_sdk30.contractSigner)(wallet, descriptor);
8188
+ const signer = await (0, import_sdk31.contractSigner)(wallet, descriptor);
8053
8189
  const held = import_base19.hex.encode(await signer.xOnlyPublicKey());
8054
8190
  if (held !== record.profile.refundKey) {
8055
8191
  throw new Error(
@@ -8089,7 +8225,7 @@ var createSwapDrive = (config) => {
8089
8225
  }
8090
8226
  };
8091
8227
  const drivable = async (record) => !readsChain(record.kind) || await resolveOnchain();
8092
- const pinnedNetwork = async () => (0, import_sdk30.getNetwork)(await config.network());
8228
+ const pinnedNetwork = async () => (0, import_sdk31.getNetwork)(await config.network());
8093
8229
  const claimLockup = async (swap, vtxos, { partiallyClaimed }) => {
8094
8230
  const record = await corridorStore().getRfqSwap(swap.rfqId);
8095
8231
  if (!record) throw new Error(`rfq swap ${swap.rfqId} has no stored record to claim from`);
@@ -8104,10 +8240,10 @@ var createSwapDrive = (config) => {
8104
8240
  return track(
8105
8241
  pushClaim(operator, {
8106
8242
  contract: script,
8107
- receiver: await (0, import_sdk30.contractSigner)(wallet, secret.signingDescriptor),
8243
+ receiver: await (0, import_sdk31.contractSigner)(wallet, secret.signingDescriptor),
8108
8244
  preimage: await preimageForSwapRecord(wallet, secret),
8109
8245
  vtxos,
8110
- destinationPkScript: import_sdk30.ArkAddress.decode(payoutAddress).pkScript,
8246
+ destinationPkScript: import_sdk31.ArkAddress.decode(payoutAddress).pkScript,
8111
8247
  // Passed through: `pushClaim`'s own value check decides whether `P` is published.
8112
8248
  expectedAmount: swap.expectedAmount,
8113
8249
  partiallyClaimed,
@@ -8175,7 +8311,7 @@ var createSwapDrive = (config) => {
8175
8311
  config.network()
8176
8312
  ]);
8177
8313
  const txs = history.map(toRestoreTx);
8178
- const { hrp, serverPubKey: operatorPubkey } = import_sdk30.ArkAddress.decode(address);
8314
+ const { hrp, serverPubKey: operatorPubkey } = import_sdk31.ArkAddress.decode(address);
8179
8315
  const reopened = await legacyOfferDepositsToAdopt(store);
8180
8316
  for (const txid of reopen) reopened.add(txid);
8181
8317
  const cursor = reopened.size === 0 ? scanned : new Set([...scanned].filter((txid) => !reopened.has(txid)));
@@ -8313,7 +8449,19 @@ var createSwapDrive = (config) => {
8313
8449
  console.warn("[swap] v1 rfq swap adoption did not complete", error);
8314
8450
  }
8315
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
+ };
8316
8463
  const restore = async () => {
8464
+ void track(migrateOfferRows());
8317
8465
  if (!repository) return;
8318
8466
  await adoptLegacyRfqSwaps(repository);
8319
8467
  const all = await collectSwapRecords(repository);
@@ -9073,13 +9221,13 @@ var verifyPlanLegs = (plan, legs, give) => {
9073
9221
 
9074
9222
  // src/client/quoteRfq.ts
9075
9223
  var import_base21 = require("@scure/base");
9076
- var import_sdk34 = require("@arkade-os/sdk");
9224
+ var import_sdk35 = require("@arkade-os/sdk");
9077
9225
  var import_solver_discovery12 = require("@arkade-os/solver-discovery");
9078
9226
 
9079
9227
  // src/jointGraph.ts
9080
9228
  var import_base20 = require("@scure/base");
9081
9229
  var import_sha26 = require("@noble/hashes/sha2.js");
9082
- var import_sdk31 = require("@arkade-os/sdk");
9230
+ var import_sdk32 = require("@arkade-os/sdk");
9083
9231
  function digestJointGraph(plan, template) {
9084
9232
  const parts = [];
9085
9233
  const pushU32 = (value) => {
@@ -9141,7 +9289,7 @@ function verifyJointGraph(plan, template) {
9141
9289
  }
9142
9290
  }
9143
9291
  function parseGraphTx(psbt) {
9144
- return import_sdk31.Transaction.fromPSBT(import_base20.base64.decode(psbt));
9292
+ return import_sdk32.Transaction.fromPSBT(import_base20.base64.decode(psbt));
9145
9293
  }
9146
9294
  function deepFreeze(value) {
9147
9295
  if (value !== null && typeof value === "object") {
@@ -9167,11 +9315,11 @@ init_onchainHtlc();
9167
9315
  init_onchainHtlc();
9168
9316
 
9169
9317
  // src/payment/onchainSwap.ts
9170
- var import_sdk33 = require("@arkade-os/sdk");
9318
+ var import_sdk34 = require("@arkade-os/sdk");
9171
9319
  init_onchainHtlc();
9172
9320
 
9173
9321
  // src/payment/swapRail.ts
9174
- var import_sdk32 = require("@arkade-os/sdk");
9322
+ var import_sdk33 = require("@arkade-os/sdk");
9175
9323
 
9176
9324
  // src/client/sats.ts
9177
9325
  var satsOf = (value, field) => {
@@ -9228,13 +9376,13 @@ var lockupOf = (derived) => ({
9228
9376
  pkScript: derived.swapPkScript
9229
9377
  });
9230
9378
  var covenantInputs = (input) => {
9231
- const network = (0, import_sdk34.networkFromArkadeInfo)(input.info);
9232
- const arkade2 = input.corridors.get("arkade").deps;
9379
+ const network = (0, import_sdk35.networkFromArkadeInfo)(input.info);
9380
+ const arkade3 = input.corridors.get("arkade").deps;
9233
9381
  return {
9234
- operatorPubkey: (0, import_sdk34.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key"),
9382
+ operatorPubkey: (0, import_sdk35.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key"),
9235
9383
  // The resolved per-network pin, never operator-reported: it lands in a covenant leaf
9236
9384
  // that decides who can move the funds.
9237
- emulatorPubkey: (0, import_sdk34.toXOnly)(import_base21.hex.decode(arkade2.emulatorPubkey), "emulator signer key"),
9385
+ emulatorPubkey: (0, import_sdk35.toXOnly)(import_base21.hex.decode(arkade3.emulatorPubkey), "emulator signer key"),
9238
9386
  claimDelay: unilateralClaimDelay(Number(input.info.unilateralExitDelay)),
9239
9387
  hrp: network.hrp
9240
9388
  };
@@ -9298,8 +9446,8 @@ var quoteArkadeAsset = async (input) => {
9298
9446
  const receivePkScript = resolveReceivePkScript(
9299
9447
  receiveAddress,
9300
9448
  maker.pkScript,
9301
- (0, import_sdk34.networkFromArkadeInfo)(input.info).hrp,
9302
- (0, import_sdk34.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key")
9449
+ (0, import_sdk35.networkFromArkadeInfo)(input.info).hrp,
9450
+ (0, import_sdk35.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key")
9303
9451
  );
9304
9452
  const choice = payment?.carrier;
9305
9453
  const carrierRequest = choice === void 0 ? void 0 : choice.mode === "purchase" ? { mode: "purchase" } : {
@@ -9363,10 +9511,10 @@ var quoteArkadeAsset = async (input) => {
9363
9511
  ) - 30;
9364
9512
  if (input.now >= validUntil) throw new Error("asset payment terms lapsed before funding");
9365
9513
  assetPayment = {
9366
- receiveAddress: receiveAddress ?? new import_sdk34.ArkAddress(
9367
- (0, import_sdk34.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key"),
9514
+ receiveAddress: receiveAddress ?? new import_sdk35.ArkAddress(
9515
+ (0, import_sdk35.toXOnly)(import_base21.hex.decode(input.info.signerPubkey), "ark signer key"),
9368
9516
  maker.pkScript.slice(2),
9369
- (0, import_sdk34.networkFromArkadeInfo)(input.info).hrp
9517
+ (0, import_sdk35.networkFromArkadeInfo)(input.info).hrp
9370
9518
  ).encode(),
9371
9519
  validUntil,
9372
9520
  ...carrier === void 0 ? {} : { carrier },
@@ -9446,14 +9594,14 @@ var assetSidesOf = (legs) => {
9446
9594
  { give: "arkade", take: "arkade" }
9447
9595
  );
9448
9596
  }
9449
- return giveIsBtc ? { wantAsset: import_sdk34.asset.AssetId.fromString(legs.take.assetId) } : { offerAsset: import_sdk34.asset.AssetId.fromString(legs.give.assetId) };
9597
+ return giveIsBtc ? { wantAsset: import_sdk35.asset.AssetId.fromString(legs.take.assetId) } : { offerAsset: import_sdk35.asset.AssetId.fromString(legs.give.assetId) };
9450
9598
  };
9451
9599
  var makerPosition = async (wallet) => {
9452
9600
  const [address, publicKey] = await Promise.all([
9453
9601
  wallet.getAddress(),
9454
9602
  wallet.identity.xOnlyPublicKey()
9455
9603
  ]);
9456
- return { pkScript: import_sdk34.ArkAddress.decode(address).pkScript, publicKey };
9604
+ return { pkScript: import_sdk35.ArkAddress.decode(address).pkScript, publicKey };
9457
9605
  };
9458
9606
  var quoteLightningSend = async (input) => {
9459
9607
  const invoice = input.endpoints.take.instrument;
@@ -9462,7 +9610,7 @@ var quoteLightningSend = async (input) => {
9462
9610
  }
9463
9611
  const pair = rfqPairFor(input.legs.give, input.legs.take);
9464
9612
  const rfqId = newRfqId();
9465
- const secrets = await (0, import_sdk34.provisionRefundKey)(input.wallet);
9613
+ const secrets = await (0, import_sdk35.provisionRefundKey)(input.wallet);
9466
9614
  const wire = await input.transport.requestQuote(
9467
9615
  lightningSendRequest({
9468
9616
  rfqId,
@@ -9537,7 +9685,7 @@ var quoteLightningReceive = async (input) => {
9537
9685
  const pinned = pinnedFor(input);
9538
9686
  const pair = rfqPairFor(input.legs.give, input.legs.take);
9539
9687
  const rfqId = newRfqId();
9540
- const secrets = await (0, import_sdk34.provisionClaimSecret)(input.wallet);
9688
+ const secrets = await (0, import_sdk35.provisionClaimSecret)(input.wallet);
9541
9689
  const paymentHash = import_base21.hex.encode(secrets.paymentHash);
9542
9690
  const payoutAddress = await input.wallet.getAddress();
9543
9691
  const lightning = input.corridors.get("lightning").deps;
@@ -9655,8 +9803,8 @@ var quoteOnchainSend = async (input) => {
9655
9803
  claimVsize: onchain.claimVsize
9656
9804
  }) : void 0;
9657
9805
  const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
9658
- const secrets = await (0, import_sdk34.provisionClaimSecret)(input.wallet);
9659
- const payoutKey = await (0, import_sdk34.provisionRefundKey)(input.wallet);
9806
+ const secrets = await (0, import_sdk35.provisionClaimSecret)(input.wallet);
9807
+ const payoutKey = await (0, import_sdk35.provisionRefundKey)(input.wallet);
9660
9808
  const paymentHash = import_base21.hex.encode(secrets.paymentHash);
9661
9809
  const wire = await input.transport.requestQuote(
9662
9810
  withCanonicalAmount(
@@ -9761,8 +9909,8 @@ var quoteOnchainReceive = async (input) => {
9761
9909
  const pair = rfqPairFor(input.legs.give, input.legs.take);
9762
9910
  const rfqId = newRfqId();
9763
9911
  const l1Network = l1NetworkFromArk(input.info.network);
9764
- const secrets = await (0, import_sdk34.provisionClaimSecret)(input.wallet);
9765
- const refundKey = await (0, import_sdk34.provisionRefundKey)(input.wallet);
9912
+ const secrets = await (0, import_sdk35.provisionClaimSecret)(input.wallet);
9913
+ const refundKey = await (0, import_sdk35.provisionRefundKey)(input.wallet);
9766
9914
  const paymentHash = import_base21.hex.encode(secrets.paymentHash);
9767
9915
  const payoutAddress = await input.wallet.getAddress();
9768
9916
  const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
@@ -9870,7 +10018,7 @@ var quoteOnchainReceive = async (input) => {
9870
10018
  };
9871
10019
 
9872
10020
  // src/client/verbs.ts
9873
- var import_sdk35 = require("@arkade-os/sdk");
10021
+ var import_sdk36 = require("@arkade-os/sdk");
9874
10022
  var enforceFeeCeiling = (quote, call, policy) => {
9875
10023
  let ceiling;
9876
10024
  for (const [source, limit] of [
@@ -9895,14 +10043,14 @@ var settle = async (deps, input, maxFee) => {
9895
10043
  return deps.accept(quote);
9896
10044
  };
9897
10045
  var pay = async (deps, destination, options = {}) => {
9898
- const arkade2 = (0, import_sdk35.arkTarget)(destination);
9899
- if (arkade2 !== void 0) {
9900
- const amount = (0, import_sdk35.resolveSendAmount)(
10046
+ const arkade3 = (0, import_sdk36.arkTarget)(destination);
10047
+ if (arkade3 !== void 0) {
10048
+ const amount = (0, import_sdk36.resolveSendAmount)(
9901
10049
  "ark",
9902
10050
  destination,
9903
10051
  options.amount === void 0 ? void 0 : satsOf(options.amount, "amount")
9904
10052
  );
9905
- return { kind: "payment", txid: await deps.wallet.send({ address: arkade2, amount }) };
10053
+ return { kind: "payment", txid: await deps.wallet.send({ address: arkade3, amount }) };
9906
10054
  }
9907
10055
  const swap = await settle(
9908
10056
  deps,
@@ -10108,7 +10256,7 @@ var createSwapClient = (config) => {
10108
10256
  }
10109
10257
  },
10110
10258
  accept: async (quote, options) => {
10111
- const validUntil = (0, import_sdk36.captureSendDeadline)(options?.validUntil);
10259
+ const validUntil = (0, import_sdk37.captureSendDeadline)(options?.validUntil);
10112
10260
  ensureLive("accept");
10113
10261
  const { corridors } = await resolved();
10114
10262
  const drive2 = driving();
@@ -10220,7 +10368,7 @@ var createSwapClient = (config) => {
10220
10368
 
10221
10369
  // src/reveal.ts
10222
10370
  var import_base23 = require("@scure/base");
10223
- var import_sdk37 = require("@arkade-os/sdk");
10371
+ var import_sdk38 = require("@arkade-os/sdk");
10224
10372
  init_claimAmountGate();
10225
10373
  init_claimPacket();
10226
10374
  init_onchainHtlc();
@@ -10270,7 +10418,7 @@ var covclaimdClient = (baseUrl, options = {}) => {
10270
10418
  const url = baseUrl.replace(/\/+$/, "");
10271
10419
  const fetchImpl = options.fetchImpl ?? fetch;
10272
10420
  const timeoutMs = options.timeoutMs ?? 3e4;
10273
- (0, import_sdk37.assertTimerMs)("timeoutMs", timeoutMs);
10421
+ (0, import_sdk38.assertTimerMs)("timeoutMs", timeoutMs);
10274
10422
  const send = async (what, path, init) => {
10275
10423
  let response;
10276
10424
  try {
@@ -10342,7 +10490,7 @@ function revealFieldsFromScript(script) {
10342
10490
  }
10343
10491
  async function revealClaimPacket(client, input) {
10344
10492
  const fields = revealFieldsFromScript(input.script);
10345
- if (import_base23.hex.encode(import_sdk37.ArkAddress.decode(input.address).pkScript) !== import_base23.hex.encode(input.script.pkScript)) {
10493
+ if (import_base23.hex.encode(import_sdk38.ArkAddress.decode(input.address).pkScript) !== import_base23.hex.encode(input.script.pkScript)) {
10346
10494
  throw new Error("address does not belong to this covenant");
10347
10495
  }
10348
10496
  assertPreimageMatches(input.preimage, input.script.options.preimageHash);
@@ -10359,7 +10507,7 @@ async function revealClaimPacket(client, input) {
10359
10507
 
10360
10508
  // src/offerFillPlan.ts
10361
10509
  var import_base24 = require("@scure/base");
10362
- var import_sdk38 = require("@arkade-os/sdk");
10510
+ var import_sdk39 = require("@arkade-os/sdk");
10363
10511
  init_offer();
10364
10512
  var OFFER_FILL_TEMPLATE = "offer-fill/1";
10365
10513
  var OFFER_FILL_OWNERS = [null, "solver", "sponsor"];
@@ -10377,7 +10525,7 @@ async function buildOfferFillPlan(wallet, arkServerUrl, offerHex, opts) {
10377
10525
  const contract = await connectFillContract(wallet, arkServerUrl, offer, { swapAddress });
10378
10526
  const vtxos = await contract.getUtxos();
10379
10527
  const vtxo = resolveDeposit(vtxos, { fundingTxid, fundingOutpoint });
10380
- const solverPayout = payoutScript ?? import_sdk38.ArkAddress.decode(await wallet.getAddress()).pkScript;
10528
+ const solverPayout = payoutScript ?? import_sdk39.ArkAddress.decode(await wallet.getAddress()).pkScript;
10381
10529
  const sponsorLeg = sponsor !== void 0 ? normalizeSponsor(sponsor, assetCarrierSats) : void 0;
10382
10530
  const fill = contract.functions.fulfill();
10383
10531
  const layout = assembleOfferFill(fill, {
@@ -10444,14 +10592,14 @@ function toJointGraph(arkTx, checkpoints, layout, wantedAssetId) {
10444
10592
  }
10445
10593
  });
10446
10594
  const ext = arkTx.getOutput(payments);
10447
- if (!ext?.script || !import_sdk38.Extension.isExtension(ext.script)) {
10595
+ if (!ext?.script || !import_sdk39.Extension.isExtension(ext.script)) {
10448
10596
  throw new Error(`fill plan output ${payments} is not the extension packet`);
10449
10597
  }
10450
10598
  const anchor = arkTx.getOutput(payments + 1);
10451
- if (!anchor?.script || import_base24.hex.encode(anchor.script) !== import_base24.hex.encode(import_sdk38.P2A.script) || anchor.amount !== import_sdk38.P2A.amount) {
10599
+ if (!anchor?.script || import_base24.hex.encode(anchor.script) !== import_base24.hex.encode(import_sdk39.P2A.script) || anchor.amount !== import_sdk39.P2A.amount) {
10452
10600
  throw new Error(`fill plan output ${payments + 1} is not the anchor`);
10453
10601
  }
10454
- const packet = import_sdk38.Extension.fromTx(arkTx).getAssetPacket();
10602
+ const packet = import_sdk39.Extension.fromTx(arkTx).getAssetPacket();
10455
10603
  for (const group of packet?.groups ?? []) {
10456
10604
  if (group.assetId === null) throw new Error("fill plan carries an issuance group");
10457
10605
  const assetId = group.assetId.toString();
@@ -10462,7 +10610,7 @@ function toJointGraph(arkTx, checkpoints, layout, wantedAssetId) {
10462
10610
  }
10463
10611
  for (const output of group.outputs) {
10464
10612
  const hosted = arkTx.getOutput(output.vout);
10465
- if (output.vout >= payments || !hosted?.script || import_sdk38.Extension.isExtension(hosted.script)) {
10613
+ if (output.vout >= payments || !hosted?.script || import_sdk39.Extension.isExtension(hosted.script)) {
10466
10614
  throw new Error(
10467
10615
  `fill plan asset ${assetId} pays nonexistent output ${output.vout}`
10468
10616
  );
package/dist/advanced.js CHANGED
@@ -136,7 +136,7 @@ import {
136
136
  withCanonicalAmount,
137
137
  withDepositFate,
138
138
  withRfqState
139
- } from "./chunk-RYJHBEDN.js";
139
+ } from "./chunk-JJINMVWB.js";
140
140
  import {
141
141
  ACTIVITY_TOKEN,
142
142
  Amount,
@@ -171,7 +171,7 @@ import {
171
171
  recordOutcome,
172
172
  swapOf,
173
173
  toAtomicDecimal
174
- } from "./chunk-B7RFWT3B.js";
174
+ } from "./chunk-RDAQR6LV.js";
175
175
  import {
176
176
  ARKADE_BTC,
177
177
  SwapRefusal,
@@ -180,7 +180,7 @@ import {
180
180
  bindsClaimAmount,
181
181
  rfqPair,
182
182
  sealClaimPacket
183
- } from "./chunk-A5NAC2XU.js";
183
+ } from "./chunk-GBQX3FJV.js";
184
184
  import "./chunk-A3SHHRX4.js";
185
185
 
186
186
  // src/reveal.ts
@@ -2937,6 +2937,7 @@ export {
2937
2937
  rfqClaimSecretOf,
2938
2938
  rfqClaimDestinationOf,
2939
2939
  swapPrograms,
2940
+ withExitClosure,
2940
2941
  offerContract,
2941
2942
  OFFER_PACKET_TYPE,
2942
2943
  encodeOffer,