ln-service 53.23.0 → 54.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Versions
 
+## 54.0.0
+
+### Breaking Changes
+
+- Versions of Node.js before 14 are no longer supported
+
 ## 53.23.0
 
 - `getChainFeeEstimate`: Add support for specifying min `utxo_confirmations`

package/package.json

@@ -11,10 +11,10 @@
     "cors": "2.8.5",
     "express": "4.18.1",
     "invoices": "2.2.0",
-    "lightning": "5.21.0",
+    "lightning": "6.0.0",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
-    "ws": "8.8.1"
+    "ws": "8.9.0"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
@@ -22,24 +22,24 @@
     "@alexbosworth/node-fetch": "2.6.2",
     "async": "3.2.4",
     "asyncjs-util": "1.2.10",
-    "bip32": "3.0.1",
+    "bip32": "3.1.0",
     "bip66": "1.1.5",
     "bitcoinjs-lib": "6.0.2",
     "bn.js": "5.2.1",
     "bs58check": "2.1.2",
     "ecpair": "2.0.1",
-    "ln-docker-daemons": "2.3.6",
+    "ln-docker-daemons": "3.0.0",
     "p2tr": "1.3.2",
     "portfinder": "1.0.32",
     "psbt": "2.7.1",
     "rimraf": "3.0.2",
     "secp256k1": "4.0.3",
     "tiny-secp256k1": "2.2.1",
-    "uuid": "8.3.2",
+    "uuid": "9.0.0",
     "varuint-bitcoin": "1.1.2"
   },
   "engines": {
-    "node": ">=12.20"
+    "node": ">=14"
   },
   "keywords": [
     "bitcoin",
@@ -71,5 +71,5 @@
     "integration-test-0.12.0": "DOCKER_LND_VERSION=v0.12.0-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"
   },
-  "version": "53.23.0"
+  "version": "54.0.0"
 }

package/test/integration/test_get_closed_channels.js

@@ -10,6 +10,7 @@ const {delay} = require('./../macros');
 const {payViaPaymentRequest} = require('./../../');
 const {getChainTransactions} = require('./../../');
 const {getClosedChannels} = require('./../../');
+const {getLockedUtxos} = require('./../../');
 const {getPendingChannels} = require('./../../');
 const {getSweepTransactions} = require('./../../');
 const {getUtxos} = require('./../../');
