paid-services 3.8.0 → 3.9.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## Version 3.9.0
+
+- `decodeTrade`: Add method to decode a trade-secret
+
 ## Version 3.8.0
 
 - `encodeTrade`: Add method to encode a trade-secret

package/index.js

@@ -1,5 +1,6 @@
 const {changeChannelCapacity} = require('./capacity');
 const {confirmServiceUse} = require('./client');
+const {decodeTrade} = require('./trades');
 const {encodeTrade} = require('./trades');
 const {getServiceSchema} = require('./client');
 const {getServicesList} = require('./client');
@@ -16,6 +17,7 @@ const serviceIds = schema.types;
 module.exports = {
   changeChannelCapacity,
   confirmServiceUse,
+  decodeTrade,
   encodeTrade,
   getServiceSchema,
   getServicesList,

package/package.json

@@ -40,5 +40,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/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.8.0"
+  "version": "3.9.0"
 }

package/trades/find_trade.js

@@ -5,6 +5,7 @@ const asyncAuto = require('async/auto');
 const asyncDetect = require('async/detect');
 const asyncDetectSeries = require('async/detectSeries');
 const asyncMap = require('async/map');
+const asyncReflect = require('async/reflect');
 const {getChannel} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getPeers} = require('ln-service');
@@ -206,19 +207,19 @@ module.exports = ({ask, id, identity, lnd, logger, nodes}, cbk) => {
       }],
 
       // Request a specific trade
-      requestTrade: ['to', ({to}, cbk) => {
+      requestTrade: ['to', asyncReflect(({to}, cbk) => {
         // Exit early when this is an open ended trade request with no id
         if (!id) {
           return cbk();
         }
 
         return requestTradeById({id, lnd, to}, cbk);
-      }],
+      })],
 
       // Request an inventory of trades
-      requestTrades: ['to', ({to}, cbk) => {
-        // Exit early when this is a trade request for a specific id
-        if (!!id) {
+      requestTrades: ['requestTrade', 'to', ({requestTrade, to}, cbk) => {
+        // Exit early when there was a successful request for a specific id
+        if (!!requestTrade.value) {
           return cbk();
         }
 
@@ -285,7 +286,7 @@ module.exports = ({ask, id, identity, lnd, logger, nodes}, cbk) => {
         ({requestTrade, requestTrades}, cbk) =>
       {
         // Exit early when the trade was already selected
-        if (!!requestTrade) {
+        if (!!requestTrade.value) {
           return cbk();
         }
 
@@ -331,7 +332,7 @@ module.exports = ({ask, id, identity, lnd, logger, nodes}, cbk) => {
         'requestTrade',
         ({fetchSelectedTrade, requestTrade}, cbk) =>
       {
-        return cbk(null, fetchSelectedTrade || requestTrade);
+        return cbk(null, fetchSelectedTrade || requestTrade.value);
       }],
     },
     returnResult({reject, resolve, of: 'trade'}, cbk));