@arkade-os/boltz-swap 0.3.45 → 0.3.46

package/dist/{arkade-swaps-C8CmzknM.d.cts → arkade-swaps-D-L0_0Ri.d.cts}

@@ -415,6 +415,13 @@ declare class ArkadeSwaps {
         swap: BoltzChainSwap;
         arkInfo: ArkInfo;
     }): Promise<boolean>;
+    /**
+     * Verifies the BTC-side Taproot HTLC of a chain swap before funds are
+     * committed: the lockup address must bind to MuSig2(boltz, user) over
+     * Boltz's leaves, and those leaves must enforce the agreed preimage hash,
+     * direction-specific keys, leaf version, and absolute refund CLTV.
+     */
+    private verifyBtcChainHtlc;
     /**
      * Renegotiates the quote for an existing chain swap. Convenience wrapper
      * over `getSwapQuote` + `acceptSwapQuote` with a safety floor.

package/dist/{arkade-swaps-gXHRbR09.d.ts → arkade-swaps-fmdCFjif.d.ts}

@@ -415,6 +415,13 @@ declare class ArkadeSwaps {
         swap: BoltzChainSwap;
         arkInfo: ArkInfo;
     }): Promise<boolean>;
+    /**
+     * Verifies the BTC-side Taproot HTLC of a chain swap before funds are
+     * committed: the lockup address must bind to MuSig2(boltz, user) over
+     * Boltz's leaves, and those leaves must enforce the agreed preimage hash,
+     * direction-specific keys, leaf version, and absolute refund CLTV.
+     */
+    private verifyBtcChainHtlc;
     /**
      * Renegotiates the quote for an existing chain swap. Convenience wrapper
      * over `getSwapQuote` + `acceptSwapQuote` with a safety floor.

package/dist/{chunk-5GBBRBFS.js → chunk-GXO2EB6C.js}

@@ -2376,14 +2376,16 @@ var IndexedDbSwapRepository = class {
 // src/arkade-swaps.ts
 import {
   ArkAddress as ArkAddress2,
-  isRecoverable
+  isRecoverable,
+  getNetwork as getNetwork2
 } from "@arkade-os/sdk";
 import { sha256 as sha2563 } from "@noble/hashes/sha2.js";
+import { ripemd160 as ripemd1602 } from "@noble/hashes/legacy.js";
 import { hex as hex8 } from "@scure/base";
 import { secp256k1 as secp256k12 } from "@noble/curves/secp256k1.js";
 import { randomBytes } from "@noble/hashes/utils.js";
 import { Address as Address2, OutScript as OutScript2, SigHash as SigHash2, Transaction as Transaction6 } from "@scure/btc-signer";
-import { NETWORK } from "@scure/btc-signer/utils.js";
+import { equalBytes as equalBytes3 } from "@scure/btc-signer/utils.js";
 
 // src/utils/musig.ts
 import { secp256k1 } from "@noble/curves/secp256k1.js";
@@ -2605,21 +2607,9 @@ var create = (privateKey, publicKeys) => {
 // src/utils/boltz-swap-tx.ts
 import { schnorr } from "@noble/curves/secp256k1.js";
 import { hex as hex4 } from "@scure/base";
-import { Script, Transaction as Transaction2 } from "@scure/btc-signer";
+import { Script, ScriptNum, Transaction as Transaction2 } from "@scure/btc-signer";
 import { tapLeafHash } from "@scure/btc-signer/payment.js";
 import { compareBytes, equalBytes as equalBytes2 } from "@scure/btc-signer/utils.js";
-var REGTEST_NETWORK = {
-  bech32: "bcrt",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
-var MUTINYNET_NETWORK = {
-  bech32: "tb",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
 var deserializeLeaf = (leaf) => ({
   version: leaf.version,
   output: hex4.decode(leaf.output)
@@ -2653,6 +2643,19 @@ var deserializeSwapTree = (tree) => {
     ])
   };
 };
+var TAPLEAF_V1 = 192;
+var PUSH_32 = Uint8Array.of(32);
+var decodeScriptNum = (data) => data instanceof Uint8Array && data.length > 0 ? Number(ScriptNum(5, true).decode(data)) : void 0;
+var assertChainHtlcLeaves = (tree, expected) => {
+  if (tree.claimLeaf.version !== TAPLEAF_V1 || tree.refundLeaf.version !== TAPLEAF_V1)
+    throw new Error("unexpected leaf version");
+  const claim = Script.decode(tree.claimLeaf.output);
+  if (claim.length !== 8 || claim[0] !== "SIZE" || !(claim[1] instanceof Uint8Array) || !equalBytes2(claim[1], PUSH_32) || claim[2] !== "EQUALVERIFY" || claim[3] !== "HASH160" || !(claim[4] instanceof Uint8Array) || !equalBytes2(claim[4], expected.preimageHash160) || claim[5] !== "EQUALVERIFY" || !(claim[6] instanceof Uint8Array) || !equalBytes2(claim[6], expected.claimXOnly) || claim[7] !== "CHECKSIG")
+    throw new Error("unexpected claim leaf");
+  const refund = Script.decode(tree.refundLeaf.output);
+  if (refund.length !== 4 || !(refund[0] instanceof Uint8Array) || !equalBytes2(refund[0], expected.refundXOnly) || refund[1] !== "CHECKSIGVERIFY" || decodeScriptNum(refund[2]) !== expected.timeoutBlockHeight || refund[3] !== "CHECKLOCKTIMEVERIFY")
+    throw new Error("unexpected refund leaf");
+};
 var taprootHashTree = (tree) => {
   if (!Array.isArray(tree)) {
     return {
@@ -2804,6 +2807,7 @@ import {
   buildOffchainTx,
   getSequence as getSequence2,
   Intent,
+  getNetwork,
   networks,
   VHTLC,
   VtxoScript as VtxoScript2,
@@ -2990,7 +2994,7 @@ var createVHTLCScript = (args) => {
     )
   });
   if (!vhtlcScript.claimScript) throw new Error("Failed to create VHTLC script");
-  const hrp = network === "bitcoin" ? "ark" : "tark";
+  const hrp = getNetwork(network).hrp;
   const vhtlcAddress = vhtlcScript.address(hrp, serverXOnlyPublicKey).encode();
   return { vhtlcScript, vhtlcAddress };
 };
@@ -4407,7 +4411,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       throw new Error(`Swap ${pendingSwap.id}: BTC transaction hex is required`);
     const lockupTx = Transaction6.fromRaw(hex8.decode(swapStatus.transaction.hex));
     const arkInfo = await this.arkProvider.getInfo();
-    const network = arkInfo.network === "bitcoin" ? NETWORK : arkInfo.network === "mutinynet" ? MUTINYNET_NETWORK : REGTEST_NETWORK;
+    const network = getNetwork2(arkInfo.network);
     const swapTree = deserializeSwapTree(pendingSwap.response.claimDetails.swapTree);
     const musig = tweakMusig(
       create(hex8.decode(pendingSwap.ephemeralKey), [
@@ -4947,8 +4951,56 @@ var ArkadeSwaps = class _ArkadeSwaps {
         message: "Boltz is trying to scam us (invalid address)"
       });
     }
+    this.verifyBtcChainHtlc({ to, swap, arkNetwork: arkInfo.network });
     return true;
   }
+  /**
+   * Verifies the BTC-side Taproot HTLC of a chain swap before funds are
+   * committed: the lockup address must bind to MuSig2(boltz, user) over
+   * Boltz's leaves, and those leaves must enforce the agreed preimage hash,
+   * direction-specific keys, leaf version, and absolute refund CLTV.
+   */
+  verifyBtcChainHtlc(args) {
+    const { to, swap, arkNetwork } = args;
+    const btcDetails = to === "ARK" ? swap.response.lockupDetails : swap.response.claimDetails;
+    if (!btcDetails.swapTree)
+      throw new SwapError({ message: `Swap ${swap.id}: missing swap tree in BTC details` });
+    if (!btcDetails.serverPublicKey)
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing server public key in BTC details`
+      });
+    if (typeof btcDetails.timeoutBlockHeight !== "number")
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing timeout block height in BTC details`
+      });
+    const network = getNetwork2(arkNetwork);
+    const swapTree = deserializeSwapTree(btcDetails.swapTree);
+    const ephemeralPub = secp256k12.getPublicKey(hex8.decode(swap.ephemeralKey));
+    const musig = tweakMusig(
+      create(hex8.decode(swap.ephemeralKey), [
+        hex8.decode(btcDetails.serverPublicKey),
+        ephemeralPub
+      ]),
+      swapTree.tree
+    );
+    const expectedScript = OutScript2.encode(Address2(network).decode(btcDetails.lockupAddress));
+    if (!equalBytes3(p2trScript(musig.aggPubkey), expectedScript))
+      throw new SwapError({ message: "Boltz is trying to scam us (invalid BTC address)" });
+    const boltzXOnly = toXOnly(hex8.decode(btcDetails.serverPublicKey));
+    const userXOnly = toXOnly(ephemeralPub);
+    try {
+      assertChainHtlcLeaves(swapTree, {
+        preimageHash160: ripemd1602(hex8.decode(swap.request.preimageHash)),
+        claimXOnly: to === "ARK" ? boltzXOnly : userXOnly,
+        refundXOnly: to === "ARK" ? userXOnly : boltzXOnly,
+        timeoutBlockHeight: btcDetails.timeoutBlockHeight
+      });
+    } catch (err) {
+      throw new SwapError({
+        message: `Boltz is trying to scam us (invalid BTC HTLC: ${err.message})`
+      });
+    }
+  }
   /**
    * Renegotiates the quote for an existing chain swap. Convenience wrapper
    * over `getSwapQuote` + `acceptSwapQuote` with a safety floor.

package/dist/{chunk-WPAI2ECT.js → chunk-UJXW5JBT.js}

@@ -7,7 +7,7 @@ import {
   isSubmarineFinalStatus,
   isSubmarineSwapRefundable,
   logger
-} from "./chunk-5GBBRBFS.js";
+} from "./chunk-GXO2EB6C.js";
 
 // src/expo/swapsPollProcessor.ts
 var SWAP_POLL_TASK_TYPE = "swap-poll";

package/dist/expo/background.cjs

@@ -969,6 +969,7 @@ var BoltzSwapProvider = class {
 // src/arkade-swaps.ts
 var import_sdk8 = require("@arkade-os/sdk");
 var import_sha23 = require("@noble/hashes/sha2.js");
+var import_legacy2 = require("@noble/hashes/legacy.js");
 var import_base9 = require("@scure/base");
 var import_secp256k13 = require("@noble/curves/secp256k1.js");
 var import_utils3 = require("@noble/hashes/utils.js");
@@ -1192,18 +1193,6 @@ var import_base3 = require("@scure/base");
 var import_btc_signer = require("@scure/btc-signer");
 var import_payment = require("@scure/btc-signer/payment.js");
 var import_utils2 = require("@scure/btc-signer/utils.js");
-var REGTEST_NETWORK = {
-  bech32: "bcrt",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
-var MUTINYNET_NETWORK = {
-  bech32: "tb",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
 var deserializeLeaf = (leaf) => ({
   version: leaf.version,
   output: import_base3.hex.decode(leaf.output)
@@ -1237,6 +1226,19 @@ var deserializeSwapTree = (tree) => {
     ])
   };
 };
+var TAPLEAF_V1 = 192;
+var PUSH_32 = Uint8Array.of(32);
+var decodeScriptNum = (data) => data instanceof Uint8Array && data.length > 0 ? Number((0, import_btc_signer.ScriptNum)(5, true).decode(data)) : void 0;
+var assertChainHtlcLeaves = (tree, expected) => {
+  if (tree.claimLeaf.version !== TAPLEAF_V1 || tree.refundLeaf.version !== TAPLEAF_V1)
+    throw new Error("unexpected leaf version");
+  const claim = import_btc_signer.Script.decode(tree.claimLeaf.output);
+  if (claim.length !== 8 || claim[0] !== "SIZE" || !(claim[1] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[1], PUSH_32) || claim[2] !== "EQUALVERIFY" || claim[3] !== "HASH160" || !(claim[4] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[4], expected.preimageHash160) || claim[5] !== "EQUALVERIFY" || !(claim[6] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[6], expected.claimXOnly) || claim[7] !== "CHECKSIG")
+    throw new Error("unexpected claim leaf");
+  const refund = import_btc_signer.Script.decode(tree.refundLeaf.output);
+  if (refund.length !== 4 || !(refund[0] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(refund[0], expected.refundXOnly) || refund[1] !== "CHECKSIGVERIFY" || decodeScriptNum(refund[2]) !== expected.timeoutBlockHeight || refund[3] !== "CHECKLOCKTIMEVERIFY")
+    throw new Error("unexpected refund leaf");
+};
 var taprootHashTree = (tree) => {
   if (!Array.isArray(tree)) {
     return {
@@ -2933,7 +2935,7 @@ var createVHTLCScript = (args) => {
     )
   });
   if (!vhtlcScript.claimScript) throw new Error("Failed to create VHTLC script");
-  const hrp = network === "bitcoin" ? "ark" : "tark";
+  const hrp = (0, import_sdk7.getNetwork)(network).hrp;
   const vhtlcAddress = vhtlcScript.address(hrp, serverXOnlyPublicKey).encode();
   return { vhtlcScript, vhtlcAddress };
 };
@@ -4350,7 +4352,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       throw new Error(`Swap ${pendingSwap.id}: BTC transaction hex is required`);
     const lockupTx = import_btc_signer5.Transaction.fromRaw(import_base9.hex.decode(swapStatus.transaction.hex));
     const arkInfo = await this.arkProvider.getInfo();
-    const network = arkInfo.network === "bitcoin" ? import_utils4.NETWORK : arkInfo.network === "mutinynet" ? MUTINYNET_NETWORK : REGTEST_NETWORK;
+    const network = (0, import_sdk8.getNetwork)(arkInfo.network);
     const swapTree = deserializeSwapTree(pendingSwap.response.claimDetails.swapTree);
     const musig = tweakMusig(
       create(import_base9.hex.decode(pendingSwap.ephemeralKey), [
@@ -4890,8 +4892,56 @@ var ArkadeSwaps = class _ArkadeSwaps {
         message: "Boltz is trying to scam us (invalid address)"
       });
     }
+    this.verifyBtcChainHtlc({ to, swap, arkNetwork: arkInfo.network });
     return true;
   }
+  /**
+   * Verifies the BTC-side Taproot HTLC of a chain swap before funds are
+   * committed: the lockup address must bind to MuSig2(boltz, user) over
+   * Boltz's leaves, and those leaves must enforce the agreed preimage hash,
+   * direction-specific keys, leaf version, and absolute refund CLTV.
+   */
+  verifyBtcChainHtlc(args) {
+    const { to, swap, arkNetwork } = args;
+    const btcDetails = to === "ARK" ? swap.response.lockupDetails : swap.response.claimDetails;
+    if (!btcDetails.swapTree)
+      throw new SwapError({ message: `Swap ${swap.id}: missing swap tree in BTC details` });
+    if (!btcDetails.serverPublicKey)
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing server public key in BTC details`
+      });
+    if (typeof btcDetails.timeoutBlockHeight !== "number")
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing timeout block height in BTC details`
+      });
+    const network = (0, import_sdk8.getNetwork)(arkNetwork);
+    const swapTree = deserializeSwapTree(btcDetails.swapTree);
+    const ephemeralPub = import_secp256k13.secp256k1.getPublicKey(import_base9.hex.decode(swap.ephemeralKey));
+    const musig = tweakMusig(
+      create(import_base9.hex.decode(swap.ephemeralKey), [
+        import_base9.hex.decode(btcDetails.serverPublicKey),
+        ephemeralPub
+      ]),
+      swapTree.tree
+    );
+    const expectedScript = import_btc_signer5.OutScript.encode((0, import_btc_signer5.Address)(network).decode(btcDetails.lockupAddress));
+    if (!(0, import_utils4.equalBytes)(p2trScript(musig.aggPubkey), expectedScript))
+      throw new SwapError({ message: "Boltz is trying to scam us (invalid BTC address)" });
+    const boltzXOnly = toXOnly(import_base9.hex.decode(btcDetails.serverPublicKey));
+    const userXOnly = toXOnly(ephemeralPub);
+    try {
+      assertChainHtlcLeaves(swapTree, {
+        preimageHash160: (0, import_legacy2.ripemd160)(import_base9.hex.decode(swap.request.preimageHash)),
+        claimXOnly: to === "ARK" ? boltzXOnly : userXOnly,
+        refundXOnly: to === "ARK" ? userXOnly : boltzXOnly,
+        timeoutBlockHeight: btcDetails.timeoutBlockHeight
+      });
+    } catch (err) {
+      throw new SwapError({
+        message: `Boltz is trying to scam us (invalid BTC HTLC: ${err.message})`
+      });
+    }
+  }
   /**
    * Renegotiates the quote for an existing chain swap. Convenience wrapper
    * over `getSwapQuote` + `acceptSwapQuote` with a safety floor.
@@ -5549,14 +5599,19 @@ function createBackgroundWalletShim(args) {
     getVtxos: async () => notImplemented("getVtxos"),
     getBoardingUtxos: async () => notImplemented("getBoardingUtxos"),
     getTransactionHistory: async () => notImplemented("getTransactionHistory"),
+    getActivityHistory: async () => notImplemented("getActivityHistory"),
     getContractManager: async () => notImplemented("getContractManager"),
     getDelegateManager: async () => notImplemented("getDelegateManager"),
     getDelegatorManager: async () => notImplemented("getDelegatorManager"),
     sendBitcoin: async () => notImplemented("sendBitcoin"),
     send: async () => notImplemented("send"),
     settle: async () => notImplemented("settle"),
+    clear: async () => notImplemented("clear"),
     assetManager: new Proxy({}, {
       get: () => notImplemented("assetManager")
+    }),
+    activity: new Proxy({}, {
+      get: () => notImplemented("activity")
     })
   };
 }
@@ -5578,13 +5633,13 @@ function defineExpoSwapBackgroundTask(taskName, options) {
       const wallet = createBackgroundWalletShim({
         identity,
         getAddress: async () => {
-          const { ArkAddress: ArkAddress3 } = await import("@arkade-os/sdk");
+          const { ArkAddress: ArkAddress3, getNetwork: getNetwork3 } = await import("@arkade-os/sdk");
           const { hex: hex9 } = await import("@scure/base");
           const info = await arkProvider.getInfo();
           const pubkey = await identity.xOnlyPublicKey();
           const serverPubKey = hex9.decode(info.signerPubkey);
           const xOnlyServerPubKey = serverPubKey.length === 33 ? serverPubKey.slice(1) : serverPubKey;
-          const hrp = info.network === "bitcoin" ? "ark" : "tark";
+          const hrp = getNetwork3(info.network).hrp;
           return new ArkAddress3(xOnlyServerPubKey, pubkey, hrp).encode();
         }
       });

package/dist/expo/background.js

@@ -1,10 +1,10 @@
 import {
   SWAP_POLL_TASK_TYPE,
   swapsPollProcessor
-} from "../chunk-WPAI2ECT.js";
+} from "../chunk-UJXW5JBT.js";
 import {
   BoltzSwapProvider
-} from "../chunk-5GBBRBFS.js";
+} from "../chunk-GXO2EB6C.js";
 import "../chunk-SJQJQO7P.js";
 
 // src/expo/background.ts
@@ -27,14 +27,19 @@ function createBackgroundWalletShim(args) {
     getVtxos: async () => notImplemented("getVtxos"),
     getBoardingUtxos: async () => notImplemented("getBoardingUtxos"),
     getTransactionHistory: async () => notImplemented("getTransactionHistory"),
+    getActivityHistory: async () => notImplemented("getActivityHistory"),
     getContractManager: async () => notImplemented("getContractManager"),
     getDelegateManager: async () => notImplemented("getDelegateManager"),
     getDelegatorManager: async () => notImplemented("getDelegatorManager"),
     sendBitcoin: async () => notImplemented("sendBitcoin"),
     send: async () => notImplemented("send"),
     settle: async () => notImplemented("settle"),
+    clear: async () => notImplemented("clear"),
     assetManager: new Proxy({}, {
       get: () => notImplemented("assetManager")
+    }),
+    activity: new Proxy({}, {
+      get: () => notImplemented("activity")
     })
   };
 }
@@ -56,13 +61,13 @@ function defineExpoSwapBackgroundTask(taskName, options) {
       const wallet = createBackgroundWalletShim({
         identity,
         getAddress: async () => {
-          const { ArkAddress } = await import("@arkade-os/sdk");
+          const { ArkAddress, getNetwork } = await import("@arkade-os/sdk");
           const { hex } = await import("@scure/base");
           const info = await arkProvider.getInfo();
           const pubkey = await identity.xOnlyPublicKey();
           const serverPubKey = hex.decode(info.signerPubkey);
           const xOnlyServerPubKey = serverPubKey.length === 33 ? serverPubKey.slice(1) : serverPubKey;
-          const hrp = info.network === "bitcoin" ? "ark" : "tark";
+          const hrp = getNetwork(info.network).hrp;
           return new ArkAddress(xOnlyServerPubKey, pubkey, hrp).encode();
         }
       });

package/dist/expo/index.cjs

@@ -959,6 +959,7 @@ var BoltzSwapProvider = class {
 
 // src/arkade-swaps.ts
 var import_sha23 = require("@noble/hashes/sha2.js");
+var import_legacy2 = require("@noble/hashes/legacy.js");
 var import_base9 = require("@scure/base");
 var import_secp256k13 = require("@noble/curves/secp256k1.js");
 var import_utils3 = require("@noble/hashes/utils.js");
@@ -1182,18 +1183,6 @@ var import_base3 = require("@scure/base");
 var import_btc_signer = require("@scure/btc-signer");
 var import_payment = require("@scure/btc-signer/payment.js");
 var import_utils2 = require("@scure/btc-signer/utils.js");
-var REGTEST_NETWORK = {
-  bech32: "bcrt",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
-var MUTINYNET_NETWORK = {
-  bech32: "tb",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
 var deserializeLeaf = (leaf) => ({
   version: leaf.version,
   output: import_base3.hex.decode(leaf.output)
@@ -1227,6 +1216,19 @@ var deserializeSwapTree = (tree) => {
     ])
   };
 };
+var TAPLEAF_V1 = 192;
+var PUSH_32 = Uint8Array.of(32);
+var decodeScriptNum = (data) => data instanceof Uint8Array && data.length > 0 ? Number((0, import_btc_signer.ScriptNum)(5, true).decode(data)) : void 0;
+var assertChainHtlcLeaves = (tree, expected) => {
+  if (tree.claimLeaf.version !== TAPLEAF_V1 || tree.refundLeaf.version !== TAPLEAF_V1)
+    throw new Error("unexpected leaf version");
+  const claim = import_btc_signer.Script.decode(tree.claimLeaf.output);
+  if (claim.length !== 8 || claim[0] !== "SIZE" || !(claim[1] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[1], PUSH_32) || claim[2] !== "EQUALVERIFY" || claim[3] !== "HASH160" || !(claim[4] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[4], expected.preimageHash160) || claim[5] !== "EQUALVERIFY" || !(claim[6] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[6], expected.claimXOnly) || claim[7] !== "CHECKSIG")
+    throw new Error("unexpected claim leaf");
+  const refund = import_btc_signer.Script.decode(tree.refundLeaf.output);
+  if (refund.length !== 4 || !(refund[0] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(refund[0], expected.refundXOnly) || refund[1] !== "CHECKSIGVERIFY" || decodeScriptNum(refund[2]) !== expected.timeoutBlockHeight || refund[3] !== "CHECKLOCKTIMEVERIFY")
+    throw new Error("unexpected refund leaf");
+};
 var taprootHashTree = (tree) => {
   if (!Array.isArray(tree)) {
     return {
@@ -2923,7 +2925,7 @@ var createVHTLCScript = (args) => {
     )
   });
   if (!vhtlcScript.claimScript) throw new Error("Failed to create VHTLC script");
-  const hrp = network === "bitcoin" ? "ark" : "tark";
+  const hrp = (0, import_sdk7.getNetwork)(network).hrp;
   const vhtlcAddress = vhtlcScript.address(hrp, serverXOnlyPublicKey).encode();
   return { vhtlcScript, vhtlcAddress };
 };
@@ -4340,7 +4342,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       throw new Error(`Swap ${pendingSwap.id}: BTC transaction hex is required`);
     const lockupTx = import_btc_signer5.Transaction.fromRaw(import_base9.hex.decode(swapStatus.transaction.hex));
     const arkInfo = await this.arkProvider.getInfo();
-    const network = arkInfo.network === "bitcoin" ? import_utils4.NETWORK : arkInfo.network === "mutinynet" ? MUTINYNET_NETWORK : REGTEST_NETWORK;
+    const network = (0, import_sdk8.getNetwork)(arkInfo.network);
     const swapTree = deserializeSwapTree(pendingSwap.response.claimDetails.swapTree);
     const musig = tweakMusig(
       create(import_base9.hex.decode(pendingSwap.ephemeralKey), [
@@ -4880,8 +4882,56 @@ var ArkadeSwaps = class _ArkadeSwaps {
         message: "Boltz is trying to scam us (invalid address)"
       });
     }
+    this.verifyBtcChainHtlc({ to, swap, arkNetwork: arkInfo.network });
     return true;
   }
+  /**
+   * Verifies the BTC-side Taproot HTLC of a chain swap before funds are
+   * committed: the lockup address must bind to MuSig2(boltz, user) over
+   * Boltz's leaves, and those leaves must enforce the agreed preimage hash,
+   * direction-specific keys, leaf version, and absolute refund CLTV.
+   */
+  verifyBtcChainHtlc(args) {
+    const { to, swap, arkNetwork } = args;
+    const btcDetails = to === "ARK" ? swap.response.lockupDetails : swap.response.claimDetails;
+    if (!btcDetails.swapTree)
+      throw new SwapError({ message: `Swap ${swap.id}: missing swap tree in BTC details` });
+    if (!btcDetails.serverPublicKey)
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing server public key in BTC details`
+      });
+    if (typeof btcDetails.timeoutBlockHeight !== "number")
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing timeout block height in BTC details`
+      });
+    const network = (0, import_sdk8.getNetwork)(arkNetwork);
+    const swapTree = deserializeSwapTree(btcDetails.swapTree);
+    const ephemeralPub = import_secp256k13.secp256k1.getPublicKey(import_base9.hex.decode(swap.ephemeralKey));
+    const musig = tweakMusig(
+      create(import_base9.hex.decode(swap.ephemeralKey), [
+        import_base9.hex.decode(btcDetails.serverPublicKey),
+        ephemeralPub
+      ]),
+      swapTree.tree
+    );
+    const expectedScript = import_btc_signer5.OutScript.encode((0, import_btc_signer5.Address)(network).decode(btcDetails.lockupAddress));
+    if (!(0, import_utils4.equalBytes)(p2trScript(musig.aggPubkey), expectedScript))
+      throw new SwapError({ message: "Boltz is trying to scam us (invalid BTC address)" });
+    const boltzXOnly = toXOnly(import_base9.hex.decode(btcDetails.serverPublicKey));
+    const userXOnly = toXOnly(ephemeralPub);
+    try {
+      assertChainHtlcLeaves(swapTree, {
+        preimageHash160: (0, import_legacy2.ripemd160)(import_base9.hex.decode(swap.request.preimageHash)),
+        claimXOnly: to === "ARK" ? boltzXOnly : userXOnly,
+        refundXOnly: to === "ARK" ? userXOnly : boltzXOnly,
+        timeoutBlockHeight: btcDetails.timeoutBlockHeight
+      });
+    } catch (err) {
+      throw new SwapError({
+        message: `Boltz is trying to scam us (invalid BTC HTLC: ${err.message})`
+      });
+    }
+  }
   /**
    * Renegotiates the quote for an existing chain swap. Convenience wrapper
    * over `getSwapQuote` + `acceptSwapQuote` with a safety floor.

package/dist/expo/index.d.cts

@@ -1,4 +1,4 @@
-import { I as IArkadeSwaps, A as ArkadeSwaps, Q as QuoteSwapOptions, V as VhtlcTimeouts } from '../arkade-swaps-C8CmzknM.cjs';
+import { I as IArkadeSwaps, A as ArkadeSwaps, Q as QuoteSwapOptions, V as VhtlcTimeouts } from '../arkade-swaps-D-L0_0Ri.cjs';
 import { n as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, S as SendLightningPaymentRequest, o as SendLightningPaymentResponse, O as OptimisticSendLightningPaymentResponse, c as BoltzSubmarineSwap, b as BoltzReverseSwap, f as SubmarineRefundOutcome, g as SubmarineRecoveryInfo, h as SubmarineRecoveryResult, F as FeesResponse, a as BoltzChainSwap, j as ArkToBtcResponse, l as ChainArkRefundOutcome, k as BtcToArkResponse, d as Chain, i as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from '../types-CS62-oEy.cjs';
 import { E as ExpoArkadeSwapsConfig } from '../swapsPollProcessor-B98F6MQF.cjs';
 export { D as DefineSwapBackgroundTaskOptions, b as ExpoArkadeLightningConfig, c as ExpoSwapBackgroundConfig, P as PersistedSwapBackgroundConfig, S as SWAP_POLL_TASK_TYPE, a as SwapTaskDependencies } from '../swapsPollProcessor-B98F6MQF.cjs';

package/dist/expo/index.d.ts

@@ -1,4 +1,4 @@
-import { I as IArkadeSwaps, A as ArkadeSwaps, Q as QuoteSwapOptions, V as VhtlcTimeouts } from '../arkade-swaps-gXHRbR09.js';
+import { I as IArkadeSwaps, A as ArkadeSwaps, Q as QuoteSwapOptions, V as VhtlcTimeouts } from '../arkade-swaps-fmdCFjif.js';
 import { n as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, S as SendLightningPaymentRequest, o as SendLightningPaymentResponse, O as OptimisticSendLightningPaymentResponse, c as BoltzSubmarineSwap, b as BoltzReverseSwap, f as SubmarineRefundOutcome, g as SubmarineRecoveryInfo, h as SubmarineRecoveryResult, F as FeesResponse, a as BoltzChainSwap, j as ArkToBtcResponse, l as ChainArkRefundOutcome, k as BtcToArkResponse, d as Chain, i as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from '../types-CS62-oEy.js';
 import { E as ExpoArkadeSwapsConfig } from '../swapsPollProcessor-Ov-wp17v.js';
 export { D as DefineSwapBackgroundTaskOptions, b as ExpoArkadeLightningConfig, c as ExpoSwapBackgroundConfig, P as PersistedSwapBackgroundConfig, S as SWAP_POLL_TASK_TYPE, a as SwapTaskDependencies } from '../swapsPollProcessor-Ov-wp17v.js';

package/dist/expo/index.js

@@ -1,9 +1,9 @@
 import {
   SWAP_POLL_TASK_TYPE
-} from "../chunk-WPAI2ECT.js";
+} from "../chunk-UJXW5JBT.js";
 import {
   ArkadeSwaps
-} from "../chunk-5GBBRBFS.js";
+} from "../chunk-GXO2EB6C.js";
 import "../chunk-SJQJQO7P.js";
 
 // src/expo/arkade-lightning.ts

package/dist/index.cjs

@@ -95,7 +95,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "0.3.45";
+var version = "0.3.46";
 
 // src/errors.ts
 var SwapError = class extends Error {
@@ -1091,6 +1091,7 @@ var BoltzSwapProvider = class {
 
 // src/arkade-swaps.ts
 var import_sha23 = require("@noble/hashes/sha2.js");
+var import_legacy2 = require("@noble/hashes/legacy.js");
 var import_base9 = require("@scure/base");
 var import_secp256k13 = require("@noble/curves/secp256k1.js");
 var import_utils3 = require("@noble/hashes/utils.js");
@@ -1314,18 +1315,6 @@ var import_base3 = require("@scure/base");
 var import_btc_signer = require("@scure/btc-signer");
 var import_payment = require("@scure/btc-signer/payment.js");
 var import_utils2 = require("@scure/btc-signer/utils.js");
-var REGTEST_NETWORK = {
-  bech32: "bcrt",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
-var MUTINYNET_NETWORK = {
-  bech32: "tb",
-  pubKeyHash: 111,
-  scriptHash: 196,
-  wif: 239
-};
 var deserializeLeaf = (leaf) => ({
   version: leaf.version,
   output: import_base3.hex.decode(leaf.output)
@@ -1359,6 +1348,19 @@ var deserializeSwapTree = (tree) => {
     ])
   };
 };
+var TAPLEAF_V1 = 192;
+var PUSH_32 = Uint8Array.of(32);
+var decodeScriptNum = (data) => data instanceof Uint8Array && data.length > 0 ? Number((0, import_btc_signer.ScriptNum)(5, true).decode(data)) : void 0;
+var assertChainHtlcLeaves = (tree, expected) => {
+  if (tree.claimLeaf.version !== TAPLEAF_V1 || tree.refundLeaf.version !== TAPLEAF_V1)
+    throw new Error("unexpected leaf version");
+  const claim = import_btc_signer.Script.decode(tree.claimLeaf.output);
+  if (claim.length !== 8 || claim[0] !== "SIZE" || !(claim[1] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[1], PUSH_32) || claim[2] !== "EQUALVERIFY" || claim[3] !== "HASH160" || !(claim[4] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[4], expected.preimageHash160) || claim[5] !== "EQUALVERIFY" || !(claim[6] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(claim[6], expected.claimXOnly) || claim[7] !== "CHECKSIG")
+    throw new Error("unexpected claim leaf");
+  const refund = import_btc_signer.Script.decode(tree.refundLeaf.output);
+  if (refund.length !== 4 || !(refund[0] instanceof Uint8Array) || !(0, import_utils2.equalBytes)(refund[0], expected.refundXOnly) || refund[1] !== "CHECKSIGVERIFY" || decodeScriptNum(refund[2]) !== expected.timeoutBlockHeight || refund[3] !== "CHECKLOCKTIMEVERIFY")
+    throw new Error("unexpected refund leaf");
+};
 var taprootHashTree = (tree) => {
   if (!Array.isArray(tree)) {
     return {
@@ -3076,7 +3078,7 @@ var createVHTLCScript = (args) => {
     )
   });
   if (!vhtlcScript.claimScript) throw new Error("Failed to create VHTLC script");
-  const hrp = network === "bitcoin" ? "ark" : "tark";
+  const hrp = (0, import_sdk7.getNetwork)(network).hrp;
   const vhtlcAddress = vhtlcScript.address(hrp, serverXOnlyPublicKey).encode();
   return { vhtlcScript, vhtlcAddress };
 };
@@ -4493,7 +4495,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       throw new Error(`Swap ${pendingSwap.id}: BTC transaction hex is required`);
     const lockupTx = import_btc_signer5.Transaction.fromRaw(import_base9.hex.decode(swapStatus.transaction.hex));
     const arkInfo = await this.arkProvider.getInfo();
-    const network = arkInfo.network === "bitcoin" ? import_utils4.NETWORK : arkInfo.network === "mutinynet" ? MUTINYNET_NETWORK : REGTEST_NETWORK;
+    const network = (0, import_sdk8.getNetwork)(arkInfo.network);
     const swapTree = deserializeSwapTree(pendingSwap.response.claimDetails.swapTree);
     const musig = tweakMusig(
       create(import_base9.hex.decode(pendingSwap.ephemeralKey), [
@@ -5033,8 +5035,56 @@ var ArkadeSwaps = class _ArkadeSwaps {
         message: "Boltz is trying to scam us (invalid address)"
       });
     }
+    this.verifyBtcChainHtlc({ to, swap, arkNetwork: arkInfo.network });
     return true;
   }
+  /**
+   * Verifies the BTC-side Taproot HTLC of a chain swap before funds are
+   * committed: the lockup address must bind to MuSig2(boltz, user) over
+   * Boltz's leaves, and those leaves must enforce the agreed preimage hash,
+   * direction-specific keys, leaf version, and absolute refund CLTV.
+   */
+  verifyBtcChainHtlc(args) {
+    const { to, swap, arkNetwork } = args;
+    const btcDetails = to === "ARK" ? swap.response.lockupDetails : swap.response.claimDetails;
+    if (!btcDetails.swapTree)
+      throw new SwapError({ message: `Swap ${swap.id}: missing swap tree in BTC details` });
+    if (!btcDetails.serverPublicKey)
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing server public key in BTC details`
+      });
+    if (typeof btcDetails.timeoutBlockHeight !== "number")
+      throw new SwapError({
+        message: `Swap ${swap.id}: missing timeout block height in BTC details`
+      });
+    const network = (0, import_sdk8.getNetwork)(arkNetwork);
+    const swapTree = deserializeSwapTree(btcDetails.swapTree);
+    const ephemeralPub = import_secp256k13.secp256k1.getPublicKey(import_base9.hex.decode(swap.ephemeralKey));
+    const musig = tweakMusig(
+      create(import_base9.hex.decode(swap.ephemeralKey), [
+        import_base9.hex.decode(btcDetails.serverPublicKey),
+        ephemeralPub
+      ]),
+      swapTree.tree
+    );
+    const expectedScript = import_btc_signer5.OutScript.encode((0, import_btc_signer5.Address)(network).decode(btcDetails.lockupAddress));
+    if (!(0, import_utils4.equalBytes)(p2trScript(musig.aggPubkey), expectedScript))
+      throw new SwapError({ message: "Boltz is trying to scam us (invalid BTC address)" });
+    const boltzXOnly = toXOnly(import_base9.hex.decode(btcDetails.serverPublicKey));
+    const userXOnly = toXOnly(ephemeralPub);
+    try {
+      assertChainHtlcLeaves(swapTree, {
+        preimageHash160: (0, import_legacy2.ripemd160)(import_base9.hex.decode(swap.request.preimageHash)),
+        claimXOnly: to === "ARK" ? boltzXOnly : userXOnly,
+        refundXOnly: to === "ARK" ? userXOnly : boltzXOnly,
+        timeoutBlockHeight: btcDetails.timeoutBlockHeight
+      });
+    } catch (err) {
+      throw new SwapError({
+        message: `Boltz is trying to scam us (invalid BTC HTLC: ${err.message})`
+      });
+    }
+  }
   /**
    * Renegotiates the quote for an existing chain swap. Convenience wrapper
    * over `getSwapQuote` + `acceptSwapQuote` with a safety floor.

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { Q as QuoteSwapOptions, I as IArkadeSwaps, V as VhtlcTimeouts } from './arkade-swaps-C8CmzknM.cjs';
-export { A as ArkadeSwaps } from './arkade-swaps-C8CmzknM.cjs';
+import { Q as QuoteSwapOptions, I as IArkadeSwaps, V as VhtlcTimeouts } from './arkade-swaps-D-L0_0Ri.cjs';
+export { A as ArkadeSwaps } from './arkade-swaps-D-L0_0Ri.cjs';
 import { B as BoltzSwap, D as DecodedInvoice, a as BoltzChainSwap, b as BoltzReverseSwap, c as BoltzSubmarineSwap, A as ArkadeSwapsConfig, N as Network, C as CreateLightningInvoiceRequest, S as SendLightningPaymentRequest, F as FeesResponse, d as Chain, e as CreateLightningInvoiceResponse, O as OptimisticSendLightningPaymentResponse, f as SubmarineRefundOutcome, g as SubmarineRecoveryInfo, h as SubmarineRecoveryResult, i as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, j as ArkToBtcResponse, k as BtcToArkResponse, l as ChainArkRefundOutcome, m as SwapRepository, n as SwapManagerClient, o as SendLightningPaymentResponse, p as GetSwapsFilter } from './types-CS62-oEy.cjs';
 export { q as ArkadeSwapsCreateConfig, r as BoltzSwapProvider, s as BoltzSwapStatus, I as IncomingPaymentSubscription, P as PendingChainSwap, t as PendingReverseSwap, u as PendingSubmarineSwap, v as PendingSwap, w as SubmarineProgressionStatus, x as SubmarineRecoveryStatus, y as SwapManager, z as SwapManagerCallbacks, E as SwapManagerConfig, H as SwapManagerEvents, V as Vtxo, J as hasSubmarineStatusReached, K as isChainClaimableStatus, M as isChainFailedStatus, Q as isChainFinalStatus, R as isChainPendingStatus, T as isChainRefundableStatus, U as isChainSignableStatus, W as isChainSuccessStatus, X as isChainSwapClaimable, Y as isChainSwapRefundable, Z as isPendingChainSwap, _ as isPendingReverseSwap, $ as isPendingSubmarineSwap, a0 as isReverseClaimableStatus, a1 as isReverseFailedStatus, a2 as isReverseFinalStatus, a3 as isReversePendingStatus, a4 as isReverseSuccessStatus, a5 as isReverseSwapClaimable, a6 as isSubmarineFailedStatus, a7 as isSubmarineFinalStatus, a8 as isSubmarinePendingStatus, a9 as isSubmarineRefundableStatus, aa as isSubmarineSuccessStatus, ab as isSubmarineSwapRefundable } from './types-CS62-oEy.cjs';
 import { Transaction } from '@scure/btc-signer';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { Q as QuoteSwapOptions, I as IArkadeSwaps, V as VhtlcTimeouts } from './arkade-swaps-gXHRbR09.js';
-export { A as ArkadeSwaps } from './arkade-swaps-gXHRbR09.js';
+import { Q as QuoteSwapOptions, I as IArkadeSwaps, V as VhtlcTimeouts } from './arkade-swaps-fmdCFjif.js';
+export { A as ArkadeSwaps } from './arkade-swaps-fmdCFjif.js';
 import { B as BoltzSwap, D as DecodedInvoice, a as BoltzChainSwap, b as BoltzReverseSwap, c as BoltzSubmarineSwap, A as ArkadeSwapsConfig, N as Network, C as CreateLightningInvoiceRequest, S as SendLightningPaymentRequest, F as FeesResponse, d as Chain, e as CreateLightningInvoiceResponse, O as OptimisticSendLightningPaymentResponse, f as SubmarineRefundOutcome, g as SubmarineRecoveryInfo, h as SubmarineRecoveryResult, i as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, j as ArkToBtcResponse, k as BtcToArkResponse, l as ChainArkRefundOutcome, m as SwapRepository, n as SwapManagerClient, o as SendLightningPaymentResponse, p as GetSwapsFilter } from './types-CS62-oEy.js';
 export { q as ArkadeSwapsCreateConfig, r as BoltzSwapProvider, s as BoltzSwapStatus, I as IncomingPaymentSubscription, P as PendingChainSwap, t as PendingReverseSwap, u as PendingSubmarineSwap, v as PendingSwap, w as SubmarineProgressionStatus, x as SubmarineRecoveryStatus, y as SwapManager, z as SwapManagerCallbacks, E as SwapManagerConfig, H as SwapManagerEvents, V as Vtxo, J as hasSubmarineStatusReached, K as isChainClaimableStatus, M as isChainFailedStatus, Q as isChainFinalStatus, R as isChainPendingStatus, T as isChainRefundableStatus, U as isChainSignableStatus, W as isChainSuccessStatus, X as isChainSwapClaimable, Y as isChainSwapRefundable, Z as isPendingChainSwap, _ as isPendingReverseSwap, $ as isPendingSubmarineSwap, a0 as isReverseClaimableStatus, a1 as isReverseFailedStatus, a2 as isReverseFinalStatus, a3 as isReversePendingStatus, a4 as isReverseSuccessStatus, a5 as isReverseSwapClaimable, a6 as isSubmarineFailedStatus, a7 as isSubmarineFinalStatus, a8 as isSubmarinePendingStatus, a9 as isSubmarineRefundableStatus, aa as isSubmarineSuccessStatus, ab as isSubmarineSwapRefundable } from './types-CS62-oEy.js';
 import { Transaction } from '@scure/btc-signer';

package/dist/index.js

@@ -53,14 +53,14 @@ import {
   updateReverseSwapStatus,
   updateSubmarineSwapStatus,
   verifySignatures
-} from "./chunk-5GBBRBFS.js";
+} from "./chunk-GXO2EB6C.js";
 import {
   applyCreatedAtOrder,
   applySwapsFilter
 } from "./chunk-SJQJQO7P.js";
 
 // package.json
-var version = "0.3.45";
+var version = "0.3.46";
 
 // src/serviceWorker/arkade-swaps-message-handler.ts
 import { RestArkProvider, RestIndexerProvider } from "@arkade-os/sdk";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/boltz-swap",
-  "version": "0.3.45",
+  "version": "0.3.46",
   "type": "module",
   "description": "A production-ready TypeScript package that brings Boltz submarine-swaps to Arkade.",
   "main": "./dist/index.js",
@@ -76,7 +76,7 @@
     "@scure/btc-signer": "2.0.1",
     "bip68": "1.0.4",
     "light-bolt11-decoder": "3.2.0",
-    "@arkade-os/sdk": "0.4.40"
+    "@arkade-os/sdk": "0.4.41"
   },
   "peerDependencies": {
     "expo-task-manager": ">=3.0.0",