@atomiqlabs/sdk 8.6.4 → 8.6.5

package/dist/prices/abstract/ISwapPrice.d.ts

@@ -64,8 +64,9 @@ export declare abstract class ISwapPrice<T extends MultiChain = MultiChain> {
      * @param tokenAddress Token address to be paid
      * @param abortSignal
      * @param preFetchedPrice An optional price pre-fetched with {@link preFetchPrice}
+     * @param realSwapFeeSats
      */
-    isValidAmountSend<C extends ChainIds<T>>(chainIdentifier: C, amountSats: bigint, satsBaseFee: bigint, feePPM: bigint, paidToken: bigint, tokenAddress: string, abortSignal?: AbortSignal, preFetchedPrice?: bigint | null): Promise<PriceInfoType>;
+    isValidAmountSend<C extends ChainIds<T>>(chainIdentifier: C, amountSats: bigint, satsBaseFee: bigint, feePPM: bigint, paidToken: bigint, tokenAddress: string, abortSignal?: AbortSignal, preFetchedPrice?: bigint | null, realSwapFeeSats?: bigint): Promise<PriceInfoType>;
     /**
      * Recomputes pricing info without fetching the current price
      *
@@ -88,8 +89,9 @@ export declare abstract class ISwapPrice<T extends MultiChain = MultiChain> {
      * @param tokenAddress Token address to be received
      * @param abortSignal
      * @param preFetchedPrice An optional price pre-fetched with {@link preFetchPrice}
+     * @param realSwapFeeSats
      */
-    isValidAmountReceive<C extends ChainIds<T>>(chainIdentifier: C, amountSats: bigint, satsBaseFee: bigint, feePPM: bigint, receiveToken: bigint, tokenAddress: string, abortSignal?: AbortSignal, preFetchedPrice?: bigint | null): Promise<PriceInfoType>;
+    isValidAmountReceive<C extends ChainIds<T>>(chainIdentifier: C, amountSats: bigint, satsBaseFee: bigint, feePPM: bigint, receiveToken: bigint, tokenAddress: string, abortSignal?: AbortSignal, preFetchedPrice?: bigint | null, realSwapFeeSats?: bigint): Promise<PriceInfoType>;
     /**
      * Pre-fetches the pricing data for a given token, such that further calls to {@link isValidAmountReceive} or
      *  {@link isValidAmountSend} are quicker and don't need to wait for the price fetch

package/dist/prices/abstract/ISwapPrice.js

@@ -59,10 +59,14 @@ class ISwapPrice {
      * @param tokenAddress Token address to be paid
      * @param abortSignal
      * @param preFetchedPrice An optional price pre-fetched with {@link preFetchPrice}
+     * @param realSwapFeeSats
      */
-    async isValidAmountSend(chainIdentifier, amountSats, satsBaseFee, feePPM, paidToken, tokenAddress, abortSignal, preFetchedPrice) {
-        const totalSats = (amountSats * (1000000n + feePPM) / 1000000n)
-            + satsBaseFee;
+    async isValidAmountSend(chainIdentifier, amountSats, satsBaseFee, feePPM, paidToken, tokenAddress, abortSignal, preFetchedPrice, realSwapFeeSats) {
+        if (realSwapFeeSats != undefined && realSwapFeeSats < 0)
+            throw new Error("Invalid swap fee! Swap fee cannot be negative!");
+        const totalSats = realSwapFeeSats != undefined
+            ? amountSats + realSwapFeeSats
+            : (amountSats * (1000000n + feePPM) / 1000000n) + satsBaseFee;
         const totalUSats = totalSats * 1000000n;
         const swapPriceUSatPerToken = totalUSats * (10n ** BigInt(this.getDecimalsThrowing(chainIdentifier, tokenAddress))) / paidToken;
         if (this.shouldIgnore(chainIdentifier, tokenAddress))
@@ -122,10 +126,18 @@ class ISwapPrice {
      * @param tokenAddress Token address to be received
      * @param abortSignal
      * @param preFetchedPrice An optional price pre-fetched with {@link preFetchPrice}
+     * @param realSwapFeeSats
      */
-    async isValidAmountReceive(chainIdentifier, amountSats, satsBaseFee, feePPM, receiveToken, tokenAddress, abortSignal, preFetchedPrice) {
-        const totalSats = (amountSats * (1000000n - feePPM) / 1000000n)
-            - satsBaseFee;
+    async isValidAmountReceive(chainIdentifier, amountSats, satsBaseFee, feePPM, receiveToken, tokenAddress, abortSignal, preFetchedPrice, realSwapFeeSats) {
+        if (realSwapFeeSats != undefined) {
+            if (realSwapFeeSats >= amountSats)
+                throw new Error("Invalid swap fee! Larger than or equal to total output amount!");
+            if (realSwapFeeSats < 0)
+                throw new Error("Invalid swap fee! Must be non-negative!");
+        }
+        const totalSats = realSwapFeeSats != undefined
+            ? amountSats - realSwapFeeSats
+            : (amountSats * (1000000n - feePPM) / 1000000n) - satsBaseFee;
         const totalUSats = totalSats * 1000000n;
         const swapPriceUSatPerToken = totalUSats * (10n ** BigInt(this.getDecimalsThrowing(chainIdentifier, tokenAddress))) / receiveToken;
         if (this.shouldIgnore(chainIdentifier, tokenAddress))

package/dist/swaps/ISwap.js

@@ -164,16 +164,21 @@ class ISwap {
         if (this.pricingInfo == null)
             return;
         const priceUsdPerBtc = this.pricingInfo.realPriceUsdPerBitcoin;
-        const input = this.getInput();
         const output = this.getOutput();
-        if (input.isUnknown || output.isUnknown)
+        if (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);
+        if ((0, Token_1.isSCToken)(this.getInputToken()) && this.getDirection() === SwapDirection_1.SwapDirection.TO_BTC) {
+            const input = this.getInputWithoutFee();
+            if (input.isUnknown)
+                return;
+            this.pricingInfo = await this.wrapper._prices.isValidAmountSend(this.chainIdentifier, output.rawAmount, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, input.rawAmount + this.swapFee, input.token.address, undefined, undefined, this.swapFeeBtc);
             this.pricingInfo.realPriceUsdPerBitcoin = priceUsdPerBtc;
         }
         else if ((0, Token_1.isSCToken)(output.token) && this.getDirection() === SwapDirection_1.SwapDirection.FROM_BTC) {
-            this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(this.chainIdentifier, input.rawAmount, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, output.rawAmount, output.token.address);
+            const input = this.getInput();
+            if (input.isUnknown)
+                return;
+            this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(this.chainIdentifier, input.rawAmount, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, output.rawAmount, output.token.address, undefined, undefined, this.swapFeeBtc);
             this.pricingInfo.realPriceUsdPerBitcoin = priceUsdPerBtc;
         }
     }

package/dist/swaps/ISwapWrapper.d.ts

@@ -194,6 +194,7 @@ export declare abstract class ISwapWrapper<T extends ChainType, D extends SwapTy
         swapFeePPM: number;
     }, send: boolean, amountSats: bigint, amountToken: bigint, token: string, feeData: {
         networkFee?: bigint;
+        swapFeeBtc?: bigint;
     }, pricePrefetchPromise?: Promise<bigint | undefined>, usdPricePrefetchPromise?: Promise<number | undefined>, abortSignal?: AbortSignal): Promise<PriceInfoType>;
     /**
      * Processes a single smart chain on-chain event

package/dist/swaps/ISwapWrapper.js

@@ -114,8 +114,8 @@ class ISwapWrapper {
             amountToken = amountToken - feeData.networkFee;
         const [isValidAmount, usdPrice] = await Promise.all([
             send ?
-                this._prices.isValidAmountSend(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise) :
-                this._prices.isValidAmountReceive(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise),
+                this._prices.isValidAmountSend(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise, feeData.swapFeeBtc) :
+                this._prices.isValidAmountReceive(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise, feeData.swapFeeBtc),
             usdPricePrefetchPromise.then(value => {
                 if (value != null)
                     return value;

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

@@ -217,10 +217,11 @@ class FromBTCLNWrapper extends IFromBTCLNWrapper_1.IFromBTCLNWrapper {
                     if (decodedPr.timeExpireDate == null)
                         throw new IntermediaryError_1.IntermediaryError("Invalid returned swap invoice, no expiry date field");
                     const amountIn = (BigInt(decodedPr.millisatoshis) + 999n) / 1000n;
+                    const swapFeeBtc = resp.swapFee * amountIn / (resp.total - resp.swapFee);
                     try {
                         this.verifyReturnedData(resp, amountData, lp, _options, decodedPr, paymentHash);
                         const [pricingInfo] = await Promise.all([
-                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.FROM_BTCLN], false, amountIn, resp.total, amountData.token, {}, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal),
+                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.FROM_BTCLN], false, amountIn, resp.total, amountData.token, { swapFeeBtc }, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal),
                             this.verifyIntermediaryLiquidity(resp.total, (0, Utils_1.throwIfUndefined)(liquidityPromise)),
                             lnCapacityPromise != null ? this.verifyLnNodeCapacity(lp, decodedPr, lnCapacityPromise, abortController.signal) : Promise.resolve()
                         ]);
@@ -229,7 +230,7 @@ class FromBTCLNWrapper extends IFromBTCLNWrapper_1.IFromBTCLNWrapper {
                             url: lp.url,
                             expiry: decodedPr.timeExpireDate * 1000,
                             swapFee: resp.swapFee,
-                            swapFeeBtc: resp.swapFee * amountIn / (resp.total - resp.swapFee),
+                            swapFeeBtc,
                             feeRate: (await _preFetches.feeRatePromise),
                             initialSwapData: await this._contract.createSwapData(base_1.ChainSwapType.HTLC, lp.getAddress(this.chainIdentifier), recipient, amountData.token, resp.total, claimHash.toString("hex"), this.getRandomSequence(), BigInt(Math.floor(Date.now() / 1000)), false, true, resp.securityDeposit, 0n, nativeTokenAddress),
                             pr: resp.pr,

package/dist/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoSwap.js

@@ -206,7 +206,7 @@ class FromBTCLNAutoSwap extends IEscrowSwap_1.IEscrowSwap {
         if (this.pricingInfo == null || this.btcAmountSwap == null)
             return;
         const usdPricePerBtc = this.pricingInfo.realPriceUsdPerBitcoin;
-        this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(this.chainIdentifier, this.btcAmountSwap, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, this.getOutputAmountWithoutFee(), this.getSwapData().getToken());
+        this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(this.chainIdentifier, this.btcAmountSwap, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, this.getOutputAmountWithoutFee(), this.getSwapData().getToken(), undefined, undefined, this.swapFeeBtc);
         this.pricingInfo.realPriceUsdPerBitcoin = usdPricePerBtc;
     }
     //////////////////////////////

package/dist/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoWrapper.js

@@ -295,9 +295,9 @@ class FromBTCLNAutoWrapper extends IFromBTCLNWrapper_1.IFromBTCLNWrapper {
                     try {
                         this.verifyReturnedData(resp, amountData, lp, _options, decodedPr, paymentHash, claimerBounty);
                         const [pricingInfo, gasPricingInfo] = await Promise.all([
-                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.FROM_BTCLN_AUTO], false, resp.btcAmountSwap, resp.total, amountData.token, {}, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal),
+                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.FROM_BTCLN_AUTO], false, resp.btcAmountSwap, resp.total, amountData.token, { swapFeeBtc: resp.swapFeeBtc }, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal),
                             _options.gasAmount === 0n ? Promise.resolve(undefined) : this.verifyReturnedPrice({ ...lp.services[SwapType_1.SwapType.FROM_BTCLN_AUTO], swapBaseFee: 0 }, //Base fee should be charged only on the amount, not on gas
-                            false, resp.btcAmountGas, resp.totalGas + resp.claimerBounty, nativeTokenAddress, {}, _preFetches.gasTokenPricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal),
+                            false, resp.btcAmountGas, resp.totalGas + resp.claimerBounty, nativeTokenAddress, { swapFeeBtc: resp.gasSwapFeeBtc }, _preFetches.gasTokenPricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal),
                             this.verifyIntermediaryLiquidity(resp.total, (0, Utils_1.throwIfUndefined)(liquidityPromise)),
                             _options.unsafeSkipLnNodeCheck ? Promise.resolve() : this.verifyLnNodeCapacity(lp, decodedPr, lnCapacityPromise, abortController.signal)
                         ]);

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

@@ -309,10 +309,11 @@ class FromBTCWrapper extends IFromBTCWrapper_1.IFromBTCWrapper {
                         }, undefined, e => e instanceof RequestError_1.RequestError, abortController.signal);
                         const data = new this._swapDataDeserializer(resp.data);
                         data.setClaimer(recipient);
+                        const swapFeeBtc = resp.swapFee * resp.amount / (data.getAmount() - resp.swapFee);
                         this.verifyReturnedData(recipient, resp, amountData, lp, _options, data, sequence, (await claimerBountyPrefetchPromise), nativeTokenAddress);
                         const [pricingInfo, signatureExpiry] = await Promise.all([
                             //Get intermediary's liquidity
-                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.FROM_BTC], false, resp.amount, resp.total, amountData.token, {}, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal),
+                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.FROM_BTC], false, resp.amount, resp.total, amountData.token, { swapFeeBtc }, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal),
                             this.verifyReturnedSignature(recipient, data, resp, feeRatePromise, signDataPromise, abortController.signal),
                             this.verifyIntermediaryLiquidity(data.getAmount(), (0, Utils_1.throwIfUndefined)(liquidityPromise)),
                         ]);
@@ -321,7 +322,7 @@ class FromBTCWrapper extends IFromBTCWrapper_1.IFromBTCWrapper {
                             url: lp.url,
                             expiry: signatureExpiry,
                             swapFee: resp.swapFee,
-                            swapFeeBtc: resp.swapFee * resp.amount / (data.getAmount() - resp.swapFee),
+                            swapFeeBtc,
                             feeRate: (await feeRatePromise),
                             signatureData: resp,
                             data,

package/dist/swaps/escrow_swaps/tobtc/ln/ToBTCLNWrapper.js

@@ -179,15 +179,15 @@ class ToBTCLNWrapper extends IToBTCWrapper_1.IToBTCWrapper {
             const data = new this._swapDataDeserializer(resp.data);
             data.setOfferer(signer);
             await this.verifyReturnedData(signer, resp, parsedPr, amountData.token, lp, calculatedOptions, data);
+            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
             const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
-                this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.TO_BTCLN], true, amountOut, data.getAmount(), amountData.token, { networkFee: resp.maxFee }, preFetches.pricePreFetchPromise, preFetches.usdPricePrefetchPromise, abortController.signal),
+                this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.TO_BTCLN], true, amountOut, data.getAmount(), amountData.token, { networkFee: resp.maxFee, swapFeeBtc }, preFetches.pricePreFetchPromise, preFetches.usdPricePrefetchPromise, abortController.signal),
                 this.verifyReturnedSignature(signer, data, resp, preFetches.feeRatePromise, signDataPromise, abortController.signal),
                 reputationPromise
             ]);
             abortController.signal.throwIfAborted();
             if (reputation != null)
                 lp.reputation[amountData.token.toString()] = reputation;
-            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
             const quote = new ToBTCLNSwap_1.ToBTCLNSwap(this, {
                 pricingInfo,
                 url: lp.url,
@@ -328,15 +328,15 @@ class ToBTCLNWrapper extends IToBTCWrapper_1.IToBTCWrapper {
             const data = new this._swapDataDeserializer(resp.data);
             data.setOfferer(signer);
             await this.verifyReturnedData(signer, resp, parsedInvoice, amountData.token, lp, calculatedOptions, data, amountData.amount);
+            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
             const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
-                this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.TO_BTCLN], true, prepareResp.amount, data.getAmount(), amountData.token, { networkFee: resp.maxFee }, preFetches.pricePreFetchPromise, preFetches.usdPricePrefetchPromise, abortSignal),
+                this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.TO_BTCLN], true, prepareResp.amount, data.getAmount(), amountData.token, { networkFee: resp.maxFee, swapFeeBtc }, preFetches.pricePreFetchPromise, preFetches.usdPricePrefetchPromise, abortSignal),
                 this.verifyReturnedSignature(signer, data, resp, preFetches.feeRatePromise, signDataPromise, abortController.signal),
                 reputationPromise
             ]);
             abortController.signal.throwIfAborted();
             if (reputation != null)
                 lp.reputation[amountData.token.toString()] = reputation;
-            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
             const quote = new ToBTCLNSwap_1.ToBTCLNSwap(this, {
                 pricingInfo,
                 url: lp.url,

package/dist/swaps/escrow_swaps/tobtc/onchain/ToBTCWrapper.js

@@ -194,18 +194,18 @@ class ToBTCWrapper extends IToBTCWrapper_1.IToBTCWrapper {
                         let hash = _hash ?? this._contract.getHashForOnchain(outputScript, resp.amount, _options.confirmations, nonce).toString("hex");
                         const data = new this._swapDataDeserializer(resp.data);
                         data.setOfferer(signer);
+                        const inputWithoutFees = data.getAmount() - resp.swapFee - resp.networkFee;
+                        const swapFeeBtc = resp.swapFee * resp.amount / inputWithoutFees;
+                        const networkFeeBtc = resp.networkFee * resp.amount / inputWithoutFees;
                         this.verifyReturnedData(signer, resp, amountData, lp, _options, data, hash);
                         const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
-                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.TO_BTC], true, resp.amount, data.getAmount(), amountData.token, resp, pricePreFetchPromise, usdPricePrefetchPromise, abortController.signal),
+                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.TO_BTC], true, resp.amount, data.getAmount(), amountData.token, { networkFee: resp.networkFee, swapFeeBtc }, pricePreFetchPromise, usdPricePrefetchPromise, abortController.signal),
                             this.verifyReturnedSignature(signer, data, resp, feeRatePromise, signDataPromise, abortController.signal),
                             reputationPromise
                         ]);
                         abortController.signal.throwIfAborted();
                         if (reputation != null)
                             lp.reputation[amountData.token.toString()] = reputation;
-                        const inputWithoutFees = data.getAmount() - resp.swapFee - resp.networkFee;
-                        const swapFeeBtc = resp.swapFee * resp.amount / inputWithoutFees;
-                        const networkFeeBtc = resp.networkFee * resp.amount / inputWithoutFees;
                         const quote = new ToBTCSwap_1.ToBTCSwap(this, {
                             pricingInfo,
                             url: lp.url,

package/dist/swaps/spv_swaps/SpvFromBTCSwap.js

@@ -254,7 +254,7 @@ class SpvFromBTCSwap extends ISwap_1.ISwap {
         if (this.pricingInfo == null)
             return;
         const usdPricePerBtc = this.pricingInfo.realPriceUsdPerBitcoin;
-        this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(this.chainIdentifier, this.btcAmountSwap, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, this.getOutputWithoutFee().rawAmount, this.outputSwapToken);
+        this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(this.chainIdentifier, this.btcAmountSwap, this.pricingInfo.satsBaseFee, this.pricingInfo.feePPM, this.getOutputWithoutFee().rawAmount, this.outputSwapToken, undefined, undefined, this.swapFeeBtc);
         this.pricingInfo.realPriceUsdPerBitcoin = usdPricePerBtc;
     }
     //////////////////////////////

package/dist/swaps/spv_swaps/SpvFromBTCWrapper.js

@@ -466,9 +466,9 @@ class SpvFromBTCWrapper extends ISwapWrapper_1.ISwapWrapper {
                         this.logger.debug("create(" + lp.url + "): LP response: ", resp);
                         const callerFeeShare = (await callerFeePrefetchPromise);
                         const [pricingInfo, gasPricingInfo, { vault, vaultUtxoValue }] = await Promise.all([
-                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.SPV_VAULT_FROM_BTC], false, resp.btcAmountSwap, resp.total * (100000n + callerFeeShare) / 100000n, amountData.token, {}, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal),
+                            this.verifyReturnedPrice(lp.services[SwapType_1.SwapType.SPV_VAULT_FROM_BTC], false, resp.btcAmountSwap, resp.total * (100000n + callerFeeShare) / 100000n, amountData.token, { swapFeeBtc: resp.swapFeeBtc }, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal),
                             _options.gasAmount === 0n ? Promise.resolve(undefined) : this.verifyReturnedPrice({ ...lp.services[SwapType_1.SwapType.SPV_VAULT_FROM_BTC], swapBaseFee: 0 }, //Base fee should be charged only on the amount, not on gas
-                            false, resp.btcAmountGas, resp.totalGas * (100000n + callerFeeShare) / 100000n, nativeTokenAddress, {}, gasTokenPricePrefetchPromise, usdPricePrefetchPromise, abortController.signal),
+                            false, resp.btcAmountGas, resp.totalGas * (100000n + callerFeeShare) / 100000n, nativeTokenAddress, { swapFeeBtc: resp.gasSwapFeeBtc }, gasTokenPricePrefetchPromise, usdPricePrefetchPromise, abortController.signal),
                             this.verifyReturnedData(resp, amountData, lp, _options, callerFeeShare, bitcoinFeeRatePromise, abortController.signal)
                         ]);
                         const swapInit = {

package/dist/swaps/trusted/ln/LnForGasWrapper.js

@@ -62,7 +62,7 @@ class LnForGasWrapper extends ISwapWrapper_1.ISwapWrapper {
             throw new IntermediaryError_1.IntermediaryError("Invalid total returned");
         const pricingInfo = await this.verifyReturnedPrice(typeof (lpOrUrl) === "string" || lpOrUrl.services[SwapType_1.SwapType.TRUSTED_FROM_BTCLN] == null ?
             { swapFeePPM: 10000, swapBaseFee: 10 } :
-            lpOrUrl.services[SwapType_1.SwapType.TRUSTED_FROM_BTCLN], false, amountIn, amount, token, {});
+            lpOrUrl.services[SwapType_1.SwapType.TRUSTED_FROM_BTCLN], false, amountIn, amount, token, { swapFeeBtc: resp.swapFeeSats });
         const quoteInit = {
             pr: resp.pr,
             outputAmount: resp.total,

package/dist/swaps/trusted/onchain/OnchainForGasWrapper.js

@@ -69,7 +69,7 @@ class OnchainForGasWrapper extends ISwapWrapper_1.ISwapWrapper {
             throw new IntermediaryError_1.IntermediaryError("Invalid total returned");
         const pricingInfo = await this.verifyReturnedPrice(typeof (lpOrUrl) === "string" || lpOrUrl.services[SwapType_1.SwapType.TRUSTED_FROM_BTC] == null ?
             { swapFeePPM: 10000, swapBaseFee: 10 } :
-            lpOrUrl.services[SwapType_1.SwapType.TRUSTED_FROM_BTC], false, resp.amountSats, amount, this._chain.getNativeCurrencyAddress(), {});
+            lpOrUrl.services[SwapType_1.SwapType.TRUSTED_FROM_BTC], false, resp.amountSats, amount, this._chain.getNativeCurrencyAddress(), { swapFeeBtc: resp.swapFeeSats });
         const quote = new OnchainForGasSwap_1.OnchainForGasSwap(this, {
             paymentHash: resp.paymentHash,
             sequence: resp.sequence,

package/package.json

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

package/src/prices/abstract/ISwapPrice.ts

@@ -100,6 +100,7 @@ export abstract class ISwapPrice<T extends MultiChain = MultiChain> {
      * @param tokenAddress Token address to be paid
      * @param abortSignal
      * @param preFetchedPrice An optional price pre-fetched with {@link preFetchPrice}
+     * @param realSwapFeeSats
      */
     public async isValidAmountSend<C extends ChainIds<T>>(
         chainIdentifier: C,
@@ -109,11 +110,15 @@ export abstract class ISwapPrice<T extends MultiChain = MultiChain> {
         paidToken: bigint,
         tokenAddress: string,
         abortSignal?: AbortSignal,
-        preFetchedPrice?: bigint | null
+        preFetchedPrice?: bigint | null,
+        realSwapFeeSats?: bigint
     ): Promise<PriceInfoType> {
-        const totalSats = (amountSats * (1000000n + feePPM) / 1000000n)
-            + satsBaseFee;
+        if(realSwapFeeSats!=undefined && realSwapFeeSats<0) throw new Error("Invalid swap fee! Swap fee cannot be negative!");
+        const totalSats = realSwapFeeSats!=undefined
+            ? amountSats + realSwapFeeSats
+            : (amountSats * (1000000n + feePPM) / 1000000n) + satsBaseFee;
         const totalUSats = totalSats * 1000000n;
+
         const swapPriceUSatPerToken = totalUSats * (10n ** BigInt(this.getDecimalsThrowing(chainIdentifier, tokenAddress))) / paidToken;
 
         if(this.shouldIgnore(chainIdentifier, tokenAddress)) return {
@@ -185,6 +190,7 @@ export abstract class ISwapPrice<T extends MultiChain = MultiChain> {
      * @param tokenAddress Token address to be received
      * @param abortSignal
      * @param preFetchedPrice An optional price pre-fetched with {@link preFetchPrice}
+     * @param realSwapFeeSats
      */
     public async isValidAmountReceive<C extends ChainIds<T>>(
         chainIdentifier: C,
@@ -194,11 +200,18 @@ export abstract class ISwapPrice<T extends MultiChain = MultiChain> {
         receiveToken: bigint,
         tokenAddress: string,
         abortSignal?: AbortSignal,
-        preFetchedPrice?: bigint | null
+        preFetchedPrice?: bigint | null,
+        realSwapFeeSats?: bigint
     ): Promise<PriceInfoType> {
-        const totalSats = (amountSats * (1000000n - feePPM) / 1000000n)
-            - satsBaseFee;
+        if(realSwapFeeSats!=undefined) {
+            if(realSwapFeeSats>=amountSats) throw new Error("Invalid swap fee! Larger than or equal to total output amount!");
+            if(realSwapFeeSats<0) throw new Error("Invalid swap fee! Must be non-negative!");
+        }
+        const totalSats = realSwapFeeSats!=undefined
+            ? amountSats - realSwapFeeSats
+            : (amountSats * (1000000n - feePPM) / 1000000n) - satsBaseFee;
         const totalUSats = totalSats * 1000000n;
+
         const swapPriceUSatPerToken = totalUSats * (10n ** BigInt(this.getDecimalsThrowing(chainIdentifier, tokenAddress))) / receiveToken;
 
         if(this.shouldIgnore(chainIdentifier, tokenAddress)) return {

package/src/swaps/ISwap.ts

@@ -315,28 +315,39 @@ export abstract class ISwap<
     public async refreshPriceData(): Promise<void> {
         if(this.pricingInfo==null) return;
         const priceUsdPerBtc = this.pricingInfo.realPriceUsdPerBitcoin;
-        const input = this.getInput();
         const output = this.getOutput();
-        if(input.isUnknown || output.isUnknown) return;
+        if(output.isUnknown) return;
+
+        if(isSCToken(this.getInputToken()) && this.getDirection()===SwapDirection.TO_BTC) {
+            const input = this.getInputWithoutFee();
+            if(input.isUnknown) return;
 
-        if(isSCToken(input.token) && this.getDirection()===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
+                input.rawAmount! + this.swapFee,
+                input.token.address,
+                undefined,
+                undefined,
+                this.swapFeeBtc
             );
             this.pricingInfo.realPriceUsdPerBitcoin = priceUsdPerBtc;
         } else if(isSCToken(output.token) && this.getDirection()===SwapDirection.FROM_BTC) {
+            const input = this.getInput();
+            if(input.isUnknown) return;
+
             this.pricingInfo = await this.wrapper._prices.isValidAmountReceive(
                 this.chainIdentifier,
                 input.rawAmount!,
                 this.pricingInfo.satsBaseFee,
                 this.pricingInfo.feePPM,
                 output.rawAmount!,
-                output.token.address
+                output.token.address,
+                undefined,
+                undefined,
+                this.swapFeeBtc
             );
             this.pricingInfo.realPriceUsdPerBitcoin = priceUsdPerBtc;
         }

package/src/swaps/ISwapWrapper.ts

@@ -259,7 +259,8 @@ export abstract class ISwapWrapper<
         amountToken: bigint,
         token: string,
         feeData: {
-            networkFee?: bigint
+            networkFee?: bigint,
+            swapFeeBtc?: bigint
         },
         pricePrefetchPromise: Promise<bigint | undefined> = Promise.resolve(undefined),
         usdPricePrefetchPromise: Promise<number | undefined> = Promise.resolve(undefined),
@@ -271,8 +272,8 @@ export abstract class ISwapWrapper<
 
         const [isValidAmount, usdPrice] = await Promise.all([
             send ?
-                this._prices.isValidAmountSend(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise) :
-                this._prices.isValidAmountReceive(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise),
+                this._prices.isValidAmountSend(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise, feeData.swapFeeBtc) :
+                this._prices.isValidAmountReceive(this.chainIdentifier, amountSats, swapBaseFee, swapFeePPM, amountToken, token, abortSignal, await pricePrefetchPromise, feeData.swapFeeBtc),
             usdPricePrefetchPromise.then(value => {
                 if(value!=null) return value;
                 return this._prices.preFetchUsdPrice(abortSignal);

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

@@ -334,12 +334,14 @@ export class FromBTCLNWrapper<
                     if(decodedPr.timeExpireDate==null) throw new IntermediaryError("Invalid returned swap invoice, no expiry date field");
                     const amountIn = (BigInt(decodedPr.millisatoshis) + 999n) / 1000n;
 
+                    const swapFeeBtc = resp.swapFee * amountIn / (resp.total - resp.swapFee);
+
                     try {
                         this.verifyReturnedData(resp, amountData, lp, _options, decodedPr, paymentHash);
                         const [pricingInfo] = await Promise.all([
                             this.verifyReturnedPrice(
                                 lp.services[SwapType.FROM_BTCLN], false, amountIn, resp.total,
-                                amountData.token, {}, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal
+                                amountData.token, {swapFeeBtc}, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal
                             ),
                             this.verifyIntermediaryLiquidity(resp.total, throwIfUndefined(liquidityPromise)),
                             lnCapacityPromise!=null ? this.verifyLnNodeCapacity(lp, decodedPr, lnCapacityPromise, abortController.signal) : Promise.resolve()
@@ -350,7 +352,7 @@ export class FromBTCLNWrapper<
                             url: lp.url,
                             expiry: decodedPr.timeExpireDate*1000,
                             swapFee: resp.swapFee,
-                            swapFeeBtc: resp.swapFee * amountIn / (resp.total - resp.swapFee),
+                            swapFeeBtc,
                             feeRate: (await _preFetches.feeRatePromise)!,
                             initialSwapData: await this._contract.createSwapData(
                                 ChainSwapType.HTLC, lp.getAddress(this.chainIdentifier), recipient, amountData.token,

package/src/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoSwap.ts

@@ -309,7 +309,10 @@ export class FromBTCLNAutoSwap<T extends ChainType = ChainType>
             this.pricingInfo.satsBaseFee,
             this.pricingInfo.feePPM,
             this.getOutputAmountWithoutFee(),
-            this.getSwapData().getToken()
+            this.getSwapData().getToken(),
+            undefined,
+            undefined,
+            this.swapFeeBtc
         );
         this.pricingInfo.realPriceUsdPerBitcoin = usdPricePerBtc;
     }

package/src/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoWrapper.ts

@@ -457,13 +457,13 @@ export class FromBTCLNAutoWrapper<
                                 lp.services[SwapType.FROM_BTCLN_AUTO],
                                 false, resp.btcAmountSwap,
                                 resp.total,
-                                amountData.token, {}, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal
+                                amountData.token, {swapFeeBtc: resp.swapFeeBtc}, _preFetches.pricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal
                             ),
                             _options.gasAmount===0n ? Promise.resolve(undefined) : this.verifyReturnedPrice(
                                 {...lp.services[SwapType.FROM_BTCLN_AUTO], swapBaseFee: 0}, //Base fee should be charged only on the amount, not on gas
                                 false, resp.btcAmountGas,
                                 resp.totalGas + resp.claimerBounty,
-                                nativeTokenAddress, {}, _preFetches.gasTokenPricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal
+                                nativeTokenAddress, {swapFeeBtc: resp.gasSwapFeeBtc}, _preFetches.gasTokenPricePrefetchPromise, _preFetches.usdPricePrefetchPromise, abortController.signal
                             ),
                             this.verifyIntermediaryLiquidity(resp.total, throwIfUndefined(liquidityPromise)),
                             _options.unsafeSkipLnNodeCheck ? Promise.resolve() : this.verifyLnNodeCapacity(lp, decodedPr, lnCapacityPromise, abortController.signal)

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

@@ -487,12 +487,14 @@ export class FromBTCWrapper<
                         const data: T["Data"] = new this._swapDataDeserializer(resp.data);
                         data.setClaimer(recipient);
 
+                        const swapFeeBtc = resp.swapFee * resp.amount / (data.getAmount() - resp.swapFee);
+
                         this.verifyReturnedData(recipient, resp, amountData, lp, _options, data, sequence, (await claimerBountyPrefetchPromise)!, nativeTokenAddress);
                         const [pricingInfo, signatureExpiry] = await Promise.all([
                             //Get intermediary's liquidity
                             this.verifyReturnedPrice(
                                 lp.services[SwapType.FROM_BTC], false, resp.amount, resp.total,
-                                amountData.token, {}, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal
+                                amountData.token, {swapFeeBtc}, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal
                             ),
                             this.verifyReturnedSignature(recipient, data, resp, feeRatePromise, signDataPromise, abortController.signal),
                             this.verifyIntermediaryLiquidity(data.getAmount(), throwIfUndefined(liquidityPromise)),
@@ -503,7 +505,7 @@ export class FromBTCWrapper<
                             url: lp.url,
                             expiry: signatureExpiry,
                             swapFee: resp.swapFee,
-                            swapFeeBtc: resp.swapFee * resp.amount / (data.getAmount() - resp.swapFee),
+                            swapFeeBtc,
                             feeRate: (await feeRatePromise)!,
                             signatureData: resp,
                             data,

package/src/swaps/escrow_swaps/tobtc/ln/ToBTCLNWrapper.ts

@@ -309,10 +309,12 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
 
             await this.verifyReturnedData(signer, resp, parsedPr, amountData.token, lp, calculatedOptions, data);
 
+            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
+
             const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
                 this.verifyReturnedPrice(
                     lp.services[SwapType.TO_BTCLN], true, amountOut, data.getAmount(),
-                    amountData.token, {networkFee: resp.maxFee},
+                    amountData.token, {networkFee: resp.maxFee, swapFeeBtc},
                     preFetches.pricePreFetchPromise, preFetches.usdPricePrefetchPromise, abortController.signal
                 ),
                 this.verifyReturnedSignature(
@@ -324,8 +326,6 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
 
             if(reputation!=null) lp.reputation[amountData.token.toString()] = reputation;
 
-            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
-
             const quote = new ToBTCLNSwap<T>(this, {
                 pricingInfo,
                 url: lp.url,
@@ -512,10 +512,12 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
 
             await this.verifyReturnedData(signer, resp, parsedInvoice, amountData.token, lp, calculatedOptions, data, amountData.amount);
 
+            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
+
             const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
                 this.verifyReturnedPrice(
                     lp.services[SwapType.TO_BTCLN], true, prepareResp.amount, data.getAmount(),
-                    amountData.token, {networkFee: resp.maxFee},
+                    amountData.token, {networkFee: resp.maxFee, swapFeeBtc},
                     preFetches.pricePreFetchPromise, preFetches.usdPricePrefetchPromise, abortSignal
                 ),
                 this.verifyReturnedSignature(
@@ -527,8 +529,6 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
 
             if(reputation!=null) lp.reputation[amountData.token.toString()] = reputation;
 
-            const swapFeeBtc = resp.swapFee * amountOut / (data.getAmount() - totalFee);
-
             const quote = new ToBTCLNSwap<T>(this, {
                 pricingInfo,
                 url: lp.url,

package/src/swaps/escrow_swaps/tobtc/onchain/ToBTCWrapper.ts

@@ -289,11 +289,15 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
                         const data: T["Data"] = new this._swapDataDeserializer(resp.data);
                         data.setOfferer(signer);
 
+                        const inputWithoutFees = data.getAmount() - resp.swapFee - resp.networkFee;
+                        const swapFeeBtc = resp.swapFee * resp.amount / inputWithoutFees;
+                        const networkFeeBtc = resp.networkFee * resp.amount / inputWithoutFees;
+
                         this.verifyReturnedData(signer, resp, amountData, lp, _options, data, hash);
                         const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
                             this.verifyReturnedPrice(
                                 lp.services[SwapType.TO_BTC], true, resp.amount, data.getAmount(),
-                                amountData.token, resp, pricePreFetchPromise, usdPricePrefetchPromise, abortController.signal
+                                amountData.token, {networkFee: resp.networkFee, swapFeeBtc}, pricePreFetchPromise, usdPricePrefetchPromise, abortController.signal
                             ),
                             this.verifyReturnedSignature(signer, data, resp, feeRatePromise, signDataPromise, abortController.signal),
                             reputationPromise
@@ -302,10 +306,6 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
 
                         if(reputation!=null) lp.reputation[amountData.token.toString()] = reputation;
 
-                        const inputWithoutFees = data.getAmount() - resp.swapFee - resp.networkFee;
-                        const swapFeeBtc = resp.swapFee * resp.amount / inputWithoutFees;
-                        const networkFeeBtc = resp.networkFee * resp.amount / inputWithoutFees
-
                         const quote = new ToBTCSwap<T>(this, {
                             pricingInfo,
                             url: lp.url,

package/src/swaps/spv_swaps/SpvFromBTCSwap.ts

@@ -398,7 +398,10 @@ export class SpvFromBTCSwap<T extends ChainType>
             this.pricingInfo.satsBaseFee,
             this.pricingInfo.feePPM,
             this.getOutputWithoutFee().rawAmount,
-            this.outputSwapToken
+            this.outputSwapToken,
+            undefined,
+            undefined,
+            this.swapFeeBtc
         );
         this.pricingInfo.realPriceUsdPerBitcoin = usdPricePerBtc;
     }

package/src/swaps/spv_swaps/SpvFromBTCWrapper.ts

@@ -652,13 +652,13 @@ export class SpvFromBTCWrapper<
                                 lp.services[SwapType.SPV_VAULT_FROM_BTC],
                                 false, resp.btcAmountSwap,
                                 resp.total * (100_000n + callerFeeShare) / 100_000n,
-                                amountData.token, {}, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal
+                                amountData.token, {swapFeeBtc: resp.swapFeeBtc}, pricePrefetchPromise, usdPricePrefetchPromise, abortController.signal
                             ),
                             _options.gasAmount===0n ? Promise.resolve(undefined) : this.verifyReturnedPrice(
                                 {...lp.services[SwapType.SPV_VAULT_FROM_BTC], swapBaseFee: 0}, //Base fee should be charged only on the amount, not on gas
                                 false, resp.btcAmountGas,
                                 resp.totalGas * (100_000n + callerFeeShare) / 100_000n,
-                                nativeTokenAddress, {}, gasTokenPricePrefetchPromise, usdPricePrefetchPromise, abortController.signal
+                                nativeTokenAddress, {swapFeeBtc: resp.gasSwapFeeBtc}, gasTokenPricePrefetchPromise, usdPricePrefetchPromise, abortController.signal
                             ),
                             this.verifyReturnedData(resp, amountData, lp, _options, callerFeeShare, bitcoinFeeRatePromise, abortController.signal)
                         ]);

package/src/swaps/trusted/ln/LnForGasWrapper.ts

@@ -68,7 +68,7 @@ export class LnForGasWrapper<T extends ChainType> extends ISwapWrapper<T, LnForG
                 {swapFeePPM: 10000, swapBaseFee: 10} :
                 lpOrUrl.services[SwapType.TRUSTED_FROM_BTCLN],
             false, amountIn,
-            amount, token, {}
+            amount, token, {swapFeeBtc: resp.swapFeeSats}
         );
 
         const quoteInit: LnForGasSwapInit = {

package/src/swaps/trusted/onchain/OnchainForGasWrapper.ts

@@ -105,7 +105,7 @@ export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, O
                 {swapFeePPM: 10000, swapBaseFee: 10} :
                 lpOrUrl.services[SwapType.TRUSTED_FROM_BTC],
             false, resp.amountSats,
-            amount, this._chain.getNativeCurrencyAddress(), {}
+            amount, this._chain.getNativeCurrencyAddress(), {swapFeeBtc: resp.swapFeeSats}
         );
 
         const quote = new OnchainForGasSwap(this, {