lightning 10.8.0 → 10.8.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## 10.8.0
+## 10.8.2
+
+- `pay` and payment via request methods: disallow features 30/31 from payments
+
+## 10.8.1
 
 - `removeAdvertisedFeature`: Add method to remove a feature bit support ad
 

package/README.md

@@ -271,6 +271,8 @@ variables set:
     Attempt to recover channel funds from a specific channel backup.
 - [recoverFundsFromChannels](https://github.com/alexbosworth/ln-service#recoverfundsfromchannels):
     Attempt to recover funds from multiple channels using a multiple channel backup.
+- [removeAdvertisedFeature](https://github.com/alexbosworth/ln-service#removeadvertisedfeature):
+    Remove a supported feature from the graph node announcement
 - [removeExternalSocket](https://github.com/alexbosworth/ln-service#removeexternalsocket):
     Remove a LN p2p network socket from the node advertisement
 - [removePeer](https://github.com/alexbosworth/ln-service#removepeer): Disconnect from a

package/lnd_methods/macaroon/methods.json

@@ -388,6 +388,10 @@
     "method": "restoreChannelBackups",
     "type": "default"
   },
+  "removeAdvertisedFeature": {
+    "method": "updateNodeAnnouncement",
+    "type": "peers"
+  },
   "removeExternalSocket": {
     "method": "updateNodeAnnouncement",
     "type": "peers"

package/lnd_methods/offchain/subscribe_to_pay.js

@@ -4,6 +4,7 @@ const EventEmitter = require('events');
 const asyncAuto = require('async/auto');
 const {chanFormat} = require('bolt07');
 const {chanNumber} = require('bolt07');
+const {parsePaymentRequest} = require('invoices');
 
 const {confirmedFromPayment} = require('./../../lnd_responses');
 const {confirmedFromPaymentStatus} = require('./../../lnd_responses');
@@ -37,6 +38,7 @@ const {round} = Math;
 const sha256 = preimage => createHash('sha256').update(preimage).digest();
 const type = 'router';
 const unknownServiceErr = 'unknown service verrpc.Versioner';
+const unsupportedFeatures = [30, 31];
 
 /** Initiate and subscribe to the outcome of a payment
 
@@ -252,6 +254,14 @@ module.exports = args => {
     throw new Error('ExpectedTokenAmountToPayWhenPaymentRequestNotSpecified');
   }
 
+  if (!!args.request) {
+    try {
+      parsePaymentRequest({request: args.request});
+    } catch (err) {
+      throw new Error('ExpectedValidPaymentRequestToMakePayment');
+    }
+  }
+
   if (!!args.routes && !isArray(args.routes)) {
     throw new Error('UnexpectedFormatForRoutesWhenSubscribingToPayment');
   }
@@ -296,6 +306,23 @@ module.exports = args => {
   const finalCltv = !args.cltv_delta ? defaultCltvDelta : args.cltv_delta;
 
   asyncAuto({
+    // Determine what features would be used with the payment
+    featureBits: cbk => {
+      // Exit early when there are no features to look at
+      if (!args.features && !args.request) {
+        return cbk(null, []);
+      }
+
+      // Exit early when feature bits are specified directly
+      if (!!features) {
+        return cbk(null, features);
+      }
+
+      const request = parsePaymentRequest({request: args.request});
+
+      return cbk(null, request.features.map(n => n.bit));
+    },
+
     // Determine the block height to figure out the height delta
     getHeight: cbk => {
       // Exit early when there is no max timeout restriction
@@ -325,6 +352,17 @@ module.exports = args => {
       }));
     },
 
+    // Validate the payment request features
+    checkFeatures: ['featureBits', ({featureBits}, cbk) => {
+      const bit = featureBits.find(n => unsupportedFeatures.includes(n));
+
+      if (!!bit) {
+        return cbk([501, 'UnsupportedPaymentFeatureInPayRequest', {bit}]);
+      }
+
+      return cbk();
+    }],
+
     // Determine the maximum CLTV delta
     maxCltvDelta: ['getHeight', ({getHeight}, cbk) => {
       if (!args.max_timeout_height) {
@@ -394,7 +432,7 @@ module.exports = args => {
     }],
 
     // Send payment
-    send: ['params', ({params}, cbk) => {
+    send: ['checkFeatures', 'params', ({params}, cbk) => {
       const sub = args.lnd.router.sendPaymentV2(params);
 
       sub.on('data', data => emitPayment({data, emitter}));

package/package.json

@@ -7,9 +7,9 @@
     "url": "https://github.com/alexbosworth/lightning/issues"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.10.3",
-    "@grpc/proto-loader": "0.7.10",
-    "@types/node": "20.11.30",
+    "@grpc/grpc-js": "1.10.4",
+    "@grpc/proto-loader": "0.7.12",
+    "@types/node": "20.12.2",
     "@types/request": "2.48.12",
     "@types/ws": "8.5.10",
     "async": "3.2.5",
@@ -22,11 +22,11 @@
     "invoices": "3.0.0",
     "psbt": "3.0.0",
     "tiny-secp256k1": "2.2.3",
-    "type-fest": "4.13.1"
+    "type-fest": "4.14.0"
   },
   "description": "Lightning Network client library",
   "devDependencies": {
-    "tsd": "0.30.7",
+    "tsd": "0.31.0",
     "typescript": "5.4.3"
   },
   "engines": {
@@ -53,5 +53,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "10.8.0"
+  "version": "10.8.2"
 }