ln-service 53.5.2 → 53.7.2

package/test/integration/test_get_node.js

@@ -24,62 +24,66 @@ test(`Get node`, async ({end, equal, strictSame}) => {
 
   const [{generate, id, lnd}, target, remote] = nodes;
 
-  const controlToTarget = await setupChannel({generate, lnd, to: target});
+  try {
+    const controlToTarget = await setupChannel({generate, lnd, to: target});
 
-  const targetToRemote = await setupChannel({
-    generate: target.generate,
-    lnd: target.lnd,
-    to: remote,
-  });
+    const targetToRemote = await setupChannel({
+      generate: target.generate,
+      lnd: target.lnd,
+      to: remote,
+    });
 
-  await updateRoutingFees({
-    lnd,
-    base_fee_tokens: baseFee,
-    cltv_delta: cltvDelta,
-    fee_rate: feeRate,
-    transaction_id: controlToTarget.transaction_id,
-    transaction_vout: controlToTarget.transaction_vout,
-  });
+    await updateRoutingFees({
+      lnd,
+      base_fee_tokens: baseFee,
+      cltv_delta: cltvDelta,
+      fee_rate: feeRate,
+      transaction_id: controlToTarget.transaction_id,
+      transaction_vout: controlToTarget.transaction_vout,
+    });
 
-  await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
 
-  await delay(3000);
+    await delay(3000);
 
-  const node = await getNode({lnd, public_key: id});
+    const node = await getNode({lnd, public_key: id});
 
-  {
-    const {channels} = await getNode({
-      lnd,
-      is_omitting_channels: true,
-      public_key: id,
-    });
+    {
+      const {channels} = await getNode({
+        lnd,
+        is_omitting_channels: true,
+        public_key: id,
+      });
 
-    equal(channels.length, [].length, 'Channels are omitted')
-  }
-
-  if (!!node.channels.length) {
-    const [{policies}] = node.channels;
+      equal(channels.length, [].length, 'Channels are omitted')
+    }
 
-    const policy = policies.find(n => n.public_key === id);
+    if (!!node.channels.length) {
+      const [{policies}] = node.channels;
 
-    equal(BigInt(policy.base_fee_mtokens), BigInt(baseFee)*mtokPerTok, 'Base');
-    equal(policy.cltv_delta, cltvDelta, 'Got expected cltv delta');
-    equal(policy.fee_rate, feeRate, 'Got expected fee rate');
-    equal(policy.is_disabled, false, 'Channel is not disabled');
-    equal(policy.max_htlc_mtokens, '990000000', 'Max HTLC mtokens returned');
-    equal(policy.min_htlc_mtokens, '1000', 'Min HTLC mtokens returned');
-  }
+      const policy = policies.find(n => n.public_key === id);
 
-  const [socket] = node.sockets;
+      equal(BigInt(policy.base_fee_mtokens), BigInt(baseFee)*mtokPerTok, 'bf');
+      equal(policy.cltv_delta, cltvDelta, 'Got expected cltv delta');
+      equal(policy.fee_rate, feeRate, 'Got expected fee rate');
+      equal(policy.is_disabled, false, 'Channel is not disabled');
+      equal(policy.max_htlc_mtokens, '990000000', 'Max HTLC mtokens returned');
+      equal(policy.min_htlc_mtokens, '1000', 'Min HTLC mtokens returned');
+    }
 
-  equal(node.alias, id.slice(0, defaultAliasLength), 'Alias');
-  equal(node.color, '#3399ff', 'Color');
-  equal(node.sockets.length, 1, 'Socket');
-  equal(!!socket.socket, true, 'Ip, port');
-  equal(socket.type, 'tcp', 'Socket type');
-  equal(node.updated_at.length, 24, 'Update date');
+    const [socket] = node.sockets;
 
-  await kill({});
+    equal(node.alias, id.slice(0, defaultAliasLength), 'Alias');
+    equal(node.color, '#3399ff', 'Color');
+    equal(node.sockets.length, 1, 'Socket');
+    equal(!!socket.socket, true, 'Ip, port');
+    equal(socket.type, 'tcp', 'Socket type');
+    equal(node.updated_at.length, 24, 'Update date');
+  } catch (err) {
+    strictSame(err, null, 'Expected no error');
+  } finally {
+    await kill({});
+  }
 
   return end();
 });

package/test/integration/test_get_pending_force.js

@@ -177,7 +177,14 @@ test(`Get pending channels`, async ({end, equal}) => {
   equal(forceClose.partner_public_key, target.id, 'pk');
   equal(forceClose.received, 0, 'No receive amount');
   equal(forceClose.recovered_tokens, undefined, 'No recovered amount');
-  equal(forceClose.remote_balance, 0, 'No remote balance');
+
+  // LND 0.14.2 and below do not support remote balance info
+  if (!!forceClose.remote_balance) {
+    equal(forceClose.remote_balance, giftTokens, 'Got gift remote balance');
+  } else {
+    equal(forceClose.remote_balance, 0, 'No remote balance');
+  }
+
   equal(forceClose.sent, 0, 'No sent amount');
   equal(!!forceClose.timelock_blocks, true, 'Timelock blocks set');
   equal(forceClose.timelock_expiration, startHeight + 265, 'Funds timelock');

package/test/integration/test_get_wallet_info.js

@@ -1,11 +1,14 @@
+const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const {getWalletInfo} = require('./../../');
 
 const initHeight = 1;
+const interval = 10;
 const pubKeyHexLength = Buffer.alloc(33).toString('hex').length;
 const regtestChainId = '06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f';
+const times = 1000;
 const walletInfoType = 'wallet';
 
 // Getting the wallet info should return info about the wallet
@@ -14,21 +17,33 @@ test(`Get wallet info`, async ({end, equal, strictSame}) => {
 
   const [{lnd}] = nodes;
 
-  const result = await getWalletInfo({lnd});
-
-  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,