ln-service 56.0.0 → 56.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Versions
 
+## 56.2.0
+
+- `getChannels`: Add support for `type` to show channel type
+- `getWalletInfo`: Add support for LND 0.16.2
+- `subscribeToChannels`: Add support for `channel_opened` `type` to show type
+
+## 56.1.0
+
+- `getWalletInfo`: Add support for LND 0.16.1
+- `subscribeToOpenRequests`: Add `type` for channel request commitment type
+
 ## 56.0.0
 
 ### Breaking Changes

package/README.md

@@ -9,7 +9,7 @@ through npm.
 
 Supported LND versions:
 
-- v0.16.0-beta
+- v0.16.0-beta to v0.16.2-beta
 - v0.15.2-beta to v0.15.5-beta
 - v0.14.4-beta to v0.14.5-beta
 
@@ -1745,6 +1745,7 @@ Requires `offchain:read` permission
         [time_online]: <Monitoring Uptime Channel Up Milliseconds Number>
         transaction_id: <Blockchain Transaction Id String>
         transaction_vout: <Blockchain Transaction Vout Number>
+        [type]: <Channel Commitment Transaction Type String>
         unsettled_balance: <Unsettled Balance Tokens Number>
       }]
     }
@@ -5332,6 +5333,7 @@ Requires `offchain:read` permission
       sent: <Sent Tokens Number>
       transaction_id: <Blockchain Transaction Id String>
       transaction_vout: <Blockchain Transaction Vout Number>
+      [type]: <Channel Commitment Transaction Type String>
       unsettled_balance: <Unsettled Balance Tokens Number>
     }
 
@@ -5739,6 +5741,7 @@ LND 0.15.0 and below do not support `is_trusted_funding`
       reject: <Reject Request Function> ({
         [reason]: <500 Character Limited Rejection Reason String>
       }) -> {}
+      [type]: <Channel Commitment Transaction Type String>
     }
 
 Example:

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.3",
-    "lightning": "9.0.0",
+    "lightning": "9.2.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
@@ -28,7 +28,7 @@
     "bn.js": "5.2.1",
     "bs58check": "3.0.1",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "5.0.0",
+    "ln-docker-daemons": "5.0.2",
     "p2tr": "1.3.3",
     "portfinder": "1.0.32",
     "psbt": "2.7.2",
@@ -56,6 +56,8 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.16.2": "DOCKER_LND_VERSION=v0.16.2-beta npm run test",
+    "integration-test-0.16.1": "DOCKER_LND_VERSION=v0.16.1-beta npm run test",
     "integration-test-0.16.0": "DOCKER_LND_VERSION=v0.16.0-beta npm run test",
     "integration-test-0.15.5": "DOCKER_LND_VERSION=v0.15.5-beta npm run test",
     "integration-test-0.15.4": "DOCKER_LND_VERSION=v0.15.4-beta npm run test",
@@ -65,5 +67,5 @@
     "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": "56.0.0"
+  "version": "56.2.0"
 }

package/test/integration/test_delete_pending_channel.js

@@ -30,7 +30,7 @@ const interval = 100;
 const race = promises => Promise.race(promises);
 const size = 3;
 const timeout = 1000 * 20;
-const times = 500;
+const times = 1000;
 
 // Forfeiting a pending channel should remove the pending channel
 test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
@@ -131,6 +131,8 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
         return channel;
       }
 
+      await broadcastChainTransaction({lnd, transaction});
+
       await generate({});
 
       throw new Error('ExpectedNewChannelCreated');

package/test/integration/test_get_channels.js

