@atomiqlabs/sdk 8.0.10 → 8.1.7

package/dist/bitcoin/wallet/BitcoinWallet.d.ts

@@ -5,7 +5,7 @@ import { BTC_NETWORK } from "@scure/btc-signer/utils";
 import { Transaction } from "@scure/btc-signer";
 import { IBitcoinWallet } from "./IBitcoinWallet";
 import { Buffer } from "buffer";
-import { BitcoinRpcWithAddressIndex } from "../BitcoinRpcWithAddressIndex";
+import { BitcoinRpcWithAddressIndex } from "@atomiqlabs/base";
 /**
  * UTXO data structure for Bitcoin wallets
  * @category Bitcoin

package/dist/bitcoin/wallet/BitcoinWallet.js

@@ -68,7 +68,7 @@ class BitcoinWallet {
                 outputScript: outputScript,
                 address: sendingAddress,
                 cpfp: !utxo.confirmed ? await this.rpc.getCPFPData(utxo.txid).then((result) => {
-                    if (result.effectiveFeePerVsize == null)
+                    if (result == null)
                         return;
                     return {
                         txVsize: result.adjustedVsize,

package/dist/bitcoin/wallet/SingleAddressBitcoinWallet.d.ts

@@ -2,7 +2,7 @@ import { CoinselectAddressTypes } from "../coinselect2";
 import { BTC_NETWORK } from "@scure/btc-signer/utils";
 import { Transaction } from "@scure/btc-signer";
 import { BitcoinWallet } from "./BitcoinWallet";
-import { BitcoinRpcWithAddressIndex } from "../BitcoinRpcWithAddressIndex";
+import { BitcoinRpcWithAddressIndex } from "@atomiqlabs/base";
 /**
  * Bitcoin wallet implementation for single-address scenarios
  * @category Bitcoin

package/dist/index.d.ts

@@ -1,10 +1,9 @@
-export * from "@atomiqlabs/base";
-export { MempoolApi } from "./bitcoin/mempool/MempoolApi";
-export * from "./bitcoin/mempool/MempoolBitcoinRpc";
+export { LightningNetworkApi, BitcoinRpc, BitcoinRpcWithAddressIndex, BitcoinNetwork, BtcRelay, ChainData, ChainInterface, ChainType, CannotInitializeATAError, SignatureVerificationError, SwapDataVerificationError, TransactionRevertedError, ChainEvents, Messenger, SpvVaultContract, SpvVaultData, SpvWithdrawalTransactionData, ExecutionData, IStorageManager, StorageObject, SwapContract, SwapData } from "@atomiqlabs/base";
+export { MempoolApi, MempoolBitcoinRpc, MempoolApiError } from "@atomiqlabs/btc-mempool";
 export * from "./bitcoin/wallet/BitcoinWallet";
 export * from "./bitcoin/wallet/IBitcoinWallet";
-export * from "./bitcoin/wallet/MinimalBitcoinWalletInterface";
-export * from "./bitcoin/wallet/MinimalLightningNetworkWalletInterface";
+export * from "./types/wallets/MinimalBitcoinWalletInterface";
+export * from "./types/wallets/MinimalLightningNetworkWalletInterface";
 export * from "./bitcoin/wallet/SingleAddressBitcoinWallet";
 export { CoinselectAddressTypes } from "./bitcoin/coinselect2";
 export * from "./enums/FeeType";

package/dist/index.js

@@ -14,15 +14,25 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ISwapWrapper = exports.ISwap = exports.OnchainForGasWrapper = exports.OnchainForGasSwapState = exports.OnchainForGasSwap = exports.LnForGasWrapper = exports.LnForGasSwapState = exports.LnForGasSwap = exports.SpvFromBTCWrapper = exports.SpvFromBTCSwapState = exports.SpvFromBTCSwap = exports.IEscrowSwapWrapper = exports.IEscrowSwap = exports.IEscrowSelfInitSwap = exports.IToBTCWrapper = exports.ToBTCSwapState = exports.IToBTCSwap = exports.ToBTCWrapper = exports.ToBTCSwap = exports.ToBTCLNWrapper = exports.ToBTCLNSwap = exports.IFromBTCWrapper = exports.IFromBTCSelfInitSwap = exports.IFromBTCLNWrapper = exports.FromBTCWrapper = exports.FromBTCSwapState = exports.FromBTCSwap = exports.FromBTCLNAutoWrapper = exports.FromBTCLNAutoSwapState = exports.FromBTCLNAutoSwap = exports.FromBTCLNWrapper = exports.FromBTCLNSwapState = exports.FromBTCLNSwap = exports.Swapper = exports.IndexedDBUnifiedStorage = exports.CustomPriceProvider = exports.OKXPriceProvider = exports.KrakenPriceProvider = exports.CoinPaprikaPriceProvider = exports.CoinGeckoPriceProvider = exports.BinancePriceProvider = exports.RedundantSwapPrice = exports.IntermediaryDiscovery = exports.Intermediary = exports.MempoolApi = void 0;
-__exportStar(require("@atomiqlabs/base"), exports);
-var MempoolApi_1 = require("./bitcoin/mempool/MempoolApi");
-Object.defineProperty(exports, "MempoolApi", { enumerable: true, get: function () { return MempoolApi_1.MempoolApi; } });
-__exportStar(require("./bitcoin/mempool/MempoolBitcoinRpc"), exports);
+exports.LnForGasWrapper = exports.LnForGasSwapState = exports.LnForGasSwap = exports.SpvFromBTCWrapper = exports.SpvFromBTCSwapState = exports.SpvFromBTCSwap = exports.IEscrowSwapWrapper = exports.IEscrowSwap = exports.IEscrowSelfInitSwap = exports.IToBTCWrapper = exports.ToBTCSwapState = exports.IToBTCSwap = exports.ToBTCWrapper = exports.ToBTCSwap = exports.ToBTCLNWrapper = exports.ToBTCLNSwap = exports.IFromBTCWrapper = exports.IFromBTCSelfInitSwap = exports.IFromBTCLNWrapper = exports.FromBTCWrapper = exports.FromBTCSwapState = exports.FromBTCSwap = exports.FromBTCLNAutoWrapper = exports.FromBTCLNAutoSwapState = exports.FromBTCLNAutoSwap = exports.FromBTCLNWrapper = exports.FromBTCLNSwapState = exports.FromBTCLNSwap = exports.Swapper = exports.IndexedDBUnifiedStorage = exports.CustomPriceProvider = exports.OKXPriceProvider = exports.KrakenPriceProvider = exports.CoinPaprikaPriceProvider = exports.CoinGeckoPriceProvider = exports.BinancePriceProvider = exports.RedundantSwapPrice = exports.IntermediaryDiscovery = exports.Intermediary = exports.MempoolApiError = exports.MempoolBitcoinRpc = exports.MempoolApi = exports.SwapData = exports.SpvWithdrawalTransactionData = exports.SpvVaultData = exports.TransactionRevertedError = exports.SwapDataVerificationError = exports.SignatureVerificationError = exports.CannotInitializeATAError = exports.BitcoinNetwork = void 0;
+exports.ISwapWrapper = exports.ISwap = exports.OnchainForGasWrapper = exports.OnchainForGasSwapState = exports.OnchainForGasSwap = void 0;
+var base_1 = require("@atomiqlabs/base");
+Object.defineProperty(exports, "BitcoinNetwork", { enumerable: true, get: function () { return base_1.BitcoinNetwork; } });
+Object.defineProperty(exports, "CannotInitializeATAError", { enumerable: true, get: function () { return base_1.CannotInitializeATAError; } });
+Object.defineProperty(exports, "SignatureVerificationError", { enumerable: true, get: function () { return base_1.SignatureVerificationError; } });
+Object.defineProperty(exports, "SwapDataVerificationError", { enumerable: true, get: function () { return base_1.SwapDataVerificationError; } });
+Object.defineProperty(exports, "TransactionRevertedError", { enumerable: true, get: function () { return base_1.TransactionRevertedError; } });
+Object.defineProperty(exports, "SpvVaultData", { enumerable: true, get: function () { return base_1.SpvVaultData; } });
+Object.defineProperty(exports, "SpvWithdrawalTransactionData", { enumerable: true, get: function () { return base_1.SpvWithdrawalTransactionData; } });
+Object.defineProperty(exports, "SwapData", { enumerable: true, get: function () { return base_1.SwapData; } });
+var btc_mempool_1 = require("@atomiqlabs/btc-mempool");
+Object.defineProperty(exports, "MempoolApi", { enumerable: true, get: function () { return btc_mempool_1.MempoolApi; } });
+Object.defineProperty(exports, "MempoolBitcoinRpc", { enumerable: true, get: function () { return btc_mempool_1.MempoolBitcoinRpc; } });
+Object.defineProperty(exports, "MempoolApiError", { enumerable: true, get: function () { return btc_mempool_1.MempoolApiError; } });
 __exportStar(require("./bitcoin/wallet/BitcoinWallet"), exports);
 __exportStar(require("./bitcoin/wallet/IBitcoinWallet"), exports);
-__exportStar(require("./bitcoin/wallet/MinimalBitcoinWalletInterface"), exports);
-__exportStar(require("./bitcoin/wallet/MinimalLightningNetworkWalletInterface"), exports);
+__exportStar(require("./types/wallets/MinimalBitcoinWalletInterface"), exports);
+__exportStar(require("./types/wallets/MinimalLightningNetworkWalletInterface"), exports);
 __exportStar(require("./bitcoin/wallet/SingleAddressBitcoinWallet"), exports);
 __exportStar(require("./enums/FeeType"), exports);
 __exportStar(require("./enums/SwapAmountType"), exports);

package/dist/intermediaries/Intermediary.d.ts

@@ -1,7 +1,6 @@
 import { SwapType } from "../enums/SwapType";
 import { SwapHandlerInfoType } from "./IntermediaryDiscovery";
-import { ChainSwapType, SwapContract } from "@atomiqlabs/base";
-import { LNNodeLiquidity } from "../bitcoin/LightningNetworkApi";
+import { ChainSwapType, LNNodeLiquidity, SwapContract } from "@atomiqlabs/base";
 /**
  * Services offered by an intermediary
  * @category Pricing and LPs

package/dist/intermediaries/apis/TrustedIntermediaryAPI.d.ts

@@ -91,6 +91,7 @@ export type TrustedFromBTCLNInit = {
 declare const TrustedFromBTCLNResponseSchema: {
     readonly pr: FieldTypeEnum.String;
     readonly swapFee: FieldTypeEnum.BigInt;
+    readonly swapFeeSats: FieldTypeEnum.BigInt;
     readonly total: FieldTypeEnum.BigInt;
 };
 export type TrustedFromBTCLNResponseType = RequestSchemaResult<typeof TrustedFromBTCLNResponseSchema>;

package/dist/intermediaries/apis/TrustedIntermediaryAPI.js

@@ -40,6 +40,7 @@ var InvoiceStatusResponseCodes;
 const TrustedFromBTCLNResponseSchema = {
     pr: SchemaVerifier_1.FieldTypeEnum.String,
     swapFee: SchemaVerifier_1.FieldTypeEnum.BigInt,
+    swapFeeSats: SchemaVerifier_1.FieldTypeEnum.BigInt,
     total: SchemaVerifier_1.FieldTypeEnum.BigInt
 };
 class TrustedIntermediaryAPI {

package/dist/swapper/Swapper.d.ts

@@ -33,14 +33,12 @@ import { FromBTCLNAutoSwap } from "../swaps/escrow_swaps/frombtc/ln_auto/FromBTC
 import { SwapAmountType } from "../enums/SwapAmountType";
 import { IClaimableSwap } from "../swaps/IClaimableSwap";
 import { SwapTypeMapping } from "../utils/SwapUtils";
-import { MempoolBitcoinBlock } from "../bitcoin/mempool/MempoolBitcoinBlock";
-import { MempoolBitcoinRpc } from "../bitcoin/mempool/MempoolBitcoinRpc";
-import { MempoolApi } from "../bitcoin/mempool/MempoolApi";
 import { TokenAmount } from "../types/TokenAmount";
 import { BtcToken, SCToken, Token } from "../types/Token";
 import { LNURLWithdraw } from "../types/lnurl/LNURLWithdraw";
 import { LNURLPay } from "../types/lnurl/LNURLPay";
 import { NotNever } from "../utils/TypeUtils";
+import { MempoolApi, MempoolBitcoinBlock, MempoolBitcoinRpc } from "@atomiqlabs/btc-mempool";
 /**
  * Configuration options for the Swapper
  * @category Core
@@ -317,16 +315,16 @@ export declare class Swapper<T extends MultiChain> extends EventEmitter<{
     create<C extends ChainIds<T>>(signer: string, srcToken: BtcToken<false>, dstToken: SCToken<C>, amount: bigint, exactIn: boolean): Promise<(SupportsSwapType<T[C], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCSwap<T[C]> : FromBTCSwap<T[C]>)>;
     create<C extends ChainIds<T>>(signer: string, srcToken: SCToken<C>, dstToken: BtcToken<false>, amount: bigint, exactIn: boolean, address: string): Promise<ToBTCSwap<T[C]>>;
     create<C extends ChainIds<T>>(signer: string, srcToken: SCToken<C>, dstToken: BtcToken<true>, amount: bigint, exactIn: boolean, lnurlPay: string | LNURLPay): Promise<ToBTCLNSwap<T[C]>>;
-    create<C extends ChainIds<T>>(signer: string, srcToken: SCToken<C>, dstToken: BtcToken<true>, amount: bigint, exactIn: false, lightningInvoice: string): Promise<ToBTCLNSwap<T[C]>>;
-    create<C extends ChainIds<T>>(signer: string, srcToken: Token<C>, dstToken: Token<C>, amount: bigint, exactIn: boolean, addressLnurlLightningInvoice?: string | LNURLWithdraw | LNURLPay): Promise<ISwap<T[C]>>;
+    create<C extends ChainIds<T>>(signer: string, srcToken: SCToken<C>, dstToken: BtcToken<true>, amount: undefined, exactIn: false, lightningInvoice: string): Promise<ToBTCLNSwap<T[C]>>;
+    create<C extends ChainIds<T>>(signer: string, srcToken: Token<C>, dstToken: Token<C>, amount: bigint | undefined, exactIn: boolean, addressLnurlLightningInvoice?: string | LNURLWithdraw | LNURLPay): Promise<ISwap<T[C]>>;
     swap<C extends ChainIds<T>>(srcToken: BtcToken<true>, dstToken: SCToken<C>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: undefined | string | LNURLWithdraw, dstSmartchainWallet: string, options?: (SupportsSwapType<T[C], SwapType.FROM_BTCLN_AUTO> extends true ? FromBTCLNAutoOptions : FromBTCLNOptions)): Promise<(SupportsSwapType<T[C], SwapType.FROM_BTCLN_AUTO> extends true ? FromBTCLNAutoSwap<T[C]> : FromBTCLNSwap<T[C]>)>;
     swap<C extends ChainIds<T>>(srcToken: BtcToken<false>, dstToken: SCToken<C>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: undefined | string, dstSmartchainWallet: string, options?: (SupportsSwapType<T[C], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCOptions : FromBTCOptions)): Promise<(SupportsSwapType<T[C], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCSwap<T[C]> : FromBTCSwap<T[C]>)>;
     swap<C extends ChainIds<T>>(srcToken: SCToken<C>, dstToken: BtcToken<false>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: string, dstAddress: string, options?: ToBTCOptions): Promise<ToBTCSwap<T[C]>>;
     swap<C extends ChainIds<T>>(srcToken: SCToken<C>, dstToken: BtcToken<true>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: string, dstLnurlPayOrInvoiceCreateService: string | LNURLPay | InvoiceCreateService, options?: ToBTCLNOptions & {
         comment?: string;
     }): Promise<ToBTCLNSwap<T[C]>>;
-    swap<C extends ChainIds<T>>(srcToken: SCToken<C>, dstToken: BtcToken<true>, amount: bigint | string, exactIn: false | SwapAmountType.EXACT_OUT, src: string, dstLightningInvoice: string, options?: ToBTCLNOptions): Promise<ToBTCLNSwap<T[C]>>;
-    swap<C extends ChainIds<T>>(srcToken: Token<C> | string, dstToken: Token<C> | string, amount: bigint | string, exactIn: boolean | SwapAmountType, src: undefined | string | LNURLWithdraw, dst: string | LNURLPay | InvoiceCreateService, options?: FromBTCLNOptions | SpvFromBTCOptions | FromBTCOptions | ToBTCOptions | (ToBTCLNOptions & {
+    swap<C extends ChainIds<T>>(srcToken: SCToken<C>, dstToken: BtcToken<true>, amount: undefined, exactIn: false | SwapAmountType.EXACT_OUT, src: string, dstLightningInvoice: string, options?: ToBTCLNOptions): Promise<ToBTCLNSwap<T[C]>>;
+    swap<C extends ChainIds<T>>(srcToken: Token<C> | string, dstToken: Token<C> | string, amount: bigint | string | undefined, exactIn: boolean | SwapAmountType, src: undefined | string | LNURLWithdraw, dst: string | LNURLPay | InvoiceCreateService, options?: FromBTCLNOptions | SpvFromBTCOptions | FromBTCOptions | ToBTCOptions | (ToBTCLNOptions & {
         comment?: string;
     }) | FromBTCLNAutoOptions): Promise<ISwap<T[C]>>;
     /**

package/dist/swapper/Swapper.js

@@ -25,7 +25,6 @@ const FromBTCLNAutoWrapper_1 = require("../swaps/escrow_swaps/frombtc/ln_auto/Fr
 const UserError_1 = require("../errors/UserError");
 const AutomaticClockDriftCorrection_1 = require("../utils/AutomaticClockDriftCorrection");
 const SwapUtils_1 = require("../utils/SwapUtils");
-const MempoolBtcRelaySynchronizer_1 = require("../bitcoin/mempool/synchronizer/MempoolBtcRelaySynchronizer");
 const IndexedDBUnifiedStorage_1 = require("../storage-browser/IndexedDBUnifiedStorage");
 const TokenAmount_1 = require("../types/TokenAmount");
 const Token_1 = require("../types/Token");
@@ -33,6 +32,7 @@ const Logger_1 = require("../utils/Logger");
 const LNURLWithdraw_1 = require("../types/lnurl/LNURLWithdraw");
 const LNURLPay_1 = require("../types/lnurl/LNURLPay");
 const RetryUtils_1 = require("../utils/RetryUtils");
+const btc_mempool_1 = require("@atomiqlabs/btc-mempool");
 /**
  * Core orchestrator for all swap operations with multi-chain support
  * @category Core
@@ -125,7 +125,7 @@ class Swapper extends events_1.EventEmitter {
         };
         this.chains = (0, Utils_1.objectMap)(chainsData, (chainData, key) => {
             const { swapContract, chainEvents, btcRelay, chainInterface, spvVaultContract, spvVaultWithdrawalDataConstructor } = chainData;
-            const synchronizer = new MempoolBtcRelaySynchronizer_1.MempoolBtcRelaySynchronizer(btcRelay, bitcoinRpc);
+            const synchronizer = new btc_mempool_1.MempoolBtcRelaySynchronizer(btcRelay, bitcoinRpc);
             const storageHandler = swapStorage(storagePrefix + chainData.chainId);
             const unifiedSwapStorage = new UnifiedSwapStorage_1.UnifiedSwapStorage(storageHandler, this.options.noSwapCache);
             const unifiedChainEvents = new UnifiedSwapEventListener_1.UnifiedSwapEventListener(unifiedSwapStorage, chainEvents);
@@ -349,7 +349,7 @@ class Swapper extends events_1.EventEmitter {
         }
         let swapLimitsChanged = false;
         if (candidates.length === 0) {
-            this.logger.warn("createSwap(): No valid intermediary found, reloading intermediary database...");
+            this.logger.warn("createSwap(): No valid intermediary found to execute the swap with, reloading intermediary database...");
             await this.intermediaryDiscovery.reloadIntermediaries();
             swapLimitsChanged = true;
             if (!inBtc) {
@@ -363,14 +363,14 @@ class Swapper extends events_1.EventEmitter {
                     const max = this.intermediaryDiscovery.getSwapMaximum(chainIdentifier, swapType, amountData.token);
                     if (min != null && max != null) {
                         if (amountData.amount < BigInt(min))
-                            throw new RequestError_1.OutOfBoundsError("Amount too low!", 200, BigInt(min), BigInt(max));
+                            throw new RequestError_1.OutOfBoundsError("Swap amount too low! Try swapping a higher amount.", 200, BigInt(min), BigInt(max));
                         if (amountData.amount > BigInt(max))
-                            throw new RequestError_1.OutOfBoundsError("Amount too high!", 200, BigInt(min), BigInt(max));
+                            throw new RequestError_1.OutOfBoundsError("Swap amount too high! Try swapping a lower amount.", 200, BigInt(min), BigInt(max));
                     }
                 }
             }
             if (candidates.length === 0)
-                throw new Error("No intermediary found!");
+                throw new Error("No intermediary found for the requested pair and amount! You can try swapping different pair or higher/lower amount.");
         }
         const abortController = new AbortController();
         this.logger.debug("createSwap() Swap candidates: ", candidates.map(lp => lp.url).join());

package/dist/swapper/SwapperFactory.d.ts

@@ -1,11 +1,10 @@
 import { ChainType, StorageObject, IStorageManager, Messenger, ChainInitializer } from "@atomiqlabs/base";
 import { Swapper, SwapperOptions } from "./Swapper";
-import { MempoolApi } from "../bitcoin/mempool/MempoolApi";
-import { MempoolBitcoinRpc } from "../bitcoin/mempool/MempoolBitcoinRpc";
 import { BtcToken, SCToken } from "../types/Token";
 import { SwapType } from "../enums/SwapType";
 import { SwapTypeMapping } from "../utils/SwapUtils";
 import { CustomPriceFunction } from "../types/CustomPriceFunction";
+import { MempoolApi, MempoolBitcoinRpc } from "@atomiqlabs/btc-mempool";
 type ChainTypeDict<T extends ChainInitializer<any, any, any>> = {
     [K in T["chainId"]]: T["chainType"];
 };

package/dist/swapper/SwapperFactory.js

@@ -5,12 +5,12 @@ const base_1 = require("@atomiqlabs/base");
 const SmartChainAssets_1 = require("../SmartChainAssets");
 const messenger_nostr_1 = require("@atomiqlabs/messenger-nostr");
 const Swapper_1 = require("./Swapper");
-const MempoolBitcoinRpc_1 = require("../bitcoin/mempool/MempoolBitcoinRpc");
 const CustomPriceProvider_1 = require("../prices/providers/CustomPriceProvider");
 const Token_1 = require("../types/Token");
 const RedundantSwapPrice_1 = require("../prices/RedundantSwapPrice");
 const LocalStorageManager_1 = require("../storage-browser/LocalStorageManager");
 const SingleSwapPrice_1 = require("../prices/SingleSwapPrice");
+const btc_mempool_1 = require("@atomiqlabs/btc-mempool");
 const registries = {
     [base_1.BitcoinNetwork.MAINNET]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry-mainnet.json?ref=main",
     [base_1.BitcoinNetwork.TESTNET]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry.json?ref=main",
@@ -86,13 +86,13 @@ class SwapperFactory {
         options.registryUrl ??= registries[options.bitcoinNetwork];
         let bitcoinRpc;
         if (options.mempoolApi != null) {
-            bitcoinRpc = options.mempoolApi instanceof MempoolBitcoinRpc_1.MempoolBitcoinRpc ? options.mempoolApi : new MempoolBitcoinRpc_1.MempoolBitcoinRpc(options.mempoolApi);
+            bitcoinRpc = options.mempoolApi instanceof btc_mempool_1.MempoolBitcoinRpc ? options.mempoolApi : new btc_mempool_1.MempoolBitcoinRpc(options.mempoolApi);
         }
         else {
             const urls = mempoolUrls[options.bitcoinNetwork];
             if (urls == null)
                 throw new Error(`No pre-configured urls for ${base_1.BitcoinNetwork[options.bitcoinNetwork]} network were found, please explicitly pass mempoolApi parameter!`);
-            bitcoinRpc = new MempoolBitcoinRpc_1.MempoolBitcoinRpc(urls);
+            bitcoinRpc = new btc_mempool_1.MempoolBitcoinRpc(urls);
         }
         const pricingAssets = [];
         Object.keys(SmartChainAssets_1.SmartChainAssets).forEach((ticker) => {

package/dist/swapper/SwapperUtils.d.ts

@@ -3,7 +3,7 @@ import { BTC_NETWORK } from "@scure/btc-signer/utils";
 import { SwapType } from "../enums/SwapType";
 import { ChainIds, MultiChain, Swapper } from "./Swapper";
 import { IBitcoinWallet } from "../bitcoin/wallet/IBitcoinWallet";
-import { MinimalBitcoinWalletInterface } from "../bitcoin/wallet/MinimalBitcoinWalletInterface";
+import { MinimalBitcoinWalletInterface } from "../types/wallets/MinimalBitcoinWalletInterface";
 import { TokenAmount } from "../types/TokenAmount";
 import { SCToken } from "../types/Token";
 import { LNURLWithdraw } from "../types/lnurl/LNURLWithdraw";

package/dist/swapper/SwapperWithChain.d.ts

@@ -9,8 +9,6 @@ import { FromBTCSwap } from "../swaps/escrow_swaps/frombtc/onchain/FromBTCSwap";
 import { ToBTCLNSwap } from "../swaps/escrow_swaps/tobtc/ln/ToBTCLNSwap";
 import { ToBTCSwap } from "../swaps/escrow_swaps/tobtc/onchain/ToBTCSwap";
 import { SwapPriceWithChain } from "../prices/SwapPriceWithChain";
-import { MempoolApi } from "../bitcoin/mempool/MempoolApi";
-import { MempoolBitcoinRpc } from "../bitcoin/mempool/MempoolBitcoinRpc";
 import { BTC_NETWORK } from "@scure/btc-signer/utils";
 import { ToBTCOptions } from "../swaps/escrow_swaps/tobtc/onchain/ToBTCWrapper";
 import { InvoiceCreateService, ToBTCLNOptions } from "../swaps/escrow_swaps/tobtc/ln/ToBTCLNWrapper";
@@ -29,6 +27,7 @@ import { TokenAmount } from "../types/TokenAmount";
 import { BtcToken, SCToken, Token } from "../types/Token";
 import { LNURLWithdraw } from "../types/lnurl/LNURLWithdraw";
 import { LNURLPay } from "../types/lnurl/LNURLPay";
+import { MempoolApi, MempoolBitcoinRpc } from "@atomiqlabs/btc-mempool";
 /**
  * Chain-specific wrapper around Swapper for a particular blockchain
  * @category Core
@@ -102,15 +101,15 @@ export declare class SwapperWithChain<T extends MultiChain, ChainIdentifier exte
     create(signer: string, srcToken: BtcToken<false>, dstToken: SCToken<ChainIdentifier>, amount: bigint, exactIn: boolean): Promise<(SupportsSwapType<T[ChainIdentifier], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCSwap<T[ChainIdentifier]> : FromBTCSwap<T[ChainIdentifier]>)>;
     create(signer: string, srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<false>, amount: bigint, exactIn: boolean, address: string): Promise<ToBTCSwap<T[ChainIdentifier]>>;
     create(signer: string, srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: bigint, exactIn: boolean, lnurlPay: string | LNURLPay): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
-    create(signer: string, srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: bigint, exactIn: false, lightningInvoice: string | LNURLWithdraw | LNURLPay): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
+    create(signer: string, srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: undefined, exactIn: false, lightningInvoice: string): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
     swap(srcToken: BtcToken<true>, dstToken: SCToken<ChainIdentifier>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: undefined | string | LNURLWithdraw, dstSmartchainWallet: string, options?: (SupportsSwapType<T[ChainIdentifier], SwapType.FROM_BTCLN_AUTO> extends true ? FromBTCLNAutoOptions : FromBTCLNOptions)): Promise<SupportsSwapType<T[ChainIdentifier], SwapType.FROM_BTCLN_AUTO> extends true ? FromBTCLNAutoSwap<T[ChainIdentifier]> : FromBTCLNSwap<T[ChainIdentifier]>>;
     swap(srcToken: BtcToken<false>, dstToken: SCToken<ChainIdentifier>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: undefined | string, dstSmartchainWallet: string, options?: (SupportsSwapType<T[ChainIdentifier], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCOptions : FromBTCOptions)): Promise<(SupportsSwapType<T[ChainIdentifier], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCSwap<T[ChainIdentifier]> : FromBTCSwap<T[ChainIdentifier]>)>;
     swap(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<false>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: string, dstAddress: string, options?: ToBTCOptions): Promise<ToBTCSwap<T[ChainIdentifier]>>;
     swap(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: bigint | string, exactIn: boolean | SwapAmountType, src: string, dstLnurlPayOrInvoiceCreateService: string | LNURLPay | InvoiceCreateService, options?: ToBTCLNOptions & {
         comment?: string;
     }): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
-    swap(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: bigint | string, exactIn: false | SwapAmountType.EXACT_OUT, src: string, dstLightningInvoice: string, options?: ToBTCLNOptions): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
-    swap(srcToken: Token<ChainIdentifier> | string, dstToken: Token<ChainIdentifier> | string, amount: bigint | string, exactIn: boolean | SwapAmountType, src: undefined | string | LNURLWithdraw, dst: string | LNURLPay | InvoiceCreateService, options?: FromBTCLNOptions | SpvFromBTCOptions | FromBTCOptions | ToBTCOptions | (ToBTCLNOptions & {
+    swap(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: undefined, exactIn: false | SwapAmountType.EXACT_OUT, src: string, dstLightningInvoice: string, options?: ToBTCLNOptions): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
+    swap(srcToken: Token<ChainIdentifier> | string, dstToken: Token<ChainIdentifier> | string, amount: bigint | string | undefined, exactIn: boolean | SwapAmountType, src: undefined | string | LNURLWithdraw, dst: string | LNURLPay | InvoiceCreateService, options?: FromBTCLNOptions | SpvFromBTCOptions | FromBTCOptions | ToBTCOptions | (ToBTCLNOptions & {
         comment?: string;
     }) | FromBTCLNAutoOptions): Promise<ISwap<T[ChainIdentifier]>>;
     /**

package/dist/swapper/SwapperWithSigner.d.ts

@@ -9,8 +9,6 @@ import { FromBTCSwap } from "../swaps/escrow_swaps/frombtc/onchain/FromBTCSwap";
 import { ToBTCLNSwap } from "../swaps/escrow_swaps/tobtc/ln/ToBTCLNSwap";
 import { ToBTCSwap } from "../swaps/escrow_swaps/tobtc/onchain/ToBTCSwap";
 import { SwapPriceWithChain } from "../prices/SwapPriceWithChain";
-import { MempoolApi } from "../bitcoin/mempool/MempoolApi";
-import { MempoolBitcoinRpc } from "../bitcoin/mempool/MempoolBitcoinRpc";
 import { BTC_NETWORK } from "@scure/btc-signer/utils";
 import { ToBTCOptions } from "../swaps/escrow_swaps/tobtc/onchain/ToBTCWrapper";
 import { ToBTCLNOptions } from "../swaps/escrow_swaps/tobtc/ln/ToBTCLNWrapper";
@@ -27,6 +25,7 @@ import { TokenAmount } from "../types/TokenAmount";
 import { BtcToken, SCToken, Token } from "../types/Token";
 import { LNURLWithdraw } from "../types/lnurl/LNURLWithdraw";
 import { LNURLPay } from "../types/lnurl/LNURLPay";
+import { MempoolApi, MempoolBitcoinRpc } from "@atomiqlabs/btc-mempool";
 /**
  * Chain and signer-specific wrapper for automatic signer injection into swap methods
  * @category Core
@@ -100,7 +99,7 @@ export declare class SwapperWithSigner<T extends MultiChain, ChainIdentifier ext
     create(srcToken: BtcToken<false>, dstToken: SCToken<ChainIdentifier>, amount: bigint, exactIn: boolean): Promise<(SupportsSwapType<T[ChainIdentifier], SwapType.SPV_VAULT_FROM_BTC> extends true ? SpvFromBTCSwap<T[ChainIdentifier]> : FromBTCSwap<T[ChainIdentifier]>)>;
     create(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<false>, amount: bigint, exactIn: boolean, address: string): Promise<ToBTCSwap<T[ChainIdentifier]>>;
     create(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: bigint, exactIn: boolean, lnurlPay: string | LNURLPay): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
-    create(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: bigint, exactIn: false, lightningInvoice: string | LNURLWithdraw | LNURLPay): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
+    create(srcToken: SCToken<ChainIdentifier>, dstToken: BtcToken<true>, amount: undefined, exactIn: false, lightningInvoice: string): Promise<ToBTCLNSwap<T[ChainIdentifier]>>;
     /**
      * Returns swaps that are in-progress and are claimable for the specific chain, optionally also for a specific signer's address
      */

