lightning 6.2.4 → 6.2.5

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 6.2.5
+
+- Fix errors with LND API changes to HTLC events
+
 ## 6.2.4
 
 - `getWalletInfo`: Add support for LND 0.15.3

package/grpc/protos/router.proto

@@ -618,6 +618,8 @@ message HtlcEvent {
         ForwardFailEvent forward_fail_event = 8;
         SettleEvent settle_event = 9;
         LinkFailEvent link_fail_event = 10;
+        SubscribedEvent subscribed_event = 11;
+        FinalHtlcEvent final_htlc_event = 12;
     }
 }
 
@@ -648,6 +650,14 @@ message SettleEvent {
     bytes preimage = 1;
 }
 
+message FinalHtlcEvent {
+    bool settled = 1;
+    bool offchain = 2;
+}
+
+message SubscribedEvent {
+}
+
 message LinkFailEvent {
     // Info contains details about the htlc that we failed.
     HtlcInfo info = 1;
@@ -792,6 +802,10 @@ message ForwardHtlcInterceptRequest {
 
     // The onion blob for the next hop
     bytes onion_blob = 9;
+
+    // The block height at which this htlc will be auto-failed to prevent the
+    // channel from force-closing.
+    int32 auto_fail_height = 10;
 }
 
 /**

package/lnd_methods/offchain/disconnect_watchtower.js

@@ -3,6 +3,7 @@ const {returnResult} = require('asyncjs-util');
 
 const {isLnd} = require('./../../lnd_requests');
 
+const errorMessageNotFound = 'tower not found';
 const hexAsBuffer = hex => Buffer.from(hex, 'hex');
 const method = 'removeTower';
 const type = 'tower_client';
@@ -47,6 +48,11 @@ module.exports = (args, cbk) => {
             return cbk([501, 'ExpectedLndWithWtclientrpcTagToDisconnect']);
           }
 
+          // Exit early when the tower is already not present
+          if (!!err && err.details === errorMessageNotFound) {
+            return cbk();
+          }
+
           if (!!err) {
             return cbk([503, 'UnexpectedErrDisconnectingWatchtower', {err}]);
           }

package/lnd_methods/offchain/subscribe_to_forwards.js

@@ -71,6 +71,15 @@ module.exports = ({lnd}) => {
   const sub = lnd[type][method]({});
 
   sub.on('data', data => {
+    // Exit early on subscribed events
+    if (!!data && !!data.subscribed_event) {
+      return;
+    }
+
+    if (!!data && !!data.final_htlc_event) {
+      return;
+    }
+
     try {
       emitter.emit(event, forwardFromHtlcEvent(data));
     } catch (err) {

package/lnd_methods/offchain/subscribe_to_past_payments.js

@@ -81,6 +81,15 @@ module.exports = ({lnd}) => {
   const emitErr = emitSubscriptionError({emitter, subscription: sub});
 
   sub.on('data', data => {
+    // Exit early on subscribed events
+    if (!!data && !!data.subscribed_event) {
+      return;
+    }
+
+    if (!!data && !!data.final_htlc_event) {
+      return;
+    }
+
     try {
       const htlc = forwardFromHtlcEvent(data);
 

package/package.json

@@ -7,10 +7,10 @@
     "url": "https://github.com/alexbosworth/lightning/issues"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.7.2",
+    "@grpc/grpc-js": "1.7.3",
     "@grpc/proto-loader": "0.7.3",
     "@types/express": "4.17.14",
-    "@types/node": "18.11.2",
+    "@types/node": "18.11.7",
     "@types/request": "2.48.8",
     "@types/ws": "8.5.3",
     "async": "3.2.4",
@@ -19,7 +19,7 @@
     "bn.js": "5.2.1",
     "body-parser": "1.20.1",
     "bolt07": "1.8.2",
-    "bolt09": "0.2.3",
+    "bolt09": "0.2.4",
     "cbor": "8.1.0",
     "ecpair": "2.1.0",
     "express": "4.18.2",
@@ -34,7 +34,7 @@
     "@alexbosworth/tap": "15.0.11",
     "tsd": "0.24.1",
     "typescript": "4.8.4",
-    "ws": "8.9.0"
+    "ws": "8.10.0"
   },
   "engines": {
     "node": ">=14"
@@ -59,5 +59,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "6.2.4"
+  "version": "6.2.5"
 }