paid-services 3.20.0 → 3.20.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## Version 3.20.1
+
+- `manageTrades`: Fix seller connection when not peered
+
 ## Version 3.20.0
 
 - `manageGroupJoin`: Add support for 2 person groups

package/package.json

@@ -47,5 +47,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/balanced/*.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.20.0"
+  "version": "3.20.1"
 }

package/trades/connect_to_seller.js

@@ -66,6 +66,9 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
       // Derive the self public key
       getIdentity: ['validate', ({}, cbk) => getIdentity({lnd}, cbk)],
 
+      // Get the actively connected peers
+      getPeered: ['validate', ({}, cbk) => getPeers({lnd}, cbk)],
+
       // Find node connect info to connect to
       getNodes: ['getIdentity', ({getIdentity}, cbk) => {
         return asyncMap(nodes, (connect, cbk) => {
@@ -144,7 +147,8 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
       removePeer: [
         'getChannels',
         'getNodes',
-        ({getChannels, getNodes}, cbk) =>
+        'getPeered',
+        ({getChannels, getNodes, getPeered}, cbk) =>
       {
         const ids = getChannels.channels.map(n => n.partner_public_key);
 
@@ -154,6 +158,11 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
             return cbk();
           }
 
+          // Exit early when already not peered
+          if (!getPeered.peers.map(n => n.public_key).includes(node.id)) {
+            return cbk();
+          }
+
           return removePeer({lnd, public_key: node.id}, (err, res) => {
             if (!!err) {
               return cbk(err);
@@ -181,7 +190,7 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
       }],
 
       // Get the list of connected peers
-      getPeers: ['removePeer', ({}, cbk) => getPeers({lnd}, cbk)],
+      getPeers: ['validate', ({}, cbk) => getPeers({lnd}, cbk)],
 
       // Try and connect to a node in order to do p2p messaging
       connect: [