package/dist/swaps/IBTCWalletSwap.d.ts

@@ -1,6 +1,6 @@
 import { IBitcoinWallet } from "../bitcoin/wallet/IBitcoinWallet";
 import { Transaction } from "@scure/btc-signer";
-import { MinimalBitcoinWalletInterface, MinimalBitcoinWalletInterfaceWithSigner } from "../bitcoin/wallet/MinimalBitcoinWalletInterface";
+import { MinimalBitcoinWalletInterface, MinimalBitcoinWalletInterfaceWithSigner } from "../types/wallets/MinimalBitcoinWalletInterface";
 import { TokenAmount } from "../types/TokenAmount";
 import { BtcToken } from "../types/Token";
 /**

package/dist/swaps/ISwap.d.ts

@@ -158,7 +158,7 @@ export declare abstract class ISwap<T extends ChainType = ChainType, D extends S
     /**
      * Returns output amount of the swap, user receives this much
      */
-    abstract getOutput(): TokenAmount | null;
+    abstract getOutput(): TokenAmount;
     /**
      * Returns the output token of the swap
      */
@@ -166,7 +166,7 @@ export declare abstract class ISwap<T extends ChainType = ChainType, D extends S
     /**
      * Returns input amount of the swap, user needs to pay this much
      */
-    abstract getInput(): TokenAmount | null;
+    abstract getInput(): TokenAmount;
     /**
      * Returns the input token of the swap
      */
