paid-services 3.11.3 → 3.11.4

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## Version 3.11.3
+## Version 3.11.4
 
 - `changeChannelCapacity`: Add `nodes` to allow moving channel to another node
 

package/capacity/get_capacity_replacement.js

@@ -293,8 +293,22 @@ module.exports = (args, cbk) => {
         return cbk(null, newCapacity);
       }],
 
+      // Make sure that we are still connected to the original peer
+      confirmConnection: [
+        'newCapacity',
+        'pendingChannel',
+        ({pendingChannel}, cbk) =>
+      {
+        return connectPeer({
+          id: pendingChannel.partner_public_key,
+          lnd: args.open_lnd,
+        },
+        cbk);
+      }],
+
       // Propose the new channel to replace the existing one
       proposeChannel: [
+        'confirmConnection',
         'newCapacity',
         'pendingChannel',
         ({newCapacity, pendingChannel}, cbk) =>

package/capacity/propose_capacity_change.js

@@ -351,12 +351,24 @@ module.exports = (args, cbk) => {
 
         // Listen to new blocks to wait for the channel change confirmation
         const sub = subscribeToBlocks({lnd: args.lnd});
+        let isFinished = false;
 
-        // Fail with error when the blocks subscription is lost
-        sub.on('error', err => {
+        // Avoid multiple callbacks
+        const done = (err, res) => {
           sub.removeAllListeners();
 
-          return cbk([503, 'LostBlockchainSubscription', {err}]);
+          if (isFinished) {
+            return;
+          }
+
+          isFinished = true;
+
+          return cbk(err, res);
+        };
+
+        // Fail with error when the blocks subscription is lost
+        sub.on('error', err => {
+          return done([503, 'LostBlockchainSubscription', {err}]);
         });
 
         // Publish the new channel transaction when a block is received
@@ -383,9 +395,7 @@ module.exports = (args, cbk) => {
 
             // The new channel confirmed successfully and so the change worked
             if (!!channel && !!channel.is_active) {
-              sub.removeAllListeners();
-
-              return cbk(null, {is_success: true});
+              return done(null, {is_success: true});
             }
           } catch (err) {
             args.logger.error({err});
@@ -419,9 +429,7 @@ module.exports = (args, cbk) => {
 
             // The old channel force closed and so the change fully failed
             if (!!channel && channel.close_transaction_id !== txId) {
-              sub.removeAllListeners();
-
-              return cbk(null, {is_success: false});
+              return done(null, {is_success: false});
             }
           } catch (err) {
             args.logger.error({err});

package/package.json

@@ -13,7 +13,7 @@
     "bolt07": "1.8.0",
     "ecpair": "2.0.1",
     "invoices": "2.0.4",
-    "ln-service": "53.9.0",
+    "ln-service": "53.9.1",
     "ln-sync": "3.10.1",
     "tiny-secp256k1": "2.2.0"
   },
@@ -42,5 +42,5 @@
     "integration-tests": "tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 180 test/integration/*.js",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 test/actions/*.js test/capacity/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/server/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "3.11.3"
+  "version": "3.11.4"
 }

package/test/integration/test_accept_capacity_change.js

@@ -6,6 +6,7 @@ const {broadcastChainTransaction} = require('ln-service');
 const {closeChannel} = require('ln-service');
 const {createChainAddress} = require('ln-service');
 const {getChainTransactions} = require('ln-service');
+const {getChannel} = require('ln-service');
 const {getChannels} = require('ln-service');
 const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
@@ -51,18 +52,30 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
 
   try {
     // Open up a new channel
-    const channelOpen = await openChannel({
-      lnd,
-      local_tokens: capacity,
-      partner_public_key: target.id,
-      partner_socket: target.socket,
+    const channelOpen = await asyncRetry({interval, times}, async () => {
+      return await openChannel({
+        lnd,
+        local_tokens: capacity,
+        partner_public_key: target.id,
+        partner_socket: target.socket,
+      });
     });
 
     // Wait for the channel to be active
     const channel = await asyncRetry({interval, times}, async () => {
       const [channel] = (await getChannels({lnd})).channels;
 
-      if (!!channel && !!channel.is_active) {
+      if (!channel) {
+        await generate({});
+
+        throw new Error('ExpectedInitialChannelActivation');
+      }
+
+      const {policies} = await getChannel({lnd, id: channel.id});
+
+      const [missingCltv] = policies.filter(n => !n.cltv_delta);
+
+      if (!!channel && !!channel.is_active && !missingCltv) {
         return channel;
       }
 

package/test/integration/test_change_channel_capacity.js

@@ -46,12 +46,14 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
 
   try {
     // Open up a new channel
-    const channelOpen = await openChannel({
-      lnd,
-      is_private: true,
-      local_tokens: capacity,
-      partner_public_key: target.id,
-      partner_socket: target.socket,
+    const channelOpen = await asyncRetry({interval, times}, async () => {
+      return await openChannel({
+        lnd,
+        is_private: true,
+        local_tokens: capacity,
+        partner_public_key: target.id,
+        partner_socket: target.socket,
+      });
     });
 
     // Wait for the channel to be active