paid-services 5.0.0 → 5.0.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Versions
 
+## Version 5.0.2
+
+- `createGroupChannel`, `joinGroupChannel`, `manageGroupJoin`: Double check
+    open channel acceptance when peering
+
 ## Version 5.0.0
 
 - 'createGroupChannel': Repeatedly broadcast chain transaction

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/assemble_channel_group.js

@@ -104,16 +104,20 @@ module.exports = ({capacity, count, ecp, identity, lnd, members, rate}) => {
   coordinator.events.once('joined', async ({ids}) => {
     emitter.emit('filled', {ids});
 
-    // Exit early when this is a pair group
-    if (count === minGroupCount) {
-      return coordinator.connected();
-    }
+    try {
+      // Exit early when this is a pair group
+      if (count === minGroupCount) {
+        const [outbound] = ids.filter(n => n !== identity);
 
-    const {inbound, outbound} = coordinator.partners(identity);
+        await peerWithPartners({capacity, lnd, outbound});
 
-    // Connect to the inbound and outbound partners
-    try {
-      await peerWithPartners({inbound, lnd, outbound});
+        return coordinator.connected();
+      }
+
+      const {inbound, outbound} = coordinator.partners(identity);
+
+      // Connect to the inbound and outbound partners
+      await peerWithPartners({capacity, inbound, lnd, outbound});
 
       // Register as connected
       return coordinator.connected();

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/groups/join_channel_group.js

@@ -107,6 +107,7 @@ module.exports = ({capacity, coordinator, count, id, lnd, rate}, cbk) => {
       });
 
       return peerWithPartners({
+        capacity,
         lnd,
         inbound: partners.inbound,
         outbound: partners.outbound,

package/groups/p2p/find_group_partners.js

@@ -21,13 +21,14 @@ const typeGroupChannelId = '1';
 
   {
     coordinator: <Group Coordinator Identity Public Key Hex String>
+    count: <Group Member Count Number>
     id: <Group Identifier Hex String>
     lnd: <Authenticated LND API Object>
   }
 
   @returns via cbk or Promise
   {
-    inbound: <Inbound Peer Public Key Identity Hex String>
+    [inbound]: <Inbound Peer Public Key Identity Hex String>
     outbound: <Outbound Peer Public Key Identity Hex String>
   }
 */

package/groups/p2p/peer_with_partners.js

@@ -1,3 +1,4 @@
+const {acceptsChannelOpen} = require('ln-sync');
 const asyncAuto = require('async/auto');
 const asyncRetry = require('async/retry');
 const {connectPeer} = require('ln-sync');
@@ -9,20 +10,21 @@ const times = 2 * 60 * 30;
 /** Peer up with group channel partners
 
   {
-    inbound: <Inbound Identity Public Key Hex String>
+    capacity: <Channel Capacity Tokens Number>
+    [inbound]: <Inbound Identity Public Key Hex String>
     lnd: <Authenticated LND API Object>
     outbound: <Outbound Identity Public Key Hex String>
   }
 
   @returns via cbk or Promise
 */
-module.exports = ({inbound, lnd, outbound}, cbk) => {
+module.exports = ({capacity, inbound, lnd, outbound}, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
       // Check arguments
       validate: cbk => {
-        if (!inbound) {
-          return cbk([400, 'ExpectedInboundPeerIdentityToConnectTo']);
+        if (!capacity) {
+          return cbk([400, 'ExpectedChannelCapacityToPeerWithPartners']);
         }
 
         if (!lnd) {
@@ -38,6 +40,11 @@ module.exports = ({inbound, lnd, outbound}, cbk) => {
 
       // Attempt connecting to the inbound peer
       connectInbound: ['validate', ({}, cbk) => {
+        // Exit early when there is no inbound peer
+        if (!inbound) {
+          return cbk();
+        }
+
         return asyncRetry({interval, times}, cbk => {
           return connectPeer({lnd, id: inbound}, cbk);
         },
@@ -51,6 +58,25 @@ module.exports = ({inbound, lnd, outbound}, cbk) => {
         },
         cbk);
       }],
+
+      // Test if outbound peer would accept a channel
+      getAcceptance: ['connectOutbound', ({}, cbk) => {
+        return acceptsChannelOpen({
+          capacity,
+          lnd,
+          partner_public_key: outbound,
+        },
+        cbk);
+      }],
+
+      // Check that the proposal would be accepted
+      checkAcceptance: ['getAcceptance', ({getAcceptance}, cbk) => {
+        if (!getAcceptance.is_accepted) {
+          return cbk([503, 'PeerRejectedChanOpenRequest', {peer: outbound}]);
+        }
+
+        return cbk();
+      }],
     },
     returnResult({reject, resolve}, 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.2.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.0"
+  "version": "5.0.2"
 }