ln-service 54.1.0 → 54.1.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## 54.1.0
+## 54.1.2
+
+- `subscribeToRpcRequests`: Fix support for LND 0.15.1
+
+## 54.1.1
 
 - `subscribeToPayments`: Add method to listen to all outgoing payments
 

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.1",
     "invoices": "2.2.0",
-    "lightning": "6.1.0",
+    "lightning": "6.1.2",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.9.0"
@@ -71,5 +71,5 @@
     "integration-test-0.12.0": "DOCKER_LND_VERSION=v0.12.0-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": "54.1.0"
+  "version": "54.1.2"
 }

package/test/{extra-integration → integration}/test_subscribe_to_rpc_requests.js

@@ -1,38 +1,51 @@
+const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const asyncRetry = require('async/retry');
 const {closeChannel} = require('./../../');
 const {createInvoice} = require('./../../');
+const {delay} = require('./../macros');
 const {getWalletInfo} = require('./../../');
 const {openChannel} = require('./../../');
 const {payViaRoutes} = require('./../../');
-const {spawnLnd} = require('./../macros');
+const {sendMessageToPeer} = require('./../../');
 const {subscribeToInvoice} = require('./../../');
 const {subscribeToRpcRequests} = require('./../../');
-const {waitForTermination} = require('./../macros');
 
+const message = '00';
 const subscribeInvoiceUri = '/invoicesrpc.Invoices/SubscribeSingleInvoice';
 
 // Subscribing to RPC requests should listen for RPC requests
 test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
-  const spawned = await (async () => {
+  // LND 0.13.4 and below do not support subscribing to RPC requests
+  {
+    const [{id, kill, lnd}] = (await spawnLightningCluster({})).nodes;
+
     try {
-      return await spawnLnd({intercept: true});
+      await sendMessageToPeer({lnd, message, public_key: id});
     } catch (err) {
-      return;
+      const [, code] = err;
+
+      if (code === 'SendMessageToPeerMethodNotSupported') {
+        await kill({});
+
+        return end();
+      }
     }
-  })();
 
-  // LND 0.13.4 and below do not support rpc interception
-  if (!spawned) {
-    return end();
+    await kill({});
   }
 
-  const {lnd} = spawned;
-  const pubKey = spawned.public_key;
+  const {kill, nodes} = await spawnLightningCluster({
+    lnd_configuration: ['--rpcmiddleware.enable'],
+  });
+
+  const [{lnd, id: key}] = nodes;
 
   const rpcRequestsSub = (await subscribeToRpcRequests({lnd})).subscription;
 
+  await delay(2000);
+
   const intercepted = [];
 
   rpcRequestsSub.on('error', error => intercepted.push({error}));
@@ -94,7 +107,7 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
       await openChannel({
         lnd,
         local_tokens: 1e6,
-        partner_public_key: spawned.public_key,
+        partner_public_key: key,
       });
 
       fail('ExpectedChannelCannotBeOpened');
@@ -102,6 +115,8 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
       strictSame(err, [400, 'CannotOpenChannelToOwnNode'], 'RPC req accepted');
     }
 
+    await delay(2000);
+
     subscription.removeAllListeners();
   }
 
@@ -127,7 +142,7 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
         lnd,
         give_tokens: 1e5,
         local_tokens: 1e6,
-        partner_public_key: spawned.public_key,
+        partner_public_key: Buffer.alloc(33, 2).toString('hex'),
       });
 
       fail('ExpectedChannelRejected');
@@ -186,12 +201,14 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
       is_intercepting_pay_via_routes_requests: true,
     });
 
+    await delay(2000);
+
     subscription.on('pay_via_route_request', async intercepted => {
       // Stop all route requests that have a non zero fee and pay to own key
       const feeMtokens = intercepted.request.route.fee_mtokens;
       const [finalHop] = intercepted.request.route.hops.reverse();
 
-      if (feeMtokens === '0' && finalHop.public_key === pubKey) {
+      if (feeMtokens === '0' && finalHop.public_key === key) {
         await intercepted.reject({message: 'message'});
       } else {
         await intercepted.accept({});
@@ -212,7 +229,7 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
             fee_mtokens: '0',
             forward: 0,
             forward_mtokens: '1',
-            public_key: pubKey,
+            public_key: key,
             timeout: 1,
           }],
           mtokens: '1',
@@ -232,9 +249,7 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
     subscription.removeAllListeners();
   }
 
-  spawned.kill({});
-
-  await waitForTermination({lnd: spawned.lnd});
+  await kill({});
 
   return end();
 });