ln-service 53.1.1 → 53.1.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 53.1.1
+
+- `openChannels`: Fix `cooperative_close_address` not being set on channels
+
 ## 53.1.0
 
 - Add support for LND 0.14.1

package/README.md

@@ -3254,7 +3254,7 @@ after the funding step.
         [partner_csv_delay]: <Peer Output CSV Delay Number>
         [partner_socket]: <Peer Connection Host:Port String>
       }]
-      is_avoiding_broadcast: <Avoid Broadcast of All Channels Bool>
+      [is_avoiding_broadcast]: <Avoid Broadcast of All Channels Bool>
       lnd: <Authenticated LND API Object>
     }
 

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.17.1",
     "invoices": "2.0.2",
-    "lightning": "5.1.0",
+    "lightning": "5.1.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.3.0"
@@ -54,5 +54,5 @@
   "scripts": {
     "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/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "53.1.1"
+  "version": "53.1.2"
 }

package/test/integration/test_open_channels.js

@@ -1,3 +1,4 @@
+const asyncMap = require('async/map');
 const asyncRetry = require('async/retry');
 const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
@@ -6,22 +7,25 @@ const {test} = require('@alexbosworth/tap');
 const {transactionAsPsbt} = require('psbt');
 
 const {addPeer} = require('./../../');
+const {createChainAddress} = require('./../../');
 const {delay} = require('./../macros');
 const {fundPendingChannels} = require('./../../');
 const {getChainBalance} = require('./../../');
 const {getChainTransactions} = require('./../../');
 const {getChannels} = require('./../../');
+const {getHeight} = require('./../../');
 const {getPeers} = require('./../../');
 const {openChannels} = require('./../../');
 const {sendToChainAddresses} = require('./../../');
 
 const capacity = 1e6;
 const count = 10;
-const interval = 1;
+const interval = 10;
+const maturity = 100;
 const race = promises => Promise.race(promises);
 const size = 3;
 const timeout = 250 * 10;
-const times = 200;
+const times = 2000;
 
 // Opening channels should open up channels
 test(`Open channels`, async ({end, equal}) => {
@@ -29,11 +33,19 @@ test(`Open channels`, async ({end, equal}) => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  await asyncRetry({times}, async () => {
-    if (!(await getChainBalance({lnd})).chain_balance) {
-      await generate({});
+  await generate({count: maturity});
+
+  await asyncRetry({interval, times}, async () => {
+    const lnds = [lnd, target.lnd, remote.lnd];
+
+    const heights = await asyncMap(lnds, async lnd => {
+      return (await getHeight({lnd})).current_block_height;
+    });
+
+    const [controlHeight, targetHeight, remoteHeight] = heights;
 
-      throw new Error('ExpectedChainBalanceToOpenChannel');
+    if (controlHeight !== targetHeight || controlHeight !== remoteHeight) {
+      throw new Error('ExpectedSyncHeights');
     }
   });
 
@@ -42,11 +54,12 @@ test(`Open channels`, async ({end, equal}) => {
 
     const spending = chainTx.map(({transaction}) => transaction);
 
-    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+    const {address} = await createChainAddress({lnd});
 
-    const channels = [target, remote].map(node => ({
+    const channels = [target, remote].map(({id}) => ({
       capacity,
-      partner_public_key: node.id,
+      cooperative_close_address: address,
+      partner_public_key: id,
     }));
 
     let pending;
@@ -54,6 +67,7 @@ test(`Open channels`, async ({end, equal}) => {
     // Wait for peers to be connected
     await asyncRetry({interval, times}, async () => {
       await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
 
       if ((await getPeers({lnd})).peers.length !== channels.length) {
         throw new Error('ExpectedConnectedPeersToOpenChannels');
@@ -67,13 +81,13 @@ test(`Open channels`, async ({end, equal}) => {
     });
 
     // Normally funding would involve an un-broadcast transaction
-    await sendToChainAddresses({lnd, send_to: pending});
+    const {id} = await sendToChainAddresses({lnd, send_to: pending});
 
-    await asyncRetry({interval, times}, async() => {
+    await asyncRetry({interval, times}, async () => {
       const {transactions} = await getChainTransactions({lnd});
 
-      if (transactions.length !== pending.length) {
-        throw new Error('ExpectedMultipleChainTransactions');
+      if (!transactions.find(n => n.id === id)) {
+        throw new Error('ExpectedChainTransaction');
       }
 
       return;
@@ -96,7 +110,7 @@ test(`Open channels`, async ({end, equal}) => {
     });
 
     await asyncRetry({interval, times}, async () => {
-      await generate({count});
+      await generate({});
 
       const {channels} = await getChannels({lnd});
 
@@ -104,8 +118,14 @@ test(`Open channels`, async ({end, equal}) => {
         throw new Error('ExpectedNewChannelsCreatedAndActive');
       }
 
+      const [channel] = channels;
+
+      equal(channel.cooperative_close_address, address, 'Channel close addr');
+
       return;
     });
+  } catch (err) {
+    equal(err, null, 'No error is reported');
   } finally {
     return await kill({});
   }