@@ -174,7 +174,7 @@ export declare abstract class ISwap<T extends ChainType = ChainType, D extends S
     /**
      * Returns input amount if the swap without the fees (swap fee, network fee)
      */
-    abstract getInputWithoutFee(): TokenAmount | null;
+    abstract getInputWithoutFee(): TokenAmount;
     /**
      * Returns total fee for the swap, the fee is represented in source currency & destination currency, but is
      *  paid only once

package/dist/swaps/ISwap.js

@@ -113,7 +113,7 @@ class ISwap {
             const priceUsdPerBtc = this.pricingInfo.realPriceUsdPerBitcoin;
             const input = this.getInput();
             const output = this.getOutput();
-            if (input == null || output == null)
+            if (input.isUnknown || output.isUnknown)
                 return;
             if ((0, Token_1.isSCToken)(input.token) && this.getDirection() === SwapDirection_1.SwapDirection.TO_BTC) {
                 this.pricingInfo = this.wrapper.prices.recomputePriceInfoSend(this.chainIdentifier, output.rawAmount, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, input.rawAmount, input.token.address);
@@ -134,7 +134,7 @@ class ISwap {
         const priceUsdPerBtc = this.pricingInfo.realPriceUsdPerBitcoin;
         const input = this.getInput();
         const output = this.getOutput();
-        if (input == null || output == null)
+        if (input.isUnknown || output.isUnknown)
             return;
         if ((0, Token_1.isSCToken)(input.token) && this.getDirection() === SwapDirection_1.SwapDirection.TO_BTC) {
             this.pricingInfo = await this.wrapper.prices.isValidAmountSend(this.chainIdentifier, output.rawAmount, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, input.rawAmount, input.token.address);

package/dist/swaps/escrow_swaps/IEscrowSelfInitSwap.d.ts

@@ -30,14 +30,14 @@ export declare abstract class IEscrowSelfInitSwap<T extends ChainType = ChainTyp
     /**
      * Returns the transaction fee paid on the smart chain
      */
