@atomiqlabs/lp-lib 15.0.11 → 15.0.13

package/dist/swaps/assertions/AmountAssertions.js

@@ -44,6 +44,8 @@ class AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the response is an error
      */
     static handlePluginErrorResponses(res) {
+        if (res == null)
+            return;
         if ((0, IPlugin_1.isQuoteThrow)(res))
             throw {
                 code: 29999,

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -344,8 +344,6 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     msg: "Used vault not found!"
                 };
             }
-            //Check the posted quote with the plugins
-            AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(await PluginManager_1.PluginManager.onHandlePostedFromBtcQuote(this.type, { chainIdentifier: swap.chainIdentifier, raw: req, parsed: parsedBody, metadata }, swap));
             //Try parse psbt
             let transaction;
             try {
@@ -358,7 +356,6 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     msg: "Error parsing PSBT, hex format required!"
                 };
             }
-            //Check correct psbt
             for (let i = 1; i < transaction.inputsLength; i++) { //Skip first vault input
                 const txIn = transaction.getInput(i);
                 if ((0, BitcoinUtils_1.isLegacyInput)(txIn))
@@ -366,6 +363,12 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                         code: 20514,
                         msg: "Legacy (pre-segwit) inputs in tx are not allowed!"
                     };
+            }
+            //Check the posted quote with the plugins
+            AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(await PluginManager_1.PluginManager.onHandlePostedFromBtcQuote(this.type, { chainIdentifier: swap.chainIdentifier, raw: req, parsed: parsedBody, metadata }, swap));
+            //Check correct psbt
+            for (let i = 1; i < transaction.inputsLength; i++) { //Skip first vault input
+                const txIn = transaction.getInput(i);
                 //Check UTXOs exist and are unspent
                 if (await this.bitcoinRpc.isSpent(Buffer.from(txIn.txid).toString("hex") + ":" + txIn.index.toString(10)))
                     throw {

package/package.json

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

package/src/swaps/assertions/AmountAssertions.ts

@@ -52,6 +52,7 @@ export abstract class AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the response is an error
      */
     static handlePluginErrorResponses(res: any): void {
+        if(res==null) return;
         if(isQuoteThrow(res)) throw {
             code: 29999,
             msg: res.message

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -471,13 +471,6 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 };
             }
 
-            //Check the posted quote with the plugins
-            AmountAssertions.handlePluginErrorResponses(await PluginManager.onHandlePostedFromBtcQuote(
-                this.type,
-                {chainIdentifier: swap.chainIdentifier, raw: req, parsed: parsedBody, metadata},
-                swap
-            ));
-
             //Try parse psbt
             let transaction: Transaction;
             try {
@@ -490,13 +483,24 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 };
             }
 
-            //Check correct psbt
             for(let i=1;i<transaction.inputsLength;i++) { //Skip first vault input
                 const txIn = transaction.getInput(i);
-                if(isLegacyInput(txIn)) throw {
+                if (isLegacyInput(txIn)) throw {
                     code: 20514,
                     msg: "Legacy (pre-segwit) inputs in tx are not allowed!"
                 };
+            }
+
+            //Check the posted quote with the plugins
+            AmountAssertions.handlePluginErrorResponses(await PluginManager.onHandlePostedFromBtcQuote(
+                this.type,
+                {chainIdentifier: swap.chainIdentifier, raw: req, parsed: parsedBody, metadata},
+                swap
+            ));
+
+            //Check correct psbt
+            for(let i=1;i<transaction.inputsLength;i++) { //Skip first vault input
+                const txIn = transaction.getInput(i);
                 //Check UTXOs exist and are unspent
                 if(await this.bitcoinRpc.isSpent(Buffer.from(txIn.txid).toString("hex")+":"+txIn.index.toString(10))) throw {
                     code: 20515,