lightning 10.27.3 → 10.27.5

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Versions
 
-## 10.26.3
+## 10.26.5
+
+- `pay`, `payViaPaymentRequest`, `subscribeToPayViaRequest`: Allow short CLTV
+    limit payments when the payment request final CLTV delta is very short
+
+## 10.26.4
 
 - Add support for LND 0.20.0
 

package/lnd_methods/offchain/subscribe_to_pay.js

@@ -307,21 +307,24 @@ module.exports = args => {
   const finalCltv = !args.cltv_delta ? defaultCltvDelta : args.cltv_delta;
 
   asyncAuto({
-    // Determine what features would be used with the payment
-    featureBits: cbk => {
+    // Determine what cltv delta and features would be used with the payment
+    aspects: cbk => {
       // Exit early when there are no features to look at
       if (!args.features && !args.request) {
-        return cbk(null, []);
+        return cbk(null, {features: []});
       }
 
       // Exit early when feature bits are specified directly
       if (!!features) {
-        return cbk(null, features);
+        return cbk(null, {features});
       }
 
       const request = parsePaymentRequest({request: args.request});
 
-      return cbk(null, request.features.map(n => n.bit));
+      return cbk(null, {
+        features: request.features.map(n => n.bit),
+        final_cltv: request.cltv_delta,
+      });
     },
 
     // Determine the block height to figure out the height delta
@@ -354,8 +357,8 @@ module.exports = args => {
     },
 
     // Validate the payment request features
-    checkFeatures: ['featureBits', ({featureBits}, cbk) => {
-      const bit = featureBits.find(n => unsupportedFeatures.includes(n));
+    checkFeatures: ['aspects', ({aspects}, cbk) => {
+      const bit = aspects.features.find(n => unsupportedFeatures.includes(n));
 
       if (!!bit) {
         return cbk([501, 'UnsupportedPaymentFeatureInPayRequest', {bit}]);
@@ -365,18 +368,26 @@ module.exports = args => {
     }],
 
     // Determine the maximum CLTV delta
-    maxCltvDelta: ['getHeight', ({getHeight}, cbk) => {
+    maxCltvDelta: ['aspects', 'getHeight', ({aspects, getHeight}, cbk) => {
       if (!args.max_timeout_height) {
         return cbk();
       }
 
       const currentHeight = getHeight.current_block_height;
+      const lastCltv = !args.request ? finalCltv : aspects.final_cltv;
 
       const maxDelta = cltvLimit(args.max_timeout_height, currentHeight);
 
       // The max cltv delta cannot be lower than the final cltv delta + buffer
-      if (!!maxDelta && !!finalCltv && maxDelta < finalCltv + cltvBuf) {
-        return cbk([400, 'MaxTimeoutTooNearCurrentHeightToMakePayment']);
+      if (!!maxDelta && !!lastCltv && maxDelta < lastCltv + cltvBuf) {
+        return cbk([
+          400,
+          'MaxTimeoutTooNearCurrentHeightToMakePayment',
+          {
+            last_cltv: lastCltv,
+            max_delta: maxDelta,
+          },
+        ]);
       }
 
       return cbk(null, maxDelta);

package/lnd_methods/onchain/fund_psbt.js

@@ -1,7 +1,6 @@
 const asyncAuto = require('async/auto');
-const {decodePsbt} = require('psbt');
 const {returnResult} = require('asyncjs-util');
-const tinysecp = require('tiny-secp256k1');
+const {Psbt} = require('bitcoinjs-lib');
 const {Transaction} = require('bitcoinjs-lib');
 
 const {isLnd} = require('./../../lnd_requests');
@@ -10,13 +9,14 @@ const asOutpoint = n => `${n.transaction_id}:${n.transaction_vout}`;
 const defaultChangeType = () => 'CHANGE_ADDRESS_TYPE_P2TR';
 const defaultConfirmationTarget = 6;
 const expirationAsDate = epoch => new Date(Number(epoch) * 1e3).toISOString();
-const {fromHex} = Transaction;
+const {fromBuffer} = Transaction;
 const hexFromBuffer = buffer => buffer.toString('hex');
 const {isArray} = Array;
 const {isBuffer} = Buffer;
 const isKnownChangeFormat = format => !format || format === 'p2tr';
 const method = 'fundPsbt';
 const notSupported = /unknown.*walletrpc.WalletKit/;
+const psbtFromHex = hex => Psbt.fromBuffer(Buffer.from(hex, 'hex'));
 const strategy = type => !type ? undefined : `STRATEGY_${type.toUpperCase()}`;
 const type = 'wallet';
 const txIdFromBuffer = buffer => buffer.slice().reverse().toString('hex');
@@ -79,9 +79,6 @@ const txIdFromHash = hash => hash.reverse().toString('hex');
 module.exports = (args, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
-      // Import ECPair library
-      ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
-
       // Check arguments
       validate: cbk => {
         if (!isKnownChangeFormat(args.change_format)) {
@@ -222,14 +219,15 @@ module.exports = (args, cbk) => {
       }],
 
       // Derive the raw transaction from the funded PSBT
-      tx: ['ecp', 'fund', ({ecp, fund}, cbk) => {
+      tx: ['fund', ({fund}, cbk) => {
         const {psbt} = fund;
 
         try {
-          const tx = fromHex(decodePsbt({ecp, psbt}).unsigned_transaction);
+          const tx = psbtFromHex(psbt).data.globalMap.unsignedTx.toBuffer();
 
-          return cbk(null, tx);
+          return cbk(null, fromBuffer(tx));
         } catch (err) {
+
           return cbk([503, 'FailedToDecodePsbtInFundPsbtResponse', {err}]);
         }
       }],

package/package.json

@@ -7,9 +7,9 @@
     "url": "https://github.com/alexbosworth/lightning/issues"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.14.1",
+    "@grpc/grpc-js": "1.14.3",
     "@grpc/proto-loader": "0.8.0",
-    "@types/node": "24.10.1",
+    "@types/node": "25.0.1",
     "@types/request": "2.48.13",
     "@types/ws": "8.18.1",
     "async": "3.2.6",
@@ -18,11 +18,9 @@
     "bn.js": "5.2.2",
     "bolt07": "1.9.4",
     "bolt09": "2.2.0",
-    "ecpair": "3.0.0",
     "invoices": "4.0.0",
     "psbt": "4.0.0",
-    "tiny-secp256k1": "2.2.4",
-    "type-fest": "5.2.0"
+    "type-fest": "5.3.1"
   },
   "description": "Lightning Network client library",
   "devDependencies": {
@@ -50,8 +48,8 @@
     "unit-tests": "node --test && npm run test:types"
   },
   "tsd": {
-    "directory": "test/typescript"
+    "directory": "test-typescript/typescript"
   },
   "types": "index.d.ts",
-  "version": "10.27.3"
+  "version": "10.27.5"
 }