ln-service 56.7.1 → 56.8.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 56.8.1
+
+- `getPendingChannels`: Add `blocks_until_expiry` for opening funding expiry
+
 ## 56.7.1
 
 - `isDestinationPayable`: Correct behavior for passing variations of amounts

package/README.md

@@ -9,7 +9,7 @@ through npm.
 
 Supported LND versions:
 
-- v0.16.0-beta to v0.16.3-beta
+- v0.16.0-beta to v0.16.4-beta
 - v0.15.2-beta to v0.15.5-beta
 - v0.14.4-beta to v0.14.5-beta
 
@@ -2885,6 +2885,8 @@ Requires `offchain:read` permission
 
 `description` is not supported in LND 0.16.4 or before
 
+`blocks_until_expiry` is not supported in LND 0.16.4 or before
+
     {
       lnd: <Authenticated LND API Object>
     }
@@ -2892,6 +2894,7 @@ Requires `offchain:read` permission
     @returns via cbk or Promise
     {
       pending_channels: [{
+        [blocks_until_expiry]: <Blocks Until Open Channel Expires Number>
         capacity: <Channel Capacity Tokens Number>
         [close_transaction_id]: <Channel Closing Transaction Id String>
         [description]: <Channel Description String>

package/package.json

@@ -7,35 +7,34 @@
     "url": "https://github.com/alexbosworth/ln-service/issues"
   },
   "dependencies": {
-    "bolt07": "1.8.3",
+    "bolt07": "1.8.4",
     "cors": "2.8.5",
     "express": "4.18.2",
-    "invoices": "2.2.3",
-    "lightning": "9.7.1",
+    "invoices": "3.0.0",
+    "lightning": "9.8.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
-    "@alexbosworth/blockchain": "1.4.0",
-    "@alexbosworth/tap": "15.0.12",
+    "@alexbosworth/blockchain": "1.5.0",
     "@alexbosworth/node-fetch": "2.6.2",
     "async": "3.2.4",
-    "asyncjs-util": "1.2.11",
+    "asyncjs-util": "1.2.12",
     "bip32": "4.0.0",
     "bip66": "1.1.5",
     "bitcoinjs-lib": "6.1.3",
     "bn.js": "5.2.1",
     "bs58check": "3.0.1",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "5.0.6",
-    "p2tr": "1.3.3",
+    "ln-docker-daemons": "5.1.1",
+    "p2tr": "2.0.0",
     "portfinder": "1.0.32",
-    "psbt": "2.7.2",
+    "psbt": "3.0.0",
     "rimraf": "5.0.1",
     "secp256k1": "5.0.0",
-    "tiny-secp256k1": "2.2.2",
+    "tiny-secp256k1": "2.2.3",
     "uuid": "9.0.0",
     "varuint-bitcoin": "1.1.2"
   },
@@ -57,6 +56,7 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.16.4": "DOCKER_LND_VERSION=v0.16.4-beta npm run test",
     "integration-test-0.16.3": "DOCKER_LND_VERSION=v0.16.3-beta npm run test",
     "integration-test-0.16.2": "DOCKER_LND_VERSION=v0.16.2-beta npm run test",
     "integration-test-0.16.1": "DOCKER_LND_VERSION=v0.16.1-beta npm run test",
@@ -67,7 +67,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/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
+    "test": "echo $DOCKER_LND_VERSION && node test/runner"
   },
-  "version": "56.7.1"
+  "version": "56.8.1"
 }

package/test/autopilotrpc-integration/test_autopilot.js

@@ -1,20 +1,22 @@
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
+
+const {setupChannel} = require('ln-docker-daemons');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {addPeer} = require('./../../');
-const {delay} = require('./../macros');
 const {getAutopilot} = require('./../../');
 const {setAutopilot} = require('./../../');
-const {setupChannel} = require('./../macros');
 
 const avg = array => array.reduce((a, b) => a + b) / array.length;
 const confirmationCount = 6;
+const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 const maxScore = 1e8;
 const score = 50000000;
 const size = 2;
 
 // Adjusting autopilot should result in changed autopilot status
