ln-service 54.4.0 → 54.4.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 54.4.0
+## 54.4.1
 
 - `subscribeToRpcRequests`: `open_channel_request` add support for
     `fee_rate`, `base_fee_mtokens`

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.2",
-    "lightning": "6.4.0",
+    "lightning": "6.4.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.11.0"
@@ -24,7 +24,7 @@
     "asyncjs-util": "1.2.10",
     "bip32": "3.1.0",
     "bip66": "1.1.5",
-    "bitcoinjs-lib": "6.0.2",
+    "bitcoinjs-lib": "6.1.0",
     "bn.js": "5.2.1",
     "bs58check": "2.1.2",
     "ecpair": "2.1.0",
@@ -62,7 +62,7 @@
     "integration-test-0.15.2": "DOCKER_LND_VERSION=v0.15.2-beta npm run test",
     "integration-test-0.14.5": "DOCKER_LND_VERSION=v0.14.5-beta npm run test",
     "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_serverrpc-integration/*.js test/walletrpc-integration/*.js"
+    "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": "54.4.0"
+  "version": "54.4.1"
 }

package/test/tower_clientrpc-integration/test_connect_watchtower.js

@@ -0,0 +1,39 @@
+const {connectWatchtower} = require('./../../');
+const {getConnectedWatchtowers} = require('./../../');
+const {getTowerServerInfo} = require('./../../');
+const {spawnLightningCluster} = require('ln-docker-daemons');
+const {test} = require('@alexbosworth/tap');
+
+const conf = ['--watchtower.active', '--wtclient.active'];
+const size = 2;
+
+// Connecting to a watchtower should add a watchtower
+test(`Connect watchtower`, async ({end, equal, fail, match}) => {
+  const {kill, nodes} = await spawnLightningCluster({
+    size,
+    lnd_configuration: conf
+  });
+
+  const [{lnd}, target] = nodes;
+
+  try {
+    const {tower} = await getTowerServerInfo({lnd: target.lnd});
+
+    const [socket] = tower.sockets;
+
+    await connectWatchtower({lnd, socket, public_key: tower.public_key});
+
+    const [watcher] = (await getConnectedWatchtowers({lnd})).towers;
+
+    equal(watcher.is_active, true, 'Tower is active');
+    equal(watcher.public_key, tower.public_key, 'Tower public key added');
+    equal(watcher.sessions.length, [].length, 'Tower has no sessions');
+    equal(watcher.sockets.pop(), socket, 'Tower at socket added');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
+
+  await kill({});
+
+  return end();
+});

package/test/tower_clientrpc-integration/test_get_connected_watchtowers.js

@@ -0,0 +1,49 @@
+const {connectWatchtower} = require('./../../');
+const {getConnectedWatchtowers} = require('./../../');
+const {getTowerServerInfo} = require('./../../');
+const {spawnLightningCluster} = require('ln-docker-daemons');
+const {test} = require('@alexbosworth/tap');
+
+const conf = ['--watchtower.active', '--wtclient.active'];
+const size = 2;
+
+// Getting connected watchtowers should return watchtowers
+test(`Get connected watchtowers`, async ({end, equal, fail, match}) => {
+  const {kill, nodes} = await spawnLightningCluster({
+    size,
+    lnd_configuration: conf
+  });
+
+  const [{lnd}, target] = nodes;
+
+  try {
+    const {tower} = await getTowerServerInfo({lnd: target.lnd});
+
+    const [socket] = tower.sockets;
+
+    await connectWatchtower({lnd, socket, public_key: tower.public_key});
+
+    const res = (await getConnectedWatchtowers({lnd}));
+
+    const [watcher] = res.towers;
+
+    equal(res.backups_count, 0, 'Got backups count');
+    equal(res.failed_backups_count, 0, 'Got failed backups count');
+    equal(res.finished_sessions_count, 0, 'Got finished sessions count');
+    equal(res.max_session_update_count, 1024, 'Got max session update count');
+    equal(res.pending_backups_count, 0, 'Got pending backups count');
+    equal(res.sessions_count, 0, 'Got sessions count');
+    equal(res.sweep_tokens_per_vbyte, 10, 'Got sweep tokens per vbyte');
+
+    equal(watcher.is_active, true, 'Tower is active');
+    equal(watcher.public_key, tower.public_key, 'Tower is connected');
+    equal(watcher.sessions.length, [].length, 'No sessions initiated');
+    equal(watcher.sockets.slice().pop(), socket, 'Tower socket returned');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
+
+  await kill({});
+
+  return end();
+});

package/test/extra-integration/tower_clientrpc-integration/test_connect_watchtower.js

@@ -1,43 +0,0 @@
-const {test} = require('@alexbosworth/tap');
-
-const {connectWatchtower} = require('./../../');
-const {getConnectedWatchtowers} = require('./../../');
-const {getTowerServerInfo} = require('./../../');
-const {spawnLnd} = require('./../macros');
-const {waitForTermination} = require('./../macros');
-
-const all = promise => Promise.all(promise);
-const nodes = [{watchers: true}, {tower: true}];
-
-// Connecting to a watchtower should add a watchtower
-test(`Connect watchtower`, async ({end, equal, fail, match}) => {
-  let client;
-  let tower;
-
-  client = await spawnLnd({watchers: true});
-  tower = await spawnLnd({tower: true});
-
-  const info = (await getTowerServerInfo({lnd: tower.lnd})).tower;
-  const {lnd} = client;
-
-  const [socket] = info.sockets;
-
-  try {
-    await connectWatchtower({lnd, socket, public_key: info.public_key});
-
-    const [watcher] = (await getConnectedWatchtowers({lnd})).towers;
-
-    equal(watcher.is_active, true, 'Tower is active');
-    equal(watcher.public_key, info.public_key, 'Tower public key added');
-    equal(watcher.sessions.length, [].length, 'Tower has no sessions');
-    equal(watcher.sockets.pop(), socket, 'Tower at socket added');
-  } catch (err) {
-    equal(err, null, 'Expects no error');
-  }
-
-  [client, tower].forEach(n => n.kill());
-
-  await all([client, tower].map(({lnd}) => waitForTermination({lnd})));
-
-  return end();
-});

package/test/extra-integration/tower_clientrpc-integration/test_get_connected_watchtowers.js

@@ -1,55 +0,0 @@
-const {test} = require('@alexbosworth/tap');
-
-const {connectWatchtower} = require('./../../');
-const {createCluster} = require('./../macros');
-const {delay} = require('./../macros');
-const {disconnectWatchtower} = require('./../../');
-const {getConnectedWatchtowers} = require('./../../');
-const {getTowerServerInfo} = require('./../../');
-const {openChannel} = require('./../../');
-const {pay} = require('./../../');
-const {spawnLnd} = require('./../macros');
-const {stopDaemon} = require('./../../');
-const {waitForChannel} = require('./../macros');
-const {waitForPendingChannel} = require('./../macros');
-const {waitForTermination} = require('./../macros');
-
-// Getting connected watchtowers should return watchtowers
-test(`Connect watchtower`, async ({end, equal, match}) => {
-  let control;
-  let tower;
-
-  control = await spawnLnd({watchers: true});
-  tower = await spawnLnd({tower: true});
-
-  const info = (await getTowerServerInfo({lnd: tower.lnd})).tower;
-  const {lnd} = control;
-
-  const [socket] = info.sockets;
-
-  await connectWatchtower({lnd, socket, public_key: info.public_key});
-
-  const res = (await getConnectedWatchtowers({lnd}));
-
-  equal(res.backups_count, 0, 'Got backups count');
-  equal(res.failed_backups_count, 0, 'Got failed backups count');
-  equal(res.finished_sessions_count, 0, 'Got finished sessions count');
-  equal(res.max_session_update_count, 1024, 'Got max session update count');
-  equal(res.pending_backups_count, 0, 'Got pending backups count');
-  equal(res.sessions_count, 0, 'Got sessions count');
-  equal(res.sweep_tokens_per_vbyte, 10, 'Got sweep tokens per vbyte');
-
-  const [watcher] = res.towers;
-
-  equal(watcher.is_active, true, 'Tower is active');
-  equal(watcher.public_key, info.public_key, 'Tower is connected');
-  equal(watcher.sessions.length, [].length, 'No sessions initiated');
-  equal(watcher.sockets.slice().pop(), socket, 'Tower socket returned');
-
-  [control, tower].forEach(n => n.kill());
-
-  await waitForTermination({lnd});
-  await waitForTermination({lnd: tower.lnd});
-
-  return end();
-});