paid-services 3.20.1 → 3.20.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 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

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

@@ -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.1"
+  "version": "3.20.2"
 }