paid-services 3.20.0 → 3.20.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Versions
 
+## Version 3.20.3
+
+- `manageGroupJoin`: Allow coordinating pair when funds are below the capacity
+
+## Version 3.20.2
+
+- `manageGroupJoin`: Allow opening a pair channel when funds are below capacity
+
+## Version 3.20.1
+
+- `manageTrades`: Fix seller connection when not peered
+
 ## Version 3.20.0
 
 - `manageGroupJoin`: Add support for 2 person groups

package/groups/ask_for_group_details.js

@@ -6,6 +6,7 @@ const {returnResult} = require('asyncjs-util');
 const defaultChannelCapacity = 5e6;
 const defaultGroupSize = 3;
 const {floor} = Math;
+const halfOf = input => Number(input) / 2;
 const isNumber = n => !isNaN(n);
 const isOdd = n => !!(n % 2);
 const maxChannelSize = 21e14;
@@ -47,76 +48,87 @@ module.exports = ({ask, lnd}, cbk) => {
       // Get the wallet balance to make sure there are enough funds to join
       getBalance: ['validate', ({}, cbk) => getChainBalance({lnd}, cbk)],
 
-      // Ask for how big the channels should be
-      askForCapacity: ['getBalance', ({getBalance}, cbk) => {
+      // Get the chain fee rate to use for a default in the chain fee query
+      getFeeRate: ['validate', ({}, cbk) => getChainFeeRate({lnd}, cbk)],
+
+      // Ask for how many group members there should be
+      askForCount: ['validate', ({}, cbk) => {
         return ask({
-          default: defaultChannelCapacity,
-          name: 'capacity',
-          message: 'Channel capacity?',
+          default: defaultGroupSize,
+          name: 'size',
+          message: 'Total number of group members?',
           validate: input => {
             if (!input || !isNumber(input)) {
               return false;
             }
 
+            // Do not allow fractional members
             if (round(Number(input)) !== Number(input)) {
               return false;
             }
 
-            if (Number(input) > getBalance.chain_balance) {
-              return `Current chain balance is ${getBalance.chain_balance}`;
-            }
-
-            if (Number(input) < minChannelSize) {
-              return `Minimum channel size is ${minChannelSize}`;
+            // Do not allow too many members
+            if (Number(input) > maxGroupSize) {
+              return `The maximum group size is ${maxGroupSize}`;
             }
 
-            if (isOdd(Number(input))) {
-              return 'Channel capacity must be even';
+            // Do not allow too few members
+            if (Number(input) < minGroupSize) {
+              return `The minimum group size is ${minGroupSize}`;
             }
 
             return true;
           },
         },
-        ({capacity}) => cbk(null, Number(capacity)));
+        ({size}) => cbk(null, Number(size)));
       }],
 
-      // Get the chain fee rate to use for a default in the chain fee query
-      getFeeRate: ['validate', ({}, cbk) => getChainFeeRate({lnd}, cbk)],
+      // Ask for how big the channels should be
+      askForCapacity: [
+        'askForCount',
+        'getBalance',
+        ({askForCount, getBalance}, cbk) =>
+      {
+        const isPair = askForCount === minGroupSize;
 
-      // Ask for how many group members there should be
-      askForCount: ['askForCapacity', ({askForCapacity}, cbk) => {
         return ask({
-          default: defaultGroupSize,
-          name: 'size',
-          message: 'Total number of group members?',
+          default: defaultChannelCapacity,
+          name: 'capacity',
+          message: 'Channel capacity?',
           validate: input => {
             if (!input || !isNumber(input)) {
               return false;
             }
 
-            // Do not allow fractional members
             if (round(Number(input)) !== Number(input)) {
               return false;
             }
 
-            // Do not allow too many members
-            if (Number(input) > maxGroupSize) {
-              return `The maximum group size is ${maxGroupSize}`;
+            if (!isPair && Number(input) > getBalance.chain_balance) {
+              return `Current chain balance is ${getBalance.chain_balance}`;
             }
 
-            // Do not allow too few members
-            if (Number(input) < minGroupSize) {
-              return `The minimum group size is ${minGroupSize}`;
+            if (isPair && halfOf(input) > getBalance.chain_balance) {
+              return `Current chain balance is ${getBalance.chain_balance}`;
+            }
+
+            if (Number(input) < minChannelSize) {
+              return `Minimum channel size is ${minChannelSize}`;
+            }
+
+            if (isOdd(Number(input))) {
+              return 'Channel capacity must be even';
             }
 
             return true;
           },
         },
-        ({size}) => cbk(null, size));
+        ({capacity}) => cbk(null, Number(capacity)));
       }],
 
       // Ask for a chain fee rate
       askForFeeRate: [
+        'askForCapacity',
         'askForCount',
         'getFeeRate',
         ({askForCount, getFeeRate}, cbk) =>

package/groups/ask_to_confirm_group_join.js

@@ -105,7 +105,7 @@ module.exports = ({ask, lnd}, cbk) => {
         ({getAlias, getBalance, getDetails}, cbk) =>
       {
         // Check to make sure that there are on chain funds for this group
-        if (getBalance.chain_balance < getDetails.capacity) {
+        if (getBalance.chain_balance < getDetails.funding) {
           return cbk([
             400,
             'InsufficientChainFundsAvailableToJoinGroup',

package/groups/messages/decode_group_details.js

@@ -1,11 +1,13 @@
 const {decodeBigSize} = require('bolt01');
 
 const findRecord = (records, type) => records.find(n => n.type === type);
+const funding = (capacity, count) => count === 2 ? capacity / 2 : capacity;
 const {isArray} = Array;
 const isOdd = n => !!(n % 2);
 const maxCapacityTokens = BigInt(7e14);
 const maxMembersCount = BigInt(650);
 const maxFeeRate = BigInt(1e5);
+const minMembersCount = BigInt(2);
 const typeCapacity = '1';
 const typeCount = '2';
 const typeRate = '3';
@@ -28,6 +30,7 @@ const version = '1';
   {
     capacity: <Channel Capacity Tokens Number>
     count: <Target Members Count Number>
+    funding: <Amount Of Funding Required Tokens Number>
     rate: <Chain Fee Rate Number>
   }
 */
@@ -88,6 +91,10 @@ module.exports = ({records}) => {
     throw new Error('UnexpectedValueForCountInGroupRecords');
   }
 
+  if (BigInt(count) < minMembersCount) {
+    throw new Error('ExpectedHigherMembersCountInGroupDetails');
+  }
+
   const rateRecord = findRecord(records, typeRate);
 
   try {
@@ -105,6 +112,7 @@ module.exports = ({records}) => {
   return {
     capacity: Number(capacity),
     count: Number(count),
+    funding: funding(Number(capacity), Number(count)),
     rate: Number(rate),
   };
 };

package/groups/p2p/get_group_details.js

@@ -24,6 +24,7 @@ const typeGroupChannelId = '1';
   {
     capacity: <Channel Capacity Tokens Number>
     count: <Target Members Count Number>
+    funding: <Amount Of Funding Required Tokens Number>
     rate: <Chain Fee Rate Number>
   }
 */

package/package.json

@@ -16,7 +16,7 @@
     "ecpair": "2.0.1",
     "goldengate": "11.2.3",
     "invoices": "2.1.0",
-    "ln-service": "53.17.5",
+    "ln-service": "53.20.0",
     "ln-sync": "3.13.1",
     "psbt": "2.7.1",
     "p2tr": "1.3.1",
@@ -25,8 +25,8 @@
   "description": "Lightning Paid Services library",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.11",
-    "ln-docker-daemons": "2.3.2",
-    "mock-lnd": "1.4.1",
+    "ln-docker-daemons": "2.3.4",
+    "mock-lnd": "1.4.3",
     "secp256k1": "4.0.3"
   },
   "engines": {
@@ -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/server/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "3.20.0"
+  "version": "3.20.3"
 }

package/trades/connect_to_seller.js

@@ -66,6 +66,9 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
       // Derive the self public key
       getIdentity: ['validate', ({}, cbk) => getIdentity({lnd}, cbk)],
 
+      // Get the actively connected peers
+      getPeered: ['validate', ({}, cbk) => getPeers({lnd}, cbk)],
+
       // Find node connect info to connect to
       getNodes: ['getIdentity', ({getIdentity}, cbk) => {
         return asyncMap(nodes, (connect, cbk) => {
@@ -144,7 +147,8 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
       removePeer: [
         'getChannels',
         'getNodes',
-        ({getChannels, getNodes}, cbk) =>
+        'getPeered',
+        ({getChannels, getNodes, getPeered}, cbk) =>
       {
         const ids = getChannels.channels.map(n => n.partner_public_key);
 
@@ -154,6 +158,11 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
             return cbk();
           }
 
+          // Exit early when already not peered
+          if (!getPeered.peers.map(n => n.public_key).includes(node.id)) {
+            return cbk();
+          }
+
           return removePeer({lnd, public_key: node.id}, (err, res) => {
             if (!!err) {
               return cbk(err);
@@ -181,7 +190,7 @@ module.exports = ({lnd, logger, nodes}, cbk) => {
       }],
 
       // Get the list of connected peers
-      getPeers: ['removePeer', ({}, cbk) => getPeers({lnd}, cbk)],
+      getPeers: ['validate', ({}, cbk) => getPeers({lnd}, cbk)],
 
       // Try and connect to a node in order to do p2p messaging
       connect: [