@atomiqlabs/lp-lib 16.0.6 → 16.0.8

package/dist/swaps/assertions/FromBtcAmountAssertions.js

@@ -138,7 +138,7 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             this.checkBtcAmountInBounds(requestedAmount.amount);
             amountBD = requestedAmount.amount - amountBDgas;
             swapFee = fees.baseFee + ((amountBD * fees.feePPM + 999999n) / 1000000n);
-            if (amountBD < 0n) {
+            if (amountBD - swapFee < 0n) {
                 throw {
                     code: 20003,
                     msg: "Amount too low!",
@@ -163,6 +163,11 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             totalInToken = await this.swapPricing.getFromBtcSwapAmount(amountBD - swapFee, requestedAmount.token, chainIdentifier, null, requestedAmount.pricePrefetch);
             signal.throwIfAborted();
         }
+        if (totalInToken < 0n)
+            throw {
+                code: 20003,
+                msg: "Amount too low!"
+            };
         return {
             amountBD,
             swapFee,

package/dist/swaps/escrow/tobtc_abstract/ToBtcAbs.js

@@ -586,6 +586,11 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 return resp;
             }, abortController.signal);
             metadata.times.priceCalculated = Date.now();
+            if (amountBD < 600n)
+                throw {
+                    code: "20019",
+                    msg: "Swap output amount is below bitcoin dust (600 sats)!"
+                };
             const claimHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
             //Add grace period another time, so the user has 1 hour to commit
             const expirySeconds = this.getExpiryFromCLTV(parsedBody.confirmationTarget, parsedBody.confirmations) + this.config.gracePeriod;

package/dist/swaps/spv_vault_swap/SpvVaults.js

@@ -120,7 +120,7 @@ class SpvVaults {
         return Object.keys(this.vaultStorage.data)
             .map(key => this.vaultStorage.data[key])
             .filter(val => chainId == null ? true : val.chainId === chainId)
-            .filter(val => val.data.getOwner() === this.chains.chains[val.chainId]?.signer?.getAddress())
+            .filter(val => this.chains.chains[val.chainId] != null && val.data.getOwner() === this.chains.chains[val.chainId]?.signer?.getAddress())
             .filter(val => token == null ? true : val.data.getTokenData()[0].token === token);
     }
     async fundVault(vault, tokenAmounts) {
@@ -296,7 +296,10 @@ class SpvVaults {
         const claimWithdrawals = [];
         let promises = [];
         for (let vault of vaults) {
-            const { signer, spvVaultContract, chainInterface } = this.chains.chains[vault.chainId];
+            const chainData = this.chains.chains[vault.chainId];
+            if (chainData == null)
+                continue;
+            const { signer, spvVaultContract, chainInterface } = chainData;
             if (vault.data.getOwner() !== signer.getAddress())
                 continue;
             if (vault.state === SpvVault_1.SpvVaultState.BTC_INITIATED) {

package/package.json

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

package/src/swaps/assertions/FromBtcAmountAssertions.ts

@@ -201,7 +201,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
             this.checkBtcAmountInBounds(requestedAmount.amount);
             amountBD = requestedAmount.amount - amountBDgas;
             swapFee = fees.baseFee + ((amountBD * fees.feePPM + 999_999n) / 1000000n);
-            if(amountBD < 0n) {
+            if(amountBD - swapFee < 0n) {
                 throw {
                     code: 20003,
                     msg: "Amount too low!",
@@ -229,6 +229,11 @@ export class FromBtcAmountAssertions extends AmountAssertions {
             signal.throwIfAborted();
         }
 
+        if(totalInToken < 0n) throw {
+            code: 20003,
+            msg: "Amount too low!"
+        };
+
         return {
             amountBD,
             swapFee,

package/src/swaps/escrow/tobtc_abstract/ToBtcAbs.ts

@@ -708,6 +708,11 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
             }, abortController.signal);
             metadata.times.priceCalculated = Date.now();
 
+            if(amountBD < 600n) throw {
+                code: "20019",
+                msg: "Swap output amount is below bitcoin dust (600 sats)!"
+            };
+
             const claimHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
 
             //Add grace period another time, so the user has 1 hour to commit

package/src/swaps/spv_vault_swap/SpvVaults.ts

@@ -162,7 +162,7 @@ export class SpvVaults {
         return Object.keys(this.vaultStorage.data)
             .map(key => this.vaultStorage.data[key])
             .filter(val => chainId==null ? true : val.chainId===chainId)
-            .filter(val => val.data.getOwner()===this.chains.chains[val.chainId]?.signer?.getAddress())
+            .filter(val => this.chains.chains[val.chainId]!=null && val.data.getOwner()===this.chains.chains[val.chainId]?.signer?.getAddress())
             .filter(val => token==null ? true : val.data.getTokenData()[0].token===token);
     }
 
@@ -351,7 +351,9 @@ export class SpvVaults {
         let promises: Promise<void>[] = [];
 
         for(let vault of vaults) {
-            const {signer, spvVaultContract, chainInterface} = this.chains.chains[vault.chainId];
+            const chainData = this.chains.chains[vault.chainId];
+            if(chainData==null) continue;
+            const {signer, spvVaultContract, chainInterface} = chainData;
             if(vault.data.getOwner()!==signer.getAddress()) continue;
 
             if(vault.state===SpvVaultState.BTC_INITIATED) {