@atomiqlabs/lp-lib 13.0.0-beta.6 → 13.0.0-beta.8

package/dist/swaps/assertions/FromBtcAmountAssertions.js

@@ -126,8 +126,18 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             }
         }
         else {
+            this.checkBtcAmountInBounds(requestedAmount.amount);
             amountBD = requestedAmount.amount - amountBDgas;
-            this.checkBtcAmountInBounds(amountBD);
+            if (amountBD < 0n) {
+                throw {
+                    code: 20003,
+                    msg: "Amount too low!",
+                    data: {
+                        min: this.config.min.toString(10),
+                        max: this.config.max.toString(10)
+                    }
+                };
+            }
         }
         const swapFee = fees.baseFee + (amountBD * fees.feePPM / 1000000n);
         const swapFeeInToken = await this.swapPricing.getFromBtcSwapAmount(swapFee, requestedAmount.token, chainIdentifier, true, requestedAmount.pricePrefetch);

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -251,7 +251,12 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             abortController.signal.throwIfAborted();
             metadata.times.addressCreated = Date.now();
             //Adjust the amounts based on passed fees
-            totalInToken = (totalInToken * 100000n / (100000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate));
+            if (parsedBody.exactOut) {
+                totalInToken = parsedBody.amount;
+            }
+            else {
+                totalInToken = (totalInToken * 100000n / (100000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate));
+            }
             totalInGasToken = (totalInGasToken * 100000n / (100000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate));
             //Calculate raw amounts
             const [rawTokenAmount, rawGasTokenAmount] = vault.toRawAmounts([totalInToken, totalInGasToken]);

package/package.json

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

package/src/swaps/assertions/FromBtcAmountAssertions.ts

@@ -189,8 +189,18 @@ export class FromBtcAmountAssertions extends AmountAssertions {
                 };
             }
         } else {
+            this.checkBtcAmountInBounds(requestedAmount.amount);
             amountBD = requestedAmount.amount - amountBDgas;
-            this.checkBtcAmountInBounds(amountBD);
+            if(amountBD < 0n) {
+                throw {
+                    code: 20003,
+                    msg: "Amount too low!",
+                    data: {
+                        min: this.config.min.toString(10),
+                        max: this.config.max.toString(10)
+                    }
+                };
+            }
         }
 
         const swapFee = fees.baseFee + (amountBD * fees.feePPM / 1000000n);

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -350,7 +350,11 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             metadata.times.addressCreated = Date.now();
 
             //Adjust the amounts based on passed fees
-            totalInToken = (totalInToken * 100_000n / (100_000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate));
+            if(parsedBody.exactOut) {
+                totalInToken = parsedBody.amount;
+            } else {
+                totalInToken = (totalInToken * 100_000n / (100_000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate));
+            }
             totalInGasToken = (totalInGasToken * 100_000n / (100_000n + parsedBody.callerFeeRate + parsedBody.frontingFeeRate));
 
             //Calculate raw amounts