@atomiqlabs/lp-lib 17.4.0 → 17.5.0

package/dist/swaps/SwapHandler.d.ts

@@ -37,10 +37,16 @@ export type SwapBaseConfig = {
     bitcoinBlocktime: bigint;
     baseFee: bigint;
     feePPM: bigint;
-    max: bigint;
-    min: bigint;
     safetyFactor: bigint;
     swapCheckInterval: number;
+    max: bigint;
+    min: bigint;
+    minMaxOverrides?: {
+        [chainIdentifier: string]: {
+            min: bigint;
+            max: bigint;
+        };
+    };
 };
 export type MultichainData = {
     chains: {

package/dist/swaps/assertions/AmountAssertions.d.ts

@@ -4,19 +4,28 @@ export type AmountAssertionsConfig = {
     max: bigint;
     baseFee: bigint;
     feePPM: bigint;
+    minMaxOverrides?: {
+        [chainIdentifier: string]: {
+            min: bigint;
+            max: bigint;
+        };
+    };
 };
 export declare abstract class AmountAssertions {
     readonly config: AmountAssertionsConfig;
     readonly swapPricing: ISwapPrice;
     constructor(config: AmountAssertionsConfig, swapPricing: ISwapPrice);
+    getSwapMinimum(chainIdentifier: string): bigint;
+    getSwapMaximum(chainIdentifier: string): bigint;
     /**
      * Checks whether the bitcoin amount is within specified min/max bounds
      *
      * @param amount
+     * @param chainIdentifier
      * @protected
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
-    protected checkBtcAmountInBounds(amount: bigint): void;
+    protected checkBtcAmountInBounds(amount: bigint, chainIdentifier: string): void;
     /**
      * Handles and throws plugin errors
      *

package/dist/swaps/assertions/AmountAssertions.js

@@ -7,31 +7,40 @@ class AmountAssertions {
         this.config = config;
         this.swapPricing = swapPricing;
     }
+    getSwapMinimum(chainIdentifier) {
+        return this.config.minMaxOverrides?.[chainIdentifier]?.min ?? this.config.min;
+    }
+    getSwapMaximum(chainIdentifier) {
+        return this.config.minMaxOverrides?.[chainIdentifier]?.max ?? this.config.max;
+    }
     /**
      * Checks whether the bitcoin amount is within specified min/max bounds
      *
      * @param amount
+     * @param chainIdentifier
      * @protected
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
-    checkBtcAmountInBounds(amount) {
-        if (amount < this.config.min) {
+    checkBtcAmountInBounds(amount, chainIdentifier) {
+        const min = this.getSwapMinimum(chainIdentifier);
+        const max = this.getSwapMaximum(chainIdentifier);
+        if (amount < min) {
             throw {
                 code: 20003,
                 msg: "Amount too low!",
                 data: {
-                    min: this.config.min.toString(10),
-                    max: this.config.max.toString(10)
+                    min: min.toString(10),
+                    max: max.toString(10)
                 }
             };
         }
-        if (amount > this.config.max) {
+        if (amount > max) {
             throw {
                 code: 20004,
                 msg: "Amount too high!",
                 data: {
-                    min: this.config.min.toString(10),
-                    max: this.config.max.toString(10)
+                    min: min.toString(10),
+                    max: max.toString(10)
                 }
             };
         }

package/dist/swaps/assertions/FromBtcAmountAssertions.js

@@ -19,7 +19,9 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
     async preCheckFromBtcAmounts(swapType, request, requestedAmount, gasAmount) {
-        const res = await PluginManager_1.PluginManager.onHandlePreFromBtcQuote(swapType, request, requestedAmount, request.chainIdentifier, { minInBtc: this.config.min, maxInBtc: this.config.max }, { baseFeeInBtc: this.config.baseFee, feePPM: this.config.feePPM }, gasAmount);
+        const min = this.getSwapMinimum(request.chainIdentifier);
+        const max = this.getSwapMaximum(request.chainIdentifier);
+        const res = await PluginManager_1.PluginManager.onHandlePreFromBtcQuote(swapType, request, requestedAmount, request.chainIdentifier, { minInBtc: min, maxInBtc: max }, { baseFeeInBtc: this.config.baseFee, feePPM: this.config.feePPM }, gasAmount);
         if (res != null) {
             AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(res);
             if ((0, IPlugin_1.isQuoteSetFees)(res)) {
@@ -32,7 +34,7 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             }
         }
         if (requestedAmount.input)
-            this.checkBtcAmountInBounds(requestedAmount.amount);
+            this.checkBtcAmountInBounds(requestedAmount.amount, request.chainIdentifier);
         if (gasAmount != null && gasAmount.amount !== 0n) {
             if (gasAmount.amount > (this.config.gasTokenMax?.[request.chainIdentifier] ?? 0n)) {
                 throw {
@@ -64,7 +66,9 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
         const chainIdentifier = request.chainIdentifier;
         let securityDepositApyPPM;
         let securityDepositBaseMultiplierPPM;
-        const res = await PluginManager_1.PluginManager.onHandlePostFromBtcQuote(swapType, request, requestedAmount, chainIdentifier, { minInBtc: this.config.min, maxInBtc: this.config.max }, { baseFeeInBtc: fees.baseFee, feePPM: fees.feePPM }, gasTokenAmount);
+        const min = this.getSwapMinimum(chainIdentifier);
+        const max = this.getSwapMaximum(chainIdentifier);
+        const res = await PluginManager_1.PluginManager.onHandlePostFromBtcQuote(swapType, request, requestedAmount, chainIdentifier, { minInBtc: min, maxInBtc: max }, { baseFeeInBtc: fees.baseFee, feePPM: fees.feePPM }, gasTokenAmount);
         signal.throwIfAborted();
         if (res != null) {
             AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(res);
@@ -117,11 +121,11 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             const _amountBD = ((amountBD + fees.baseFee) * 1000000n + denominator - 1n) / denominator;
             swapFee = _amountBD - amountBD;
             amountBD = _amountBD;
-            const tooLow = amountBD < (this.config.min * 95n / 100n);
-            const tooHigh = amountBD > (this.config.max * 105n / 100n);
+            const tooLow = amountBD < (min * 95n / 100n);
+            const tooHigh = amountBD > (max * 105n / 100n);
             if (tooLow || tooHigh) {
-                const adjustedMin = this.config.min * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
-                const adjustedMax = this.config.max * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
+                const adjustedMin = min * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
+                const adjustedMax = max * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
                 const minIn = await this.swapPricing.getFromBtcSwapAmount(adjustedMin, requestedAmount.token, chainIdentifier, null, requestedAmount.pricePrefetch);
                 const maxIn = await this.swapPricing.getFromBtcSwapAmount(adjustedMax, requestedAmount.token, chainIdentifier, null, requestedAmount.pricePrefetch);
                 throw {
@@ -135,7 +139,7 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             }
         }
         else {
-            this.checkBtcAmountInBounds(requestedAmount.amount);
+            this.checkBtcAmountInBounds(requestedAmount.amount, chainIdentifier);
             amountBD = requestedAmount.amount - amountBDgas;
             swapFee = fees.baseFee + ((amountBD * fees.feePPM + 999999n) / 1000000n);
             if (amountBD - swapFee < 0n) {
@@ -143,8 +147,8 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
                     code: 20003,
                     msg: "Amount too low!",
                     data: {
-                        min: this.config.min.toString(10),
-                        max: this.config.max.toString(10)
+                        min: min.toString(10),
+                        max: max.toString(10)
                     }
                 };
             }

package/dist/swaps/assertions/ToBtcAmountAssertions.js

@@ -14,7 +14,9 @@ class ToBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
     async preCheckToBtcAmounts(swapType, request, requestedAmount) {
-        const res = await PluginManager_1.PluginManager.onHandlePreToBtcQuote(swapType, request, requestedAmount, request.chainIdentifier, { minInBtc: this.config.min, maxInBtc: this.config.max }, { baseFeeInBtc: this.config.baseFee, feePPM: this.config.feePPM });
+        const min = this.getSwapMinimum(request.chainIdentifier);
+        const max = this.getSwapMaximum(request.chainIdentifier);
+        const res = await PluginManager_1.PluginManager.onHandlePreToBtcQuote(swapType, request, requestedAmount, request.chainIdentifier, { minInBtc: min, maxInBtc: max }, { baseFeeInBtc: this.config.baseFee, feePPM: this.config.feePPM });
         if (res != null) {
             AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(res);
             if ((0, IPlugin_1.isQuoteSetFees)(res)) {
@@ -25,7 +27,7 @@ class ToBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             }
         }
         if (!requestedAmount.input) {
-            this.checkBtcAmountInBounds(requestedAmount.amount);
+            this.checkBtcAmountInBounds(requestedAmount.amount, request.chainIdentifier);
         }
         return {
             baseFee: this.config.baseFee,
@@ -46,7 +48,9 @@ class ToBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
      */
     async checkToBtcAmount(swapType, request, requestedAmount, fees, getNetworkFee, signal) {
         const chainIdentifier = request.chainIdentifier;
-        const res = await PluginManager_1.PluginManager.onHandlePostToBtcQuote(swapType, request, requestedAmount, request.chainIdentifier, { minInBtc: this.config.min, maxInBtc: this.config.max }, { baseFeeInBtc: fees.baseFee, feePPM: fees.feePPM, networkFeeGetter: getNetworkFee });
+        const min = this.getSwapMinimum(chainIdentifier);
+        const max = this.getSwapMaximum(chainIdentifier);
+        const res = await PluginManager_1.PluginManager.onHandlePostToBtcQuote(swapType, request, requestedAmount, request.chainIdentifier, { minInBtc: min, maxInBtc: max }, { baseFeeInBtc: fees.baseFee, feePPM: fees.feePPM, networkFeeGetter: getNetworkFee });
         signal.throwIfAborted();
         if (res != null) {
             AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(res);
@@ -90,19 +94,19 @@ class ToBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             //Decrease by base fee
             amountBD = amountBD - fees.baseFee;
             //If it's already smaller than minimum, set it to minimum so we can calculate the network fee
-            if (amountBD < (this.config.min * 95n / 100n)) {
-                amountBD = this.config.min;
+            if (amountBD < (min * 95n / 100n)) {
+                amountBD = min;
                 tooLow = true;
             }
             //If it's already larger than maximum, set it to maximum so we can calculate the network fee
-            if (amountBD > (this.config.max * 105n / 100n)) {
-                amountBD = this.config.max;
+            if (amountBD > (max * 105n / 100n)) {
+                amountBD = max;
                 tooHigh = true;
             }
         }
         else {
             amountBD = requestedAmount.amount;
-            this.checkBtcAmountInBounds(amountBD);
+            this.checkBtcAmountInBounds(amountBD, chainIdentifier);
         }
         const resp = await getNetworkFee(amountBD);
         signal.throwIfAborted();
@@ -111,12 +115,12 @@ class ToBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             amountBD = amountBD - resp.networkFee;
             //Decrease by percentage fee
             amountBD = amountBD * 1000000n / (fees.feePPM + 1000000n);
-            tooHigh || (tooHigh = amountBD > (this.config.max * 105n / 100n));
-            tooLow || (tooLow = amountBD < (this.config.min * 95n / 100n));
+            tooHigh || (tooHigh = amountBD > (max * 105n / 100n));
+            tooLow || (tooLow = amountBD < (min * 95n / 100n));
             if (tooLow || tooHigh) {
                 //Compute min/max
-                let adjustedMin = this.config.min * (fees.feePPM + 1000000n) / 1000000n;
-                let adjustedMax = this.config.max * (fees.feePPM + 1000000n) / 1000000n;
+                let adjustedMin = min * (fees.feePPM + 1000000n) / 1000000n;
+                let adjustedMax = max * (fees.feePPM + 1000000n) / 1000000n;
                 adjustedMin = adjustedMin + fees.baseFee + resp.networkFee;
                 adjustedMax = adjustedMax + fees.baseFee + resp.networkFee;
                 const minIn = await this.swapPricing.getFromBtcSwapAmount(adjustedMin, requestedAmount.token, chainIdentifier, null, requestedAmount.pricePrefetch);

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -17,6 +17,17 @@ const AmountAssertions_1 = require("../assertions/AmountAssertions");
 const IPlugin_1 = require("../../plugins/IPlugin");
 const StickyAddress_1 = require("./StickyAddress");
 const TX_MAX_VSIZE = 16 * 1024;
+function parseAmountAdjustUtxos(amountAdjustUtxos) {
+    if (!Array.isArray(amountAdjustUtxos))
+        return null;
+    if (amountAdjustUtxos.length > 250)
+        return null;
+    const validArray = amountAdjustUtxos.every(value => value != null && typeof (value) === "object" && typeof (value.value) === "number" && typeof (value.vSize) === "number" &&
+        (value.cpfp == null || (typeof (value.cpfp) === "object" && typeof (value.cpfp.effectiveVSize) === "number" && typeof (value.cpfp.effectiveFeeRate) === "number")));
+    if (!validArray)
+        return null;
+    return amountAdjustUtxos;
+}
 class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
     constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config, stickyAddresses) {
         super(storageDirectory, path, chainsData, swapPricing);
@@ -309,6 +320,23 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     code: 20100,
                     msg: "Invalid request body"
                 };
+            const inputAmountAdjustments = req.paramReader.getExistingParamsOrNull({
+                amountUtxos: SchemaVerifier_1.FieldTypeEnum.AnyOptional,
+                amountFeeRate: SchemaVerifier_1.FieldTypeEnum.NumberOptional
+            });
+            if (inputAmountAdjustments == null)
+                throw {
+                    code: 20100,
+                    msg: "Invalid request body"
+                };
+            const clientInputUtxos = inputAmountAdjustments?.amountUtxos != null
+                ? parseAmountAdjustUtxos(inputAmountAdjustments.amountUtxos)
+                : null;
+            if (inputAmountAdjustments?.amountUtxos != null && clientInputUtxos == null)
+                throw {
+                    code: 20100,
+                    msg: "Invalid request body (amountUtxos)"
+                };
             const parsedBody = { ...preFetchParsedBody, ...actualParsedBody };
             metadata.request = parsedBody;
             if (parsedBody.gasToken !== chainInterface.getNativeCurrencyAddress())
@@ -333,6 +361,44 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     parsedBody.amount,
                 token: parsedBody.token
             };
+            if (clientInputUtxos != null) {
+                if (parsedBody.exactOut)
+                    throw {
+                        code: 20193,
+                        msg: "amountAdjustUtxos cannot be specified for exactOut swaps!"
+                    };
+                let btcFeeRate = await btcFeeRatePrefetch;
+                if (inputAmountAdjustments.amountFeeRate != null && inputAmountAdjustments.amountFeeRate > btcFeeRate)
+                    btcFeeRate = inputAmountAdjustments.amountFeeRate;
+                let feeAccumulator = 0;
+                let valueAccumulator = 0;
+                for (let utxo of clientInputUtxos) {
+                    const cpfpAdditionalFee = utxo.cpfp == null ? 0 : Math.ceil(utxo.cpfp.effectiveVSize * Math.max(0, btcFeeRate - utxo.cpfp.effectiveFeeRate));
+                    const spendFee = utxo.vSize * btcFeeRate;
+                    const totalFee = cpfpAdditionalFee + spendFee;
+                    if (totalFee > utxo.value)
+                        continue; //Skip detrimental UTXO
+                    feeAccumulator += totalFee;
+                    valueAccumulator += utxo.value;
+                }
+                let baseTxVSize = 10.5; // 4b version, 1b inputs, 1b outputs, 4b locktime, 0.5vB witness flag + witness elements count
+                //vault input and output
+                baseTxVSize += 32 + 4 + 1 + 4; //Input base
+                baseTxVSize += this.vaultSigner.getAddressType() === "p2tr" ? (1 + 1 + 65) / 4 : (1 + 1 + 72 + 1 + 33) / 4;
+                baseTxVSize += 8 + 1; //Output base
+                baseTxVSize += this.vaultSigner.getAddressType() === "p2tr" ? 34 : 22;
+                //opreturn output
+                baseTxVSize += 8 + 1; //Output base
+                const opReturnDataSize = spvVaultContract.toOpReturnData(parsedBody.address, parsedBody.gasAmount > 0 ? [0xffffffffffffffffn, 0xffffffffffffffffn] : [0xffffffffffffffffn]).length;
+                baseTxVSize += (opReturnDataSize <= 0x4b ? 2 : 3 /*Needs an OP_PUSHDATA1 opcode*/) + opReturnDataSize;
+                //LP output
+                baseTxVSize += 8 + 1; //Output base
+                baseTxVSize += this.bitcoin.getAddressType() === "p2tr" ? 34 : this.bitcoin.getAddressType() === "p2wpkh" ? 22 : 23;
+                const baseTxFee = Math.ceil(baseTxVSize) * btcFeeRate;
+                feeAccumulator += baseTxFee;
+                const amount = Math.floor(valueAccumulator - Math.ceil(feeAccumulator));
+                requestedAmount.amount = BigInt(amount);
+            }
             const gasTokenAmount = {
                 input: false,
                 amount: parsedBody.gasAmount * (100000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate) / 100000n,
@@ -420,7 +486,8 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     gasSwapFee: gasSwapFeeInToken.toString(10),
                     callerFeeShare: callerFeeShare.toString(10),
                     frontingFeeShare: frontingFeeShare.toString(10),
-                    executionFeeShare: executionFeeShare.toString(10)
+                    executionFeeShare: executionFeeShare.toString(10),
+                    usedUtxoInputCalculation: clientInputUtxos != null
                 }
             });
         }));

