ln-service 53.7.1 → 53.7.2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 53.7.1
+## 53.7.2
 
 - `payViaRoutes`, `subscribeToPayViaRoutes`: Add support for relay messages
 

package/package.json

@@ -26,9 +26,9 @@
     "bitcoinjs-lib": "6.0.1",
     "bn.js": "5.2.0",
     "ecpair": "2.0.1",
-    "ln-docker-daemons": "2.2.3",
+    "ln-docker-daemons": "2.2.4",
     "portfinder": "1.0.28",
-    "psbt": "1.1.11",
+    "psbt": "2.0.0",
     "rimraf": "3.0.2",
     "secp256k1": "4.0.3",
     "tiny-secp256k1": "2.2.0",
@@ -64,7 +64,7 @@
     "integration-test-0.13.0": "DOCKER_LND_VERSION=v0.13.0-beta npm run test",
     "integration-test-0.12.1": "DOCKER_LND_VERSION=v0.12.1-beta npm run test",
     "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/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 && tap -j 3 --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/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "53.7.1"
+  "version": "53.7.2"
 }

package/test/integration/test_add_peer.js

@@ -9,7 +9,7 @@ const {getPeers} = require('./../../');
 const interval = 100;
 const size = 2;
 const times = 100;
-const timeout = 1;
+const timeout = 1000;
 
 // Adding peers should result in a connected peer
 test(`Add a peer`, async ({end, equal}) => {
@@ -27,6 +27,8 @@ test(`Add a peer`, async ({end, equal}) => {
         lnd,
         timeout,
         public_key: target.id,
+        retry_count: 1,
+        retry_delay: 1,
         socket: target.socket,
       });
 

package/test/integration/test_delete_pending_channel.js

@@ -5,6 +5,7 @@ const asyncRetry = require('async/retry');
 const {extractTransaction} = require('psbt');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
+const tinysecp = require('tiny-secp256k1');
 
 const {addPeer} = require('./../../');
 const {broadcastChainTransaction} = require('./../../');
@@ -27,11 +28,13 @@ const count = 100;
 const interval = 100;
 const race = promises => Promise.race(promises);
 const size = 3;
-const timeout = 1000 * 5;
+const timeout = 1000 * 20;
 const times = 200;
 
 // Forfeiting a pending channel should remove the pending channel
 test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
+  const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
+
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target, remote] = nodes;
@@ -105,7 +108,7 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
       funding: signRemote.psbt,
     });
 
-    const {transaction} = extractTransaction({psbt: signRemote.psbt});
+    const {transaction} = extractTransaction({ecp, psbt: signRemote.psbt});
 
     await broadcastChainTransaction({lnd, transaction});
 

package/test/integration/test_get_wallet_info.js

@@ -17,29 +17,33 @@ test(`Get wallet info`, async ({end, equal, strictSame}) => {
 
   const [{lnd}] = nodes;
 
-  const result = await getWalletInfo({lnd});
-
-  await asyncRetry({interval, times}, async () => {
-    if (result.current_block_height === initHeight) {
-      return;
-    }
-
-    throw new Error('ExpectedBlockHeightAtInitHeight');
-  });
-
-  equal(result.active_channels_count, 0, 'Expected channels count');
-  equal(!!result.alias, true, 'Expected alias');
-  strictSame(result.chains, [regtestChainId], 'Got chains');
-  equal(!!result.current_block_hash, true, 'Expected best block hash');
-  equal(result.current_block_height, initHeight, 'Expected best block height');
-  equal(!!result.latest_block_at, true, 'Last block time');
-  equal(result.peers_count, 0, 'Expected wallet peers count');
-  equal(result.pending_channels_count, 0, 'Expected pending channels count');
-  equal(result.public_key.length, pubKeyHexLength, 'Expected public key');
-  strictSame(result.uris.length, 1, 'Expected node URI');
-  equal(!!result.version, true, 'Expected version');
-
-  await kill({});
+  try {
+    const result = await asyncRetry({interval, times}, async () => {
+      const result = await getWalletInfo({lnd});
+
+      if (result.current_block_height === initHeight) {
+        return result;
+      }
+
+      throw new Error('ExpectedBlockHeightAtInitHeight');
+    });
+
+    equal(result.active_channels_count, 0, 'Expected channels count');
+    equal(!!result.alias, true, 'Expected alias');
+    strictSame(result.chains, [regtestChainId], 'Got chains');
+    equal(!!result.current_block_hash, true, 'Expected best block hash');
+    equal(result.current_block_height, initHeight, 'Expected best block height');
+    equal(!!result.latest_block_at, true, 'Last block time');
+    equal(result.peers_count, 0, 'Expected wallet peers count');
+    equal(result.pending_channels_count, 0, 'Expected pending channels count');
+    equal(result.public_key.length, pubKeyHexLength, 'Expected public key');
+    strictSame(result.uris.length, 1, 'Expected node URI');
+    equal(!!result.version, true, 'Expected version');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
+  }
 
   return end();
 });

package/test/integration/test_open_channels.js

@@ -4,6 +4,7 @@ const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
+const tinysecp = require('tiny-secp256k1');
 const {transactionAsPsbt} = require('psbt');
 
 const {addPeer} = require('./../../');
@@ -29,27 +30,29 @@ const times = 2000;
 
 // Opening channels should open up channels
 test(`Open channels`, async ({end, equal}) => {
+  const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
+
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, lnd}, target, remote] = nodes;
 
   await generate({count: maturity});
 
-  await asyncRetry({interval, times}, async () => {
-    const lnds = [lnd, target.lnd, remote.lnd];
+  try {
+    await asyncRetry({interval, times}, async () => {
+      const lnds = [lnd, target.lnd, remote.lnd];
 
-    const heights = await asyncMap(lnds, async lnd => {
-      return (await getHeight({lnd})).current_block_height;
-    });
+      const heights = await asyncMap(lnds, async lnd => {
+        return (await getHeight({lnd})).current_block_height;
+      });
 
-    const [controlHeight, targetHeight, remoteHeight] = heights;
+      const [controlHeight, targetHeight, remoteHeight] = heights;
 
-    if (controlHeight !== targetHeight || controlHeight !== remoteHeight) {
-      throw new Error('ExpectedSyncHeights');
-    }
-  });
+      if (controlHeight !== targetHeight || controlHeight !== remoteHeight) {
+        throw new Error('ExpectedSyncHeights');
+      }
+    });
 
-  try {
     const chainTx = (await getChainTransactions({lnd})).transactions;
 
     const spending = chainTx.map(({transaction}) => transaction);
@@ -97,11 +100,15 @@ test(`Open channels`, async ({end, equal}) => {
       .map(({transaction}) => transaction)
       .find(transaction => spending.find(spend => transaction !== spend));
 
-    const fundingPsbt = transactionAsPsbt({spending, transaction: fundTx});
+    const fundingPsbt = transactionAsPsbt({
+      ecp,
+      spending,
+      transaction: fundTx,
+    });
 
-    const {psbt} = finalizePsbt({psbt: fundingPsbt.psbt});
+    const {psbt} = finalizePsbt({ecp, psbt: fundingPsbt.psbt});
 
-    const reconstitutedTransaction = extractTransaction({psbt});
+    const reconstitutedTransaction = extractTransaction({ecp, psbt});
 
     await fundPendingChannels({
       lnd,