ln-service 57.27.3 → 58.0.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Versions
 
+## 58.0.1
+
+- Add support for LND 0.20.1-beta
+
+## 58.0.0
+
+### Breaking Changes
+
+- End support for node.js 18, require 20 or higher
+
 ## 57.27.3
 
 - `pay`, `payViaPaymentRequest`, `subscribeToPayViaRequest`: Allow short CLTV

package/README.md

@@ -9,7 +9,7 @@ through npm.
 
 Supported LND versions:
 
-- v0.20.0-beta
+- v0.20.0-beta to v0.20.1-beta
 - v0.19.0-beta to v0.19.3-beta
 - v0.18.0-beta to v0.18.5-beta
 - v0.17.0-beta to v0.17.5-beta
@@ -5643,7 +5643,7 @@ Requires LND built with `chainrpc` build tag
 Requires `onchain:read` permission
 
     {
-      [bech32_address]: <Address String>
+      [bech32_address]: <Bech32 P2WPKH or P2WSH Address String>
       lnd: <Chain RPC LND gRPC API Object>
       [min_confirmations]: <Minimum Confirmations Number>
       min_height: <Minimum Transaction Inclusion Blockchain Height Number>

package/package.json

@@ -8,13 +8,13 @@
   },
   "dependencies": {
     "bolt07": "1.9.4",
-    "invoices": "4.0.0",
-    "lightning": "10.27.5",
+    "invoices": "5.0.0",
+    "lightning": "11.0.1",
     "macaroon": "3.0.4"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
-    "@alexbosworth/blockchain": "2.0.0",
+    "@alexbosworth/blockchain": "3.2.0",
     "@alexbosworth/node-fetch": "2.6.2",
     "async": "3.2.6",
     "asyncjs-util": "1.2.12",
@@ -23,7 +23,7 @@
     "bitcoinjs-lib": "6.1.7",
     "bn.js": "5.2.2",
     "bs58check": "4.0.0",
-    "ecpair": "3.0.0",
+    "ecpair": "3.0.1",
     "ln-docker-daemons": "6.0.28",
     "p2tr": "2.0.0",
     "portfinder": "1.0.38",
@@ -34,7 +34,7 @@
     "varuint-bitcoin": "2.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "keywords": [
     "bitcoin",
@@ -81,5 +81,5 @@
     "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && node test/runner"
   },
-  "version": "57.27.3"
+  "version": "58.0.1"
 }

package/test/integration/test_create_chain_address.js

@@ -1,13 +1,16 @@
 const {equal} = require('node:assert').strict;
 const test = require('node:test');
 
-const {address} = require('bitcoinjs-lib');
+const {decodeBase58Address} = require('@alexbosworth/blockchain');
+const {decodeBech32Address} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 
 const {createChainAddress} = require('./../../');
 
 const formats = ['np2wpkh', 'p2wpkh'];
 const p2shAddressVersion = 196;
+const p2trProgramLength = 32;
+const p2trVersion = 1;
 const pkHashByteLength = 20;
 const prefixForV1 = 'bcrt1p';
 const regtestBech32AddressHrp = 'bcrt';
