paid-services 4.0.0 → 4.0.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## Version 4.0.0
+## Version 4.0.2
+
+- `manageTrades`: Fix connection to seller failing
+
+## Version 4.0.1
 
 - `createGroupChannel`: Add method to coordinate a channel group
 - `joinGroupChannel`: Add method to join a channel group

package/groups/assemble_channel_group.js

@@ -138,27 +138,31 @@ module.exports = ({capacity, count, ecp, identity, lnd, rate}) => {
 
     const basePsbt = decodePsbt({ecp, psbt: coordinator.unsigned()});
 
-    // Sign the unsigned funding transaction
-    const signed = await signAndFundGroupChannel({
-      lnd,
-      id: pending.id,
-      psbt: coordinator.unsigned(),
-      utxos: pending.utxos,
-    });
-
-    // Make sure there is an incoming channel
-    await asyncRetry({interval, times}, async () => {
-      return await confirmIncomingChannel({
-        capacity,
+    try {
+      // Sign the unsigned funding transaction
+      const signed = await signAndFundGroupChannel({
         lnd,
-        from: coordinator.partners(identity).inbound,
-        id: fromHex(basePsbt.unsigned_transaction).getId(),
-        to: coordinator.partners(identity).outbound || undefined,
+        id: pending.id,
+        psbt: coordinator.unsigned(),
+        utxos: pending.utxos,
+      });
+
+      // Make sure there is an incoming channel
+      await asyncRetry({interval, times}, async () => {
+        return await confirmIncomingChannel({
+          capacity,
+          lnd,
+          from: coordinator.partners(identity).inbound,
+          id: fromHex(basePsbt.unsigned_transaction).getId(),
+          to: coordinator.partners(identity).outbound || undefined,
+        });
       });
-    });
 
-    // Register the signature with the coordinator
-    return coordinator.sign({id: identity, signed: signed.psbt});
+      // Register the signature with the coordinator
+      return coordinator.sign({id: identity, signed: signed.psbt});
+    } catch (err) {
+      return errored(err);
+    }
   });
 
   // Group members have submitted their partial signatures

package/package.json

@@ -16,8 +16,8 @@
     "ecpair": "2.1.0",
     "goldengate": "11.4.0",
     "invoices": "2.2.0",
-    "ln-service": "54.2.0",
-    "ln-sync": "3.14.0",
+    "ln-service": "54.2.3",
+    "ln-sync": "4.0.4",
     "psbt": "2.7.1",
     "p2tr": "1.3.2",
     "tiny-secp256k1": "2.2.1"
@@ -25,7 +25,7 @@
   "description": "Lightning Paid Services library",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.11",
-    "ln-docker-daemons": "3.1.0",
+    "ln-docker-daemons": "3.1.2",
     "mock-lnd": "1.4.4",
     "secp256k1": "4.0.3"
   },
@@ -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": "4.0.0"
+  "version": "4.0.2"
 }

package/trades/connect_to_seller.js

@@ -15,7 +15,7 @@ const {returnResult} = require('asyncjs-util');
 
 const interval = 1000;
 const {isArray} = Array;
-const times = 10;
+const times = 20;
 const uniq = arr => Array.from(new Set(arr));
 
 /** Connect to a seller
@@ -213,7 +213,7 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
 
         // Try and connect to a referenced node
         return asyncDetect(getNodes.filter(n => !!n), (node, cbk) => {
-          logger.info({connecting_to: node.id});
+          logger.info({finalizing_connection_to: node.id});
 
           // Attempt referenced sockets to establish p2p connection
           return asyncDetectSeries(node.sockets, (socket, cbk) => {
@@ -244,6 +244,8 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
 
             const peer = res.peers.find(n => n.public_key === connect.id);
 
+            logger.info({peer_connection_pending: connect.id});
+
             if (!peer) {
               return cbk([503, 'FailedToConnectToPeer']);
             }

package/trades/find_trade.js

@@ -2,6 +2,7 @@ const {randomBytes} = require('crypto');
 
 const asyncAuto = require('async/auto');
 const asyncReflect = require('async/reflect');
+const asyncRetry = require('async/retry');
 const {returnResult} = require('asyncjs-util');
 
 const connectToSeller = require('./connect_to_seller');
@@ -16,7 +17,7 @@ const findBasicRecord = records => records.find(n => n.type === '1');
 const findIdRecord = records => records.find(n => n.type === '0');
 const {isArray} = Array;
 const makeRequestId = () => randomBytes(32).toString('hex');
-const requestTradesTimeoutMs = 1000 * 30;
+const requestTradesTimeoutMs = 1000 * 45;
 const tradesRequestIdType = '1';
 const uniqBy = (a,b) => a.filter((e,i) => a.findIndex(n => n[b] == e[b]) == i);
 const waitForTradesMs = 1000 * 5;
@@ -72,7 +73,10 @@ module.exports = ({ask, id, lnd, logger, nodes}, cbk) => {
 
       // Connect to the seller
       connect: ['validate', ({}, cbk) => {
-        return connectToSeller({lnd, logger, nodes}, cbk);
+        return asyncRetry({}, cbk => {
+          return connectToSeller({lnd, logger, nodes}, cbk);
+        },
+        cbk);
       }],
 
       // Send request to node with public key identity