@atomiqlabs/lp-lib 12.1.0 → 13.0.0-beta.1

package/dist/swaps/escrow/ToBtcBaseSwapHandler.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToBtcBaseSwapHandler = void 0;
+const SchemaVerifier_1 = require("../../utils/paramcoders/SchemaVerifier");
+const EscrowHandler_1 = require("./EscrowHandler");
+const ToBtcAmountAssertions_1 = require("../assertions/ToBtcAmountAssertions");
+class ToBtcBaseSwapHandler extends EscrowHandler_1.EscrowHandler {
+    constructor(storageDirectory, path, chainsData, swapPricing, config) {
+        super(storageDirectory, path, chainsData, swapPricing);
+        this.pdaExistsForToken = {};
+        this.AmountAssertions = new ToBtcAmountAssertions_1.ToBtcAmountAssertions(config, swapPricing);
+    }
+    async checkVaultInitialized(chainIdentifier, token) {
+        if (!this.pdaExistsForToken[chainIdentifier] || !this.pdaExistsForToken[chainIdentifier][token]) {
+            this.logger.debug("checkVaultInitialized(): checking vault exists for chain: " + chainIdentifier + " token: " + token);
+            const { swapContract, signer } = this.getChain(chainIdentifier);
+            const reputation = await swapContract.getIntermediaryReputation(signer.getAddress(), token);
+            this.logger.debug("checkVaultInitialized(): vault state, chain: " + chainIdentifier + " token: " + token + " exists: " + (reputation != null));
+            if (reputation != null) {
+                if (this.pdaExistsForToken[chainIdentifier] == null)
+                    this.pdaExistsForToken[chainIdentifier] = {};
+                this.pdaExistsForToken[chainIdentifier][token] = true;
+            }
+            else {
+                throw {
+                    code: 20201,
+                    msg: "Token not supported!"
+                };
+            }
+        }
+    }
+    /**
+     * Starts pre-fetches for swap pricing & signature data
+     *
+     * @param chainIdentifier
+     * @param token
+     * @param responseStream
+     * @param abortController
+     */
+    getToBtcPrefetches(chainIdentifier, token, responseStream, abortController) {
+        //Fetch pricing & signature data in parallel
+        const pricePrefetchPromise = this.swapPricing.preFetchPrice(token, chainIdentifier).catch(e => {
+            this.logger.error("getToBtcPrefetches(): pricePrefetch error", e);
+            abortController.abort(e);
+            return null;
+        });
+        return {
+            pricePrefetchPromise,
+            signDataPrefetchPromise: this.getSignDataPrefetch(chainIdentifier, abortController, responseStream)
+        };
+    }
+    /**
+     * Signs the created swap
+     *
+     * @param chainIdentifier
+     * @param swapObject
+     * @param req
+     * @param abortSignal
+     * @param signDataPrefetchPromise
+     */
+    async getToBtcSignatureData(chainIdentifier, swapObject, req, abortSignal, signDataPrefetchPromise) {
+        const prefetchedSignData = signDataPrefetchPromise != null ? await signDataPrefetchPromise : null;
+        if (prefetchedSignData != null)
+            this.logger.debug("getToBtcSignatureData(): pre-fetched signature data: ", prefetchedSignData);
+        abortSignal.throwIfAborted();
+        const feeRateObj = await req.paramReader.getParams({
+            feeRate: SchemaVerifier_1.FieldTypeEnum.String
+        }).catch(() => null);
+        abortSignal.throwIfAborted();
+        const feeRate = feeRateObj?.feeRate != null && typeof (feeRateObj.feeRate) === "string" ? feeRateObj.feeRate : null;
+        this.logger.debug("getToBtcSignatureData(): using fee rate from client: ", feeRate);
+        const { swapContract, signer } = this.getChain(chainIdentifier);
+        const sigData = await swapContract.getInitSignature(signer, swapObject, this.getInitAuthorizationTimeout(chainIdentifier), prefetchedSignData, feeRate);
+        abortSignal.throwIfAborted();
+        return {
+            ...sigData,
+            feeRate
+        };
+    }
+}
+exports.ToBtcBaseSwapHandler = ToBtcBaseSwapHandler;