-test(`Autopilot`, async ({end, equal}) => {
+test(`Autopilot`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -25,7 +27,11 @@ test(`Autopilot`, async ({end, equal}) => {
 
   await setupChannel({lnd, generate: control.generate, to: cluster.target});
 
-  equal((await getAutopilot({lnd})).is_enabled, false, 'Autopilot starts off');
+  strictEqual(
+    (await getAutopilot({lnd})).is_enabled,
+    false,
+    'Autopilot starts off'
+  );
 
   await Promise.all([
     cluster.control.generate({count: confirmationCount}),
@@ -39,11 +45,19 @@ test(`Autopilot`, async ({end, equal}) => {
     socket: cluster.target.socket,
   });
 
-  equal((await getAutopilot({lnd})).is_enabled, true, 'Autopilot turned on');
+  strictEqual(
+    (await getAutopilot({lnd})).is_enabled,
+    true,
+    'Autopilot turned on'
+  );
 
   await setAutopilot({lnd, is_enabled: false});
 
-  equal((await getAutopilot({lnd})).is_enabled, false, 'Autopilot turned off');
+  strictEqual(
+    (await getAutopilot({lnd})).is_enabled,
+    false,
+    'Autopilot turned off'
+  );
 
   const pubKey = cluster.control.id;
 
@@ -55,19 +69,19 @@ test(`Autopilot`, async ({end, equal}) => {
 
   const autopilot = await getAutopilot({lnd, node_scores: [pubKey]});
 
-  equal(autopilot.is_enabled, true, 'Autopilot was enable');
+  strictEqual(autopilot.is_enabled, true, 'Autopilot was enable');
 
   const [node] = autopilot.nodes;
 
-  equal(node.local_preferential_score, maxScore, 'Local preferential score');
-  equal(node.local_score, score, 'Local score is represented');
-  equal(node.preferential_score, maxScore, 'Global preferential score');
-  equal(node.public_key, pubKey, 'Candidate node public key');
-  equal(node.score, score, 'External score is represented');
-  equal(node.weighted_local_score, avg([maxScore, score]), 'Weight averaged');
-  equal(node.weighted_score, avg([maxScore, score]), 'Normal Weight average');
+  strictEqual(node.local_preferential_score, maxScore, 'Local score');
+  strictEqual(node.local_score, score, 'Local score is represented');
+  strictEqual(node.preferential_score, maxScore, 'Global preferential score');
+  strictEqual(node.public_key, pubKey, 'Candidate node public key');
+  strictEqual(node.score, score, 'External score is represented');
+  strictEqual(node.weighted_local_score, avg([maxScore, score]), 'Weight avg');
+  strictEqual(node.weighted_score, avg([maxScore, score]), 'Norm Weight avg');
 
   await kill({});
 
-  return end();
+  return;
 });

package/test/chainrpc-integration/test_get_block.js

@@ -1,12 +1,14 @@
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
+
 const {idForBlock} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {getBlock} = require('./../../');
 const {getHeight} = require('./../../');
 
 // Get height should return height
-test(`Get height`, async ({end, equal, fail}) => {
+test(`Get height`, async () => {
   const {nodes} = await spawnLightningCluster({});
 
   const [{chain, generate, kill, lnd}] = nodes;
@@ -20,36 +22,37 @@ test(`Get height`, async ({end, equal, fail}) => {
   try {
     const {block} = await getBlock({lnd, id: blockchain.current_block_hash});
 
-    equal(idForBlock({block}).id, hash, 'Got block');
+    strictEqual(idForBlock({block}).id, hash, 'Got block');
   } catch (err) {
     const [code, message] = err;
 
-    equal(code, 501, 'Got expected code');
-    equal(message, 'GetBlockMethodNotSupported', 'Got expected message');
+    strictEqual(code, 501, 'Got expected code');
+    strictEqual(message, 'GetBlockMethodNotSupported', 'Got expected message');
 
     await kill({});
 
-    return end();
+    return;
   }
 
   // Try getting a block by the height
   try {
     const {block} = await getBlock({height, lnd});
-    equal(idForBlock({block}).id, hash, 'Got block for height');
+
+    strictEqual(idForBlock({block}).id, hash, 'Got block for height');
   } catch (err) {
-    equal(err, null, 'Expected no error');
+    strictEqual(err, null, 'Expected no error');
   }
 
   // Try getting the chain tip block
   try {
     const {block} = await getBlock({lnd});
 
-    equal(idForBlock({block}).id, hash, 'Got chain tip block');
+    strictEqual(idForBlock({block}).id, hash, 'Got chain tip block');
   } catch (err) {
-    equal(err, null, 'Expected no error');
+    strictEqual(err, null, 'Expected no error');
   }
 
   await kill({});
 
-  return end();
+  return;
 });

package/test/chainrpc-integration/test_get_height.js

@@ -1,6 +1,8 @@
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
+
 const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {getHeight} = require('./../../');
 
@@ -8,7 +10,7 @@ const confirmationCount = 6;
 const times = 100;
 
 // Get height should return height
-test(`Get height`, async ({end, equal, fail}) => {
+test(`Get height`, async () => {
   const {nodes} = await spawnLightningCluster({});
 
   const [{chain, generate, kill, lnd}] = nodes;
@@ -24,12 +26,16 @@ test(`Get height`, async ({end, equal, fail}) => {
       throw new Error('ExpectedHeightIncreaseReflected');
     }
 
-    equal(endHeight - startHeight >= confirmationCount, true, 'Got height');
+    strictEqual(
+      endHeight - startHeight >= confirmationCount,
+      true,
+      'Got height'
+    );
 
     return;
   });
 
   await kill({});
 
-  return end();
+  return;
 });

package/test/chainrpc-integration/test_subscribe_to_blocks.js

@@ -1,9 +1,10 @@
-const EventEmitter = require('events');
-const {once} = require('events');
+const EventEmitter = require('node:events');
+const {once} = require('node:events');
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
 
 const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {createChainAddress} = require('./../../');
 const {delay} = require('./../macros');
@@ -19,7 +20,7 @@ const race = promises => Promise.race(promises);
 const times = 4000;
 
 // Subscribers to blocks should receive block notifications
-test(`Subscribe to blocks`, async ({end, equal, fail}) => {
+test(`Subscribe to blocks`, async () => {
   const blocks = [];
   const {kill, nodes} = await spawnLightningCluster({});
 
@@ -40,7 +41,7 @@ test(`Subscribe to blocks`, async ({end, equal, fail}) => {
     return !!event.height;
   });
 
-  equal(gotHeight, true, 'Got the block height');
+  strictEqual(gotHeight, true, 'Got the block height');
 
   try {
     // Wait for chainrpc to be active
@@ -73,15 +74,15 @@ test(`Subscribe to blocks`, async ({end, equal, fail}) => {
     });
 
     blocks.forEach(({height, id}) => {
-      equal(!!height, true, 'Got expected block height');
-      equal(id.length, 64, 'Got expected block hash length');
+      strictEqual(!!height, true, 'Got expected block height');
+      strictEqual(id.length, 64, 'Got expected block hash length');
       return;
     });
   } catch (err) {
-    equal(err, null, 'Expected no error');
+    strictEqual(err, null, 'Expected no error');
   } finally {
     await kill({});
 
-    return end();
+    return;
   }
 });

package/test/chainrpc-integration/test_subscribe_to_chain_address.js

@@ -1,6 +1,8 @@
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
+
 const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {chainSendTransaction} = require('./../macros');
 const {createChainAddress} = require('./../../');
@@ -23,7 +25,7 @@ const times = 1500;
 const tokens = 1e8;
 
 // Subscribing to chain transaction confirmations should trigger events
-test(`Subscribe to chain transactions`, async ({end, equal, fail}) => {
+test(`Subscribe to chain transactions`, async () => {
   const {kill, nodes} = await spawnLightningCluster({});
 
   const [{chain, generate, lnd}] = nodes;
@@ -77,9 +79,9 @@ test(`Subscribe to chain transactions`, async ({end, equal, fail}) => {
         throw new Error('ExpectedSubscribeToChainAddressSeesConf');
       }
 
-      equal(firstConf.block.length, 64, 'Confirmation block hash returned');
-      equal(firstConf.height >= 102, true, 'Got confirmation block height');
-      equal(firstConf.transaction, transaction, 'Confirmation raw tx');
+      strictEqual(firstConf.block.length, 64, 'Confirmation hash returned');
+      strictEqual(firstConf.height >= 102, true, 'Got confirmation height');
+      strictEqual(firstConf.transaction, transaction, 'Confirmation raw tx');
 
       return;
     });
@@ -105,9 +107,9 @@ test(`Subscribe to chain transactions`, async ({end, equal, fail}) => {
         throw new Error('ExpectedSubscribeToChainAddressSeesConfirmation');
       }
 
-      equal(secondConf.block.length, 64, 'Confirmation block hash returned');
-      equal(secondConf.height >= 102, true, 'Confirmation block height');
-      equal(secondConf.transaction, transaction, '2nd conf raw tx returned');
+      strictEqual(secondConf.block.length, 64, 'Confirmation hash returned');
+      strictEqual(secondConf.height >= 102, true, 'Confirmation block height');
+      strictEqual(secondConf.transaction, transaction, '2nd conf tx returned');
 
       return;
     });
@@ -117,5 +119,5 @@ test(`Subscribe to chain transactions`, async ({end, equal, fail}) => {
 
   await kill({});
 
-  return end();
+  return;
 });

package/test/chainrpc-integration/test_subscribe_to_chain_spend.js

@@ -1,8 +1,9 @@
-const {once} = require('events');
+const {once} = require('node:events');
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
 
 const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {createChainAddress} = require('./../../');
 const {getChainBalance} = require('./../../');
@@ -22,7 +23,7 @@ const times = 1000;
 const tokens = 1e6;
 
 // Subscribing to chain spend should push events on spend confirmations
-test(`Subscribe to chain spend`, async ({end, equal}) => {
+test(`Subscribe to chain spend`, async () => {
   let gotAddressConf = false;
 
   const {kill, nodes} = await spawnLightningCluster({size});
@@ -77,9 +78,9 @@ test(`Subscribe to chain spend`, async ({end, equal}) => {
   sub.on('error', err => {});
 
   sub.once('confirmation', ({height, transaction, vin}) => {
-    equal(!!height, true, 'Height of the confirmation is returned');
-    equal(!!transaction, true, 'Raw transaction is returned');
-    equal(vin !== undefined, true, 'Transaction input index is returned');
+    strictEqual(!!height, true, 'Height of the confirmation is returned');
+    strictEqual(!!transaction, true, 'Raw transaction is returned');
+    strictEqual(vin !== undefined, true, 'Transaction input index returned');
 
     return gotAddressConf = true;
   });
@@ -109,7 +110,7 @@ test(`Subscribe to chain spend`, async ({end, equal}) => {
 
   await kill({});
 
-  equal(gotAddressConf, true, 'Subscribe to address sees confirmation');
+  strictEqual(gotAddressConf, true, 'Subscribe to address sees confirmation');
 
-  return end();
+  return;
 });

package/test/integration/test_add_peer.js

@@ -1,6 +1,8 @@
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
+
 const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {addPeer} = require('./../../');
 const {createCluster} = require('./../macros');
@@ -12,7 +14,7 @@ const times = 4000;
 const timeout = 100;
 
 // Adding peers should result in a connected peer
-test(`Add a peer`, async ({end, equal}) => {
+test(`Add a peer`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{lnd}, target] = nodes;
@@ -20,7 +22,11 @@ test(`Add a peer`, async ({end, equal}) => {
   try {
     const connectedKeys = (await getPeers({lnd})).peers.map(n => n.public_key);
 
-    equal(connectedKeys.find(n => n === target.id), undefined, 'No peer');
+    strictEqual(
+      connectedKeys.find(n => n === target.id),
+      undefined,
+      'No peer'
+    );
 
     await asyncRetry({interval, times}, async () => {
       await addPeer({
@@ -40,13 +46,13 @@ test(`Add a peer`, async ({end, equal}) => {
         throw new Error('ExpectedConnectionToTarget');
       }
 
-      equal(connected.public_key, target.id, 'Connected to remote node');
+      strictEqual(connected.public_key, target.id, 'Connected to remote node');
     });
   } catch (err) {
-    equal(err, null, 'Expected no error');
+    strictEqual(err, null, 'Expected no error');
   } finally {
     await kill({});
   }
 
-  return end();
+  return;
 });

package/test/integration/test_cancel_pending_channel.js

@@ -1,17 +1,16 @@
+const test = require('node:test');
+
 const asyncEach = require('async/each');
 const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {addPeer} = require('./../../');
 const {cancelPendingChannel} = require('./../../');
-const {createCluster} = require('./../macros');
-const {delay} = require('./../macros');
-const {getChainBalance} = require('./../../');
 const {openChannels} = require('./../../');
 
 const capacity = 1e6;
 const count = 100;
+const delay = n => new Promise(resolve => setTimeout(resolve, n));
 const interval = 100;
 const race = promises => Promise.race(promises);
 const size = 2;
@@ -19,20 +18,18 @@ const timeout = 1000 * 5;
 const times = 200;
 
 // Cancel a channel should result in no pending channels
-test(`Cancel pending channel`, async ({end, equal}) => {
+test(`Cancel pending channel`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
-  const [control, target] = nodes;
-
-  const {lnd} = control;
+  const [{generate, lnd}, target] = nodes;
 
-  await control.generate({count});
-
-  await addPeer({lnd, public_key: target.id, socket: target.socket});
+  await generate({count});
 
   const channels = [{capacity, partner_public_key: target.id}];
 
   await asyncRetry({interval, times}, async () => {
+    await addPeer({lnd, public_key: target.id, socket: target.socket});
+
     const toCancel = await race([
       delay(timeout),
       openChannels({channels, lnd}),
@@ -45,5 +42,5 @@ test(`Cancel pending channel`, async ({end, equal}) => {
 
   await kill({});
 
-  return end();
+  return;
 });

package/test/integration/test_close_channel.js

@@ -1,14 +1,15 @@
+const {strictEqual} = require('node:assert').strict;
+const test = require('node:test');
+
+const {setupChannel} = require('ln-docker-daemons');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {closeChannel} = require('./../../');
-const {createCluster} = require('./../macros');
-const {setupChannel} = require('./../macros');
 
 const size = 2;
 
 // Closing a channel should close the channel
-test(`Close channel`, async ({end, equal}) => {
+test(`Close channel`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -28,10 +29,10 @@ test(`Close channel`, async ({end, equal}) => {
       transaction_vout: channelOpen.transaction_vout,
     });
 
-    equal(channelClose.transaction_id.length, 64, 'Force close id returned');
-    equal(channelClose.transaction_vout, 0, 'Force close vout returned');
+    strictEqual(channelClose.transaction_id.length, 64, 'Got force close id');
+    strictEqual(channelClose.transaction_vout, 0, 'Force close vout returned');
   } catch (err) {
-    equal(err, null, 'Expected no error force closing');
+    strictEqual(err, null, 'Expected no error force closing');
   }
 
   // Coop close channel using the channel id
@@ -47,13 +48,13 @@ test(`Close channel`, async ({end, equal}) => {
       lnd: control.lnd,
     });
 
-    equal(channelClose.transaction_id.length, 64, 'Coop close id is returned');
-    equal(channelClose.transaction_vout, 0, 'Coop close tx vout returned');
+    strictEqual(channelClose.transaction_id.length, 64, 'Got coop close id');
+    strictEqual(channelClose.transaction_vout, 0, 'Got coop close tx vout');
   } catch (err) {
-    equal(err, null, 'Expected no error coop closing');
+    strictEqual(err, null, 'Expected no error coop closing');
   }
 
   await kill({});
 
-  return end();
+  return;
 });

package/test/integration/test_create_chain_address.js

@@ -1,6 +1,8 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {address} = require('bitcoinjs-lib');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {createChainAddress} = require('./../../');
 
@@ -11,7 +13,7 @@ const prefixForV1 = 'bcrt1p';
 const regtestBech32AddressHrp = 'bcrt';
 
 // Creating addresses should result in addresses
-test(`Create address results in address creation`, async ({end, equal}) => {
+test(`Create address results in address creation`, async () => {
   const [{kill, lnd}] = (await spawnLightningCluster({})).nodes;
 
   const createNewChainAddresses = formats
@@ -48,5 +50,5 @@ test(`Create address results in address creation`, async ({end, equal}) => {
 
   await kill({});
 
-  return end();
+  return;
 });