ln-service 56.5.1 → 56.7.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Versions
 
+## 56.7.0
+
+- `getPendingChannels`: Add `description` to return pending channel description
+- `getPendingChannels`: Add `is_private` to show pending channel announcement
+
+## 56.6.0
+
+- `getPendingChannels`: Add `type` to return pending channel type
+
 ## 56.5.1
 
 - `getPendingChannels`: Fix returning closing transaction id for waiting close

package/README.md

@@ -1684,7 +1684,7 @@ Requires `offchain:read` permission
 
 `is_trusted_funding` is not supported on LND 0.15.0 and below
 
-`description` is not supported on LND 0.16.3 and below
+`description` is not supported on LND 0.16.4 and below
 
     {
       [is_active]: <Limit Results To Only Active Channels Bool> // false
@@ -2881,6 +2881,10 @@ channel may be opening, closing, or active.
 
 Requires `offchain:read` permission
 
+`is_private` is not supported in LND 0.14.5 or before
+
+`description` is not supported in LND 0.16.4 or before
+
     {
       lnd: <Authenticated LND API Object>
     }
@@ -2890,10 +2894,12 @@ Requires `offchain:read` permission
       pending_channels: [{
         capacity: <Channel Capacity Tokens Number>
         [close_transaction_id]: <Channel Closing Transaction Id String>
+        [description]: <Channel Description String>
         is_active: <Channel Is Active Bool>
         is_closing: <Channel Is Closing Bool>
         is_opening: <Channel Is Opening Bool>
         [is_partner_initiated]: <Channel Partner Initiated Channel Bool>
+        [is_private]: <Channel Is Private Bool>
         is_timelocked: <Channel Local Funds Constrained by Timelock Script Bool>
         local_balance: <Channel Local Tokens Balance Number>
         local_reserve: <Channel Local Reserved Tokens Number>
@@ -2917,6 +2923,7 @@ Requires `offchain:read` permission
         transaction_id: <Channel Funding Transaction Id String>
         transaction_vout: <Channel Funding Transaction Vout Number>
         [transaction_weight]: <Commit Transaction Weight Number>
+        [type]: <Channel Commitment Transaction Type String>
       }]
     }
 
@@ -3701,9 +3708,9 @@ Requires `offchain:write`, `onchain:write`, `peers:write` permissions
 `base_fee_mtokens` is not supported on LND 0.15.5 and below
 `fee_rate` is not supported on LND 0.15.5 and below
 
-`is_max_funding` is not supported on LND 0.16.3 and below
+`is_max_funding` is not supported on LND 0.16.4 and below
 
