ln-service 53.7.2 → 53.7.3

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 53.7.2
+## 53.7.3
 
 - `payViaRoutes`, `subscribeToPayViaRoutes`: Add support for relay messages
 

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.17.2",
     "invoices": "2.0.3",
-    "lightning": "5.6.1",
+    "lightning": "5.6.2",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.4.2"
@@ -64,7 +64,7 @@
     "integration-test-0.13.0": "DOCKER_LND_VERSION=v0.13.0-beta npm run test",
     "integration-test-0.12.1": "DOCKER_LND_VERSION=v0.12.1-beta npm run test",
     "integration-test-0.12.0": "DOCKER_LND_VERSION=v0.12.0-beta npm run test",
-    "test": "echo $DOCKER_LND_VERSION && tap -j 3 --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"
+    "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.7.2"
+  "version": "53.7.3"
 }

package/test/integration/test_add_peer.js

@@ -8,8 +8,8 @@ const {getPeers} = require('./../../');
 
 const interval = 100;
 const size = 2;
-const times = 100;
-const timeout = 1000;
+const times = 2000;
+const timeout = 100;
 
 // Adding peers should result in a connected peer
 test(`Add a peer`, async ({end, equal}) => {

package/test/integration/test_get_closed_channels.js

@@ -9,9 +9,7 @@ const {createHodlInvoice} = require('./../../');
 const {delay} = require('./../macros');
 const {payViaPaymentRequest} = require('./../../');
 const {getChainTransactions} = require('./../../');
-const {getChannels} = require('./../../');
 const {getClosedChannels} = require('./../../');
-const {getHeight} = require('./../../');
 const {getPendingChannels} = require('./../../');
 const {getSweepTransactions} = require('./../../');
 const {getUtxos} = require('./../../');

package/test/integration/test_get_invoice.js

@@ -2,7 +2,6 @@ const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const {createInvoice} = require('./../../');
-const {getHeight} = require('./../../');
 const {getInvoice} = require('./../../');
 const {pay} = require('./../../');
 const {setupChannel} = require('./../macros');

package/test/integration/test_get_node.js

@@ -1,3 +1,4 @@
+const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
@@ -15,8 +16,10 @@ const confirmationCount = 20;
 const defaultFee = 1e3;
 const defaultAliasLength = '00000000000000000000'.length;
 const feeRate = 21;
+const interval = 10;
 const mtokPerTok = BigInt(1e3);
 const size = 3;
+const times = 1000;
 
 // Getting a node should return the public graph node info
 test(`Get node`, async ({end, equal, strictSame}) => {
@@ -42,7 +45,16 @@ test(`Get node`, async ({end, equal, strictSame}) => {
       transaction_vout: controlToTarget.transaction_vout,
     });
 
-    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: remote.id,
+        retry_count: 1,
+        retry_delay: 1,
+        socket: remote.socket,
+        timeout: 1000,
+      });
+    });
 
     await delay(3000);
 

package/test/integration/test_get_peers.js

@@ -15,27 +15,38 @@ test('Get peers', async ({end, equal}) => {
 
   const [{lnd}, target] = nodes;
 
-  await asyncRetry({interval, times}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-
-    const [peer] = (await getPeers({lnd})).peers;
-
-    if (!peer || !peer.is_sync_peer) {
-      throw new Error('ExpectedSyncPeer');
-    }
-
-    equal(peer.bytes_received !== undefined, true, 'Bytes received');
-    equal(peer.bytes_sent !== undefined, true, 'Bytes sent');
-    equal(peer.is_inbound, false, 'Is inbound peer');
-    equal(peer.is_sync_peer, true, 'Is sync peer');
-    equal(peer.ping_time, 0, 'Ping time');
-    equal(peer.public_key, target.id, 'Public key');
-    equal(!!peer.socket, true, 'Socket');
-    equal(peer.tokens_received, 0, 'Tokens received');
-    equal(peer.tokens_sent, 0, 'Tokens sent');
-
-    return;
-  });
+  try {
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: target.id,
+        retry_count: 1,
+        retry_delay: 1,
+        socket: target.socket,
+        timeout: 100,
+      });
+
+      const [peer] = (await getPeers({lnd})).peers;
+
+      if (!peer || !peer.is_sync_peer) {
+        throw new Error('ExpectedSyncPeer');
+      }
+
+      equal(peer.bytes_received !== undefined, true, 'Bytes received');
+      equal(peer.bytes_sent !== undefined, true, 'Bytes sent');
+      equal(peer.is_inbound, false, 'Is inbound peer');
+      equal(peer.is_sync_peer, true, 'Is sync peer');
+      equal(peer.ping_time, 0, 'Ping time');
+      equal(peer.public_key, target.id, 'Public key');
+      equal(!!peer.socket, true, 'Socket');
+      equal(peer.tokens_received, 0, 'Tokens received');
+      equal(peer.tokens_sent, 0, 'Tokens sent');
+
+      return;
+    });
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/integration/test_get_wallet_info.js

