@atomiqlabs/lp-lib 14.0.0-dev.15 → 14.0.0-dev.17

package/dist/swaps/assertions/FromBtcAmountAssertions.js

@@ -108,11 +108,15 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             amountBDgas = _amountBDgas;
         }
         let amountBD;
+        let swapFee;
         if (!requestedAmount.input) {
             amountBD = await this.swapPricing.getToBtcSwapAmount(requestedAmount.amount, requestedAmount.token, chainIdentifier, true, requestedAmount.pricePrefetch);
             signal.throwIfAborted();
             // amt = (amt+base_fee)/(1-fee)
-            amountBD = (amountBD + fees.baseFee) * 1000000n / (1000000n - fees.feePPM);
+            const denominator = (1000000n - fees.feePPM);
+            const _amountBD = ((amountBD + fees.baseFee) * 1000000n + denominator - 1n) / denominator;
+            swapFee = _amountBD - amountBD;
+            amountBD = _amountBD;
             const tooLow = amountBD < (this.config.min * 95n / 100n);
             const tooHigh = amountBD > (this.config.max * 105n / 100n);
             if (tooLow || tooHigh) {
@@ -133,6 +137,7 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
         else {
             this.checkBtcAmountInBounds(requestedAmount.amount);
             amountBD = requestedAmount.amount - amountBDgas;
+            swapFee = fees.baseFee + ((amountBD * fees.feePPM + 999999n) / 1000000n);
             if (amountBD < 0n) {
                 throw {
                     code: 20003,
@@ -144,7 +149,6 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
                 };
             }
         }
-        const swapFee = fees.baseFee + (amountBD * fees.feePPM / 1000000n);
         const swapFeeInToken = await this.swapPricing.getFromBtcSwapAmount(swapFee, requestedAmount.token, chainIdentifier, true, requestedAmount.pricePrefetch);
         signal.throwIfAborted();
         const gasSwapFeeInToken = gasTokenAmount == null ?

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.js

@@ -232,6 +232,8 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             " maxFee: " + maxFee.toString(10) +
             " invoice: " + swap.pr);
         const blockHeight = await this.lightning.getBlockheight();
+        swap.payInitiated = true;
+        await this.saveSwapData(swap);
         try {
             await this.lightning.pay({
                 request: swap.pr,

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnSwapAbs.d.ts

@@ -12,6 +12,7 @@ export declare enum ToBtcLnSwapState {
 export declare class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap<T, ToBtcLnSwapState> {
     lnPaymentHash: string;
     readonly pr: string;
+    payInitiated: boolean;
     secret: string;
     constructor(chainIdentifier: string, lnPaymentHash: string, pr: string, amountMtokens: bigint, swapFee: bigint, swapFeeInToken: bigint, quotedNetworkFee: bigint, quotedNetworkFeeInToken: bigint);
     constructor(obj: any);

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnSwapAbs.js

@@ -27,6 +27,7 @@ class ToBtcLnSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
             this.pr = chainIdOrObj.pr;
             this.secret = chainIdOrObj.secret;
             this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.payInitiated = chainIdOrObj.payInitiated;
             //Compatibility with older versions
             this.quotedNetworkFee ?? (this.quotedNetworkFee = (0, Utils_1.deserializeBN)(chainIdOrObj.maxFee));
             this.realNetworkFee ?? (this.realNetworkFee = (0, Utils_1.deserializeBN)(chainIdOrObj.realRoutingFee));
@@ -41,6 +42,7 @@ class ToBtcLnSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
         partialSerialized.pr = this.pr;
         partialSerialized.lnPaymentHash = this.lnPaymentHash;
         partialSerialized.secret = this.secret;
+        partialSerialized.payInitiated = this.payInitiated;
         return partialSerialized;
     }
     isInitiated() {

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -12,6 +12,7 @@ const FromBtcAmountAssertions_1 = require("../assertions/FromBtcAmountAssertions
 const crypto_1 = require("crypto");
 const btc_signer_1 = require("@scure/btc-signer");
 const SpvVaults_1 = require("./SpvVaults");
+const BitcoinUtils_1 = require("../../utils/BitcoinUtils");
 const TX_MAX_VSIZE = 16 * 1024;
 class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
     constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config) {
@@ -342,7 +343,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             //Check correct psbt
             for (let i = 1; i < transaction.inputsLength; i++) { //Skip first vault input
                 const txIn = transaction.getInput(i);
-                if ((0, btc_signer_1.getInputType)(txIn).txType === "legacy")
+                if ((0, BitcoinUtils_1.isLegacyInput)(txIn))
                     throw {
                         code: 20514,
                         msg: "Legacy (pre-segwit) inputs in tx are not allowed!"

package/dist/utils/BitcoinUtils.d.ts

@@ -0,0 +1,2 @@
+import { TransactionInput } from "@scure/btc-signer/psbt";
+export declare function isLegacyInput(input: TransactionInput): boolean;

package/dist/utils/BitcoinUtils.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLegacyInput = void 0;
+const utxo_1 = require("@scure/btc-signer/utxo");
+const btc_signer_1 = require("@scure/btc-signer");
+function parsePushOpcode(script) {
+    if (script[0] === 0x00) {
+        return Uint8Array.from([]);
+    }
+    if (script[0] <= 0x4b) {
+        return script.slice(1, 1 + script[0]);
+    }
+    if (script[0] === 0x4c) {
+        return script.slice(2, 2 + script[1]);
+    }
+    if (script[0] === 0x4d) {
+        const length = Buffer.from(script.slice(1, 3)).readUInt16LE();
+        return script.slice(3, 3 + length);
+    }
+    if (script[0] === 0x4e) {
+        const length = Buffer.from(script.slice(1, 5)).readUInt32LE();
+        return script.slice(5, 5 + length);
+    }
+    if (script[0] === 0x4f) {
+        return Uint8Array.from([0x81]);
+    }
+    if (script[0] >= 0x51 && script[0] <= 0x60) {
+        return Uint8Array.from([script[0] - 0x50]);
+    }
+    throw new Error("No push opcode detected");
+}
+function isLegacyInput(input) {
+    const prevOut = (0, utxo_1.getPrevOut)(input);
+    const first = btc_signer_1.OutScript.decode(prevOut.script);
+    if (first.type === "tr" || first.type === "wsh" || first.type === "wpkh")
+        return false;
+    if (first.type === "sh") {
+        const redeemScript = input.redeemScript ?? parsePushOpcode(input.finalScriptSig);
+        const second = btc_signer_1.OutScript.decode(redeemScript);
+        if (second.type === "wsh" || second.type === "wpkh")
+            return false;
+    }
+    return true;
+}
+exports.isLegacyInput = isLegacyInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "14.0.0-dev.15",
+  "version": "14.0.0-dev.17",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/swaps/assertions/FromBtcAmountAssertions.ts

@@ -166,12 +166,16 @@ export class FromBtcAmountAssertions extends AmountAssertions {
         }
 
         let amountBD: bigint;
+        let swapFee: bigint;
         if(!requestedAmount.input) {
             amountBD = await this.swapPricing.getToBtcSwapAmount(requestedAmount.amount, requestedAmount.token, chainIdentifier, true, requestedAmount.pricePrefetch);
             signal.throwIfAborted();
 
             // amt = (amt+base_fee)/(1-fee)
-            amountBD = (amountBD + fees.baseFee) * 1000000n / (1000000n - fees.feePPM);
+            const denominator = (1000000n - fees.feePPM);
+            const _amountBD = ((amountBD + fees.baseFee) * 1000000n + denominator - 1n) / denominator;
+            swapFee = _amountBD - amountBD;
+            amountBD = _amountBD;
 
             const tooLow = amountBD < (this.config.min * 95n / 100n);
             const tooHigh = amountBD > (this.config.max * 105n / 100n);
@@ -196,6 +200,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
         } else {
             this.checkBtcAmountInBounds(requestedAmount.amount);
             amountBD = requestedAmount.amount - amountBDgas;
+            swapFee = fees.baseFee + ((amountBD * fees.feePPM + 999_999n) / 1000000n);
             if(amountBD < 0n) {
                 throw {
                     code: 20003,
@@ -208,7 +213,6 @@ export class FromBtcAmountAssertions extends AmountAssertions {
             }
         }
 
-        const swapFee = fees.baseFee + (amountBD * fees.feePPM / 1000000n);
         const swapFeeInToken = await this.swapPricing.getFromBtcSwapAmount(swapFee, requestedAmount.token, chainIdentifier, true, requestedAmount.pricePrefetch);
         signal.throwIfAborted();
 

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.ts

@@ -338,6 +338,8 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
 
         const blockHeight = await this.lightning.getBlockheight();
 
+        swap.payInitiated = true;
+        await this.saveSwapData(swap);
         try {
             await this.lightning.pay({
                 request: swap.pr,

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnSwapAbs.ts

@@ -17,6 +17,7 @@ export class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap
 
     lnPaymentHash: string;
     readonly pr: string;
+    payInitiated: boolean;
 
     secret: string;
 
@@ -43,6 +44,7 @@ export class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap
             this.pr = chainIdOrObj.pr;
             this.secret = chainIdOrObj.secret;
             this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.payInitiated = chainIdOrObj.payInitiated;
 
             //Compatibility with older versions
             this.quotedNetworkFee ??= deserializeBN(chainIdOrObj.maxFee);
@@ -60,6 +62,7 @@ export class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap
         partialSerialized.pr = this.pr;
         partialSerialized.lnPaymentHash = this.lnPaymentHash;
         partialSerialized.secret = this.secret;
+        partialSerialized.payInitiated = this.payInitiated;
         return partialSerialized;
     }
 

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -29,6 +29,7 @@ import {FromBtcAmountAssertions} from "../assertions/FromBtcAmountAssertions";
 import {randomBytes} from "crypto";
 import {getInputType, OutScript, Transaction} from "@scure/btc-signer";
 import {SpvVaults, VAULT_DUST_AMOUNT} from "./SpvVaults";
+import {isLegacyInput} from "../../utils/BitcoinUtils";
 
 export type SpvVaultSwapHandlerConfig = SwapBaseConfig & {
     vaultsCheckInterval: number,
@@ -471,7 +472,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             //Check correct psbt
             for(let i=1;i<transaction.inputsLength;i++) { //Skip first vault input
                 const txIn = transaction.getInput(i);
-                if(getInputType(txIn).txType==="legacy") throw {
+                if(isLegacyInput(txIn)) throw {
                     code: 20514,
                     msg: "Legacy (pre-segwit) inputs in tx are not allowed!"
                 };

package/src/utils/BitcoinUtils.ts

@@ -0,0 +1,42 @@
+import {TransactionInput} from "@scure/btc-signer/psbt";
+import {getPrevOut} from "@scure/btc-signer/utxo";
+import {OutScript} from "@scure/btc-signer";
+
+function parsePushOpcode(script: Uint8Array): Uint8Array {
+    if(script[0]===0x00) {
+        return Uint8Array.from([]);
+    }
+    if(script[0]<=0x4b) {
+        return script.slice(1, 1+script[0]);
+    }
+    if(script[0]===0x4c) {
+        return script.slice(2, 2+script[1]);
+    }
+    if(script[0]===0x4d) {
+        const length = Buffer.from(script.slice(1, 3)).readUInt16LE();
+        return script.slice(3, 3+length);
+    }
+    if(script[0]===0x4e) {
+        const length = Buffer.from(script.slice(1, 5)).readUInt32LE();
+        return script.slice(5, 5+length);
+    }
+    if(script[0]===0x4f) {
+        return Uint8Array.from([0x81]);
+    }
+    if(script[0]>=0x51 && script[0]<=0x60) {
+        return Uint8Array.from([script[0] - 0x50]);
+    }
+    throw new Error("No push opcode detected");
+}
+
+export function isLegacyInput(input: TransactionInput): boolean {
+    const prevOut = getPrevOut(input);
+    const first = OutScript.decode(prevOut.script);
+    if(first.type==="tr" || first.type==="wsh" || first.type==="wpkh") return false;
+    if(first.type==="sh") {
+        const redeemScript = input.redeemScript ?? parsePushOpcode(input.finalScriptSig);
+        const second = OutScript.decode(redeemScript);
+        if(second.type==="wsh" || second.type==="wpkh") return false;
+    }
+    return true;
+}