paid-services 5.0.1 → 5.0.3

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## Version 5.0.1
+## Version 5.0.3
 
 - `createGroupChannel`, `joinGroupChannel`, `manageGroupJoin`: Double check
     open channel acceptance when peering

package/groups/ask_to_confirm_group_join.js

@@ -1,5 +1,6 @@
 const asyncAuto = require('async/auto');
 const asyncRetry = require('async/retry');
+const asyncTimeout = require('async/timeout');
 const {connectPeer} = require('ln-sync');
 const {getChainBalance} = require('ln-service');
 const {getNodeAlias} = require('ln-sync');
@@ -8,6 +9,7 @@ const {returnResult} = require('asyncjs-util');
 const {getGroupDetails} = require('./p2p');
 
 const coordinatorFromJoinCode = n => n.slice(0, 66);
+const defaultConnectRetryMs = 1000 * 60;
 const groupIdFromJoinCode = n => n.slice(66);
 const interval = 500;
 const isCode = n => !!n && n.length === 98;
@@ -77,7 +79,11 @@ module.exports = ({ask, lnd}, cbk) => {
       // Connect to the coordinator
       connect: ['group', ({group}, cbk) => {
         return asyncRetry({interval, times}, cbk => {
-          return connectPeer({lnd, id: group.coordinator}, cbk);
+          return asyncTimeout(connectPeer, defaultConnectRetryMs)({
+            lnd,
+            id: group.coordinator,
+          },
+          cbk);
         },
         cbk);
       }],
@@ -88,11 +94,14 @@ module.exports = ({ask, lnd}, cbk) => {
       }],
 
       // Get the group details from the coordinator
-      getDetails: ['group', ({group}, cbk) => {
-        return getGroupDetails({
-          lnd,
-          coordinator: group.coordinator,
-          id: group.id,
+      getDetails: ['connect', 'group', ({group}, cbk) => {
+        return asyncRetry({interval, times}, cbk => {
+          return asyncTimeout(getGroupDetails, defaultConnectRetryMs)({
+            lnd,
+            coordinator: group.coordinator,
+            id: group.id,
+          },
+          cbk);
         },
         cbk);
       }],

package/groups/get_join_details.js

@@ -1,5 +1,6 @@
 const asyncAuto = require('async/auto');
 const asyncRetry = require('async/retry');
+const asyncTimeout = require('async/timeout');
 const {connectPeer} = require('ln-sync');
 const {getChainBalance} = require('ln-service');
 const {getNodeAlias} = require('ln-sync');
@@ -8,6 +9,7 @@ const {returnResult} = require('asyncjs-util');
 const {getGroupDetails} = require('./p2p');
 
 const coordinatorFromJoinCode = n => n.slice(0, 66);
+const defaultTimeoutMs = 1000 * 60;
 const groupIdFromJoinCode = n => n.slice(66);
 const interval = 500;
 const isCode = n => !!n && n.length === 98;
@@ -73,7 +75,13 @@ module.exports = ({code, lnd, logger}, cbk) => {
       // Connect to the coordinator
       connect: ['group', ({group}, cbk) => {
         return asyncRetry({interval, times}, cbk => {
-          return connectPeer({lnd, id: group.coordinator}, cbk);
+          logger.info({connecting_to: group.coordinator});
+
+          return asyncTimeout(connectPeer, defaultTimeoutMs)({
+            lnd,
+            id: group.coordinator,
+          },
+          cbk);
         },
         cbk);
       }],
@@ -84,11 +92,16 @@ module.exports = ({code, lnd, logger}, cbk) => {
       }],
 
       // Get the group details from the coordinator
-      getDetails: ['group', ({group}, cbk) => {
-        return getGroupDetails({
-          lnd,
-          coordinator: group.coordinator,
-          id: group.id,
+      getDetails: ['connect', 'group', ({group}, cbk) => {
+        return asyncRetry({interval, times}, cbk => {
+          logger.info({requesting_group_details_from: group.coordinator});
+
+          return getGroupDetails({
+            lnd,
+            coordinator: group.coordinator,
+            id: group.id,
+          },
+          cbk);
         },
         cbk);
       }],

package/package.json

@@ -16,8 +16,8 @@
     "ecpair": "2.1.0",
     "goldengate": "12.0.5",
     "invoices": "2.2.3",
-    "ln-service": "56.1.0",
-    "ln-sync": "4.3.2",
+    "ln-service": "56.3.0",
+    "ln-sync": "5.1.0",
     "psbt": "2.7.2",
     "p2tr": "1.3.3",
     "tiny-secp256k1": "2.2.1"
@@ -25,7 +25,7 @@
   "description": "Lightning Paid Services library",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.12",
-    "ln-docker-daemons": "5.0.1",
+    "ln-docker-daemons": "5.0.2",
     "mock-lnd": "1.4.4",
     "secp256k1": "5.0.0"
   },
@@ -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/swaps/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "5.0.1"
+  "version": "5.0.3"
 }

package/trades/connect_to_seller.js

@@ -150,6 +150,10 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
         'getPeered',
         ({getChannels, getNodes, getPeered}, cbk) =>
       {
+        if (!getNodes.filter(n => !!n).length) {
+          return cbk([404, 'FailedToFindSellerNodeDetails']);
+        }
+
         const ids = getChannels.channels.map(n => n.partner_public_key);
 
         return asyncEach(getNodes, (node, cbk) => {