package/dist/swaps/{frombtc_abstract → escrow/frombtc_abstract}/FromBtcAbs.d.ts

@@ -1,11 +1,11 @@
 import { Express } from "express";
 import { FromBtcSwapAbs, FromBtcSwapState } from "./FromBtcSwapAbs";
-import { MultichainData, SwapHandlerType } from "../SwapHandler";
-import { ISwapPrice } from "../ISwapPrice";
+import { MultichainData, SwapHandlerType } from "../../SwapHandler";
+import { ISwapPrice } from "../../../prices/ISwapPrice";
 import { ChainSwapType, ClaimEvent, InitializeEvent, RefundEvent, SwapData } from "@atomiqlabs/base";
-import { IIntermediaryStorage } from "../../storage/IIntermediaryStorage";
+import { IIntermediaryStorage } from "../../../storage/IIntermediaryStorage";
 import { FromBtcBaseConfig, FromBtcBaseSwapHandler } from "../FromBtcBaseSwapHandler";
-import { IBitcoinWallet } from "../../wallets/IBitcoinWallet";
+import { IBitcoinWallet } from "../../../wallets/IBitcoinWallet";
 export type FromBtcConfig = FromBtcBaseConfig & {
     confirmations: number;
     swapCsvDelta: number;

package/dist/swaps/{frombtc_abstract → escrow/frombtc_abstract}/FromBtcAbs.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FromBtcAbs = void 0;
 const FromBtcSwapAbs_1 = require("./FromBtcSwapAbs");
-const SwapHandler_1 = require("../SwapHandler");
+const SwapHandler_1 = require("../../SwapHandler");
 const base_1 = require("@atomiqlabs/base");
 const crypto_1 = require("crypto");
-const Utils_1 = require("../../utils/Utils");
-const PluginManager_1 = require("../../plugins/PluginManager");
-const SchemaVerifier_1 = require("../../utils/paramcoders/SchemaVerifier");
-const ServerParamDecoder_1 = require("../../utils/paramcoders/server/ServerParamDecoder");
+const Utils_1 = require("../../../utils/Utils");
+const PluginManager_1 = require("../../../plugins/PluginManager");
+const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
+const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const FromBtcBaseSwapHandler_1 = require("../FromBtcBaseSwapHandler");
 /**
  * Swap handler handling from BTC swaps using PTLCs (proof-time locked contracts) and btc relay (on-chain bitcoin SPV)
  */
 class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
     constructor(storageDirectory, path, chains, bitcoin, swapPricing, config) {
-        super(storageDirectory, path, chains, swapPricing);
+        super(storageDirectory, path, chains, swapPricing, config);
         this.type = SwapHandler_1.SwapHandlerType.FROM_BTC;
         this.swapType = base_1.ChainSwapType.CHAIN;
         this.bitcoin = bitcoin;
@@ -57,8 +57,8 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                 return false;
             }
             this.swapLogger.info(swap, "processPastSwap(state=CREATED): removing past swap due to authorization expiry, address: " + swap.address);
-            await this.bitcoin.addUnusedAddress(swap.address);
             await this.removeSwapData(swap, FromBtcSwapAbs_1.FromBtcSwapState.CANCELED);
+            await this.bitcoin.addUnusedAddress(swap.address);
             return false;
         }
         //Check if commited swap expired by now