package/dist/swaps/trusted/frombtc_trusted/FromBtcTrusted.js

@@ -134,9 +134,9 @@ class FromBtcTrusted extends SwapHandler_1.SwapHandler {
             }
             else {
                 //If lower than minimum then ignore
-                if (sentSats < this.config.min)
+                if (sentSats < this.AmountAssertions.getSwapMinimum(swap.chainIdentifier))
                     return;
-                if (sentSats > this.config.max) {
+                if (sentSats > this.AmountAssertions.getSwapMaximum(swap.chainIdentifier)) {
                     swap.adjustedInput = sentSats;
                     swap.btcTx = tx;
                     swap.txId = tx.txid;

package/package.json

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

package/src/swaps/SwapHandler.ts

@@ -41,10 +41,15 @@ export type SwapBaseConfig = {
     bitcoinBlocktime: bigint,
     baseFee: bigint,
     feePPM: bigint,
+    safetyFactor: bigint,
+    swapCheckInterval: number,
+
     max: bigint,
     min: bigint,
-    safetyFactor: bigint,
-    swapCheckInterval: number
+
+    minMaxOverrides?: {
+        [chainIdentifier: string]: {min: bigint, max: bigint}
+    }
 };
 
 export type MultichainData = {

package/src/swaps/assertions/AmountAssertions.ts

@@ -1,7 +1,16 @@
 import {ISwapPrice} from "../../prices/ISwapPrice";
 import {isQuoteAmountTooHigh, isQuoteAmountTooLow, isQuoteThrow} from "../../plugins/IPlugin";
 
-export type AmountAssertionsConfig = {min: bigint, max: bigint, baseFee: bigint, feePPM: bigint};
+export type AmountAssertionsConfig = {
+    min: bigint,
+    max: bigint,
+    baseFee: bigint,
+    feePPM: bigint,
+
+    minMaxOverrides?: {
+        [chainIdentifier: string]: {min: bigint, max: bigint}
+    }
+};
 
 export abstract class AmountAssertions {
 
@@ -13,32 +22,43 @@ export abstract class AmountAssertions {
         this.swapPricing = swapPricing;
     }
 
+    getSwapMinimum(chainIdentifier: string) {
+        return this.config.minMaxOverrides?.[chainIdentifier]?.min ?? this.config.min;
+    }
+
+    getSwapMaximum(chainIdentifier: string) {
+        return this.config.minMaxOverrides?.[chainIdentifier]?.max ?? this.config.max;
+    }
+
     /**
      * Checks whether the bitcoin amount is within specified min/max bounds
      *
      * @param amount
+     * @param chainIdentifier
      * @protected
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
-    protected checkBtcAmountInBounds(amount: bigint): void {
-        if (amount < this.config.min) {
+    protected checkBtcAmountInBounds(amount: bigint, chainIdentifier: string): void {
+        const min = this.getSwapMinimum(chainIdentifier);
+        const max = this.getSwapMaximum(chainIdentifier);
+        if (amount < min) {
             throw {
                 code: 20003,
                 msg: "Amount too low!",
                 data: {
-                    min: this.config.min.toString(10),
-                    max: this.config.max.toString(10)
+                    min: min.toString(10),
+                    max: max.toString(10)
                 }
             };
         }
 
-        if(amount > this.config.max) {
+        if(amount > max) {
             throw {
                 code: 20004,
                 msg: "Amount too high!",
                 data: {
-                    min: this.config.min.toString(10),
-                    max: this.config.max.toString(10)
+                    min: min.toString(10),
+                    max: max.toString(10)
                 }
             };
         }

package/src/swaps/assertions/FromBtcAmountAssertions.ts

@@ -42,12 +42,15 @@ export class FromBtcAmountAssertions extends AmountAssertions {
         securityDepositApyPPM?: bigint,
         securityDepositBaseMultiplierPPM?: bigint,
     }> {
+        const min = this.getSwapMinimum(request.chainIdentifier);
+        const max = this.getSwapMaximum(request.chainIdentifier);
+
         const res = await PluginManager.onHandlePreFromBtcQuote(
             swapType,
             request,
             requestedAmount,
             request.chainIdentifier,
-            {minInBtc: this.config.min, maxInBtc: this.config.max},
+            {minInBtc: min, maxInBtc: max},
             {baseFeeInBtc: this.config.baseFee, feePPM: this.config.feePPM},
             gasAmount
         );
@@ -62,7 +65,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
                 }
             }
         }
-        if(requestedAmount.input) this.checkBtcAmountInBounds(requestedAmount.amount);
+        if(requestedAmount.input) this.checkBtcAmountInBounds(requestedAmount.amount, request.chainIdentifier);
 
         if(gasAmount!=null && gasAmount.amount!==0n) {
             if(gasAmount.amount > (this.config.gasTokenMax?.[request.chainIdentifier] ?? 0n)) {
@@ -117,12 +120,15 @@ export class FromBtcAmountAssertions extends AmountAssertions {
         let securityDepositApyPPM: bigint;
         let securityDepositBaseMultiplierPPM: bigint;
 
+        const min = this.getSwapMinimum(chainIdentifier);
+        const max = this.getSwapMaximum(chainIdentifier);
+
         const res = await PluginManager.onHandlePostFromBtcQuote(
             swapType,
             request,
             requestedAmount,
             chainIdentifier,
-            {minInBtc: this.config.min, maxInBtc: this.config.max},
+            {minInBtc: min, maxInBtc: max},
             {baseFeeInBtc: fees.baseFee, feePPM: fees.feePPM},
             gasTokenAmount
         );
@@ -177,11 +183,11 @@ export class FromBtcAmountAssertions extends AmountAssertions {
             swapFee = _amountBD - amountBD;
             amountBD = _amountBD;
 
-            const tooLow = amountBD < (this.config.min * 95n / 100n);
-            const tooHigh = amountBD > (this.config.max * 105n / 100n);
+            const tooLow = amountBD < (min * 95n / 100n);
+            const tooHigh = amountBD > (max * 105n / 100n);
             if(tooLow || tooHigh) {
-                const adjustedMin = this.config.min * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
-                const adjustedMax = this.config.max * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
+                const adjustedMin = min * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
+                const adjustedMax = max * (1000000n - fees.feePPM) / (1000000n - fees.baseFee);
                 const minIn = await this.swapPricing.getFromBtcSwapAmount(
                     adjustedMin, requestedAmount.token, chainIdentifier, null, requestedAmount.pricePrefetch
                 );
@@ -198,7 +204,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
                 };
             }
         } else {
-            this.checkBtcAmountInBounds(requestedAmount.amount);
+            this.checkBtcAmountInBounds(requestedAmount.amount, chainIdentifier);
             amountBD = requestedAmount.amount - amountBDgas;
             swapFee = fees.baseFee + ((amountBD * fees.feePPM + 999_999n) / 1000000n);
             if(amountBD - swapFee < 0n) {
@@ -206,8 +212,8 @@ export class FromBtcAmountAssertions extends AmountAssertions {
                     code: 20003,
                     msg: "Amount too low!",
                     data: {
-                        min: this.config.min.toString(10),
-                        max: this.config.max.toString(10)
+                        min: min.toString(10),
+                        max: max.toString(10)
                     }
                 };
             }

package/src/swaps/assertions/ToBtcAmountAssertions.ts

@@ -21,12 +21,15 @@ export class ToBtcAmountAssertions extends AmountAssertions {
         request: RequestData<ToBtcLnRequestType | ToBtcRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string}
     ): Promise<{baseFee: bigint, feePPM: bigint}> {
+        const min = this.getSwapMinimum(request.chainIdentifier);
+        const max = this.getSwapMaximum(request.chainIdentifier);
+
         const res = await PluginManager.onHandlePreToBtcQuote(
             swapType,
             request,
             requestedAmount,
             request.chainIdentifier,
-            {minInBtc: this.config.min, maxInBtc: this.config.max},
+            {minInBtc: min, maxInBtc: max},
             {baseFeeInBtc: this.config.baseFee, feePPM: this.config.feePPM},
         );
         if(res!=null) {
@@ -39,7 +42,7 @@ export class ToBtcAmountAssertions extends AmountAssertions {
             }
         }
         if(!requestedAmount.input) {
-            this.checkBtcAmountInBounds(requestedAmount.amount);
+            this.checkBtcAmountInBounds(requestedAmount.amount, request.chainIdentifier);
         }
         return {
             baseFee: this.config.baseFee,
@@ -77,12 +80,15 @@ export class ToBtcAmountAssertions extends AmountAssertions {
     }> {
         const chainIdentifier = request.chainIdentifier;
 
+        const min = this.getSwapMinimum(chainIdentifier);
+        const max = this.getSwapMaximum(chainIdentifier);
+
         const res = await PluginManager.onHandlePostToBtcQuote<T>(
             swapType,
             request,
             requestedAmount,
             request.chainIdentifier,
-            {minInBtc: this.config.min, maxInBtc: this.config.max},
+            {minInBtc: min, maxInBtc: max},
             {baseFeeInBtc: fees.baseFee, feePPM: fees.feePPM, networkFeeGetter: getNetworkFee}
         );
         signal.throwIfAborted();
@@ -128,18 +134,18 @@ export class ToBtcAmountAssertions extends AmountAssertions {
             amountBD = amountBD - fees.baseFee;
 
             //If it's already smaller than minimum, set it to minimum so we can calculate the network fee
-            if(amountBD < (this.config.min * 95n / 100n)) {
-                amountBD = this.config.min;
+            if(amountBD < (min * 95n / 100n)) {
+                amountBD = min;
                 tooLow = true;
             }
             //If it's already larger than maximum, set it to maximum so we can calculate the network fee
-            if(amountBD > (this.config.max * 105n / 100n)) {
-                amountBD = this.config.max;
+            if(amountBD > (max * 105n / 100n)) {
+                amountBD = max;
                 tooHigh = true;
             }
         } else {
             amountBD = requestedAmount.amount;
-            this.checkBtcAmountInBounds(amountBD);
+            this.checkBtcAmountInBounds(amountBD, chainIdentifier);
         }
 
         const resp = await getNetworkFee(amountBD);
@@ -152,12 +158,12 @@ export class ToBtcAmountAssertions extends AmountAssertions {
             //Decrease by percentage fee
             amountBD = amountBD * 1000000n / (fees.feePPM + 1000000n);
 
-            tooHigh ||= amountBD > (this.config.max * 105n / 100n);
-            tooLow ||= amountBD < (this.config.min * 95n / 100n);
+            tooHigh ||= amountBD > (max * 105n / 100n);
+            tooLow ||= amountBD < (min * 95n / 100n);
             if(tooLow || tooHigh) {
                 //Compute min/max
-                let adjustedMin = this.config.min * (fees.feePPM + 1000000n) / 1000000n;
-                let adjustedMax = this.config.max * (fees.feePPM + 1000000n) / 1000000n;
+                let adjustedMin = min * (fees.feePPM + 1000000n) / 1000000n;
+                let adjustedMax = max * (fees.feePPM + 1000000n) / 1000000n;
                 adjustedMin = adjustedMin + fees.baseFee + resp.networkFee;
                 adjustedMax = adjustedMax + fees.baseFee + resp.networkFee;
                 const minIn = await this.swapPricing.getFromBtcSwapAmount(

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -64,6 +64,26 @@ export type SpvVaultPostQuote = {
 
 const TX_MAX_VSIZE = 16*1024;
 
+type AmountAdjustUtxo = {
+    value: number,
+    vSize: number,
+    cpfp?: {
+        effectiveVSize: number,
+        effectiveFeeRate: number
+    }
+}
+
+function parseAmountAdjustUtxos(amountAdjustUtxos: any): AmountAdjustUtxo[] {
+    if(!Array.isArray(amountAdjustUtxos)) return null;
+    if(amountAdjustUtxos.length > 250) return null;
+    const validArray = amountAdjustUtxos.every(value =>
+        value!=null && typeof(value)==="object" && typeof(value.value)==="number" && typeof(value.vSize)==="number" &&
+        (value.cpfp==null || (typeof(value.cpfp)==="object" && typeof(value.cpfp.effectiveVSize)==="number" && typeof(value.cpfp.effectiveFeeRate)==="number"))
+    );
+    if(!validArray) return null;
+    return amountAdjustUtxos;
+}
+
 export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapState> {
     readonly type = SwapHandlerType.FROM_BTC_SPV;
     readonly inflightSwapStates = new Set([SpvVaultSwapState.SIGNED, SpvVaultSwapState.SENT, SpvVaultSwapState.BTC_CONFIRMED]);
@@ -354,7 +374,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 gasTokenPricePrefetchPromise
             } = this.getPricePrefetches(chainIdentifier, preFetchParsedBody.token, preFetchParsedBody.gasToken, abortController);
             const nativeBalancePrefetch = this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
-            const btcFeeRatePrefetch = this.bitcoin.getFeeRate().catch(e => {
+            const btcFeeRatePrefetch: Promise<number> = this.bitcoin.getFeeRate().catch(e => {
                 abortController.abort(e);
                 return null;
             });
@@ -405,6 +425,23 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 msg: "Invalid request body"
             };
 
+            const inputAmountAdjustments = req.paramReader.getExistingParamsOrNull({
+                amountUtxos: FieldTypeEnum.AnyOptional,
+                amountFeeRate: FieldTypeEnum.NumberOptional
+            });
+            if(inputAmountAdjustments==null) throw {
+                code: 20100,
+                msg: "Invalid request body"
+            };
+
+            const clientInputUtxos: AmountAdjustUtxo[] | null = inputAmountAdjustments?.amountUtxos!=null
+                ? parseAmountAdjustUtxos(inputAmountAdjustments.amountUtxos)
+                : null;
+            if(inputAmountAdjustments?.amountUtxos!=null && clientInputUtxos==null) throw {
+                code: 20100,
+                msg: "Invalid request body (amountUtxos)"
+            };
+
             const parsedBody: SpvVaultSwapRequestType = {...preFetchParsedBody, ...actualParsedBody};
             metadata.request = parsedBody;
 
@@ -429,6 +466,48 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                     parsedBody.amount,
                 token: parsedBody.token
             };
+            if(clientInputUtxos!=null) {
+                if(parsedBody.exactOut) throw {
+                    code: 20193,
+                    msg: "amountAdjustUtxos cannot be specified for exactOut swaps!"
+                };
+
+                let btcFeeRate = await btcFeeRatePrefetch;
+                if(inputAmountAdjustments.amountFeeRate!=null && inputAmountAdjustments.amountFeeRate>btcFeeRate)
+                    btcFeeRate = inputAmountAdjustments.amountFeeRate;
+
+                let feeAccumulator: number = 0;
+                let valueAccumulator: number = 0;
+                for(let utxo of clientInputUtxos) {
+                    const cpfpAdditionalFee: number = utxo.cpfp==null ? 0 : Math.ceil(utxo.cpfp.effectiveVSize * Math.max(0, btcFeeRate - utxo.cpfp.effectiveFeeRate));
+                    const spendFee: number = utxo.vSize * btcFeeRate;
+                    const totalFee: number = cpfpAdditionalFee + spendFee;
+                    if(totalFee > utxo.value) continue; //Skip detrimental UTXO
+                    feeAccumulator += totalFee;
+                    valueAccumulator += utxo.value;
+                }
+
+                let baseTxVSize: number = 10.5; // 4b version, 1b inputs, 1b outputs, 4b locktime, 0.5vB witness flag + witness elements count
+                //vault input and output
+                baseTxVSize += 32 + 4 + 1 + 4; //Input base
+                baseTxVSize += this.vaultSigner.getAddressType()==="p2tr" ? (1+1+65)/4 : (1+1+72+1+33)/4;
+                baseTxVSize += 8 + 1; //Output base
+                baseTxVSize += this.vaultSigner.getAddressType()==="p2tr" ? 34 : 22;
+                //opreturn output
+                baseTxVSize += 8 + 1; //Output base
+                const opReturnDataSize = spvVaultContract.toOpReturnData(parsedBody.address, parsedBody.gasAmount > 0 ? [0xffffffffffffffffn, 0xffffffffffffffffn] : [0xffffffffffffffffn]).length;
+                baseTxVSize += (opReturnDataSize <= 0x4b ? 2 : 3 /*Needs an OP_PUSHDATA1 opcode*/) + opReturnDataSize;
+                //LP output
+                baseTxVSize += 8 + 1; //Output base
+                baseTxVSize += this.bitcoin.getAddressType()==="p2tr" ? 34 : this.bitcoin.getAddressType()==="p2wpkh" ? 22 : 23;
+
+                const baseTxFee = Math.ceil(baseTxVSize) * btcFeeRate;
+                feeAccumulator += baseTxFee;
+
+                const amount = Math.floor(valueAccumulator - Math.ceil(feeAccumulator));
+                requestedAmount.amount = BigInt(amount);
+            }
+
             const gasTokenAmount = {
                 input: false,
                 amount: parsedBody.gasAmount * (100_000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate) / 100_000n,
@@ -562,7 +641,9 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
 
                     callerFeeShare: callerFeeShare.toString(10),
                     frontingFeeShare: frontingFeeShare.toString(10),
-                    executionFeeShare: executionFeeShare.toString(10)
+                    executionFeeShare: executionFeeShare.toString(10),
+
+                    usedUtxoInputCalculation: clientInputUtxos!=null
                 }
             });
         }));

package/src/swaps/trusted/frombtc_trusted/FromBtcTrusted.ts

@@ -185,8 +185,8 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
                 swap.adjustedOutput = swap.outputTokens;
             } else {
                 //If lower than minimum then ignore
-                if(sentSats < this.config.min) return;
-                if(sentSats > this.config.max) {
+                if(sentSats < this.AmountAssertions.getSwapMinimum(swap.chainIdentifier)) return;
+                if(sentSats > this.AmountAssertions.getSwapMaximum(swap.chainIdentifier)) {
                     swap.adjustedInput = sentSats;
                     swap.btcTx = tx;
                     swap.txId = tx.txid;