@atomiqlabs/lp-lib 16.0.8 → 16.0.10

package/dist/info/InfoHandler.js

@@ -18,20 +18,19 @@ class InfoHandler {
      * @param restServer
      */
     startRestServer(restServer) {
-        restServer.use(this.path + "/info", express.json());
-        restServer.post(this.path + "/info", async (req, res) => {
-            if (req.body == null ||
-                req.body.nonce == null ||
-                typeof (req.body.nonce) !== "string" ||
-                req.body.nonce.length > 64 ||
-                !HEX_REGEX.test(req.body.nonce)) {
+        const infoHandler = async (req, res) => {
+            const reqParams = { ...req.body, ...req.query };
+            if (reqParams.nonce == null ||
+                typeof (reqParams.nonce) !== "string" ||
+                reqParams.nonce.length > 64 ||
+                !HEX_REGEX.test(reqParams.nonce)) {
                 res.status(400).json({
                     msg: "Invalid request body (nonce)"
                 });
                 return;
             }
             const env = {
-                nonce: req.body.nonce,
+                nonce: reqParams.nonce,
                 services: {}
             };
             for (let swapHandler of this.swapHandlers) {
@@ -52,7 +51,10 @@ class InfoHandler {
                 chains
             };
             res.status(200).json(response);
-        });
+        };
+        restServer.use(this.path + "/info", express.json());
+        restServer.post(this.path + "/info", infoHandler);
+        restServer.get(this.path + "/info", infoHandler);
     }
 }
 exports.InfoHandler = InfoHandler;

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.d.ts

@@ -167,11 +167,10 @@ export declare class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToB
      * Checks if the newly submitted PR has the same parameters (destination, cltv_delta, routes) as the initial dummy
      *  invoice sent for exactIn swap quote
      *
-     * @param pr
+     * @param parsedRequest
      * @param parsedAuth
-     * @throws {DefinedRuntimeError} will throw an error if the details don't match
      */
-    private checkPaymentRequestMatchesInitial;
+    private isPaymentRequestMatchingInitial;
     startRestServer(restServer: Express): void;
     init(): Promise<void>;
     getInfoData(): any;

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.js

@@ -537,26 +537,13 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      * Checks if the newly submitted PR has the same parameters (destination, cltv_delta, routes) as the initial dummy
      *  invoice sent for exactIn swap quote
      *
-     * @param pr
+     * @param parsedRequest
      * @param parsedAuth
-     * @throws {DefinedRuntimeError} will throw an error if the details don't match
      */
-    async checkPaymentRequestMatchesInitial(pr, parsedAuth) {
-        const parsedRequest = await this.lightning.parsePaymentRequest(pr);
-        if (parsedRequest.destination !== parsedAuth.initialInvoice.destination ||
-            parsedRequest.cltvDelta !== parsedAuth.initialInvoice.cltvDelta ||
-            parsedRequest.mtokens !== parsedAuth.amount * 1000n) {
-            throw {
-                code: 20102,
-                msg: "Provided PR doesn't match initial!"
-            };
-        }
-        if (!(0, ILightningWallet_1.routesMatch)(parsedRequest.routes, parsedAuth.initialInvoice.routes)) {
-            throw {
-                code: 20102,
-                msg: "Provided PR doesn't match initial (routes)!"
-            };
-        }
+    isPaymentRequestMatchingInitial(parsedRequest, parsedAuth) {
+        return parsedRequest.destination === parsedAuth.initialInvoice.destination &&
+            parsedRequest.cltvDelta === parsedAuth.initialInvoice.cltvDelta &&
+            (0, ILightningWallet_1.routesMatch)(parsedRequest.routes, parsedAuth.initialInvoice.routes);
     }
     startRestServer(restServer) {
         restServer.use(this.path + "/payInvoiceExactIn", (0, ServerParamDecoder_1.serverParamDecoder)(10 * 1000));
@@ -583,7 +570,25 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             const abortSignal = responseStream.getAbortSignal();
             //Check request params
             const { parsedPR, halfConfidence } = await this.checkPaymentRequest(parsedAuth.chainIdentifier, parsedBody.pr);
-            await this.checkPaymentRequestMatchesInitial(parsedBody.pr, parsedAuth);
+            if (parsedPR.mtokens !== parsedAuth.amount * 1000n)
+                throw {
+                    code: 20102,
+                    msg: "Provided PR doesn't match requested (amount)!"
+                };
+            if (!this.isPaymentRequestMatchingInitial(parsedPR, parsedAuth)) {
+                //The provided payment request doesn't match the parameters from the initial one, try to probe/route again
+                // with the same max fee parameters
+                const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
+                const { networkFee, confidence } = await this.checkAndGetNetworkFee(parsedAuth.amount, parsedAuth.quotedNetworkFee, parsedAuth.swapExpiry, currentTimestamp, parsedBody.pr, parsedAuth.metadata, abortSignal);
+                this.logger.info("REST: /payInvoiceExactIn: re-checked network fee for exact-in swap," +
+                    " reqId: " + parsedBody.reqId +
+                    " initialNetworkFee: " + parsedAuth.quotedNetworkFee.toString(10) +
+                    " newNetworkFee: " + networkFee.toString(10) +
+                    " oldConfidence: " + parsedAuth.confidence.toString(10) +
+                    " newConfidence: " + confidence.toString(10) +
+                    " invoice: " + parsedBody.pr);
+                parsedAuth.confidence = confidence;
+            }
             const metadata = parsedAuth.metadata;
             const sequence = base_1.BigIntBufferUtils.fromBuffer((0, crypto_1.randomBytes)(8));
             const { swapContract, signer } = this.getChain(parsedAuth.chainIdentifier);

package/package.json

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

package/src/info/InfoHandler.ts

@@ -44,15 +44,14 @@ export class InfoHandler {
      */
     startRestServer(restServer: Express) {
 
-        restServer.use(this.path+"/info", express.json());
-        restServer.post(this.path+"/info", async (req, res) => {
-            if (
-                req.body == null ||
+        const infoHandler = async (req, res) => {
+            const reqParams = {...req.body, ...req.query};
 
-                req.body.nonce == null ||
-                typeof(req.body.nonce) !== "string" ||
-                req.body.nonce.length>64 ||
-                !HEX_REGEX.test(req.body.nonce)
+            if (
+                reqParams.nonce == null ||
+                typeof(reqParams.nonce) !== "string" ||
+                reqParams.nonce.length>64 ||
+                !HEX_REGEX.test(reqParams.nonce)
             ) {
                 res.status(400).json({
                     msg: "Invalid request body (nonce)"
@@ -61,7 +60,7 @@ export class InfoHandler {
             }
 
             const env: InfoHandlerResponseEnvelope = {
-                nonce: req.body.nonce,
+                nonce: reqParams.nonce,
                 services: {}
             };
 
@@ -92,7 +91,11 @@ export class InfoHandler {
             };
 
             res.status(200).json(response);
-        });
+        };
+
+        restServer.use(this.path+"/info", express.json());
+        restServer.post(this.path+"/info", infoHandler);
+        restServer.get(this.path+"/info", infoHandler);
 
     }
 

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.ts

@@ -666,30 +666,13 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
      * Checks if the newly submitted PR has the same parameters (destination, cltv_delta, routes) as the initial dummy
      *  invoice sent for exactIn swap quote
      *
-     * @param pr
+     * @param parsedRequest
      * @param parsedAuth
-     * @throws {DefinedRuntimeError} will throw an error if the details don't match
      */
-    private async checkPaymentRequestMatchesInitial(pr: string, parsedAuth: ExactInAuthorization): Promise<void> {
-        const parsedRequest = await this.lightning.parsePaymentRequest(pr);
-
-        if(
-            parsedRequest.destination!==parsedAuth.initialInvoice.destination ||
-            parsedRequest.cltvDelta!==parsedAuth.initialInvoice.cltvDelta ||
-            parsedRequest.mtokens!==parsedAuth.amount * 1000n
-        ) {
-            throw {
-                code: 20102,
-                msg: "Provided PR doesn't match initial!"
-            };
-        }
-
-        if(!routesMatch(parsedRequest.routes, parsedAuth.initialInvoice.routes)) {
-            throw {
-                code: 20102,
-                msg: "Provided PR doesn't match initial (routes)!"
-            };
-        }
+    private isPaymentRequestMatchingInitial(parsedRequest: ParsedPaymentRequest, parsedAuth: ExactInAuthorization): boolean {
+        return parsedRequest.destination===parsedAuth.initialInvoice.destination &&
+            parsedRequest.cltvDelta===parsedAuth.initialInvoice.cltvDelta &&
+            routesMatch(parsedRequest.routes, parsedAuth.initialInvoice.routes);
     }
 
     startRestServer(restServer: Express) {
@@ -721,7 +704,27 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
 
             //Check request params
             const {parsedPR, halfConfidence} = await this.checkPaymentRequest(parsedAuth.chainIdentifier, parsedBody.pr);
-            await this.checkPaymentRequestMatchesInitial(parsedBody.pr, parsedAuth);
+            if(parsedPR.mtokens!==parsedAuth.amount*1000n) throw {
+                code: 20102,
+                msg: "Provided PR doesn't match requested (amount)!"
+            };
+            if(!this.isPaymentRequestMatchingInitial(parsedPR, parsedAuth)) {
+                //The provided payment request doesn't match the parameters from the initial one, try to probe/route again
+                // with the same max fee parameters
+                const currentTimestamp: bigint = BigInt(Math.floor(Date.now()/1000));
+                const {networkFee, confidence} = await this.checkAndGetNetworkFee(
+                    parsedAuth.amount, parsedAuth.quotedNetworkFee, parsedAuth.swapExpiry,
+                    currentTimestamp, parsedBody.pr, parsedAuth.metadata, abortSignal
+                );
+                this.logger.info("REST: /payInvoiceExactIn: re-checked network fee for exact-in swap,"+
+                    " reqId: "+parsedBody.reqId+
+                    " initialNetworkFee: "+parsedAuth.quotedNetworkFee.toString(10)+
+                    " newNetworkFee: "+networkFee.toString(10)+
+                    " oldConfidence: "+parsedAuth.confidence.toString(10)+
+                    " newConfidence: "+confidence.toString(10)+
+                    " invoice: "+parsedBody.pr);
+                parsedAuth.confidence = confidence;
+            }
 
             const metadata = parsedAuth.metadata;