ln-service 54.2.1 → 54.2.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 54.2.3
+
+- `getWalletInfo`: Add support for LND 0.15.3
+
+## 54.2.2
+
+- `getWalletInfo`: Add support for LND 0.14.4
+
 ## 54.2.1
 
 - `getWalletInfo`: Add support for LND 0.15.2

package/README.md

@@ -9,7 +9,8 @@ through npm.
 
 Supported LND versions:
 
-- v0.15.2-beta
+- v0.15.2-beta to v0.15.3-beta
+- v0.14.4-beta
 
 For typescript-ready methods, check out https://github.com/alexbosworth/lightning#readme
 

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.0",
-    "lightning": "6.2.2",
+    "lightning": "6.2.4",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.9.0"
@@ -28,7 +28,7 @@
     "bn.js": "5.2.1",
     "bs58check": "2.1.2",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "3.1.1",
+    "ln-docker-daemons": "3.1.2",
     "p2tr": "1.3.2",
     "portfinder": "1.0.32",
     "psbt": "2.7.1",
@@ -56,8 +56,10 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.15.3": "DOCKER_LND_VERSION=v0.15.3-beta npm run test",
     "integration-test-0.15.2": "DOCKER_LND_VERSION=v0.15.2-beta npm run test",
+    "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-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": "54.2.1"
+  "version": "54.2.3"
 }

package/test/integration/test_get_chain_transactions.js

