ln-service 54.3.3 → 54.4.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Versions
 
+## 54.4.1
+
+- `subscribeToRpcRequests`: `open_channel_request` add support for
+    `fee_rate`, `base_fee_mtokens`
+
 ## 54.3.3
 
 - `getWalletInfo`: Add support for LND 0.15.5

package/README.md

@@ -6704,8 +6704,10 @@ This method is not supported in LND 0.13.4 and below
       macaroon: <Base64 Encoded Macaroon String>
       reject: ({message: <Rejection String>}, [cbk]) => {}
       request: {
+        [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
         [chain_fee_tokens_per_vbyte]: <Chain Fee Tokens Per VByte Number>
         [cooperative_close_address]: <Prefer Cooperative Close To Address String>
+        [fee_rate]: <Routing Fee Rate In Millitokens Per Million Number>
         [give_tokens]: <Tokens to Gift To Partner Number>
         [is_private]: <Channel is Private Bool>
         local_tokens: <Local Tokens Number>

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.2",
-    "lightning": "6.3.2",
+    "lightning": "6.4.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.11.0"
@@ -24,11 +24,11 @@
     "asyncjs-util": "1.2.10",
     "bip32": "3.1.0",
     "bip66": "1.1.5",
-    "bitcoinjs-lib": "6.0.2",
+    "bitcoinjs-lib": "6.1.0",
     "bn.js": "5.2.1",
     "bs58check": "2.1.2",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "3.1.6",
+    "ln-docker-daemons": "4.0.0",
     "p2tr": "1.3.2",
     "portfinder": "1.0.32",
     "psbt": "2.7.1",
@@ -62,7 +62,7 @@
     "integration-test-0.15.2": "DOCKER_LND_VERSION=v0.15.2-beta npm run test",
     "integration-test-0.14.5": "DOCKER_LND_VERSION=v0.14.5-beta npm run test",
     "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
-    "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/peersrpc-integration/*.js test/routerrpc-integration/*.js test/signerrpc-integration/*.js test/walletrpc-integration/*.js"
+    "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/peersrpc-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": "54.3.3"
+  "version": "54.4.1"
 }

package/test/chainrpc-integration/test_subscribe_to_blocks.js

@@ -14,7 +14,7 @@ const {subscribeToBlocks} = require('./../../');
 const {waitForTermination} = require('./../macros');
 
 const confirmationCount = 6;
-const interval = 10;
+const interval = 50;
 const race = promises => Promise.race(promises);
 const times = 4000;
 

package/test/integration/test_get_forwards.js

@@ -9,8 +9,10 @@ const {getForwards} = require('./../../');
 const {pay} = require('./../../');
 const {setupChannel} = require('./../macros');
 
+const interval = 100;
 const limit = 1;
 const size = 3;
+const times = 1000;
 const tokens = 100;
 
 // Getting forwarded payments should return all forwarded payments
@@ -32,7 +34,7 @@ test('Get forwards', async ({end, equal, strictSame}) => {
   await delay(2000);
 
   for (let i = 0, l = remote.lnd; i < 3; i++) {
-    await asyncRetry({}, async () => {
+    await asyncRetry({interval, times}, async () => {
       await delay(1000);
 
       await pay({

package/test/integration/test_recover_funds_from_channel.js

@@ -34,6 +34,7 @@ test(`Recover funds from channel`, async ({end, equal}) => {
       generate_address: generateAddress,
       lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
       lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+      lightning_tower_port: await getPort({port: 14001, stopPort: 15000}),
     });
   });
 
@@ -46,6 +47,7 @@ test(`Recover funds from channel`, async ({end, equal}) => {
       generate_address: generateAddress,
       lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
       lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+      lightning_tower_port: await getPort({port: 14001, stopPort: 15000}),
     });
   });
 
@@ -116,6 +118,7 @@ test(`Recover funds from channel`, async ({end, equal}) => {
       generate_address: generateAddress,
       lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
       lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+      lightning_tower_port: await getPort({port: 14001, stopPort: 15000}),
     });
   });
 

package/test/integration/test_recover_funds_from_channels.js

@@ -34,6 +34,7 @@ test(`Recover funds from channels`, async ({end, equal}) => {
       generate_address: generateAddress,
       lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
       lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+      lightning_tower_port: await getPort({port: 14001, stopPort: 15000}),
     });
   });
 
@@ -46,6 +47,7 @@ test(`Recover funds from channels`, async ({end, equal}) => {
       generate_address: generateAddress,
       lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
       lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+      lightning_tower_port: await getPort({port: 14001, stopPort: 15000}),
     });
   });
 