@@ -28,8 +28,6 @@ test(`Get channels`, async ({end, equal, ok}) => {
   const {features} = await getWalletInfo({lnd});
   const [targetChan] = (await getChannels({lnd: target.lnd})).channels;
 
-  const isAnchors = !!features.find(n => n.bit === anchorFeatureBit);
-
   equal(targetChan.is_partner_initiated, true, 'Self-init channel');
 
   if (!!channel.local_given) {
@@ -55,24 +53,16 @@ test(`Get channels`, async ({end, equal, ok}) => {
     equal(channel.remote_min_htlc_mtokens, '1', 'Remote min HTLC mtokens');
   }
 
-  // LND 0.11.1 and below do not support anchor channels
-  if (isAnchors) {
-    equal(channel.local_balance, 896530, 'Local balance');
-    equal(channel.commit_transaction_fee, 2810, 'Commit fee');
-    equal(channel.commit_transaction_weight, 1116, 'Commit weight');
-  } else {
-    equal(channel.local_balance, 890950, 'Local balance');
-    equal(channel.commit_transaction_fee, 9050, 'Commit fee');
-    equal(channel.commit_transaction_weight, 724, 'Commit weight');
-  }
-
   equal(channel.capacity, 1000000, 'Channel capacity');
+  equal(channel.commit_transaction_fee, 2810, 'Commit fee');
+  equal(channel.commit_transaction_weight, 1116, 'Commit weight');
   equal(channel.id, chan.id, 'Channel id returned');
   equal(channel.is_active, true, 'Channel active');
   equal(channel.is_closing, false, 'Channel not closing');
   equal(channel.is_opening, false, 'Channel not opening');
   equal(channel.is_partner_initiated, false, 'Partner initiated channel');
   equal(channel.is_private, false, 'Channel not private');
+  equal(channel.local_balance, 896530, 'Local balance');
   equal(channel.local_reserve, 10000, 'Local reserve');
   equal(channel.partner_public_key, target.id, 'Pubkey');
   equal(channel.pending_payments.length, 0, 'No pending payments');
@@ -82,6 +72,7 @@ test(`Get channels`, async ({end, equal, ok}) => {
   equal(channel.sent, 0, 'Channel sent');
   equal(channel.transaction_id, chan.transaction_id, 'Chan funding tx id');
   equal(channel.transaction_vout, 0, 'Channel transactin vout');
+  equal(channel.type, 'anchor', 'Channel type is returned');
   equal(channel.unsettled_balance, 0, 'Channel unsettled balance');
 
   await kill({});

package/test/integration/test_open_channels.js

@@ -24,7 +24,7 @@ const baseFeeMtokens = '1234';
 const capacity = 1e6;
 const count = 10;
 const defaultBaseFee = '1000';
-const interval = 10;
+const interval = 20;
 const feeRate = 56;
 const maturity = 100;
 const race = promises => Promise.race(promises);

package/test/integration/test_subscribe_to_channels.js

@@ -121,6 +121,7 @@ test('Subscribe to channels', async ({end, equal, fail}) => {
   equal(openEvent.sent, 0, 'No tokens sent yet');
   equal(openEvent.transaction_id, channelOpen.transaction_id, 'Funding tx id');
   equal(openEvent.transaction_vout, channelOpen.transaction_vout, 'Fund vout');
+  equal(openEvent.type, 'anchor', 'Got channel type');
   equal(openEvent.unsettled_balance, 0, 'No unsettled balance');
 
   // Wait for the channel close to confirm

package/test/integration/test_subscribe_to_open_requests.js

@@ -90,6 +90,7 @@ test(`Subscribe to open requests`, async ({end, equal, fail, ok}) => {
     ok(request.min_chain_output >= dustLimit, 'Dust limit tokens returned');
     equal(request.min_htlc_mtokens, '1', 'Got min htlc amount');
     equal(request.partner_public_key, target.id, 'Got pubkey');
+    equal(request.type, 'anchor', 'Channel type is returned');
 
     request.accept({
       cooperative_close_address: address,

package/test/integration/test_subscribe_to_rpc_requests.js

@@ -122,7 +122,7 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
     subscription.removeAllListeners();
   }
 
-  {
+  try {
     const {subscription} = await subscribeToRpcRequests({
       lnd,
       id: 'stop channel give tokens',
@@ -166,10 +166,14 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
       }
     });
 
+    await delay(2000);
+
     subscription.removeAllListeners();
+  } catch (err) {
+    equal(err, null, 'Expected no error opening channel');
   }
 
-  {
+  try {
     const {subscription} = await subscribeToRpcRequests({
       lnd,
       id: 'stop channel close to address',
@@ -207,12 +211,14 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
         }
 
         strictSame(code, 503, 'Close fails with server error');
-        strictSame(message, 'UnexpectedCloseChannelError', 'Close err message');
+        strictSame(message, 'UnexpectedCloseChannelError', 'Close error');
         strictSame(raw.err.details, 'message', 'Custom message received');
       }
     });
 
     subscription.removeAllListeners();
+  } catch (err) {
+    equal(err, null, 'Expected no error');
   }
 
   {
@@ -236,36 +242,42 @@ test(`Subscribe to RPC requests`, async ({end, equal, fail, strictSame}) => {
       }
     });
 
-    try {
-      // Attempt a payment
-      await payViaRoutes({
-        lnd,
-        routes: [{
-          fee: 0,
-          fee_mtokens: '0',
-          hops: [{
-            channel: '0x0x1',
-            channel_capacity: 1,
+    await asyncRetry({interval, times}, async () => {
+      try {
+        // Attempt a payment
+        await payViaRoutes({
+          lnd,
+          routes: [{
             fee: 0,
             fee_mtokens: '0',
-            forward: 0,
-            forward_mtokens: '1',
-            public_key: key,
+            hops: [{
+              channel: '0x0x1',
+              channel_capacity: 1,
+              fee: 0,
+              fee_mtokens: '0',
+              forward: 0,
+              forward_mtokens: '1',
+              public_key: key,
+              timeout: 1,
+            }],
+            mtokens: '1',
             timeout: 1,
+            tokens: 0,
           }],
-          mtokens: '1',
-          timeout: 1,
-          tokens: 0,
-        }],
-      });
+        });
 
-      fail('ExpectedPayViaRouteRejected');
-    } catch (err) {
-      const [code, message] = err;
+        fail('ExpectedPayViaRouteRejected');
+      } catch (err) {
+        const [code, message] = err;
 
-      equal(code, 503);
-      equal(message, 'UnexpectedErrorWhenPayingViaRoute');
-    }
+        if (message !== 'UnexpectedErrorWhenPayingViaRoute') {
+          throw err;
+        }
+
+        equal(code, 503);
+        equal(message, 'UnexpectedErrorWhenPayingViaRoute');
+      }
+    });
 
     subscription.removeAllListeners();
   }

package/test/integration/test_trusted_funding.js

@@ -205,13 +205,13 @@ test(`Open unconfirmed channels`, async ({end, equal, match, strictSame}) => {
       funding: signedPrivate.psbt,
     });
 
-    // Generate the channel into a block
-    await broadcastChainTransaction({
-      lnd,
-      transaction: signedPrivate.transaction,
-    });
-
     const privateConfirmed = await asyncRetry({interval, times}, async () => {
+      // Generate the channel into a block
+      await broadcastChainTransaction({
+        lnd,
+        transaction: signedPrivate.transaction,
+      });
+
       await generate({});
 
       const [confirmed] = (await getChannels({lnd})).channels;