@@ -20,14 +20,14 @@ test(`Get chain transactions`, async ({end, equal, strictSame}) => {
   // Generate some funds for LND
   await generate({count});
 
-  await asyncRetry({interval: 10, times: 2000}, async () => {
+  await asyncRetry({interval: 10, times: 3000}, async () => {
     const wallet = await getWalletInfo({lnd});
 
     if (!wallet.is_synced_to_chain) {
       throw new Error('ExpectedWalletSyncedToChain');
     }
 
-    if (wallet.current_block_height !== count + 1) {
+    if (wallet.current_block_height < count + 1) {
       throw new Error('ExpectedFullySyncedToChain');
     }
   });

package/test/integration/test_get_closed_channels.js

@@ -86,7 +86,7 @@ test(`Get closed channels`, async ({end, equal}) => {
 
   // LND 0.11.1 and below do not use anchors
   if (isAnchors) {
-    equal([53345, 2810].includes(spend), true, 'Final');
+    equal([53345, 28473, 2810].includes(spend), true, 'Final');
   } else {
     equal(spend, 9050, 'Final');
   }

package/test/integration/test_open_channel.js

@@ -66,6 +66,10 @@ test(`Open channel`, async ({end, equal}) => {
 
     const policy = policies.find(n => n.public_key === id);
 
+    if (!policy.base_fee_mtokens) {
+      throw new Error('ExpectedKnownPolicyBaseFeeMtokens');
+    }
+
     // LND 0.15.3 and below do not support setting fees on open
     if (policy.base_fee_mtokens === defaultBaseFee) {
       return;

package/test/integration/test_recover_funds_from_channel.js

@@ -24,25 +24,29 @@ const times = 3000;
 
 // Using a channel backup should recover funds
 test(`Recover funds from channel`, async ({end, equal}) => {
-  const control = await spawnLightningDocker({
-    seed,
-    chain_p2p_port: await getPort({port: 8000, stopPort: 9000}),
-    chain_rpc_port: await getPort({port: 9001, stopPort: 10000}),
-    chain_zmq_block_port: await getPort({port: 10001, stopPort: 11000}),
-    chain_zmq_tx_port: await getPort({port: 11001, stopPort: 12000}),
-    generate_address: generateAddress,
-    lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
-    lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+  const control = await asyncRetry({interval, times}, async () => {
+    return await spawnLightningDocker({
+      seed,
+      chain_p2p_port: await getPort({port: 8000, stopPort: 9000}),
+      chain_rpc_port: await getPort({port: 9001, stopPort: 10000}),
+      chain_zmq_block_port: await getPort({port: 10001, stopPort: 11000}),
+      chain_zmq_tx_port: await getPort({port: 11001, stopPort: 12000}),
+      generate_address: generateAddress,
+      lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
+      lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+    });
   });
 
-  const target = await spawnLightningDocker({
-    chain_p2p_port: await getPort({port: 8000, stopPort: 9000}),
-    chain_rpc_port: await getPort({port: 9001, stopPort: 10000}),
-    chain_zmq_block_port: await getPort({port: 10001, stopPort: 11000}),
-    chain_zmq_tx_port: await getPort({port: 11001, stopPort: 12000}),
-    generate_address: generateAddress,
-    lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
-    lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+  const target = await asyncRetry({interval, times}, async () => {
+    return await spawnLightningDocker({
+      chain_p2p_port: await getPort({port: 8000, stopPort: 9000}),
+      chain_rpc_port: await getPort({port: 9001, stopPort: 10000}),
+      chain_zmq_block_port: await getPort({port: 10001, stopPort: 11000}),
+      chain_zmq_tx_port: await getPort({port: 11001, stopPort: 12000}),
+      generate_address: generateAddress,
+      lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
+      lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+    });
   });
 
   await control.add_chain_peer({socket: target.chain_socket});
@@ -102,15 +106,17 @@ test(`Recover funds from channel`, async ({end, equal}) => {
 
   await control.kill({});
 
-  const clone = await spawnLightningDocker({
-    seed,
-    chain_p2p_port: await getPort({port: 8000, stopPort: 9000}),
-    chain_rpc_port: await getPort({port: 9001, stopPort: 10000}),
-    chain_zmq_block_port: await getPort({port: 10001, stopPort: 11000}),
-    chain_zmq_tx_port: await getPort({port: 11001, stopPort: 12000}),
-    generate_address: generateAddress,
-    lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
-    lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+  const clone = await asyncRetry({interval, times}, async () => {
+    return await spawnLightningDocker({
+      seed,
+      chain_p2p_port: await getPort({port: 8000, stopPort: 9000}),
+      chain_rpc_port: await getPort({port: 9001, stopPort: 10000}),
+      chain_zmq_block_port: await getPort({port: 10001, stopPort: 11000}),
+      chain_zmq_tx_port: await getPort({port: 11001, stopPort: 12000}),
+      generate_address: generateAddress,
+      lightning_p2p_port: await getPort({port: 12001, stopPort: 13000}),
+      lightning_rpc_port: await getPort({port: 13001, stopPort: 14000}),
+    });
   });
 
   await clone.add_chain_peer({socket: target.chain_socket});

package/test/integration/test_subscribe_to_channels.js

@@ -150,7 +150,7 @@ test('Subscribe to channels', async ({end, equal, fail}) => {
   if (isAnchors) {
     const final = closeEvent.final_local_balance;
 
-    equal([897190, 846655].includes(final), true, 'Close final local balance');
+    equal([897190, 846655, 863366].includes(final), true, 'Close final');
   } else {
     equal(closeEvent.final_local_balance, 890950, 'Close final local balance');
   }

package/test/integration/test_subscribe_to_rpc_requests.js

@@ -12,8 +12,10 @@ const {sendMessageToPeer} = require('./../../');
 const {subscribeToInvoice} = require('./../../');
 const {subscribeToRpcRequests} = require('./../../');
 
+const interval = 10;
 const message = '00';
 const subscribeInvoiceUri = '/invoicesrpc.Invoices/SubscribeSingleInvoice';
+const times = 2000;
 
 // Subscribing to RPC requests should listen for RPC requests
 test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
@@ -136,23 +138,31 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
       }
     });
 
-    try {
-      // Gift some tokens in a channel
-      await openChannel({
-        lnd,
-        give_tokens: 1e5,
-        local_tokens: 1e6,
-        partner_public_key: Buffer.alloc(33, 2).toString('hex'),
-      });
-
-      fail('ExpectedChannelRejected');
-    } catch (err) {
-      strictSame(
-        err,
-        [503, 'FailedToOpenChannel', {err: 'message'}],
-        'Channel open fails to execute'
-      );
-    }
+    await asyncRetry({interval, times}, async () => {
+      try {
+        // Gift some tokens in a channel
+        await openChannel({
+          lnd,
+          give_tokens: 1e5,
+          local_tokens: 1e6,
+          partner_public_key: Buffer.alloc(33, 2).toString('hex'),
+        });
+
+        fail('ExpectedChannelRejected');
+      } catch (err) {
+        const [code, message] = err;
+
+        if (message !== 'FailedToOpenChannel') {
+          throw err;
+        }
+
+        strictSame(
+          err,
+          [503, 'FailedToOpenChannel', {err: 'message'}],
+          'Channel open fails to execute'
+        );
+      }
+    });
 
     subscription.removeAllListeners();
   }