ln-service 57.24.0 → 57.25.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 57.25.1
+
+- Add support for LND 0.19.0-beta
+
+## 57.25.0
+
+- Add support for Testnet4
+
 ## 57.24.0
 
 - `closeChannel`: Add `is_graceful_close` option to wait for pending resolution

package/README.md

@@ -9,6 +9,7 @@ through npm.
 
 Supported LND versions:
 
+- v0.19.0-beta
 - v0.18.0-beta to v0.18.5-beta
 - v0.17.0-beta to v0.17.5-beta
 - v0.16.0-beta to v0.16.4-beta

package/package.json

@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "bolt07": "1.9.4",
-    "invoices": "3.0.0",
-    "lightning": "10.24.0",
+    "invoices": "4.0.0",
+    "lightning": "10.25.2",
     "macaroon": "3.0.4"
   },
   "description": "Interaction helper for your Lightning Network daemon",
@@ -21,13 +21,13 @@
     "bip32": "4.0.0",
     "bip66": "2.0.0",
     "bitcoinjs-lib": "6.1.7",
-    "bn.js": "5.2.1",
+    "bn.js": "5.2.2",
     "bs58check": "4.0.0",
-    "ecpair": "2.1.0",
-    "ln-docker-daemons": "6.0.24",
+    "ecpair": "3.0.0",
+    "ln-docker-daemons": "6.0.25",
     "p2tr": "2.0.0",
-    "portfinder": "1.0.34",
-    "psbt": "3.0.0",
+    "portfinder": "1.0.37",
+    "psbt": "4.0.0",
     "rimraf": "6.0.1",
     "tiny-secp256k1": "2.2.3",
     "uuid": "11.1.0",
@@ -51,6 +51,7 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.19.0": "DOCKER_LND_VERSION=v0.19.0-beta npm run test",
     "integration-test-0.18.5": "DOCKER_LND_VERSION=v0.18.5-beta npm run test",
     "integration-test-0.18.4": "DOCKER_LND_VERSION=v0.18.4-beta npm run test",
     "integration-test-0.18.3": "DOCKER_LND_VERSION=v0.18.3-beta npm run test",
@@ -76,5 +77,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.24.0"
+  "version": "57.25.1"
 }

package/test/chainrpc-integration/test_get_height.js

@@ -7,6 +7,7 @@ const {spawnLightningCluster} = require('ln-docker-daemons');
 const {getHeight} = require('./../../');
 
 const confirmationCount = 6;
+const interval = 100;
 const times = 100;
 
 // Get height should return height
