paid-services 3.14.2 → 3.14.5

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## Version 3.14.2
+## Version 3.14.5
+
+- `manageTrades`: Fix connecting to sellers when not already connected
+
+## Version 3.14.4
 
 - `manageTrades`: Fix listing of trades that have fiat-pricing
 

package/package.json

@@ -14,14 +14,14 @@
     "bolt07": "1.8.0",
     "ecpair": "2.0.1",
     "invoices": "2.0.4",
-    "ln-service": "53.9.3",
+    "ln-service": "53.9.4",
     "ln-sync": "3.11.0",
     "tiny-secp256k1": "2.2.1"
   },
   "description": "Lightning Paid Services library",
   "devDependencies": {
-    "@alexbosworth/tap": "15.0.10",
-    "ln-docker-daemons": "2.2.4",
+    "@alexbosworth/tap": "15.0.11",
+    "ln-docker-daemons": "2.2.5",
     "mock-lnd": "1.4.1",
     "secp256k1": "4.0.3"
   },
@@ -43,5 +43,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.14.2"
+  "version": "3.14.5"
 }

package/test/capacity/test_interim_replacement_psbt.js

@@ -1,4 +1,5 @@
 const {test} = require('@alexbosworth/tap');
+const tinysecp = require('tiny-secp256k1');
 
 const method = require('./../../capacity/interim_replacement_psbt');
 
@@ -31,6 +32,8 @@ const tests = [
 
 tests.forEach(({args, description, error, expected}) => {
   return test(description, async ({end, strictSame, throws}) => {
+    args.ecp = (await import('ecpair')).ECPairFactory(tinysecp);
+
     if (!!error) {
       throws(() => method(args), new Error(error), 'Got error');
     } else {

package/trades/connect_to_seller.js

@@ -1,15 +1,18 @@
-const addPeer = require('ln-service');
+const {addPeer} = require('ln-service');
 const asyncAuto = require('async/auto');
 const asyncDetect = require('async/detect');
 const asyncDetectSeries = require('async/detectSeries');
 const asyncMap = require('async/map');
+const asyncRetry = require('async/retry');
 const {getChannel} = require('ln-service');
 const {getIdentity} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getPeers} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
+const interval = 1000;
 const {isArray} = Array;
+const times = 10;
 const uniq = arr => Array.from(new Set(arr));
 
 /** Connect to a seller
@@ -169,6 +172,30 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
         cbk);
       }],
 
+      // Confirm the connection
+      confirmConnected: ['connect', ({connect}, cbk) => {
+        return asyncRetry({interval, times}, cbk => {
+          return getPeers({lnd}, (err, res) => {
+            if (!!err) {
+              return cbk(err);
+            }
+
+            const peer = res.peers.find(n => n.public_key === connect.id);
+
+            if (!peer) {
+              return cbk([503, 'FailedToConnectToPeer']);
+            }
+
+            if (!peer.bytes_received) {
+              return cbk([503, 'FailedToFinalizeConnectionWithPeer']);
+            }
+
+            return cbk();
+          });
+        },
+        cbk);
+      }],
+
       // Connected to seller
       connected: ['connect', ({connect}, cbk) => {
         if (!connect) {

package/trades/manage_trades.js

@@ -315,8 +315,10 @@ module.exports = ({ask, lnd, logger, request, separator}, cbk) => {
           return logger.info(`sold: ${tokensAsBigUnit(tokens)} ${item}`);
         });
 
-        sub.on('start', ({description, tokens}) => {
-          const trade = `${tokensAsBigUnit(tokens)} ${description}`;
+        sub.on('start', ({description, price, tokens}) => {
+          const amount = !!tokens ? tokensAsBigUnit(tokens) : price;
+
+          const trade = `${amount} ${description}`;
 
           return logger.info(`open: ${trade}`);
         });

package/trades/service_anchored_trades.js

@@ -95,6 +95,7 @@ module.exports = ({lnd, request}) => {
       description: trade.description,
       expires_at: trade.expires_at,
       id: trade.id,
+      price: trade.price,
       secret: trade.secret,
       tokens: trade.tokens,
     });