@@ -112,6 +114,7 @@ test(`Recover funds from channels`, async ({end, equal}) => {
       generate_address: generateAddress,
       lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
       lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+      lightning_tower_port: await getPort({port: 14001, stopPort: 15000}),
     });
   });
 

package/test/integration/test_send_to_chain_addresses.js

@@ -6,6 +6,7 @@ const {createChainAddress} = require('./../../');
 const {getChainBalance} = require('./../../');
 const {sendToChainAddresses} = require('./../../');
 
+const interval = 1000;
 const regtestBech32AddressHrp = 'bcrt';
 const size = 2;
 const times = 10;
@@ -47,7 +48,7 @@ test(`Send to chain address`, async ({end, equal}) => {
   equal(sent.is_outgoing, true, 'Transaction is outgoing');
   equal(sent.tokens, tokens, 'Tokens amount matches tokens sent');
 
-  await asyncRetry({times}, async () => {
+  await asyncRetry({interval, times}, async () => {
     // Generate to confirm the tx
     await control.generate({});
 

package/test/integration/test_subscribe_to_rpc_requests.js

@@ -143,6 +143,8 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
         // Gift some tokens in a channel
         await openChannel({
           lnd,
+          base_fee_mtokens: '1',
+          fee_rate: 1,
           give_tokens: 1e5,
           local_tokens: 1e6,
           partner_public_key: Buffer.alloc(33, 2).toString('hex'),

package/test/integration/test_trusted_funding.js

@@ -85,13 +85,15 @@ test(`Open unconfirmed channels`, async ({end, equal, match, strictSame}) => {
     });
 
     // Propose the channel to the peer
-    const {pending} = await openChannels({
-      lnd,
-      channels: [{
-        capacity,
-        is_trusted_funding: true,
-        partner_public_key: target.id,
-      }],
+    const {pending} = await asyncRetry({interval, times}, async () => {
+      return await openChannels({
+        lnd,
+        channels: [{
+          capacity,
+          is_trusted_funding: true,
+          partner_public_key: target.id,
+        }],
+      });
     });
 
     // Setup funding to the 2:2 output

package/test/tower_clientrpc-integration/test_connect_watchtower.js

@@ -0,0 +1,39 @@
+const {connectWatchtower} = require('./../../');
+const {getConnectedWatchtowers} = require('./../../');
+const {getTowerServerInfo} = require('./../../');
+const {spawnLightningCluster} = require('ln-docker-daemons');
+const {test} = require('@alexbosworth/tap');
+
+const conf = ['--watchtower.active', '--wtclient.active'];
+const size = 2;
+
+// Connecting to a watchtower should add a watchtower
+test(`Connect watchtower`, async ({end, equal, fail, match}) => {
+  const {kill, nodes} = await spawnLightningCluster({
+    size,
+    lnd_configuration: conf
+  });
+
+  const [{lnd}, target] = nodes;
+
+  try {
+    const {tower} = await getTowerServerInfo({lnd: target.lnd});
+
+    const [socket] = tower.sockets;
+
+    await connectWatchtower({lnd, socket, public_key: tower.public_key});
+
+    const [watcher] = (await getConnectedWatchtowers({lnd})).towers;
+
+    equal(watcher.is_active, true, 'Tower is active');
+    equal(watcher.public_key, tower.public_key, 'Tower public key added');
+    equal(watcher.sessions.length, [].length, 'Tower has no sessions');
+    equal(watcher.sockets.pop(), socket, 'Tower at socket added');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
+
+  await kill({});
+
+  return end();
+});

package/test/tower_clientrpc-integration/test_get_connected_watchtowers.js

@@ -0,0 +1,49 @@
+const {connectWatchtower} = require('./../../');
+const {getConnectedWatchtowers} = require('./../../');
+const {getTowerServerInfo} = require('./../../');
+const {spawnLightningCluster} = require('ln-docker-daemons');
+const {test} = require('@alexbosworth/tap');
+
+const conf = ['--watchtower.active', '--wtclient.active'];
+const size = 2;
+
+// Getting connected watchtowers should return watchtowers
+test(`Get connected watchtowers`, async ({end, equal, fail, match}) => {
+  const {kill, nodes} = await spawnLightningCluster({
+    size,
+    lnd_configuration: conf
+  });
+
+  const [{lnd}, target] = nodes;
+
+  try {
+    const {tower} = await getTowerServerInfo({lnd: target.lnd});
+
+    const [socket] = tower.sockets;
+
+    await connectWatchtower({lnd, socket, public_key: tower.public_key});
+
+    const res = (await getConnectedWatchtowers({lnd}));
+
+    const [watcher] = res.towers;
+
+    equal(res.backups_count, 0, 'Got backups count');
+    equal(res.failed_backups_count, 0, 'Got failed backups count');
+    equal(res.finished_sessions_count, 0, 'Got finished sessions count');
+    equal(res.max_session_update_count, 1024, 'Got max session update count');
+    equal(res.pending_backups_count, 0, 'Got pending backups count');
+    equal(res.sessions_count, 0, 'Got sessions count');
+    equal(res.sweep_tokens_per_vbyte, 10, 'Got sweep tokens per vbyte');
+
+    equal(watcher.is_active, true, 'Tower is active');
+    equal(watcher.public_key, tower.public_key, 'Tower is connected');
+    equal(watcher.sessions.length, [].length, 'No sessions initiated');
+    equal(watcher.sockets.slice().pop(), socket, 'Tower socket returned');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
+
+  await kill({});
+
+  return end();
+});

package/test/{extra-integration/tower_serverrpc-integration → tower_serverrpc-integration}/test_get_tower_server_info.js

@@ -1,16 +1,15 @@
+const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const {getTowerServerInfo} = require('./../../');
-const {spawnLnd} = require('./../macros');
-const {waitForTermination} = require('./../macros');
 
-const pubKeyHexLength = Buffer.alloc(33).toString('hex').length;
+const conf = ['--watchtower.active'];
 
 // Getting the tower server info should return tower server info
 test(`Get tower server info`, async ({end, equal, match}) => {
-  const spawned = await spawnLnd({tower: true});
+  const {kill, nodes} = await spawnLightningCluster({lnd_configuration: conf});
 
-  const {lnd} = spawned;
+  const [{lnd}] = nodes;
 
   const {tower} = await getTowerServerInfo({lnd});
 
@@ -20,15 +19,13 @@ test(`Get tower server info`, async ({end, equal, match}) => {
 
   match(socket, /127.0.0.1\:\d\d\d\d/, 'Tower socket returned');
 
-  equal(tower.public_key.length, pubKeyHexLength, 'Public key returned');
+  equal(tower.public_key.length, 66, 'Public key returned');
 
   const [uri] = tower.uris;
 
   equal(uri, `${tower.public_key}@${socket}`, 'Got back socket');
 
-  spawned.kill();
-
-  await waitForTermination({lnd});
+  await kill({});
 
   return end();
 });

package/test/extra-integration/tower_clientrpc-integration/test_connect_watchtower.js

@@ -1,43 +0,0 @@
-const {test} = require('@alexbosworth/tap');
-
-const {connectWatchtower} = require('./../../');
-const {getConnectedWatchtowers} = require('./../../');
-const {getTowerServerInfo} = require('./../../');
-const {spawnLnd} = require('./../macros');
-const {waitForTermination} = require('./../macros');
-
-const all = promise => Promise.all(promise);
-const nodes = [{watchers: true}, {tower: true}];
-
-// Connecting to a watchtower should add a watchtower
-test(`Connect watchtower`, async ({end, equal, fail, match}) => {
-  let client;
-  let tower;
-
-  client = await spawnLnd({watchers: true});
-  tower = await spawnLnd({tower: true});
-
-  const info = (await getTowerServerInfo({lnd: tower.lnd})).tower;
-  const {lnd} = client;
-
-  const [socket] = info.sockets;
-
-  try {
-    await connectWatchtower({lnd, socket, public_key: info.public_key});
-
-    const [watcher] = (await getConnectedWatchtowers({lnd})).towers;
-
-    equal(watcher.is_active, true, 'Tower is active');
-    equal(watcher.public_key, info.public_key, 'Tower public key added');
-    equal(watcher.sessions.length, [].length, 'Tower has no sessions');
-    equal(watcher.sockets.pop(), socket, 'Tower at socket added');
-  } catch (err) {
-    equal(err, null, 'Expects no error');
-  }
-
-  [client, tower].forEach(n => n.kill());
-
-  await all([client, tower].map(({lnd}) => waitForTermination({lnd})));
-
-  return end();
-});

package/test/extra-integration/tower_clientrpc-integration/test_get_connected_watchtowers.js

@@ -1,55 +0,0 @@
-const {test} = require('@alexbosworth/tap');
-
-const {connectWatchtower} = require('./../../');
-const {createCluster} = require('./../macros');
-const {delay} = require('./../macros');
-const {disconnectWatchtower} = require('./../../');
-const {getConnectedWatchtowers} = require('./../../');
-const {getTowerServerInfo} = require('./../../');
-const {openChannel} = require('./../../');
-const {pay} = require('./../../');
-const {spawnLnd} = require('./../macros');
-const {stopDaemon} = require('./../../');
-const {waitForChannel} = require('./../macros');
-const {waitForPendingChannel} = require('./../macros');
-const {waitForTermination} = require('./../macros');
-
-// Getting connected watchtowers should return watchtowers
-test(`Connect watchtower`, async ({end, equal, match}) => {
-  let control;
-  let tower;
-
-  control = await spawnLnd({watchers: true});
-  tower = await spawnLnd({tower: true});
-
-  const info = (await getTowerServerInfo({lnd: tower.lnd})).tower;
-  const {lnd} = control;
-
-  const [socket] = info.sockets;
-
-  await connectWatchtower({lnd, socket, public_key: info.public_key});
-
-  const res = (await getConnectedWatchtowers({lnd}));
-
-  equal(res.backups_count, 0, 'Got backups count');
-  equal(res.failed_backups_count, 0, 'Got failed backups count');
-  equal(res.finished_sessions_count, 0, 'Got finished sessions count');
-  equal(res.max_session_update_count, 1024, 'Got max session update count');
-  equal(res.pending_backups_count, 0, 'Got pending backups count');
-  equal(res.sessions_count, 0, 'Got sessions count');
-  equal(res.sweep_tokens_per_vbyte, 10, 'Got sweep tokens per vbyte');
-
-  const [watcher] = res.towers;
-
-  equal(watcher.is_active, true, 'Tower is active');
-  equal(watcher.public_key, info.public_key, 'Tower is connected');
-  equal(watcher.sessions.length, [].length, 'No sessions initiated');
-  equal(watcher.sockets.slice().pop(), socket, 'Tower socket returned');
-
-  [control, tower].forEach(n => n.kill());
-
-  await waitForTermination({lnd});
-  await waitForTermination({lnd: tower.lnd});
-
-  return end();
-});