@@ -36,6 +37,15 @@ test(`Get closed channels`, async ({end, equal}) => {
 
   const {generate, lnd} = control;
 
+  try {
+    await getLockedUtxos({lnd});
+  } catch (err) {
+    // Skip test on LND 0.12 due to sweep timing
+    await kill({});
+
+    return end();
+  }
+
   const channelOpen = await setupChannel({
     generate,
     lnd,

package/test/{extra-integration → integration}/test_revoke_access.js

@@ -1,32 +1,26 @@
-const {address} = require('bitcoinjs-lib');
+const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
-const {authenticatedLndGrpc} = require('./../../');
 const {createChainAddress} = require('./../../');
 const {grantAccess} = require('./../../');
 const {revokeAccess} = require('./../../');
-const {spawnLnd} = require('./../macros');
-const {waitForTermination} = require('./../macros');
 
+const err = [503, 'UnexpectedErrorCreatingAddress'];
 const format = 'np2wpkh';
 const id = '1';
-const p2shAddressVersion = 196;
-const pkHashByteLength = 20;
-const regtestBech32AddressHrp = 'bcrt';
+const permissions = ['address:read'];
 
 // Revoking access should result in access denied
 test(`Revoke access credentials`, async ({end, equal, rejects}) => {
-  const spawned = await spawnLnd({});
-
-  const {lnd, kill} = spawned;
+  const [{lnd, kill, rpc}] = (await spawnLightningCluster({})).nodes;
 
   await grantAccess({lnd, is_ok_to_create_chain_addresses: true});
 
   const makeChainAddresses = await grantAccess({
     id,
     lnd,
+    permissions,
     is_ok_to_create_chain_addresses: true,
-    permissions: ['address:read'],
   });
 
   try {
@@ -36,27 +30,17 @@ test(`Revoke access credentials`, async ({end, equal, rejects}) => {
 
     // Avoid this test on LND 0.11.0 and below
     if (type === 'RevokeAccessMethodNotSupported') {
-      kill();
-
-      await waitForTermination({lnd});
+      await kill({});
 
       return end();
     }
   }
 
-  const macLnd = authenticatedLndGrpc({
-    cert: spawned.lnd_cert,
-    macaroon: makeChainAddresses.macaroon,
-    socket: spawned.lnd_socket,
-  });
-
-  const err = [503, 'UnexpectedErrorCreatingAddress'];
+  const macLnd = rpc({macaroon: makeChainAddresses.macaroon});
 
   await rejects(createChainAddress({format, lnd: macLnd.lnd}), err, 'Fails');
 
-  kill();
-
-  await waitForTermination({lnd});
+  await kill({});
 
   return end();
 });

package/test/invoicesrpc-integration/test_cancel_invoice.js

@@ -2,16 +2,15 @@ const {createHash} = require('crypto');
 const {randomBytes} = require('crypto');
 
 const asyncRetry = require('async/retry');
+const {setupChannel} = require('ln-docker-daemons');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const {cancelHodlInvoice} = require('./../../');
 const {createHodlInvoice} = require('./../../');
-const {delay} = require('./../macros');
 const {getInvoice} = require('./../../');
 const {getInvoices} = require('./../../');
 const {pay} = require('./../../');
-const {setupChannel} = require('./../macros');
 const {subscribeToInvoice} = require('./../../');
 
 const size = 2;
@@ -24,43 +23,47 @@ test(`Cancel back a hodl invoice`, async ({end, equal}) => {
 
   const [{generate, lnd}, target] = nodes;
 
-  await setupChannel({generate, lnd, to: target});
+  try {
+    await setupChannel({generate, lnd, to: target});
 
-  const id = createHash('sha256').update(randomBytes(32)).digest('hex');
+    const id = createHash('sha256').update(randomBytes(32)).digest('hex');
 
-  const invoice = await createHodlInvoice({id, tokens, lnd: target.lnd});
+    const invoice = await createHodlInvoice({id, tokens, lnd: target.lnd});
 
-  const sub = subscribeToInvoice({id, lnd: target.lnd});
+    const sub = subscribeToInvoice({id, lnd: target.lnd});
 
-  sub.on('invoice_updated', async updated => {
-    if (!updated.is_held) {
-      return;
-    }
+    sub.on('invoice_updated', async updated => {
+      if (!updated.is_held) {
+        return;
+      }
 
-    const [created] = (await getInvoices({lnd: target.lnd})).invoices;
+      const [created] = (await getInvoices({lnd: target.lnd})).invoices;
 
-    const invoice = await getInvoice({id, lnd: target.lnd});
+      const invoice = await getInvoice({id, lnd: target.lnd});
 
-    equal(created.is_confirmed, false, 'invoices shows not yet been settled');
-    equal(created.is_held, true, 'invoices shows HTLC locked in place');
-    equal(invoice.is_confirmed, false, 'HTLC has not yet been settled');
-    equal(invoice.is_held, true, 'HTLC is locked in place');
+      equal(created.is_confirmed, false, 'invoices shows not yet settled');
+      equal(created.is_held, true, 'invoices shows HTLC locked in place');
+      equal(invoice.is_confirmed, false, 'HTLC has not yet been settled');
+      equal(invoice.is_held, true, 'HTLC is locked in place');
 
-    await cancelHodlInvoice({id, lnd: target.lnd});
-  });
+      await cancelHodlInvoice({id, lnd: target.lnd});
+    });
 
-  let cancelErr = [];
+    let cancelErr = [];
 
-  try {
-    await pay({lnd, request: invoice.request});
-  } catch (err) {
-    cancelErr = err;
-  }
+    try {
+      await pay({lnd, request: invoice.request});
+    } catch (err) {
+      cancelErr = err;
+    }
 
-  const [code, message] = cancelErr;
+    const [code, message] = cancelErr;
 
-  equal(code, 503, 'Canceled back HODL HTLC results in unknown payment hash');
-  equal(message, 'PaymentRejectedByDestination', 'Got back unknownhash error');
+    equal(code, 503, 'Canceled back HODL HTLC results in 404');
+    equal(message, 'PaymentRejectedByDestination', 'Got back 404 error');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/routerrpc-integration/test_subscribe_to_forwards.js

@@ -9,6 +9,7 @@ const {createInvoice} = require('./../../');
 const {delay} = require('./../macros');
 const {getChannels} = require('./../../');
 const {getHeight} = require('./../../');
+const {getLockedUtxos} = require('./../../');
 const {getWalletInfo} = require('./../../');
 const {payViaPaymentRequest} = require('./../../');
 const {setupChannel} = require('./../macros');
@@ -26,6 +27,15 @@ test('Subscribe to forwards', async ({end, equal, rejects, strictSame}) => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
+  try {
+    await getLockedUtxos({lnd});
+  } catch (err) {
+    // Skip test on LND 0.12 due to timeout timing
+    await kill({});
+
+    return end();
+  }
+
   try {
     const {features} = await getWalletInfo({lnd});
     const testSub = subscribeToForwards({lnd});