@@ -130,8 +130,8 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
     async processRefundEvent(chainIdentifier, savedSwap, event) {
         savedSwap.txIds.refund = event.meta?.txId;
         this.swapLogger.info(event, "SC: RefundEvent: swap refunded, address: " + savedSwap.address);
-        await this.bitcoin.addUnusedAddress(savedSwap.address);
         await this.removeSwapData(savedSwap, FromBtcSwapAbs_1.FromBtcSwapState.REFUNDED);
+        await this.bitcoin.addUnusedAddress(savedSwap.address);
     }
     /**
      * Calculates the requested claimer bounty, based on client's request
@@ -179,8 +179,8 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         restServer.post(this.path + "/getAddress", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
             const chainIdentifier = req.query.chain ?? this.chains.default;
-            const { swapContract, signer } = this.getChain(chainIdentifier);
-            const depositToken = req.query.depositToken ?? swapContract.getNativeCurrencyAddress();
+            const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
+            const depositToken = req.query.depositToken ?? chainInterface.getNativeCurrencyAddress();
             this.checkAllowedDepositToken(chainIdentifier, depositToken);
             metadata.times.requestReceived = Date.now();
             /**
@@ -202,7 +202,7 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             const parsedBody = await req.paramReader.getParams({
                 address: (val) => val != null &&
                     typeof (val) === "string" &&
-                    swapContract.isValidAddress(val) ? val : null,
+                    chainInterface.isValidAddress(val) ? val : null,
                 amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
@@ -216,7 +216,7 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     msg: "Invalid request body"
                 };
             metadata.request = parsedBody;
-            const requestedAmount = { input: !parsedBody.exactOut, amount: parsedBody.amount };
+            const requestedAmount = { input: !parsedBody.exactOut, amount: parsedBody.amount, token: parsedBody.token };
             const request = {
                 chainIdentifier,
                 raw: req,
@@ -226,11 +226,11 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             const useToken = parsedBody.token;
             //Check request params
             this.checkSequence(parsedBody.sequence);
-            const fees = await this.preCheckAmounts(request, requestedAmount, useToken);
+            const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
             //Create abortController for parallel prefetches
             const responseStream = res.responseStream;
-            const abortController = this.getAbortController(responseStream);
+            const abortController = (0, Utils_1.getAbortController)(responseStream);
             //Pre-fetch data
             const { pricePrefetchPromise, gasTokenPricePrefetchPromise, depositTokenPricePrefetchPromise } = this.getFromBtcPricePrefetches(chainIdentifier, useToken, depositToken, abortController);
             const balancePrefetch = this.getBalancePrefetch(chainIdentifier, useToken, abortController);
@@ -239,7 +239,7 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             abortController.signal.throwIfAborted();
             const baseSDPromise = this.getBaseSecurityDepositPrefetch(chainIdentifier, dummySwapData, depositToken, gasTokenPricePrefetchPromise, depositTokenPricePrefetchPromise, abortController);
             //Check valid amount specified (min/max)
-            const { amountBD, swapFee, swapFeeInToken, totalInToken, securityDepositApyPPM, securityDepositBaseMultiplierPPM } = await this.checkFromBtcAmount(request, requestedAmount, fees, useToken, abortController.signal, pricePrefetchPromise);
+            const { amountBD, swapFee, swapFeeInToken, totalInToken, securityDepositApyPPM, securityDepositBaseMultiplierPPM } = await this.AmountAssertions.checkFromBtcAmount(this.type, request, { ...requestedAmount, pricePrefetch: pricePrefetchPromise }, fees, abortController.signal);
             metadata.times.priceCalculated = Date.now();
             if (securityDepositApyPPM != null)
                 fees.securityDepositApyPPM = securityDepositApyPPM;

package/dist/swaps/{frombtc_abstract → escrow/frombtc_abstract}/FromBtcSwapAbs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FromBtcSwapAbs = exports.FromBtcSwapState = void 0;
-const SwapHandler_1 = require("../SwapHandler");
+const SwapHandler_1 = require("../../SwapHandler");
 const FromBtcBaseSwap_1 = require("../FromBtcBaseSwap");
 var FromBtcSwapState;
 (function (FromBtcSwapState) {

package/dist/swaps/{frombtcln_abstract → escrow/frombtcln_abstract}/FromBtcLnAbs.d.ts

@@ -1,12 +1,12 @@
 import { Express } from "express";
 import { FromBtcLnSwapAbs, FromBtcLnSwapState } from "./FromBtcLnSwapAbs";
-import { MultichainData, SwapHandlerType } from "../SwapHandler";
-import { ISwapPrice } from "../ISwapPrice";
+import { MultichainData, SwapHandlerType } from "../../SwapHandler";
+import { ISwapPrice } from "../../../prices/ISwapPrice";
 import { ChainSwapType, ClaimEvent, InitializeEvent, RefundEvent, SwapData } from "@atomiqlabs/base";
-import { IIntermediaryStorage } from "../../storage/IIntermediaryStorage";
-import { FromBtcBaseConfig } from "../FromBtcBaseSwapHandler";
-import { FromBtcLnBaseSwapHandler } from "../FromBtcLnBaseSwapHandler";
-import { ILightningWallet } from "../../wallets/ILightningWallet";
+import { IIntermediaryStorage } from "../../../storage/IIntermediaryStorage";
+import { FromBtcBaseConfig, FromBtcBaseSwapHandler } from "../FromBtcBaseSwapHandler";
+import { ILightningWallet } from "../../../wallets/ILightningWallet";
+import { LightningAssertions } from "../../assertions/LightningAssertions";
 export type FromBtcLnConfig = FromBtcBaseConfig & {
     invoiceTimeoutSeconds?: number;
     minCltv: bigint;
@@ -23,10 +23,12 @@ export type FromBtcLnRequestType = {
 /**
  * Swap handler handling from BTCLN swaps using submarine swaps
  */