@@ -12,16 +12,18 @@ const times = 1000;
 const walletInfoType = 'wallet';
 
 // Getting the wallet info should return info about the wallet
-test(`Get wallet info`, async ({end, equal, strictSame}) => {
+test(`Get wallet info`, async ({end, equal, ok, strictSame}) => {
   const {kill, nodes} = await spawnLightningCluster({});
 
-  const [{lnd}] = nodes;
+  const [{generate, lnd}] = nodes;
 
   try {
     const result = await asyncRetry({interval, times}, async () => {
+      await generate({});
+
       const result = await getWalletInfo({lnd});
 
-      if (result.current_block_height === initHeight) {
+      if (result.current_block_height >= initHeight) {
         return result;
       }
 
@@ -32,7 +34,7 @@ test(`Get wallet info`, async ({end, equal, strictSame}) => {
     equal(!!result.alias, true, 'Expected alias');
     strictSame(result.chains, [regtestChainId], 'Got chains');
     equal(!!result.current_block_hash, true, 'Expected best block hash');
-    equal(result.current_block_height, initHeight, 'Expected best block height');
+    ok(result.current_block_height >= initHeight, 'Expected block height');
     equal(!!result.latest_block_at, true, 'Last block time');
     equal(result.peers_count, 0, 'Expected wallet peers count');
     equal(result.pending_channels_count, 0, 'Expected pending channels count');

package/test/integration/test_open_channels.js

@@ -36,9 +36,9 @@ test(`Open channels`, async ({end, equal}) => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  await generate({count: maturity});
-
   try {
+    await generate({count: maturity});
+
     await asyncRetry({interval, times}, async () => {
       const lnds = [lnd, target.lnd, remote.lnd];
 

package/test/integration/test_pay.js

@@ -10,7 +10,6 @@ const {createInvoice} = require('./../../');
 const {decodePaymentRequest} = require('./../../');
 const {delay} = require('./../macros');
 const {getChannel} = require('./../../');
-const {getChannels} = require('./../../');
 const {getHeight} = require('./../../');
 const {getNetworkGraph} = require('./../../');
 const {getRouteToDestination} = require('./../../');

package/test/integration/test_pay_private_invoice.js

@@ -8,7 +8,6 @@ const {cancelHodlInvoice} = require('./../../');
 const {createInvoice} = require('./../../');
 const {decodePaymentRequest} = require('./../../');
 const {getChannel} = require('./../../');
-const {getChannels} = require('./../../');
 const {getInvoice} = require('./../../');
 const {getRouteToDestination} = require('./../../');
 const {openChannel} = require('./../../');

package/test/integration/test_remove_peer.js

@@ -14,21 +14,25 @@ test(`Remove a peer`, async ({end, equal}) => {
 
   const [{id, lnd}, target] = nodes;
 
-  await asyncRetry({interval: 10, times: 2000}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-  });
+  try {
+    await asyncRetry({interval: 10, times: 2000}, async () => {
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
+    });
 
-  const {peers} = await getPeers({lnd});
+    const {peers} = await getPeers({lnd});
 
-  const [targetPeer] = peers;
+    const [targetPeer] = peers;
 
-  equal(targetPeer.public_key, target.id, 'Peer is added');
+    equal(targetPeer.public_key, target.id, 'Peer is added');
 
-  await removePeer({lnd, public_key: targetPeer.public_key});
+    await removePeer({lnd, public_key: targetPeer.public_key});
 
-  const postRemovalPeers = await getPeers({lnd});
+    const postRemovalPeers = await getPeers({lnd});
 
-  equal(postRemovalPeers.peers.length, [].length, 'Peer is removed');
+    equal(postRemovalPeers.peers.length, [].length, 'Peer is removed');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/integration/test_send_message_to_peer.js

@@ -8,7 +8,7 @@ const {subscribeToPeerMessages} = require('./../../');
 
 const interval = 10;
 const size = 2;
-const times = 1000;
+const times = 2000;
 
 // Sending a message to a peer should result in the message received
 test(`Send peer message`, async ({end, equal, strictSame}) => {
@@ -33,39 +33,50 @@ test(`Send peer message`, async ({end, equal, strictSame}) => {
     }
   }
 
-  await asyncRetry({interval, times}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-  });
+  try {
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: target.id,
+        retry_count: 1,
+        retry_delay: 1,
+        socket: target.socket,
+        timeout: 1000,
+      });
+    });
 
-  const sub = subscribeToPeerMessages({lnd: target.lnd});
+    const sub = subscribeToPeerMessages({lnd: target.lnd});
 
-  const messages = [];
+    const messages = [];
 
-  sub.on('message_received', message => messages.push(message));
+    sub.on('message_received', message => messages.push(message));
 
-  await asyncRetry({interval, times}, async () => {
-    await sendMessageToPeer({
-      lnd,
-      message: Buffer.from('message').toString('hex'),
-      public_key: target.id,
-    });
+    await asyncRetry({interval, times}, async () => {
+      await sendMessageToPeer({
+        lnd,
+        message: Buffer.from('message').toString('hex'),
+        public_key: target.id,
+      });
 
-    if (!messages.length) {
-      throw new Error('ExpectedMessage');
-    }
-  });
-
-  const [message] = messages;
+      if (!messages.length) {
+        throw new Error('ExpectedMessage');
+      }
+    });
 
-  strictSame(
-    message,
-    {
-      message: Buffer.from('message').toString('hex'),
-      public_key: id,
-      type: 32768,
-    },
-    'Message successfully sent to peer'
-  );
+    const [message] = messages;
+
+    strictSame(
+      message,
+      {
+        message: Buffer.from('message').toString('hex'),
+        public_key: id,
+        type: 32768,
+      },
+      'Message successfully sent to peer'
+    );
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/integration/test_subscribe_to_channels.js

@@ -5,7 +5,6 @@ const {test} = require('@alexbosworth/tap');
 const {addPeer} = require('./../../');
 const {closeChannel} = require('./../../');
 const {getChainBalance} = require('./../../');
-const {getHeight} = require('./../../');
 const {getWalletInfo} = require('./../../');
 const {openChannel} = require('./../../');
 const {removePeer} = require('./../../');

package/test/integration/test_subscribe_to_invoices.js

@@ -4,13 +4,9 @@ const {routeFromHops} = require('bolt07');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
-const {cancelHodlInvoice} = require('./../../');
 const {createInvoice} = require('./../../');
 const {getChannel} = require('./../../');
-const {getChannels} = require('./../../');
-const {getHeight} = require('./../../');
 const {pay} = require('./../../');
-const {payViaRoutes} = require('./../../');
 const {setupChannel} = require('./../macros');
 const {subscribeToInvoices} = require('./../../');
 
@@ -37,107 +33,113 @@ test('Subscribe to invoices', async ({end, equal, fail}) => {
 
   const destination = control.id;
 
-  // Create a channel from the control to the target node
-  const controlToTargetChannel = await setupChannel({
-    generate,
-    lnd,
-    give: 1e5,
-    to: target,
-  });
+  try {
+    await generate({count: 100});
 
-  // Create a channel from the target back to the control
-  const targetToControlChannel = await setupChannel({
-    lnd: target.lnd,
-    generate: target.generate,
-    give: 1e5,
-    to: control,
-  });
-
-  // Created invoices are emitted
-  {
-    const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
+    // Create a channel from the control to the target node
+    const controlToTargetChannel = await setupChannel({
+      generate,
+      lnd,
+      give: 1e5,
+      to: target,
+    });
 
-    const updates = [];
+    // Create a channel from the target back to the control
+    const targetToControlChannel = await setupChannel({
+      lnd: target.lnd,
+      generate: target.generate,
+      give: 1e5,
+      to: control,
+    });
 
-    sub.on('invoice_updated', updated => updates.push(updated));
+    // Created invoices are emitted
+    {
+      const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
 
-    const update = await asyncRetry({interval, times}, async () => {
-      await createInvoice({lnd});
+      const updates = [];
 
-      const [update] = updates;
+      sub.on('invoice_updated', updated => updates.push(updated));
 
-      if (!update) {
-        throw new Error('ExpectedInvoiceUpdate');
-      }
+      const update = await asyncRetry({interval, times}, async () => {
+        await createInvoice({lnd});
 
-      return update;
-    });
+        const [update] = updates;
 
-    equal(update.tokens, 0, 'Invoiced zero');
+        if (!update) {
+          throw new Error('ExpectedInvoiceUpdate');
+        }
 
-    sub.removeAllListeners();
-  }
+        return update;
+      });
 
-  // Paid invoices are emitted
-  {
-    const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
+      equal(update.tokens, 0, 'Invoiced zero');
 
-    const updates = [];
+      sub.removeAllListeners();
+    }
 
-    sub.on('invoice_updated', updated => updates.push(updated));
+    // Paid invoices are emitted
+    {
+      const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
 
-    const update = await asyncRetry({interval, times}, async () => {
-      await pay({
-        lnd: target.lnd,
-        request: (await createInvoice({lnd, tokens})).request,
-      });
+      const updates = [];
 
-      const [update] = updates.filter(n => n.is_confirmed);
+      sub.on('invoice_updated', updated => updates.push(updated));
 
-      if (!update) {
-        throw new Error('ExpectedPaidInvoiceUpdate');
-      }
+      const update = await asyncRetry({interval, times}, async () => {
+        await pay({
+          lnd: target.lnd,
+          request: (await createInvoice({lnd, tokens})).request,
+        });
 
-      return update;
-    });
+        const [update] = updates.filter(n => n.is_confirmed);
 
-    equal(!!update.confirmed_at, true, 'Got receive date');
-    equal(!!update.confirmed_index, true, 'Got confirm index');
-    equal(update.payments.length, 1, 'Got received HTLC');
-    equal(update.received, tokens, 'Got received tokens');
-    equal(update.received_mtokens, '10000000', 'Got invoice mtokens');
+        if (!update) {
+          throw new Error('ExpectedPaidInvoiceUpdate');
+        }
 
-    sub.removeAllListeners();
-  }
+        return update;
+      });
 
-  // Old invoices are emitted
-  {
-    const sub = subscribeToInvoices({
-      lnd,
-      added_after: 1,
-      restart_delay_ms: 1,
-    });
+      equal(!!update.confirmed_at, true, 'Got receive date');
+      equal(!!update.confirmed_index, true, 'Got confirm index');
+      equal(update.payments.length, 1, 'Got received HTLC');
+      equal(update.received, tokens, 'Got received tokens');
+      equal(update.received_mtokens, '10000000', 'Got invoice mtokens');
+
+      sub.removeAllListeners();
+    }
+
+    // Old invoices are emitted
+    {
+      const sub = subscribeToInvoices({
+        lnd,
+        added_after: 1,
+        restart_delay_ms: 1,
+      });
 
-    const updates = [];
+      const updates = [];
 
-    sub.on('invoice_updated', updated => updates.push(updated));
+      sub.on('invoice_updated', updated => updates.push(updated));
 
-    const update = await asyncRetry({interval, times}, async () => {
-      const [update] = updates;
+      const update = await asyncRetry({interval, times}, async () => {
+        const [update] = updates;
 
-      if (!update) {
-        throw new Error('ExpectedPastInvoiceUpdate');
-      }
+        if (!update) {
+          throw new Error('ExpectedPastInvoiceUpdate');
+        }
 
-      return update;
-    });
+        return update;
+      });
 
-    equal(update.index, 2, 'Got past update');
+      equal(update.index, 2, 'Got past update');
 
-    sub.removeAllListeners();
+      sub.removeAllListeners();
+    }
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
   }
 
-  await kill({});
-
   return end();
 });

package/test/integration/test_subscribe_to_peer_messages.js

@@ -17,10 +17,12 @@ test(`Subscribe to peer messages`, async ({end, equal, strictSame}) => {
   const [{lnd}, target, remote] = nodes;
 
   try {
-    await addPeer({
-      lnd,
-      public_key: target.id,
-      socket: target.socket,
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: target.id,
+        socket: target.socket,
+      });
     });
 
     await addPeer({

package/test/invoicesrpc-integration/test_get_sweep_transactions.js

@@ -10,10 +10,8 @@ const {closeChannel} = require('./../../');
 const {createHodlInvoice} = require('./../../');
 const {delay} = require('./../macros');
 const {getChainTransactions} = require('./../../');
-const {getChannels} = require('./../../');
 const {getClosedChannels} = require('./../../');
 const {getInvoice} = require('./../../');
-const {getInvoices} = require('./../../');
 const {getPendingChannels} = require('./../../');
 const {getSweepTransactions} = require('./../../');
 const {getWalletInfo} = require('./../../');

package/test/invoicesrpc-integration/test_subscribe_cancel_invoice.js

@@ -8,7 +8,6 @@ const {cancelHodlInvoice} = require('./../../');
 const {createHodlInvoice} = require('./../../');
 const {delay} = require('./../macros');
 const {getInvoice} = require('./../../');
-const {getInvoices} = require('./../../');
 const {pay} = require('./../../');
 const {setupChannel} = require('./../macros');
 const {subscribeToInvoice} = require('./../../');

package/test/macros/wait_for_channel.js

@@ -6,7 +6,7 @@ const {getChannel} = require('./../../');
 const {getChannels} = require('./../../');
 
 const interval = 10;
-const times = 6000;
+const times = 10000;
 
 /** Wait for channel to be open