ln-service 53.4.1 → 53.5.2

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Versions
 
-## 53.4.1
+## 53.5.2
+
+- `getPayments`: Correct paging issue that prevented paging through all results
+
+## 53.5.0
+
+- `createWallet`: Add support for returning the admin `macaroon`
+
+## 53.4.2
 
 - `pay`, `payViaPaymentRequest`: Fix support for `outgoing_channels` constraint
 

package/README.md

@@ -762,6 +762,9 @@ Requires unlocked lnd and unauthenticated LND API Object
     }
 
     @returns via cbk or Promise
+    {
+      macaroon: <Base64 Encoded Admin Macaroon String>
+    }
 
 Example:
 

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.17.2",
     "invoices": "2.0.3",
-    "lightning": "5.3.1",
+    "lightning": "5.4.0",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.4.2"
@@ -31,7 +31,7 @@
     "psbt": "1.1.10",
     "rimraf": "3.0.2",
     "secp256k1": "4.0.3",
-    "tiny-secp256k1": "2.1.2",
+    "tiny-secp256k1": "2.2.0",
     "uuid": "8.3.2",
     "varuint-bitcoin": "1.1.2"
   },
@@ -55,5 +55,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.4.1"
+  "version": "53.5.2"
 }

package/test/integration/test_delete_pending_channel.js

@@ -8,6 +8,7 @@ const {test} = require('@alexbosworth/tap');
 
 const {addPeer} = require('./../../');
 const {broadcastChainTransaction} = require('./../../');
+const {cancelPendingChannel} = require('./../../');
 const {createCluster} = require('./../macros');
 const {delay} = require('./../macros');
 const {deletePendingChannel} = require('./../../');
@@ -60,7 +61,7 @@ test(`Forfeit pending channel`, async ({end, equal}) => {
     // Sign the funding to the target
     const signTarget = await signPsbt({lnd, psbt: fundTarget.psbt});
 
-    // Fund the target channel
+    // Fund the target channel that will get stuck
     await fundPendingChannels({
       lnd,
       channels: proposeToTarget.pending.map(n => n.id),
@@ -124,6 +125,17 @@ test(`Forfeit pending channel`, async ({end, equal}) => {
 
     const stuckTx = extractTransaction({psbt: signTarget.psbt});
 
+    const [stuckPending] = proposeToTarget.pending;
+
+    // Try to cancel the pending channel, it will fail
+    try {
+      await cancelPendingChannel({lnd, id: stuckPending.id});
+    } catch (err) {
+      const [code] = err;
+
+      equal(code, 503, 'Pending channel cannot be canceled');
+    }
+
     await deletePendingChannel({
       lnd,
       confirmed_transaction: transaction,

package/test/integration/test_get_network_centrality.js

@@ -9,7 +9,7 @@ const {setupChannel} = require('./../macros');
 
 const interval = 100;
 const size = 3;
-const times = 300;
+const times = 800;
 
 // Getting the network centrality should return the centrality scores
 test(`Get network centrality`, async ({end, equal, strictSame}) => {
@@ -19,42 +19,50 @@ test(`Get network centrality`, async ({end, equal, strictSame}) => {
 
   const {lnd} = control;
 
-  await setupChannel({lnd, generate: control.generate, to: target});
+  try {
+    await control.generate({count: 100});
 
-  await setupChannel({
-    generate: target.generate,
-    lnd: target.lnd,
-    to: remote,
-  });
-
-  await asyncRetry({interval, times}, async () => {
     await addPeer({lnd, public_key: remote.id, socket: remote.socket});
 
-    const {nodes} = await getNetworkCentrality({lnd});
-
-    const controlScore = nodes.find(n => n.public_key === control.id);
-    const remoteScore = nodes.find(n => n.public_key === remote.id);
-    const targetScore = nodes.find(n => n.public_key === target.id);
-
-    if (!targetScore.betweenness || !targetScore.betweenness_normalized) {
-      throw new Error('UnexpectedValueForTargetScoreBetweenness');
-    }
-
-    if (targetScore.betweenness !== 1e6) {
-      throw new Error('WrongBetweennessScore');
-    }
-
-    equal(controlScore.betweenness, 0, 'No centrality on control');
-    equal(controlScore.betweenness_normalized, 0, 'No centrality on control');
-    equal(remoteScore.betweenness, 0, 'No centrality on remote');
-    equal(remoteScore.betweenness_normalized, 0, 'No centrality on remote');
-    equal(targetScore.betweenness, 1e6, 'Centrality around target');
-    equal(targetScore.betweenness_normalized, 1e6, 'Centrality around target');
-
-    return;
-  });
-
-  await kill({});
+    await setupChannel({lnd, generate: control.generate, to: target});
+
+    await setupChannel({
+      generate: target.generate,
+      lnd: target.lnd,
+      to: remote,
+    });
+
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+
+      const {nodes} = await getNetworkCentrality({lnd});
+
+      const controlScore = nodes.find(n => n.public_key === control.id);
+      const remoteScore = nodes.find(n => n.public_key === remote.id);
+      const targetScore = nodes.find(n => n.public_key === target.id);
+
+      if (!targetScore.betweenness || !targetScore.betweenness_normalized) {
+        throw new Error('UnexpectedValueForTargetScoreBetweenness');
+      }
+
+      if (targetScore.betweenness !== 1e6) {
+        throw new Error('WrongBetweennessScore');
+      }
+
+      equal(controlScore.betweenness, 0, 'No centrality on control');
+      equal(controlScore.betweenness_normalized, 0, 'No control centrality');
+      equal(remoteScore.betweenness, 0, 'No centrality on remote');
+      equal(remoteScore.betweenness_normalized, 0, 'No centrality on remote');
+      equal(targetScore.betweenness, 1e6, 'Centrality around target');
+      equal(targetScore.betweenness_normalized, 1e6, 'Centrality at target');
+
+      return;
+    });
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
+  }
 
   return end();
 });

package/test/tower_clientrpc-integration/test_disconnect_watchtower.js

@@ -9,9 +9,9 @@ const {spawnLnd} = require('./../macros');
 const {waitForTermination} = require('./../macros');
 
 const all = promise => Promise.all(promise);
-const interval = 100;
+const interval = 200;
 const nodes = [{watchers: true}, {tower: true}];
-const times = 200;
+const times = 1000;
 
 // Disconnecting a watchtower should remove a watchtower
 test(`Disconnect watchtower`, async ({end, equal, match}) => {