@atomiqlabs/lp-lib 13.0.0-beta.5 → 13.0.0-beta.7

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/SpvVaultSwap.js

@@ -18,7 +18,7 @@ var SpvVaultSwapState;
 class SpvVaultSwap extends SwapHandlerSwap_1.SwapHandlerSwap {
     constructor(chainIdentifierOrObj, quoteId, expiry, vault, vaultUtxo, btcAddress, btcFeeRate, recipient, amountBtc, amountToken, amountGasToken, swapFee, swapFeeInToken, gasSwapFee, gasSwapFeeInToken, callerFeeShare, frontingFeeShare, executionFeeShare, token, gasToken) {
         if (typeof (chainIdentifierOrObj) === "string") {
-            super(chainIdentifierOrObj, swapFee + gasSwapFee, swapFeeInToken * (swapFee + gasSwapFee) / swapFee);
+            super(chainIdentifierOrObj, swapFee + gasSwapFee, swapFeeInToken);
             this.state = SpvVaultSwapState.CREATED;
             this.quoteId = quoteId;
             this.expiry = expiry;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "13.0.0-beta.5",
+  "version": "13.0.0-beta.7",
   "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/SpvVaultSwap.ts

@@ -70,7 +70,7 @@ export class SpvVaultSwap extends SwapHandlerSwap<SpvVaultSwapState> {
         token?: string, gasToken?: string
     ) {
         if(typeof(chainIdentifierOrObj)==="string") {
-            super(chainIdentifierOrObj, swapFee + gasSwapFee, swapFeeInToken * (swapFee + gasSwapFee) / swapFee);
+            super(chainIdentifierOrObj, swapFee + gasSwapFee, swapFeeInToken);
             this.state = SpvVaultSwapState.CREATED;
             this.quoteId = quoteId;
             this.expiry = expiry;