-    getSmartChainNetworkFee(): Promise<TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>>;
+    getSmartChainNetworkFee(): Promise<TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>>;
     /**
      * Checks if the initiator/sender has enough balance to cover the transaction fee for processing the swap
      */
     abstract hasEnoughForTxFees(): Promise<{
         enoughBalance: boolean;
-        balance: TokenAmount;
-        required: TokenAmount;
+        balance: TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
+        required: TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     }>;
     abstract txsCommit(skipChecks?: boolean): Promise<T["TX"][]>;
     abstract commit(_signer: T["Signer"] | T["NativeSigner"], abortSignal?: AbortSignal, skipChecks?: boolean, onBeforeTxSent?: (txId: string) => void): Promise<string>;

package/dist/swaps/escrow_swaps/frombtc/IFromBTCLNWrapper.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { ChainType, SwapData } from "@atomiqlabs/base";
+import { ChainType, LightningNetworkApi, LNNodeLiquidity, SwapData } from "@atomiqlabs/base";
 import { IFromBTCDefinition, IFromBTCWrapper } from "./IFromBTCWrapper";
 import { ISwapWrapperOptions, WrapperCtorTokens } from "../../ISwapWrapper";
-import { LightningNetworkApi, LNNodeLiquidity } from "../../../bitcoin/LightningNetworkApi";
 import { UnifiedSwapStorage } from "../../../storage/UnifiedSwapStorage";
 import { UnifiedSwapEventListener } from "../../../events/UnifiedSwapEventListener";
 import { ISwapPrice } from "../../../prices/abstract/ISwapPrice";