@@ -21,10 +24,10 @@ test(`Create address results in address creation`, async () => {
 
   const [np2wpkh, p2wpkh] = await Promise.all(createNewChainAddresses);
 
-  const nativeAddress = address.fromBech32(p2wpkh.address);
-  const nestedAddress = address.fromBase58Check(np2wpkh.address);
+  const nativeAddress = decodeBech32Address({address: p2wpkh.address});
+  const nestedAddress = decodeBase58Address({address: np2wpkh.address});
 
-  equal(nativeAddress.data.length, pkHashByteLength, 'Native address pkHash');
+  equal(nativeAddress.program.length, pkHashByteLength, 'Native addr pkHash');
   equal(nativeAddress.prefix, regtestBech32AddressHrp, 'Native addr prefix');
   equal(nestedAddress.version, p2shAddressVersion, 'Nested address version');
 
@@ -41,6 +44,12 @@ test(`Create address results in address creation`, async () => {
     const {address} = await createChainAddress({lnd, format: 'p2tr'});
 
     equal(address.startsWith(prefixForV1), true, 'A taproot address is made');
+
+    const p2trAddress = decodeBech32Address({address});
+
+    equal(p2trAddress.prefix, regtestBech32AddressHrp, 'addr has p2tr prefix');
+    equal(p2trAddress.program.length, p2trProgramLength, 'P2TR addr length');
+    equal(p2trAddress.version, p2trVersion, 'address has the P2TR version');
   } catch (err) {
     // LND 0.14.5 and below do not support TR addresses
     const [code] = err;

package/test/integration/test_get_forwards.js

@@ -25,9 +25,17 @@ test('Get forwards', async () => {
   const [{generate, lnd}, target, remote] = nodes;
 
   await asyncRetry({interval, times}, async () => {
+    await generate({});
+
     await addPeer({lnd, public_key: remote.id, socket: remote.socket});
 
     await setupChannel({generate, lnd, to: target});
+  });
+
+  await asyncRetry({interval, times}, async () => {
+    await generate({});
+
+    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
 
     await setupChannel({
       lnd: target.lnd,

package/test/integration/test_pay_private_invoice.js

@@ -39,6 +39,16 @@ test(`Pay private invoice`, async () => {
       }
     });
 
+    await asyncRetry({interval, times}, async () => {
+      const wallet = await getWalletInfo({lnd: target.lnd});
+
+      await generate({});
+
+      if (!wallet.is_synced_to_chain) {
+        throw new Error('NotSyncedToChain');
+      }
+    });
+
     const channel = await setupChannel({generate, lnd, to: target});
 
     const remoteChannel = await setupChannel({

package/test/invoicesrpc-integration/test_cancel_invoice.js

@@ -12,9 +12,11 @@ const {createHodlInvoice} = require('./../../');
 const {getInvoice} = require('./../../');
 const {getInvoices} = require('./../../');
 const {getPayment} = require('./../../');
+const {getWalletInfo} = require('./../../');
 const {pay} = require('./../../');
 const {subscribeToInvoice} = require('./../../');
 
+const interval = 10;
 const size = 2;
 const times = 1000;
 const tokens = 100;
@@ -26,6 +28,16 @@ test(`Cancel back a hodl invoice`, async () => {
   const [{generate, lnd}, target] = nodes;
 
   try {
+    await asyncRetry({interval, times}, async () => {
+      const wallet = await getWalletInfo({lnd});
+
+      await generate({});
+
+      if (!wallet.is_synced_to_chain) {
+        throw new Error('NotSyncedToChain');
+      }
+    });
+
     await setupChannel({generate, lnd, to: target});
 
     const id = createHash('sha256').update(randomBytes(32)).digest('hex');

package/test/invoicesrpc-integration/test_create_hinted_invoice.js

@@ -23,7 +23,11 @@ test(`Create an invoice with hop hints`, async t => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  const channel = await setupChannel({generate, lnd, to: target});
+  const channel = await asyncRetry({interval, times}, async () => {
+    await generate({});
+
+    return await setupChannel({generate, lnd, to: target});
+  });
 
   const remoteChannel = await setupChannel({
     generate: target.generate,

package/test/routerrpc-integration/test_get_route_through_hops.js

@@ -33,7 +33,11 @@ test(`Get route through hops`, async () => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  const controlToTargetChan = await setupChannel({generate, lnd, to: target});
+  const controlToTargetChan = await asyncRetry({interval, times}, async () => {
+    await generate({});
+
+    return await setupChannel({generate, lnd, to: target});
+  });
 
   await generate({});
 

package/test/routerrpc-integration/test_route_from_channels_complex.js

@@ -145,6 +145,8 @@ test(`Get route through complex hops`, async () => {
     await asyncRetry({interval, times}, async () => {
       const {features} = await getNode({lnd, public_key: farthest.id});
 
+      await generate({});
+
       await addPeer({lnd, public_key: farthest.id, socket: farthest.socket});
 
       if (!features.length) {

package/test/runner.js

@@ -4,7 +4,7 @@ const {run} = require('node:test');
 const {tap} = require('node:test/reporters');
 
 const concurrency = 3;
-const timeout = 1000 * 60 * 5;
+const timeout = 1000 * 60 * 10;
 
 const dirs = [
   'autopilotrpc-integration',

package/test/signerrpc-integration/test_sign_transaction.js

@@ -2,10 +2,11 @@ const {equal} = require('node:assert').strict;
 const test = require('node:test');
 
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {Transaction} = require('bitcoinjs-lib');
 
 const {signTransaction} = require('./../../');
 
+const transactionSighashAll = 1;
+
 // Signing a transaction should result in signatures for the transaction
 test(`Sign transaction`, async () => {
   const {kill, nodes} = await spawnLightningCluster({});
@@ -19,7 +20,7 @@ test(`Sign transaction`, async () => {
       key_index: 1,
       output_script: '00147ab105a90ccd7e49d96672abcac2995bdb852baa',
       output_tokens: 1e8,
-      sighash: Transaction.SIGHASH_ALL,
+      sighash: transactionSighashAll,
       vin: 0,
       witness_script: '00',
     }],

package/test/walletrpc-integration/test_create_funded_psbt.js

@@ -2,8 +2,8 @@ const {equal} = require('node:assert').strict;
 const test = require('node:test');
 
 const asyncRetry = require('async/retry');
-const {address} = require('bitcoinjs-lib');
 const {componentsOfTransaction} = require('@alexbosworth/blockchain');
+const {decodeBech32Address} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 
 const {broadcastChainTransaction} = require('./../../');
@@ -18,7 +18,7 @@ const bufferAsHex = buffer => buffer.toString('hex');
 const {concat} = Buffer;
 const count = 100;
 const format = 'p2tr';
-const {fromBech32} = address;
+const fromBech32 = address => decodeBech32Address({address}).program;
 const interval = retryCount => 10 * Math.pow(2, retryCount);
 const OP_1 = Buffer.from([81]);
 const push32 = Buffer.from([32]);
@@ -62,7 +62,7 @@ test(`Create funded PSBT`, async () => {
     const {address} = await createChainAddress({format, lnd});
     const {utxos} = await getUtxos({lnd});
 
-    const outputScriptElements = [OP_1, push32, fromBech32(address).data];
+    const outputScriptElements = [OP_1, push32, fromBech32(address)];
     const [utxo] = utxos;
 
     const output = bufferAsHex(concat(outputScriptElements));

package/test/walletrpc-integration/test_partially_sign_psbt.js

@@ -12,7 +12,6 @@ const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const tinysecp = require('tiny-secp256k1');
-const {Transaction} = require('bitcoinjs-lib');
 const {updatePsbt} = require('psbt');
 
 const {broadcastChainTransaction} = require('./../../');
@@ -31,6 +30,7 @@ const size = 3;
 const startingFunds = 1e7;
 const times = 1000;
 const tokens = 1e6;
+const transactionSighashAll = 1;
 
 // Partially signing a PSBT should result in a partially signed PSBT
 test(`Partially sign PSBT`, async () => {
@@ -173,7 +173,7 @@ test(`Partially sign PSBT`, async () => {
       psbt: base.psbt,
       sighashes: inputs.map(input => ({
         id: input.transaction_id,
-        sighash: Transaction.SIGHASH_ALL,
+        sighash: transactionSighashAll,
         vout: input.transaction_vout,
       })),
       transactions: controlTransactions.concat(targetTransactions),