Merge pull request #728 from BoltzExchange/lightning-fixes

Lightning fixes

boltzr/src/lightning/lnd/mod.rs

@@ -139,7 +139,7 @@ impl BaseClient for Lnd {
                     Err(err) => {
                         error!("LND subscriptions failed: {}", err);
                         warn!(
-                            "Reconnecting to LND subscriptions in : {:?}",
+                            "Reconnecting to LND subscriptions in: {:?}",
                             RECONNECT_INTERVAL
                         );
                         tokio::time::sleep(RECONNECT_INTERVAL).await;

docs/deployment.md

@@ -255,6 +255,10 @@ maxZeroConfRisk = 1_000_000
 # Can be set to alert about the balance of an unused wallet being more than a certain threshold
 # maxUnusedWalletBalance = 100_000
 
+# Public keys of Lightning nodes on the network of the currency
+# to which we cannot route reliably
+noRoute = ["02588a9f9835642d8ab1fb8018f2d9cd85b8fb353cc5375f0f7f59cad87a62133f"]
+
     [currencies.chain]
     host = "127.0.0.1"
     port = 18_332

lib/Config.ts

@@ -78,6 +78,7 @@ type RoutingOffsetException = {
 type CurrencyConfig = BaseCurrencyConfig & {
   lnd?: LndConfig;
   cln?: ClnConfig;
+  noRoute?: string[];
   routingOffsetExceptions?: RoutingOffsetException[];
 
   // Max fee ratio for LND's sendPayment

lib/cli/commands/AllowRefund.ts

@@ -0,0 +1,25 @@
+import { Arguments } from 'yargs';
+import { AllowRefundRequest } from '../../proto/boltzrpc_pb';
+import { ApiType, BuilderTypes } from '../BuilderComponents';
+import { callback, loadBoltzClient } from '../Command';
+
+export const command = 'allowrefund <id>';
+
+export const describe =
+  'skips the safety checks and allows cooperative refunds for a swap';
+
+export const builder = {
+  id: {
+    type: 'string',
+    describe: 'ID of the swap',
+  },
+};
+
+export const handler = (
+  argv: Arguments<BuilderTypes<typeof builder> & ApiType>,
+): void => {
+  const request = new AllowRefundRequest();
+  request.setId(argv.id);
+
+  loadBoltzClient(argv).allowRefund(request, callback());
+};

lib/grpc/GrpcServer.ts

@@ -35,6 +35,7 @@ class GrpcServer {
       listSwaps: grpcService.listSwaps,
       rescan: grpcService.rescan,
       setSwapStatus: grpcService.setSwapStatus,
+      allowRefund: grpcService.allowRefund,
       devHeapDump: grpcService.devHeapDump,
       getLockedFunds: grpcService.getLockedFunds,
       getPendingSweeps: grpcService.getPendingSweeps,

lib/grpc/GrpcService.ts

@@ -195,6 +195,18 @@ class GrpcService {
     });
   };
 
+  public allowRefund: handleUnaryCall<
+    boltzrpc.AllowRefundRequest,
+    boltzrpc.AllowRefundResponse
+  > = async (call, callback) => {
+    await this.handleCallback(call, callback, async () => {
+      const { id } = call.request.toObject();
+      await this.service.allowRefund(id);
+
+      return new boltzrpc.AllowRefundResponse();
+    });
+  };
+
   public getLockedFunds: handleUnaryCall<
     boltzrpc.GetLockedFundsRequest,
     boltzrpc.GetLockedFundsResponse

lib/grpc/Interceptors.ts

@@ -6,7 +6,7 @@ export const loggingInterceptor =
   (methodDescriptor, call) =>
     new ServerInterceptingCall(call, {
       start: (next) => {
-        logger.debug(`Got gRPC call ${methodDescriptor.path}`);
+        logger.debug(`Got gRPC call: ${methodDescriptor.path}`);
         return next();
       },
     });