-`description` is not supported on LND 0.16.3 and below
+`description` is not supported on LND 0.16.4 and below
 
     {
       [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
@@ -3760,7 +3767,7 @@ as well as a channel open request listener to accept the trusted funding.
 `base_fee_mtokens` is not supported on LND 0.15.5 and below
 `fee_rate` is not supported on LND 0.15.5 and below
 
-`description` is not supported on LND 0.16.3 and below
+`description` is not supported on LND 0.16.4 and below
 
     {
       channels: [{
@@ -4393,7 +4400,7 @@ Requires `address:read`, `offchain:write`, `onchain:write` permissions
 
 Requires LND compiled with `walletrpc` build tag
 
-`description` is not supported on LND 0.16.3 and below
+`description` is not supported on LND 0.16.4 and below
 
     {
       capacity: <Channel Capacity Tokens Number>
@@ -5263,7 +5270,7 @@ Requires `offchain:read` permission
 
 `is_trusted_funding`, `other_ids` are not supported on LND 0.15.0 and below
 
-`description` is not supported on LND 0.16.3 and below
+`description` is not supported on LND 0.16.4 and below
 
     {
       lnd: <Authenticated LND API Object>
@@ -6805,7 +6812,7 @@ LND must be running with "RPC middleware" enabled: `rpcmiddleware.enable=1`
 
 This method is not supported in LND 0.13.4 and below
 
-`description` is not supported on LND 0.16.3 and below
+`description` is not supported on LND 0.16.4 and below
 
     {
       [id]: <RPC Middleware Interception Name String>

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.3",
-    "lightning": "9.5.1",
+    "lightning": "9.7.0",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
@@ -25,11 +25,11 @@
     "asyncjs-util": "1.2.11",
     "bip32": "4.0.0",
     "bip66": "1.1.5",
-    "bitcoinjs-lib": "6.1.2",
+    "bitcoinjs-lib": "6.1.3",
     "bn.js": "5.2.1",
     "bs58check": "3.0.1",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "5.0.5",
+    "ln-docker-daemons": "5.0.6",
     "p2tr": "1.3.3",
     "portfinder": "1.0.32",
     "psbt": "2.7.2",
@@ -69,5 +69,5 @@
     "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 200 test/autopilotrpc-integration/*.js test/chainrpc-integration/*.js test/integration/*.js test/invoicesrpc-integration/*.js test/peersrpc-integration/*.js test/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "56.5.1"
+  "version": "56.7.0"
 }

package/test/integration/test_delete_pending_channel.js

@@ -27,6 +27,7 @@ const {unlockUtxo} = require('./../../');
 
 const capacity = 1e6;
 const count = 100;
+const description = 'description';
 const interval = 100;
 const race = promises => Promise.race(promises);
 const size = 3;
@@ -61,11 +62,16 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
       return await addPeer({lnd, public_key: node.id, socket: node.socket});
     });
 
-    const channels = [{capacity, partner_public_key: target.id}];
+    const channels = [{
+      capacity,
+      description,
+      is_private: true,
+      partner_public_key: target.id,
+    }];
 
     // Propose a channel to target
-    const proposeToTarget = await asyncRetry({interval, times}, cbk => {
-      return asyncTimeout(openChannels, 1000 * 10)({
+    const proposeToTarget = await asyncRetry({interval: 1000, times}, cbk => {
+      return asyncTimeout(openChannels, 1000 * 3)({
         channels,
         lnd,
         is_avoiding_broadcast: true,
@@ -96,10 +102,15 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
     });
 
     // Propose a channel to remote
-    const proposeToRemote = await asyncRetry({interval, times}, cbk => {
-      return asyncTimeout(openChannels, 1000 * 10)({
+    const proposeToRemote = await asyncRetry({interval: 1000, times}, cbk => {
+      return asyncTimeout(openChannels, 1000 * 3)({
         lnd,
-        channels: [{capacity, partner_public_key: remote.id}],
+        channels: [{
+          capacity,
+          description,
+          is_private: true,
+          partner_public_key: remote.id,
+        }],
         is_avoiding_broadcast: true,
       },
       cbk);
@@ -122,13 +133,18 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
       funding: signRemote.psbt,
     });
 
+    await delay(1000);
+
     const {transaction} = extractTransaction({ecp, psbt: signRemote.psbt});
 
     await broadcastChainTransaction({lnd, transaction});
 
-    const channel = await asyncRetry({interval, times}, async () => {
+    await generate({});
+
+    const channel = await asyncRetry({interval: 1000, times}, async () => {
       const [channel] = (await getChannels({lnd})).channels;
 
+      // Exit early when the channel is created
       if (!!channel) {
         return channel;
       }
@@ -142,6 +158,12 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
 
     const [pending] = (await getPendingChannels({lnd})).pending_channels;
 
+    // Description is not supported in LND 0.16.4 or before
+    if (!!pending.description) {
+      strictSame(pending.description, description, 'Got expected description');
+      strictSame(pending.is_private, true, 'Got pending private status');
+    }
+
     const stuckTx = extractTransaction({ecp, psbt: signTarget.psbt});
 
     const [stuckPending] = proposeToTarget.pending;

package/test/integration/test_subscribe_to_channels.js

@@ -107,7 +107,7 @@ test('Subscribe to channels', async ({end, equal, fail}) => {
     equal(openEvent.local_balance, 890950, 'Channel local balance returned');
   }
 
-  // LND 0.16.3 and below do not support channel descriptions
+  // LND 0.16.4 and below do not support channel descriptions
   if (!!openEvent.description) {
     equal(openEvent.description, description, 'Got channel open description');
   }

package/test/integration/test_subscribe_to_graph.js

@@ -121,7 +121,6 @@ test('Subscribe to channels', async ({end, equal, fail, strictSame}) => {
         return;
       });
 
-
       const gotControl = nodeUpdated.find(n => n.public_key === control.id);
 
       const expectedControl = {