feat: mpay to pay invoices

BoltzExchange · Jan 22, 2024 · 4c6eb4a · 4c6eb4a
1 parent 6e9fdab
commit 4c6eb4a
Show file tree

Hide file tree

Showing 31 changed files with 612 additions and 164 deletions.
diff --git a/lib/Boltz.ts b/lib/Boltz.ts
@@ -18,9 +18,10 @@ import ChainTip from './db/models/ChainTip';
 import ChainTipRepository from './db/repositories/ChainTipRepository';
 import GrpcServer from './grpc/GrpcServer';
 import GrpcService from './grpc/GrpcService';
-import ClnClient from './lightning/ClnClient';
 import { LightningClient } from './lightning/LightningClient';
 import LndClient from './lightning/LndClient';
+import ClnClient from './lightning/cln/ClnClient';
+import MpayClient from './lightning/cln/MpayClient';
 import NotificationProvider from './notifications/NotificationProvider';
 import Service from './service/Service';
 import NodeSwitch from './swap/NodeSwitch';
@@ -310,6 +311,19 @@ class Boltz {
           client.symbol,
           holdInfo.version,
         );
+
+        if (client.useMpay()) {
+          const mpayInfo = await client.mpay!.getInfo();
+          this.logger.verbose(
+            `${client.symbol} ${MpayClient.serviceName} version: ${mpayInfo.version}`,
+          );
+
+          VersionCheck.checkLightningVersion(
+            MpayClient.serviceName,
+            client.symbol,
+            mpayInfo.version,
+          );
+        }
       }
 
       this.logStatus(service, info);

diff --git a/lib/Config.ts b/lib/Config.ts
@@ -9,8 +9,8 @@ import { WebdavConfig } from './backup/providers/Webdav';
 import { Network } from './consts/Enums';
 import Errors from './consts/Errors';
 import { PairConfig } from './consts/Types';
-import { ClnConfig } from './lightning/ClnClient';
 import { LndConfig } from './lightning/LndClient';
+import { ClnConfig } from './lightning/cln/ClnClient';
 import { NodeSwitchConfig } from './swap/NodeSwitch';
 
 type PostgresConfig = {

diff --git a/lib/VersionCheck.ts b/lib/VersionCheck.ts
@@ -1,6 +1,7 @@
 import ChainClient from './chain/ChainClient';
-import ClnClient from './lightning/ClnClient';
 import LndClient from './lightning/LndClient';
+import ClnClient from './lightning/cln/ClnClient';
+import MpayClient from './lightning/cln/MpayClient';
 
 type Version = string | number;
 
@@ -69,7 +70,13 @@ class Comperator {
 }
 
 class VersionCheck {
-  private static versionLimits = {
+  private static versionLimits: Record<
+    string,
+    {
+      minimal: string | number;
+      maximal: string | number;
+    }
+  > = {
     [ChainClient.serviceName]: {
       minimal: 220000,
       maximal: 260000,
@@ -82,6 +89,10 @@ class VersionCheck {
       minimal: '0.0.3',
       maximal: '0.0.4',
     },
+    [MpayClient.serviceName]: {
+      minimal: '0.1.0',
+      maximal: '0.1.0',
+    },
     [LndClient.serviceName]: {
       minimal: '0.16.0',
       maximal: '0.17.3',
@@ -138,6 +149,10 @@ class VersionCheck {
         limits = VersionCheck.versionLimits[ClnClient.serviceNameHold];
         break;
 
+      case MpayClient.serviceName:
+        limits = VersionCheck.versionLimits[MpayClient.serviceName];
+        break;
+
       default:
         throw `unsupported lightning client ${serviceName}`;
     }

diff --git a/lib/api/Controller.ts b/lib/api/Controller.ts
@@ -14,8 +14,8 @@ import ReferralStats from '../data/ReferralStats';
 import ChannelCreationRepository from '../db/repositories/ChannelCreationRepository';
 import ReverseSwapRepository from '../db/repositories/ReverseSwapRepository';
 import SwapRepository from '../db/repositories/SwapRepository';
-import ClnClient from '../lightning/ClnClient';
 import LndClient from '../lightning/LndClient';
+import ClnClient from '../lightning/cln/ClnClient';
 import ServiceErrors from '../service/Errors';
 import { SwapUpdate } from '../service/EventHandler';
 import NodeInfo from '../service/NodeInfo';