ln-service 53.1.2 → 53.2.0

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## 53.1.1
+## 54.2.0
+
+- `getPendingChannels`: Add support for channel `capacity`
+
+## 53.1.2
 
 - `openChannels`: Fix `cooperative_close_address` not being set on channels
 

package/README.md

@@ -74,8 +74,8 @@ the LND directory. (~/.lnd or ~/Library/Application Support/Lnd)
 
 Be careful to avoid copying any newline characters in creds. To exclude them:
 
-    base64 ~/.lnd/tls.cert | tr -d '\n'
-    base64 ~/.lnd/data/chain/bitcoin/mainnet/admin.macaroon | tr -d '\n'
+    base64 -w0 ~/.lnd/tls.cert
+    base64 -w0 ~/.lnd/data/chain/bitcoin/mainnet/admin.macaroon
 
 You can then use these to interact with your LND node directly:
 
@@ -2535,6 +2535,7 @@ Requires `offchain:read` permission
     @returns via cbk or Promise
     {
       pending_channels: [{
+        capacity: <Channel Capacity Tokens Number>
         [close_transaction_id]: <Channel Closing Transaction Id String>
         is_active: <Channel Is Active Bool>
         is_closing: <Channel Is Closing Bool>
@@ -3205,11 +3206,11 @@ Requires `offchain:write`, `onchain:write`, `peers:write` permissions
       [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
       [is_private]: <Channel is Private Bool> // Defaults to false
       lnd: <Authenticated LND API Object>
-      local_tokens: <Local Tokens Number>
+      local_tokens: <Total Channel Capacity Tokens Number>
       [min_confirmations]: <Spend UTXOs With Minimum Confirmations Number>
       [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
-      partner_public_key: <Public Key Hex String>
       [partner_csv_delay]: <Peer Output CSV Delay Number>
+      partner_public_key: <Public Key Hex String>
       [partner_socket]: <Peer Connection Host:Port String>
     }
 
@@ -3250,8 +3251,8 @@ after the funding step.
         [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
         [is_private]: <Channel is Private Bool> // Defaults to false
         [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
-        partner_public_key: <Public Key Hex String>
         [partner_csv_delay]: <Peer Output CSV Delay Number>
+        partner_public_key: <Public Key Hex String>
         [partner_socket]: <Peer Connection Host:Port String>
       }]
       [is_avoiding_broadcast]: <Avoid Broadcast of All Channels Bool>
@@ -6060,8 +6061,8 @@ This method is not supported in LND 0.13.4 and below
         local_tokens: <Local Tokens Number>
         [min_confirmations]: <Spend UTXOs With Minimum Confirmations Number>
         [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
-        partner_public_key: <Public Key Hex String>
         [partner_csv_delay]: <Peer Output CSV Delay Number>
+        partner_public_key: <Public Key Hex String>
       }
       uri: <RPC URI String>
     }

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.17.1",
     "invoices": "2.0.2",
-    "lightning": "5.1.1",
+    "lightning": "5.2.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.3.0"
@@ -35,7 +35,7 @@
     "varuint-bitcoin": "1.1.2"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=12.20"
   },
   "keywords": [
     "bitcoin",
@@ -54,5 +54,5 @@
   "scripts": {
     "test": "echo $DOCKER_LND_VERSION && tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 200 test/autopilotrpc-integration/*.js test/chainrpc-integration/*.js test/integration/*.js test/invoicesrpc-integration/*.js test/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "53.1.2"
+  "version": "53.2.0"
 }

package/test/integration/test_get_pending_coop.js

@@ -51,6 +51,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(channel.pending_balance, 980950, 'Waiting on balance');
   }
 
+  equal(channel.capacity, 1000000, 'Got channel capacity');
   equal(channel.close_transaction_id, undefined, 'No close tx id');
   equal(channel.is_active, false, 'Ended');
   equal(channel.is_closing, true, 'Closing');

package/test/integration/test_get_pending_force.js

@@ -68,6 +68,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(pendingOpen.transaction_weight, 724, 'Channel tx weight');
   }
 
+  equal(pendingOpen.capacity, 1000000, 'Got channel opening capacity');
   equal(pendingOpen.close_transaction_id, undefined, 'Not closing');
   equal(pendingOpen.is_active, false, 'Not active yet');
   equal(pendingOpen.is_closing, false, 'Not closing yet');
@@ -111,6 +112,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(waitClose.pending_balance, 980950, 'Waiting on balance');
   }
 
+  equal(waitClose.capacity, 1000000, 'Got channel closing capacity');
   equal(waitClose.close_transaction_id, undefined, 'Waiting for close tx');
   equal(waitClose.is_active, false, 'Not active yet');
   equal(waitClose.is_closing, true, 'Channel is closing');
@@ -166,6 +168,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(forceClose.pending_balance, 980950, 'Waiting on balance');
   }
 
+  equal(forceClose.capacity, 1000000, 'Got channel close capacity');
   equal(forceClose.close_transaction_id, channelClose.transaction_id, 'Txid');
   equal(forceClose.is_active, false, 'Not active anymore');
   equal(forceClose.is_closing, true, 'Channel is force closing');

package/test/integration/test_propose_channel.js

@@ -359,6 +359,7 @@ test(`Propose a channel with a coop delay`, async ({end, equal, ok}) => {
     equal(incoming.transaction_weight, 724, 'Funding tx weight');
   }
 
+  equal(incoming.capacity, 1000000, 'Incoming capacity is defined');
   equal(incoming.close_transaction_id, undefined, 'Not a closing tx');
   equal(incoming.is_active, false, 'Not active yet');
   equal(incoming.is_closing, false, 'Channel is not closing');

package/test/integration/test_subscribe_to_peers.js

@@ -1,5 +1,6 @@
 const {once} = require('events');
 
+const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
@@ -9,7 +10,9 @@ const {removePeer} = require('./../../');
 const {subscribeToPeers} = require('./../../');
 
 const all = promise => Promise.all(promise);
+const interval = 10;
 const size = 2;
+const times = 1000;
 
 // Subscribing to peer events should trigger reception of peer status changes
 test(`Subscribe to peers`, async ({end, equal}) => {
@@ -21,7 +24,9 @@ test(`Subscribe to peers`, async ({end, equal}) => {
 
   sub.on('error', () => {});
 
-  await addPeer({lnd, public_key: target.id, socket: target.socket});
+  await asyncRetry({interval, times}, async () => {
+    await addPeer({lnd, public_key: target.id, socket: target.socket});
+  });
 
   const disconnect = removePeer({lnd, public_key: target.id});
   const receiveDisconnect = once(sub, 'disconnected');
@@ -32,7 +37,9 @@ test(`Subscribe to peers`, async ({end, equal}) => {
 
   equal(disconnected.public_key, target.id, 'Got d/c event');
 
-  const connect = addPeer({lnd, public_key: target.id, socket: target.socket});
+  const connect = asyncRetry({interval, times}, async () => {
+    return addPeer({lnd, public_key: target.id, socket: target.socket});
+  });
 
   const receiveConnectMessage = once(sub, 'connected');
 

package/test/routerrpc-integration/test_multipath_payment.js

@@ -103,7 +103,7 @@ test(`Pay with multiple paths`, async ({end, equal, rejects, strictSame}) => {
     total_mtokens: parsed.mtokens,
   });
 
-  // Pay using routes. Multiple channels must be used too avoid tempChanFail
+  // Pay using routes. Multiple channels must be used to avoid tempChanFail
   try {
     const routes = [route1.route, route2.route];