package/dist/swaps/escrow_swaps/frombtc/IFromBTCSelfInitSwap.d.ts

@@ -42,15 +42,15 @@ export declare abstract class IFromBTCSelfInitSwap<T extends ChainType = ChainTy
         fee: Fee<T["ChainId"], BtcToken, SCToken<T["ChainId"]>>;
     }];
     getOutputToken(): SCToken<T["ChainId"]>;
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>;
+    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     abstract getInput(): TokenAmount<T["ChainId"], BtcToken>;
     getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken>;
-    getSecurityDeposit(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>;
-    getTotalDeposit(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>;
+    getSecurityDeposit(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
+    getTotalDeposit(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     hasEnoughForTxFees(): Promise<{
         enoughBalance: boolean;
-        balance: TokenAmount;
-        required: TokenAmount;
+        balance: TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
+        required: TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     }>;
     /**
      * Returns the transactions required for committing the swap on-chain, locking the tokens from the intermediary

package/dist/swaps/escrow_swaps/frombtc/IFromBTCSelfInitSwap.js

@@ -15,8 +15,9 @@ class IFromBTCSelfInitSwap extends IEscrowSelfInitSwap_1.IEscrowSelfInitSwap {
      * @protected
      */
     tryRecomputeSwapPrice() {
-        if (this.swapFeeBtc == null) {
-            this.swapFeeBtc = this.swapFee * this.getInput().rawAmount / this.getOutAmountWithoutFee();
+        const input = this.getInput();
+        if (this.swapFeeBtc == null && input.rawAmount != null) {
+            this.swapFeeBtc = this.swapFee * input.rawAmount / this.getOutAmountWithoutFee();
         }
         super.tryRecomputeSwapPrice();
     }
@@ -41,7 +42,8 @@ class IFromBTCSelfInitSwap extends IEscrowSelfInitSwap_1.IEscrowSelfInitSwap {
         if (this.pricingInfo == null)
             throw new Error("No pricing info known, cannot estimate fee!");
         const feeWithoutBaseFee = this.swapFeeBtc - this.pricingInfo.satsBaseFee;
-        const swapFeePPM = feeWithoutBaseFee * 1000000n / this.getInputWithoutFee().rawAmount;
+        const inputWithoutFee = this.getInputWithoutFee();
+        const swapFeePPM = inputWithoutFee.rawAmount == null ? 0n : feeWithoutBaseFee * 1000000n / inputWithoutFee.rawAmount;
         const amountInSrcToken = (0, TokenAmount_1.toTokenAmount)(this.swapFeeBtc, this.inputToken, this.wrapper.prices, this.pricingInfo);
         return {
             amountInSrcToken,
@@ -71,7 +73,10 @@ class IFromBTCSelfInitSwap extends IEscrowSelfInitSwap_1.IEscrowSelfInitSwap {
         return (0, TokenAmount_1.toTokenAmount)(this.getSwapData().getAmount(), this.wrapper.tokens[this.getSwapData().getToken()], this.wrapper.prices, this.pricingInfo);
     }
     getInputWithoutFee() {
-        return (0, TokenAmount_1.toTokenAmount)(this.getInput().rawAmount - this.swapFeeBtc, this.inputToken, this.wrapper.prices, this.pricingInfo);
+        const input = this.getInput();
+        if (input.rawAmount == null)
+            return (0, TokenAmount_1.toTokenAmount)(null, this.inputToken, this.wrapper.prices, this.pricingInfo);
+        return (0, TokenAmount_1.toTokenAmount)(input.rawAmount - this.swapFeeBtc, this.inputToken, this.wrapper.prices, this.pricingInfo);
     }
     getSecurityDeposit() {
         return (0, TokenAmount_1.toTokenAmount)(this.getSwapData().getSecurityDeposit(), this.wrapper.getNativeToken(), this.wrapper.prices, this.pricingInfo);

package/dist/swaps/escrow_swaps/frombtc/ln/FromBTCLNSwap.d.ts

@@ -5,7 +5,7 @@ import { IFromBTCSelfInitSwap } from "../IFromBTCSelfInitSwap";
 import { SwapType } from "../../../../enums/SwapType";
 import { ChainType, SignatureData, SwapCommitState, SwapData } from "@atomiqlabs/base";
 import { Buffer } from "buffer";
-import { MinimalLightningNetworkWalletInterface } from "../../../../bitcoin/wallet/MinimalLightningNetworkWalletInterface";
+import { MinimalLightningNetworkWalletInterface } from "../../../../types/wallets/MinimalLightningNetworkWalletInterface";
 import { IClaimableSwap } from "../../../IClaimableSwap";
 import { IAddressSwap } from "../../../IAddressSwap";
 import { IEscrowSelfInitSwapInit } from "../../IEscrowSelfInitSwap";
@@ -85,11 +85,11 @@ export declare class FromBTCLNSwap<T extends ChainType = ChainType> extends IFro
     verifyQuoteValid(): Promise<boolean>;
     getInputToken(): BtcToken<true>;
     getInput(): TokenAmount<T["ChainId"], BtcToken<true>>;
-    getSmartChainNetworkFee(): Promise<TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>>;
+    getSmartChainNetworkFee(): Promise<TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>>;
     hasEnoughForTxFees(): Promise<{
         enoughBalance: boolean;
-        balance: TokenAmount;
-        required: TokenAmount;
+        balance: TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
+        required: TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     }>;
     /**
      * Executes the swap with the provided bitcoin lightning network wallet or LNURL

package/dist/swaps/escrow_swaps/frombtc/ln/FromBTCLNWrapper.d.ts

@@ -2,11 +2,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { FromBTCLNSwap, FromBTCLNSwapState } from "./FromBTCLNSwap";
-import { ChainType, ClaimEvent, InitializeEvent, RefundEvent } from "@atomiqlabs/base";
+import { ChainType, ClaimEvent, InitializeEvent, LightningNetworkApi, RefundEvent } from "@atomiqlabs/base";
 import { Intermediary } from "../../../../intermediaries/Intermediary";
 import { Buffer } from "buffer";
 import { SwapType } from "../../../../enums/SwapType";
-import { LightningNetworkApi } from "../../../../bitcoin/LightningNetworkApi";
 import { ISwapPrice } from "../../../../prices/abstract/ISwapPrice";
 import { EventEmitter } from "events";
 import { ISwapWrapperOptions, WrapperCtorTokens } from "../../../ISwapWrapper";

package/dist/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoSwap.d.ts

@@ -7,7 +7,7 @@ import { Fee } from "../../../../types/fees/Fee";
 import { IAddressSwap } from "../../../IAddressSwap";
 import { FromBTCLNAutoDefinition, FromBTCLNAutoWrapper } from "./FromBTCLNAutoWrapper";
 import { ISwapWithGasDrop } from "../../../ISwapWithGasDrop";
-import { MinimalLightningNetworkWalletInterface } from "../../../../bitcoin/wallet/MinimalLightningNetworkWalletInterface";
+import { MinimalLightningNetworkWalletInterface } from "../../../../types/wallets/MinimalLightningNetworkWalletInterface";
 import { IClaimableSwap } from "../../../IClaimableSwap";
 import { IEscrowSwap, IEscrowSwapInit } from "../../IEscrowSwap";
 import { FeeType } from "../../../../enums/FeeType";
@@ -111,10 +111,10 @@ export declare class FromBTCLNAutoSwap<T extends ChainType = ChainType> extends
     protected getOutputAmountWithoutFee(): bigint;
     getInputToken(): BtcToken<true>;
     getInput(): TokenAmount<T["ChainId"], BtcToken<true>>;
-    getInputWithoutFee(): TokenAmount;
+    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<true>>;
     getOutputToken(): SCToken<T["ChainId"]>;
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>;
-    getGasDropOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>;
+    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
+    getGasDropOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     protected getSwapFee(): Fee<T["ChainId"], BtcToken<true>, SCToken<T["ChainId"]>>;
     protected getWatchtowerFee(): Fee<T["ChainId"], BtcToken<true>, SCToken<T["ChainId"]>>;
     getFee(): Fee<T["ChainId"], BtcToken<true>, SCToken<T["ChainId"]>>;

package/dist/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoWrapper.d.ts

@@ -1,11 +1,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { ChainType, ClaimEvent, InitializeEvent, Messenger, RefundEvent } from "@atomiqlabs/base";
+import { ChainType, ClaimEvent, InitializeEvent, LightningNetworkApi, Messenger, RefundEvent } from "@atomiqlabs/base";
 import { Intermediary } from "../../../../intermediaries/Intermediary";
 import { Buffer } from "buffer";
 import { SwapType } from "../../../../enums/SwapType";
-import { LightningNetworkApi } from "../../../../bitcoin/LightningNetworkApi";
 import { ISwapPrice } from "../../../../prices/abstract/ISwapPrice";
 import { EventEmitter } from "events";
 import { ISwapWrapperOptions, WrapperCtorTokens } from "../../../ISwapWrapper";

package/dist/swaps/escrow_swaps/frombtc/onchain/FromBTCSwap.d.ts

@@ -5,7 +5,7 @@ import { ChainType, SwapCommitState, SwapData } from "@atomiqlabs/base";
 import { IBitcoinWallet } from "../../../../bitcoin/wallet/IBitcoinWallet";
 import { IBTCWalletSwap } from "../../../IBTCWalletSwap";
 import { Transaction } from "@scure/btc-signer";
-import { MinimalBitcoinWalletInterface, MinimalBitcoinWalletInterfaceWithSigner } from "../../../../bitcoin/wallet/MinimalBitcoinWalletInterface";
+import { MinimalBitcoinWalletInterface, MinimalBitcoinWalletInterfaceWithSigner } from "../../../../types/wallets/MinimalBitcoinWalletInterface";
 import { IClaimableSwap } from "../../../IClaimableSwap";
 import { IEscrowSelfInitSwapInit } from "../../IEscrowSelfInitSwap";
 import { IAddressSwap } from "../../../IAddressSwap";
@@ -81,7 +81,7 @@ export declare class FromBTCSwap<T extends ChainType = ChainType> extends IFromB
     /**
      * Returns claimer bounty, acting as a reward for watchtowers to claim the swap automatically
      */
-    getClaimerBounty(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>>;
+    getClaimerBounty(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true>;
     getRequiredConfirmationsCount(): number;
     /**
      * Checks whether a bitcoin payment was already made, returns the payment or null when no payment has been made.
@@ -136,7 +136,7 @@ export declare class FromBTCSwap<T extends ChainType = ChainType> extends IFromB
      * @param _psbt A psbt - either a Transaction object or a hex or base64 encoded PSBT string
      */
     submitPsbt(_psbt: Transaction | string): Promise<string>;
-    estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<any, BtcToken<false>> | null>;
+    estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<any, BtcToken<false>, true> | null>;
     sendBitcoinTransaction(wallet: IBitcoinWallet | MinimalBitcoinWalletInterfaceWithSigner, feeRate?: number): Promise<string>;
     /**
      * Executes the swap with the provided bitcoin wallet,

package/dist/swaps/escrow_swaps/frombtc/onchain/FromBTCWrapper.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
 import { IFromBTCWrapper } from "../IFromBTCWrapper";
 import { FromBTCSwap, FromBTCSwapState } from "./FromBTCSwap";
-import { ChainType, ClaimEvent, InitializeEvent, RefundEvent, RelaySynchronizer, SwapData, BtcRelay } from "@atomiqlabs/base";
+import { ChainType, ClaimEvent, InitializeEvent, RefundEvent, RelaySynchronizer, SwapData, BtcRelay, BitcoinRpcWithAddressIndex } from "@atomiqlabs/base";
 import { EventEmitter } from "events";
 import { Intermediary } from "../../../../intermediaries/Intermediary";
-import { BitcoinRpcWithAddressIndex } from "../../../../bitcoin/BitcoinRpcWithAddressIndex";
 import { ISwapPrice } from "../../../../prices/abstract/ISwapPrice";
 import { ISwapWrapperOptions, WrapperCtorTokens } from "../../../ISwapWrapper";
 import { SwapType } from "../../../../enums/SwapType";