-export declare class FromBtcLnAbs extends FromBtcLnBaseSwapHandler<FromBtcLnSwapAbs, FromBtcLnSwapState> {
+export declare class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromBtcLnSwapState> {
     readonly type = SwapHandlerType.FROM_BTCLN;
     readonly swapType = ChainSwapType.HTLC;
     readonly config: FromBtcLnConfig;
+    readonly lightning: ILightningWallet;
+    readonly LightningAssertions: LightningAssertions;
     constructor(storageDirectory: IIntermediaryStorage<FromBtcLnSwapAbs>, path: string, chains: MultichainData, lightning: ILightningWallet, swapPricing: ISwapPrice, config: FromBtcLnConfig);
     protected processPastSwap(swap: FromBtcLnSwapAbs): Promise<"REFUND" | "SETTLE" | "CANCEL" | null>;
     protected refundSwaps(refundSwaps: FromBtcLnSwapAbs[]): Promise<void>;

package/dist/swaps/{frombtcln_abstract → escrow/frombtcln_abstract}/FromBtcLnAbs.js

@@ -3,23 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FromBtcLnAbs = void 0;
 const crypto_1 = require("crypto");
 const FromBtcLnSwapAbs_1 = require("./FromBtcLnSwapAbs");
-const SwapHandler_1 = require("../SwapHandler");
+const SwapHandler_1 = require("../../SwapHandler");
 const base_1 = require("@atomiqlabs/base");
-const Utils_1 = require("../../utils/Utils");
-const PluginManager_1 = require("../../plugins/PluginManager");
-const SchemaVerifier_1 = require("../../utils/paramcoders/SchemaVerifier");
-const ServerParamDecoder_1 = require("../../utils/paramcoders/server/ServerParamDecoder");
-const FromBtcLnBaseSwapHandler_1 = require("../FromBtcLnBaseSwapHandler");
+const Utils_1 = require("../../../utils/Utils");
+const PluginManager_1 = require("../../../plugins/PluginManager");
+const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
+const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
+const FromBtcBaseSwapHandler_1 = require("../FromBtcBaseSwapHandler");
+const LightningAssertions_1 = require("../../assertions/LightningAssertions");
 /**
  * Swap handler handling from BTCLN swaps using submarine swaps
  */
-class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
+class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
     constructor(storageDirectory, path, chains, lightning, swapPricing, config) {
-        super(storageDirectory, path, chains, lightning, swapPricing);
+        super(storageDirectory, path, chains, swapPricing, config);
         this.type = SwapHandler_1.SwapHandlerType.FROM_BTCLN;
         this.swapType = base_1.ChainSwapType.HTLC;
         this.config = config;
         this.config.invoiceTimeoutSeconds = this.config.invoiceTimeoutSeconds || 90;
+        this.lightning = lightning;
+        this.LightningAssertions = new LightningAssertions_1.LightningAssertions(this.logger, lightning);
     }
     async processPastSwap(swap) {
         const { swapContract, signer } = this.getChain(swap.chainIdentifier);
@@ -392,8 +395,8 @@ class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
             chainIdentifier = this.chains.default;
             address = invoice.description;
         }
-        const { swapContract } = this.getChain(chainIdentifier);
-        if (!swapContract.isValidAddress(address))
+        const { chainInterface } = this.getChain(chainIdentifier);
+        if (!chainInterface.isValidAddress(address))
             throw {
                 _httpStatus: 200,
                 code: 10001,
@@ -427,8 +430,8 @@ class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
         restServer.post(this.path + "/createInvoice", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
             const chainIdentifier = req.query.chain ?? this.chains.default;
-            const { swapContract, signer } = this.getChain(chainIdentifier);
-            const depositToken = req.query.depositToken ?? swapContract.getNativeCurrencyAddress();
+            const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
+            const depositToken = req.query.depositToken ?? chainInterface.getNativeCurrencyAddress();
             this.checkAllowedDepositToken(chainIdentifier, depositToken);
             metadata.times.requestReceived = Date.now();
             /**
@@ -445,7 +448,7 @@ class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
             const parsedBody = await req.paramReader.getParams({
                 address: (val) => val != null &&
                     typeof (val) === "string" &&
-                    swapContract.isValidAddress(val) ? val : null,
+                    chainInterface.isValidAddress(val) ? val : null,
                 paymentHash: (val) => val != null &&
                     typeof (val) === "string" &&
                     val.length === 64 &&
@@ -463,7 +466,7 @@ class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
                     msg: "Invalid request body"
                 };
             metadata.request = parsedBody;
-            const requestedAmount = { input: !parsedBody.exactOut, amount: parsedBody.amount };
+            const requestedAmount = { input: !parsedBody.exactOut, amount: parsedBody.amount, token: parsedBody.token };
             const request = {
                 chainIdentifier,
                 raw: req,
@@ -473,22 +476,22 @@ class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
             const useToken = parsedBody.token;
             //Check request params
             this.checkDescriptionHash(parsedBody.descriptionHash);
-            const fees = await this.preCheckAmounts(request, requestedAmount, useToken);
+            const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
             //Create abortController for parallel prefetches
             const responseStream = res.responseStream;
-            const abortController = this.getAbortController(responseStream);
+            const abortController = (0, Utils_1.getAbortController)(responseStream);
             //Pre-fetch data
             const { pricePrefetchPromise, gasTokenPricePrefetchPromise, depositTokenPricePrefetchPromise } = this.getFromBtcPricePrefetches(chainIdentifier, useToken, depositToken, abortController);
             const balancePrefetch = this.getBalancePrefetch(chainIdentifier, useToken, abortController);
-            const channelsPrefetch = this.getChannelsPrefetch(abortController);
+            const channelsPrefetch = this.LightningAssertions.getChannelsPrefetch(abortController);
             const dummySwapData = await this.getDummySwapData(chainIdentifier, useToken, parsedBody.address, parsedBody.paymentHash);
             abortController.signal.throwIfAborted();
             const baseSDPromise = this.getBaseSecurityDepositPrefetch(chainIdentifier, dummySwapData, depositToken, gasTokenPricePrefetchPromise, depositTokenPricePrefetchPromise, abortController);
             //Asynchronously send the node's public key to the client
             this.sendPublicKeyAsync(responseStream);
             //Check valid amount specified (min/max)
-            const { amountBD, swapFee, swapFeeInToken, totalInToken, securityDepositApyPPM, securityDepositBaseMultiplierPPM } = await this.checkFromBtcAmount(request, requestedAmount, fees, useToken, abortController.signal, pricePrefetchPromise);
+            const { amountBD, swapFee, swapFeeInToken, totalInToken, securityDepositApyPPM, securityDepositBaseMultiplierPPM } = await this.AmountAssertions.checkFromBtcAmount(this.type, request, { ...requestedAmount, pricePrefetch: pricePrefetchPromise }, fees, abortController.signal);
             metadata.times.priceCalculated = Date.now();
             if (securityDepositApyPPM != null)
                 fees.securityDepositApyPPM = securityDepositApyPPM;
@@ -496,7 +499,7 @@ class FromBtcLnAbs extends FromBtcLnBaseSwapHandler_1.FromBtcLnBaseSwapHandler {
                 fees.securityDepositBaseMultiplierPPM = securityDepositBaseMultiplierPPM;
             //Check if we have enough funds to honor the request
             await this.checkBalance(totalInToken, balancePrefetch, abortController.signal);
-            await this.checkInboundLiquidity(amountBD, channelsPrefetch, abortController.signal);
+            await this.LightningAssertions.checkInboundLiquidity(amountBD, channelsPrefetch, abortController.signal);
             metadata.times.balanceChecked = Date.now();
             //Create swap
             const hodlInvoiceObj = {

package/dist/swaps/{frombtcln_abstract → escrow/frombtcln_abstract}/FromBtcLnSwapAbs.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FromBtcLnSwapAbs = exports.FromBtcLnSwapState = void 0;
-const __1 = require("../..");
+const index_1 = require("../../../index");
 const FromBtcBaseSwap_1 = require("../FromBtcBaseSwap");
-const Utils_1 = require("../../utils/Utils");
+const Utils_1 = require("../../../utils/Utils");
 var FromBtcLnSwapState;
 (function (FromBtcLnSwapState) {
     FromBtcLnSwapState[FromBtcLnSwapState["REFUNDED"] = -2] = "REFUNDED";
@@ -48,7 +48,7 @@ class FromBtcLnSwapAbs extends FromBtcBaseSwap_1.FromBtcBaseSwap {
                 this.securityDeposit = this.data.getSecurityDeposit();
             }
         }
-        this.type = __1.SwapHandlerType.FROM_BTCLN;
+        this.type = index_1.SwapHandlerType.FROM_BTCLN;
     }
     serialize() {
         const partialSerialized = super.serialize();

package/dist/swaps/{tobtc_abstract → escrow/tobtc_abstract}/ToBtcAbs.d.ts

@@ -1,12 +1,12 @@
 import { Express } from "express";
 import { ToBtcSwapAbs, ToBtcSwapState } from "./ToBtcSwapAbs";
-import { MultichainData, SwapHandlerType } from "../SwapHandler";
-import { ISwapPrice } from "../ISwapPrice";
+import { MultichainData, SwapHandlerType } from "../../SwapHandler";
+import { ISwapPrice } from "../../../prices/ISwapPrice";
 import { BtcTx, ChainSwapType, ClaimEvent, InitializeEvent, RefundEvent, SwapData, BitcoinRpc, BtcBlock } from "@atomiqlabs/base";
-import { IIntermediaryStorage } from "../../storage/IIntermediaryStorage";
+import { IIntermediaryStorage } from "../../../storage/IIntermediaryStorage";
 import { ToBtcBaseConfig, ToBtcBaseSwapHandler } from "../ToBtcBaseSwapHandler";
 import { PromiseQueue } from "promise-queue-ts";
-import { IBitcoinWallet } from "../../wallets/IBitcoinWallet";
+import { IBitcoinWallet } from "../../../wallets/IBitcoinWallet";
 export type ToBtcConfig = ToBtcBaseConfig & {
     sendSafetyFactor: bigint;
     minChainCltv: bigint;

package/dist/swaps/{tobtc_abstract → escrow/tobtc_abstract}/ToBtcAbs.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToBtcAbs = void 0;
 const ToBtcSwapAbs_1 = require("./ToBtcSwapAbs");
-const SwapHandler_1 = require("../SwapHandler");
+const SwapHandler_1 = require("../../SwapHandler");
 const base_1 = require("@atomiqlabs/base");
-const Utils_1 = require("../../utils/Utils");
-const PluginManager_1 = require("../../plugins/PluginManager");
+const Utils_1 = require("../../../utils/Utils");
+const PluginManager_1 = require("../../../plugins/PluginManager");
 const crypto_1 = require("crypto");
-const SchemaVerifier_1 = require("../../utils/paramcoders/SchemaVerifier");
-const ServerParamDecoder_1 = require("../../utils/paramcoders/server/ServerParamDecoder");
+const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
+const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const ToBtcBaseSwapHandler_1 = require("../ToBtcBaseSwapHandler");
 const promise_queue_ts_1 = require("promise-queue-ts");
 const OUTPUT_SCRIPT_MAX_LENGTH = 200;
@@ -17,7 +17,7 @@ const OUTPUT_SCRIPT_MAX_LENGTH = 200;
  */
 class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
     constructor(storageDirectory, path, chainData, bitcoin, swapPricing, bitcoinRpc, config) {
-        super(storageDirectory, path, chainData, swapPricing);
+        super(storageDirectory, path, chainData, swapPricing, config);
         this.type = SwapHandler_1.SwapHandlerType.TO_BTC;
         this.swapType = base_1.ChainSwapType.CHAIN_NONCED;
         this.activeSubscriptions = {};
@@ -487,7 +487,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         restServer.post(this.path + "/payInvoice", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
             const chainIdentifier = req.query.chain ?? this.chains.default;
-            const { swapContract, signer } = this.getChain(chainIdentifier);
+            const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**
              *Sent initially:
@@ -514,7 +514,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
                 offerer: (val) => val != null &&
                     typeof (val) === "string" &&
-                    swapContract.isValidAddress(val) ? val : null,
+                    chainInterface.isValidAddress(val) ? val : null,
                 exactIn: SchemaVerifier_1.FieldTypeEnum.BooleanOptional
             });
             if (parsedBody == null)
@@ -523,7 +523,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                     msg: "Invalid request body"
                 };
             metadata.request = parsedBody;
-            const requestedAmount = { input: !!parsedBody.exactIn, amount: parsedBody.amount };
+            const requestedAmount = { input: !!parsedBody.exactIn, amount: parsedBody.amount, token: parsedBody.token };
             const request = {
                 chainIdentifier,
                 raw: req,
@@ -537,17 +537,18 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             this.checkRequiredConfirmations(parsedBody.confirmations);
             this.checkAddress(parsedBody.address);
             await this.checkVaultInitialized(chainIdentifier, parsedBody.token);
-            const fees = await this.preCheckAmounts(request, requestedAmount, useToken);
+            const fees = await this.AmountAssertions.preCheckToBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
             //Initialize abort controller for the parallel async operations
-            const abortController = this.getAbortController(responseStream);
+            const abortController = (0, Utils_1.getAbortController)(responseStream);
             const { pricePrefetchPromise, signDataPrefetchPromise } = this.getToBtcPrefetches(chainIdentifier, useToken, responseStream, abortController);
-            const { amountBD, networkFeeData, totalInToken, swapFee, swapFeeInToken, networkFeeInToken } = await this.checkToBtcAmount(request, requestedAmount, fees, useToken, async (amount) => {
+            const { amountBD, networkFeeData, totalInToken, swapFee, swapFeeInToken, networkFeeInToken } = await this.AmountAssertions.checkToBtcAmount(this.type, request, { ...requestedAmount, pricePrefetch: pricePrefetchPromise }, fees, async (amount) => {
                 metadata.times.amountsChecked = Date.now();
                 const resp = await this.checkAndGetNetworkFee(parsedBody.address, amount);
+                this.logger.debug("checkToBtcAmount(): network fee calculated, amount: " + amount.toString(10) + " fee: " + resp.networkFee.toString(10));
                 metadata.times.chainFeeCalculated = Date.now();
                 return resp;
-            }, abortController.signal, pricePrefetchPromise);
+            }, abortController.signal);
             metadata.times.priceCalculated = Date.now();
             const paymentHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
             //Add grace period another time, so the user has 1 hour to commit

package/dist/swaps/{tobtc_abstract → escrow/tobtc_abstract}/ToBtcSwapAbs.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToBtcSwapAbs = exports.ToBtcSwapState = void 0;
-const __1 = require("../..");
+const index_1 = require("../../../index");
 const ToBtcBaseSwap_1 = require("../ToBtcBaseSwap");
-const Utils_1 = require("../../utils/Utils");
+const Utils_1 = require("../../../utils/Utils");
 var ToBtcSwapState;
 (function (ToBtcSwapState) {
     ToBtcSwapState[ToBtcSwapState["REFUNDED"] = -3] = "REFUNDED";
@@ -37,7 +37,7 @@ class ToBtcSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
             //Compatibility
             this.quotedNetworkFee ?? (this.quotedNetworkFee = (0, Utils_1.deserializeBN)(chainIdOrObj.networkFee));
         }
-        this.type = __1.SwapHandlerType.TO_BTC;
+        this.type = index_1.SwapHandlerType.TO_BTC;
     }
     serialize() {
         const partialSerialized = super.serialize();

package/dist/swaps/{tobtcln_abstract → escrow/tobtcln_abstract}/ToBtcLnAbs.d.ts

@@ -1,11 +1,12 @@
 import { Express } from "express";
 import { ToBtcLnSwapAbs, ToBtcLnSwapState } from "./ToBtcLnSwapAbs";
-import { MultichainData, SwapHandlerType } from "../SwapHandler";
-import { ISwapPrice } from "../ISwapPrice";
+import { MultichainData, SwapHandlerType } from "../../SwapHandler";
+import { ISwapPrice } from "../../../prices/ISwapPrice";
 import { ChainSwapType, ClaimEvent, InitializeEvent, RefundEvent, SwapData } from "@atomiqlabs/base";
-import { IIntermediaryStorage } from "../../storage/IIntermediaryStorage";
+import { IIntermediaryStorage } from "../../../storage/IIntermediaryStorage";
 import { ToBtcBaseConfig, ToBtcBaseSwapHandler } from "../ToBtcBaseSwapHandler";
-import { ILightningWallet, ParsedPaymentRequest } from "../../wallets/ILightningWallet";
+import { ILightningWallet, ParsedPaymentRequest } from "../../../wallets/ILightningWallet";
+import { LightningAssertions } from "../../assertions/LightningAssertions";
 export type ToBtcLnConfig = ToBtcBaseConfig & {
     routingFeeMultiplier: bigint;
     minSendCltv: bigint;
@@ -54,12 +55,7 @@ export type ToBtcLnRequestType = {
  * Swap handler handling to BTCLN swaps using submarine swaps
  */
 export declare class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwapState> {
-    protected readonly LIGHTNING_LIQUIDITY_CACHE_TIMEOUT: number;
     activeSubscriptions: Set<string>;
-    lightningLiquidityCache: {
-        liquidity: bigint;
-        timestamp: number;
-    };
     readonly type = SwapHandlerType.TO_BTCLN;
     readonly swapType = ChainSwapType.HTLC;
     readonly config: ToBtcLnConfig & {
@@ -69,6 +65,7 @@ export declare class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToB
         [reqId: string]: ExactInAuthorization;
     };
     readonly lightning: ILightningWallet;
+    readonly LightningAssertions: LightningAssertions;
     constructor(storageDirectory: IIntermediaryStorage<ToBtcLnSwapAbs>, path: string, chainData: MultichainData, lightning: ILightningWallet, swapPricing: ISwapPrice, config: ToBtcLnConfig);
     /**
      * Cleans up exactIn authorization that are already past their expiry
@@ -143,23 +140,6 @@ export declare class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToB
      * @throws {DefinedRuntimeError} will throw an error if the expiry time is too short
      */
     private checkExpiry;
-    /**
-     * Checks if the prior payment with the same paymentHash exists
-     *
-     * @param paymentHash
-     * @param abortSignal
-     * @throws {DefinedRuntimeError} will throw an error if payment already exists
-     */
-    private checkPriorPayment;
-    /**
-     * Checks if the underlying LND backend has enough liquidity in channels to honor the swap
-     *
-     * @param amount
-     * @param abortSignal
-     * @param useCached Whether to use cached liquidity values
-     * @throws {DefinedRuntimeError} will throw an error if there isn't enough liquidity
-     */
-    private checkLiquidity;
     /**
      * Estimates the routing fee & confidence by either probing or routing (if probing fails), the fee is also adjusted
      *  according to routing fee multiplier, and subject to minimums set in config