@atomiqlabs/sdk 8.6.7 → 8.6.9

package/dist/bitcoin/wallet/SingleAddressBitcoinWallet.js

@@ -5,10 +5,12 @@ const utils_1 = require("@scure/btc-signer/utils");
 const btc_signer_1 = require("@scure/btc-signer");
 const buffer_1 = require("buffer");
 const BitcoinWallet_1 = require("./BitcoinWallet");
+const base_1 = require("@atomiqlabs/base");
 const bip32_1 = require("@scure/bip32");
 const bip39_1 = require("@scure/bip39");
 const english_js_1 = require("@scure/bip39/wordlists/english.js");
 const sha2_1 = require("@noble/hashes/sha2");
+const logger = (0, base_1.getLogger)("SingleAddressBitcoinWallet: ");
 /**
  * Bitcoin wallet implementation deriving a single address from a WIF encoded private key
  *
@@ -32,12 +34,24 @@ class SingleAddressBitcoinWallet extends BitcoinWallet_1.BitcoinWallet {
             if (address == null)
                 throw new Error("Failed to generate p2wpkh address from the provided private key!");
             this.address = address;
+            this.addressType = (0, BitcoinWallet_1.identifyAddressType)(this.address, network);
         }
         else {
             this.address = addressDataOrWIF.address;
+            this.addressType = (0, BitcoinWallet_1.identifyAddressType)(this.address, network);
             this.pubkey = buffer_1.Buffer.from(addressDataOrWIF.publicKey, "hex");
+            // Some wallets seem to be returning a full 33-byte compressed pubkey instead of a taproot
+            //  32-byte long X-only key. Handle these cases here
+            if (this.addressType === "p2tr") {
+                if (this.pubkey.length !== 33)
+                    return;
+                const leadingByte = this.pubkey[0];
+                if (leadingByte !== 0x03 && leadingByte !== 0x02)
+                    throw new Error("Invalid public key passed for taproot bitcoin wallet, expected an X-only 32-byte public key, or a compressed 33-byte public key");
+                logger.debug(`constructor(): Converting compressed public key ${addressDataOrWIF.publicKey} to taproot X-only 32-byte public key`);
+                this.pubkey = this.pubkey.slice(1);
+            }
         }
-        this.addressType = (0, BitcoinWallet_1.identifyAddressType)(this.address, network);
     }
     /**
      * Returns all the wallet addresses controlled by the wallet

package/dist/swaps/escrow_swaps/frombtc/ln/FromBTCLNWrapper.js

@@ -217,7 +217,7 @@ class FromBTCLNWrapper extends IFromBTCLNWrapper_1.IFromBTCLNWrapper {
                     if (decodedPr.timeExpireDate == null)
                         throw new IntermediaryError_1.IntermediaryError("Invalid returned swap invoice, no expiry date field");
                     const amountIn = (BigInt(decodedPr.millisatoshis) + 999n) / 1000n;
-                    const swapFeeBtc = resp.swapFee * amountIn / (resp.total - resp.swapFee);
+                    const swapFeeBtc = resp.swapFee * amountIn / (resp.total + resp.swapFee);
                     try {
                         this.verifyReturnedData(resp, amountData, lp, _options, decodedPr, paymentHash);
                         const [pricingInfo] = await Promise.all([

package/dist/swaps/escrow_swaps/frombtc/onchain/FromBTCWrapper.js

@@ -309,7 +309,7 @@ class FromBTCWrapper extends IFromBTCWrapper_1.IFromBTCWrapper {
                         }, undefined, e => e instanceof RequestError_1.RequestError, abortController.signal);
                         const data = new this._swapDataDeserializer(resp.data);
                         data.setClaimer(recipient);
-                        const swapFeeBtc = resp.swapFee * resp.amount / (data.getAmount() - resp.swapFee);
+                        const swapFeeBtc = resp.swapFee * resp.amount / (data.getAmount() + resp.swapFee);
                         this.verifyReturnedData(recipient, resp, amountData, lp, _options, data, sequence, (await claimerBountyPrefetchPromise), nativeTokenAddress);
                         const [pricingInfo, signatureExpiry] = await Promise.all([
                             //Get intermediary's liquidity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/sdk",
-  "version": "8.6.7",
+  "version": "8.6.9",
   "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/bitcoin/wallet/SingleAddressBitcoinWallet.ts

@@ -3,12 +3,14 @@ import {BTC_NETWORK, NETWORK, pubECDSA, randomPrivateKeyBytes, TEST_NETWORK} fro
 import {getAddress, Transaction, WIF} from "@scure/btc-signer";
 import {Buffer} from "buffer";
 import {identifyAddressType, BitcoinWallet} from "./BitcoinWallet";
-import {BitcoinNetwork, BitcoinRpcWithAddressIndex} from "@atomiqlabs/base";
+import {BitcoinNetwork, BitcoinRpcWithAddressIndex, getLogger} from "@atomiqlabs/base";
 import {HDKey} from "@scure/bip32";
 import {entropyToMnemonic, generateMnemonic, mnemonicToSeed} from "@scure/bip39";
 import {wordlist} from "@scure/bip39/wordlists/english.js";
 import {sha256} from "@noble/hashes/sha2";
 
+const logger = getLogger("SingleAddressBitcoinWallet: ");
+
 /**
  * Bitcoin wallet implementation deriving a single address from a WIF encoded private key
  *
@@ -42,11 +44,21 @@ export class SingleAddressBitcoinWallet extends BitcoinWallet {
             const address = getAddress("wpkh", this.privKey, network);
             if(address==null) throw new Error("Failed to generate p2wpkh address from the provided private key!");
             this.address = address;
+            this.addressType = identifyAddressType(this.address, network);
         } else {
             this.address = addressDataOrWIF.address;
+            this.addressType = identifyAddressType(this.address, network);
             this.pubkey = Buffer.from(addressDataOrWIF.publicKey, "hex");
+            // Some wallets seem to be returning a full 33-byte compressed pubkey instead of a taproot
+            //  32-byte long X-only key. Handle these cases here
+            if(this.addressType==="p2tr") {
+                if(this.pubkey.length!==33) return;
+                const leadingByte = this.pubkey[0];
+                if(leadingByte!==0x03 && leadingByte!==0x02) throw new Error("Invalid public key passed for taproot bitcoin wallet, expected an X-only 32-byte public key, or a compressed 33-byte public key");
+                logger.debug(`constructor(): Converting compressed public key ${addressDataOrWIF.publicKey} to taproot X-only 32-byte public key`);
+                this.pubkey = this.pubkey.slice(1);
+            }
         }
-        this.addressType = identifyAddressType(this.address, network);
     }
 
     /**

package/src/swaps/escrow_swaps/frombtc/ln/FromBTCLNWrapper.ts

@@ -334,7 +334,7 @@ export class FromBTCLNWrapper<
                     if(decodedPr.timeExpireDate==null) throw new IntermediaryError("Invalid returned swap invoice, no expiry date field");
                     const amountIn = (BigInt(decodedPr.millisatoshis) + 999n) / 1000n;
 
-                    const swapFeeBtc = resp.swapFee * amountIn / (resp.total - resp.swapFee);
+                    const swapFeeBtc = resp.swapFee * amountIn / (resp.total + resp.swapFee);
 
                     try {
                         this.verifyReturnedData(resp, amountData, lp, _options, decodedPr, paymentHash);

package/src/swaps/escrow_swaps/frombtc/onchain/FromBTCWrapper.ts

@@ -487,7 +487,7 @@ export class FromBTCWrapper<
                         const data: T["Data"] = new this._swapDataDeserializer(resp.data);
                         data.setClaimer(recipient);
 
-                        const swapFeeBtc = resp.swapFee * resp.amount / (data.getAmount() - resp.swapFee);
+                        const swapFeeBtc = resp.swapFee * resp.amount / (data.getAmount() + resp.swapFee);
 
                         this.verifyReturnedData(recipient, resp, amountData, lp, _options, data, sequence, (await claimerBountyPrefetchPromise)!, nativeTokenAddress);
                         const [pricingInfo, signatureExpiry] = await Promise.all([