@@ -17,7 +18,7 @@ test(`Get height`, async () => {
 
   const startHeight = (await getHeight({lnd})).current_block_height;
 
-  await asyncRetry({times}, async () => {
+  await asyncRetry({interval, times}, async () => {
     await generate({});
 
     const endHeight = (await getHeight({lnd})).current_block_height;

package/test/integration/test_get_chain_fee_estimate.js

@@ -8,8 +8,8 @@ const {createChainAddress} = require('./../../');
 const {getChainBalance} = require('./../../');
 const {getChainFeeEstimate} = require('./../../');
 
-const expectedFee = 9250;
-const expectedFeeRate = 50;
+const expectedFee = 4625;
+const expectedFeeRate = 25;
 const format = 'np2wpkh';
 const size = 2;
 const times = 200;
@@ -44,11 +44,18 @@ test(`Get chain fee estimate`, async () => {
   // LND 0.15.4 and below uses P2WPKH as change
   if (estimate.fee === 8650) {
     strictEqual(estimate.fee, 8650, 'Total fee is estimated');
+  } else if (estimate.fee === 9250) { // LND 0.18.5 and below fee rate
+    strictEqual(estimate.fee, 9250, 'Total fee is estimated');
   } else {
     strictEqual(estimate.fee, expectedFee, 'Total fee is estimated');
   }
 
-  strictEqual(estimate.tokens_per_vbyte, expectedFeeRate, 'Got fee per vbyte');
+  // LND 0.18.5 and below fee rate is higher
+  if (estimate.tokens_per_vbyte === 50) {
+    strictEqual(estimate.tokens_per_vbyte, 50, 'Got fee/vbyte');
+  } else {
+    strictEqual(estimate.tokens_per_vbyte, expectedFeeRate, 'Got fee/vbyte');
+  }
 
   await kill({});
 

package/test/integration/test_subscribe_to_channels.js

@@ -150,7 +150,7 @@ test('Subscribe to channels', async () => {
 
   const final = closeEvent.final_local_balance;
 
-  equal([897190, 846655, 863366].includes(final), true, 'Close final');
+  equal([897190, 846655, 863366, 875633].includes(final), true, 'Close final');
 
   equal(closeEvent.capacity, channelCapacityTokens, 'Channel close capacity');
   equal(!!closeEvent.close_confirm_height, true, 'Close confirm height');

package/test/integration/test_subscribe_to_transactions.js

@@ -71,9 +71,12 @@ test(`Subscribe to chain transactions`, async () => {
   if (tx.fee === 7050) {
     equal(tx.fee, 7050, 'Transaction has a chain fee');
     equal(tx.tokens, 1007050, 'Tx tokens is fee + tokens sent');
-  } else {
+  } else if (tx.fee === 7650) { // LND 0.18.5 and below fee rate
     equal(tx.fee, 7650, 'Transaction has a chain fee');
     equal(tx.tokens, 1007650, 'Tx tokens is fee + tokens sent');
+  } else {
+    equal(tx.fee, 3825, 'Transaction has a chain fee');
+    equal(tx.tokens, 1003825, 'Tx tokens is fee + tokens sent');
   }
 
   if (!!tx.output_addresses.find(n => n.length < 14 || n.length > 74)) {

package/test/invoicesrpc-integration/test_subscribe_settle_invoice.js

@@ -85,8 +85,10 @@ test(`Subscribe to settled invoice`, async () => {
     if (!!payments.length) {
       const [payment] = payments;
 
-      if (!!payment.messages.length) {
-        const [{type, value}] = payment.messages;
+      const messages = payment.messages.filter(n => n.type === tlvType);
+
+      if (!!messages.filter(n => n.type === tlvType).length) {
+        const [{type, value}] = messages;
 
         equal(type, tlvType, 'Payment message TLV type returned');
         equal(value, tlvValue, 'Payment message TLV value returned');

package/test/routerrpc-integration/test_get_route_through_hops.js

@@ -132,9 +132,11 @@ test(`Get route through hops`, async () => {
 
   const [payment] = payments;
 
+  const paymentMessages = payment.messages.filter(n => n.type !== '106823');
+
   equal(payment.total_mtokens, invoice.mtokens, 'Got MPP total mtokens');
 
-  deepEqual(payment.messages, route.messages, 'Remote got TLV messages');
+  deepEqual(paymentMessages, route.messages, 'Remote got TLV messages');
 
   await kill({});
 

package/test/routerrpc-integration/test_pay_via_payment_details.js

@@ -137,8 +137,10 @@ test(`Pay via payment details`, async () => {
       if (!!payments) {
         const [payment] = payments;
 
-        if (!!payment && !!payment.messages.length) {
-          const [message] = payment.messages;
+        const messages = payment.messages.filter(n => n.type !== '106823');
+
+        if (!!payment && !!messages.length) {
+          const [message] = messages;
 
           equal(message.type, tlvType, 'Got TLV type');
           equal(message.value, tlvData, 'Got TLV value');
@@ -154,8 +156,10 @@ test(`Pay via payment details`, async () => {
       if (!!payments.length) {
         const [payment] = payments;
 
-        if (!!payment && !!payment.messages.length) {
-          const [message] = payment.messages;
+        const messages = payment.messages.filter(n => n.type !== '106823');
+
+        if (!!payment && !!messages.length) {
+          const [message] = messages;
 
           equal(message.type, tlvType, 'Got TLV type');
           equal(message.value, tlvData, 'Got TLV value');

package/test/routerrpc-integration/test_pay_via_payment_request.js

@@ -132,8 +132,10 @@ test(`Pay via payment request`, async () => {
       if (!!payments.length) {
         const [payment] = payments;
 
-        if (!!payment.messages.length) {
-          const [message] = payment.messages;
+        const messages = payment.messages.filter(n => n.type !== '106823');
+
+        if (!!messages.length) {
+          const [message] = messages;
 
           equal(message.type, tlvType, 'Got TLV message type');
           equal(message.value, tlvValue, 'Got TLV message value');

package/test/routerrpc-integration/test_pay_via_routes.js

@@ -205,8 +205,10 @@ test(`Pay via routes`, async () => {
   if (!!paidInvoice.payments.length) {
     const [payment] = paidInvoice.payments;
 
-    if (!!payment.messages.length) {
-      const [message] = payment.messages;
+    const messages = payment.messages.filter(n => n.type !== '106823');
+
+    if (!!messages.length) {
+      const [message] = messages;
 
       equal(message.type, tlvType, 'Got message type');
       equal(message.value, tlvValue, 'Got message value');

package/test/signerrpc-integration/test_sign_taproot.js

@@ -194,7 +194,10 @@ test(`Sign a taproot transaction`, async () => {
 
     const unusedKey = ecp.makeRandom({network: networks.regtest});
 
-    const witnessScript = compile([unusedKey.publicKey.slice(1), OP_CHECKSIG]);
+    const witnessScript = compile([
+      Buffer.from(unusedKey.publicKey).slice(1),
+      OP_CHECKSIG,
+    ]);
 
     const branches = [{script: witnessScript}];
 
@@ -273,6 +276,9 @@ test(`Sign a taproot transaction`, async () => {
       }
     });
   } catch (err) {
+    console.log("ERR", err);
+    await kill({});
+
     equal(err, null, 'Expected no error');
   }
 

package/test/tower_clientrpc-integration/test_connect_watchtower.js

@@ -10,6 +10,7 @@ const {getTowerServerInfo} = require('./../../');
 const {getWalletInfo} = require('./../../');
 
 const conf = ['--watchtower.active', '--wtclient.active'];
+const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 const interval = 50;
 const size = 2;
 const times = 5000;
@@ -38,6 +39,9 @@ test(`Connect watchtower`, async () => {
 
     const [socket] = tower.sockets;
 
+    // LND 0.19.0 requires a wait before connecting
+    await delay(5000);
+
     await connectWatchtower({lnd, socket, public_key: tower.public_key});
 
     const [watcher] = (await getConnectedWatchtowers({lnd})).towers;

package/test/tower_clientrpc-integration/test_get_connected_watchtowers.js

@@ -10,6 +10,7 @@ const {getTowerServerInfo} = require('./../../');
 const {getWalletInfo} = require('./../../');
 
 const conf = ['--watchtower.active', '--wtclient.active'];
+const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 const interval = 50;
 const size = 2;
 const times = 3000;
@@ -38,6 +39,9 @@ test(`Get connected watchtowers`, async () => {
 
     const [socket] = tower.sockets;
 
+    // LND 0.19.0 requires a wait before connecting
+    await delay(5000);
+
     await connectWatchtower({lnd, socket, public_key: tower.public_key});
 
     const res = (await getConnectedWatchtowers({lnd}));

package/test/walletrpc-integration/test_fund_psbt.js

@@ -97,9 +97,12 @@ test(`Fund PSBT`, async () => {
   if (change.output_script.length === 44) {
     equal(change.output_script.length, 44, 'Change address is returned');
     equal(change.tokens, 4998992950, 'Got change output value');
-  } else {
+  } else if (change.tokens === 4998992350) { // LND 0.18.5 and below
     equal(change.output_script.length, 68, 'Change address is returned');
     equal(change.tokens, 4998992350, 'Got change output value');
+  } else {
+    equal(change.output_script.length, 68, 'Change address is returned');
+    equal(change.tokens, 4998996175, 'Got change output value');
   }
 
   equal(output.tokens, tokens, 'Got expected tokens output');
@@ -128,14 +131,20 @@ test(`Fund PSBT`, async () => {
     const keyPair2 = ecp.makeRandom({network: networks.regtest});
     const unusedKey = ecp.makeRandom({network: networks.regtest});
 
-    const witnessScript = compile([unusedKey.publicKey.slice(1), OP_CHECKSIG]);
+    const witnessScript = compile([
+      from(unusedKey.publicKey).slice(1),
+      OP_CHECKSIG,
+    ]);
 
     const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 
     // Create a combined key using public key material
-    const combinedPoint = pointAdd(keyPair1.publicKey, keyPair2.publicKey);
+    const combinedPoint = pointAdd(
+      from(keyPair1.publicKey),
+      from(keyPair2.publicKey)
+    );
 
     const output = v1OutputScript({
       hash,
@@ -187,7 +196,10 @@ test(`Fund PSBT`, async () => {
     });
 
     // Ready for private key combining
-    const combinedKey = privateAdd(keyPair1.privateKey, keyPair2.privateKey);
+    const combinedKey = privateAdd(
+      from(keyPair1.privateKey),
+      from(keyPair2.privateKey)
+    );
 
     const signedInput = signHash({
       hash,
@@ -224,7 +236,10 @@ test(`Fund PSBT`, async () => {
 
     const keyPair = ecp.makeRandom({network: networks.regtest});
 
-    const witnessScript = compile([keyPair.publicKey.slice(1), OP_CHECKSIG]);
+    const witnessScript = compile([
+      from(keyPair.publicKey.slice(1)),
+      OP_CHECKSIG,
+    ]);
 
     const branches = [{script: witnessScript}];
 
@@ -277,7 +292,7 @@ test(`Fund PSBT`, async () => {
       );
     });
 
-    const signature = from(signSchnorr(hashToSign, keyPair.privateKey));
+    const signature = from(signSchnorr(hashToSign, from(keyPair.privateKey)));
 
     const {block} = controlBlock({
       external_key: output.external_key,
@@ -308,7 +323,11 @@ test(`Fund PSBT`, async () => {
       }
     });
   } catch (err) {
+    await kill({});
+
     equal(err, null, 'Expected no error');
+
+    return;
   }
 
   // A Taproot output should be funded for a regular key spend
@@ -318,7 +337,7 @@ test(`Fund PSBT`, async () => {
     const keyPair = ecp.makeRandom({network: networks.regtest});
 
     const output = v1OutputScript({
-      internal_key: keyPair.publicKey.toString('hex'),
+      internal_key: from(keyPair.publicKey).toString('hex'),
     });
 
     const outputScript = hexAsBuffer(output.script);
@@ -368,8 +387,8 @@ test(`Fund PSBT`, async () => {
     });
 
     const signedInput = signHash({
-      private_key: keyPair.privateKey.toString('hex'),
-      public_key: keyPair.publicKey.toString('hex'),
+      private_key: from(keyPair.privateKey).toString('hex'),
+      public_key: from(keyPair.publicKey).toString('hex'),
       sign_hash: hashToSign.toString('hex'),
     });
 

package/test/walletrpc-integration/test_get_chain_fee_rate.js

@@ -11,7 +11,12 @@ test(`Get chain fee rate`, async () => {
 
   const feeRate = await getChainFeeRate({lnd});
 
-  equal(feeRate.tokens_per_vbyte, 50, 'Fee rate is returned');
+  // LND 0.18.5 and below return 50
+  if (feeRate.tokens_per_vbyte === 50) {
+    equal(feeRate.tokens_per_vbyte, 50, 'Fee rate is returned');
+  } else {
+    equal(feeRate.tokens_per_vbyte, 25, 'Fee rate is returned');
+  }
 
   await kill({});
 

package/test/walletrpc-integration/test_request_chain_fee_increase.js

@@ -35,16 +35,18 @@ test(`Request chain fee increase`, async () => {
 
     const bump = (await getUtxos({lnd})).utxos.find(n => n.tokens === tokens);
 
-    try {
-      await requestChainFeeIncrease({
-        lnd,
-        transaction_id: bump.transaction_id,
-        transaction_vout: bump.transaction_vout + 1,
-      });
-      fail('Expected chain fee increase rejected');
-    } catch (err) {
-      deepEqual(err, [404, 'SpecifiedOutpointNotFoundInWalletUtxos'], '404');
-    }
+    // // LND 0.19.0 does not support this error
+    // try {
+    //   await requestChainFeeIncrease({
+    //     lnd,
+    //     transaction_id: bump.transaction_id,
+    //     transaction_vout: bump.transaction_vout + 1,
+    //   });
+    //
+    //   fail('Expected chain fee increase rejected');
+    // } catch (err) {
+    //   deepEqual(err, [404, 'SpecifiedOutpointNotFoundInWalletUtxos'], '404');
+    // }
 
     await requestChainFeeIncrease({
       lnd,
@@ -53,9 +55,9 @@ test(`Request chain fee increase`, async () => {
     });
   } catch (err) {
     equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
   }
 
-  await kill({});
-
   return;
 });