lightning 9.1.0 → 9.2.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Versions
 
+## 9.2.0
+
+- `getChannels`: Add support for `type` to show channel type
+- `subscribeToChannels`: Add support for `channel_opened` `type` to show type
+
 ## 9.1.0
 
 - `getWalletInfo`: Add support for LND 0.16.1

package/lnd_methods/offchain/get_channels.d.ts

@@ -114,6 +114,8 @@ export type GetChannelsResult = {
     transaction_id: string;
     /** Blockchain Transaction Vout */
     transaction_vout: number;
+    /** Channel Commitment Transaction Type */
+    type?: string;
     /** Unsettled Balance Tokens */
     unsettled_balance: number;
   }[];

package/lnd_methods/offchain/get_channels.js

@@ -78,6 +78,7 @@ const type = 'default';
       [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>
     }]
   }

package/lnd_methods/offchain/subscribe_to_channels.d.ts

@@ -127,6 +127,8 @@ export type SubscribeToChannelsChannelOpenedEvent = {
   transaction_id: string;
   /** Blockchain Transaction Vout */
   transaction_vout: number;
+  /** Channel Commitment Transaction Type */
+  type?: string;
   /** Unsettled Balance Tokens */
   unsettled_balance: number;
 };

package/lnd_methods/offchain/subscribe_to_channels.js

@@ -109,6 +109,7 @@ const updateOpening = 'pending_open_channel';
     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>
   }
 

package/lnd_responses/rpc_channel_as_channel.js

@@ -1,6 +1,6 @@
 const {chanFormat} = require('bolt07');
 
-const {commitmentTypes} = require('./constants');
+const {channelTypes} = require('./constants');
 const parseThawHeight = require('./parse_thaw_height');
 const rpcHtlcAsPayment = require('./rpc_htlc_as_payment');
 
@@ -118,6 +118,7 @@ const outpointDelimiter = ':';
     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>
   }
 */
@@ -150,6 +151,10 @@ module.exports = args => {
     throw new Error('ExpectedCommitWeightInChannelMessage');
   }
 
+  if (!args.commitment_type) {
+    throw new Error('ExpectedChannelCommitmentTypeInChannelMessage');
+  }
+
   if (args.fee_per_kw === undefined) {
     throw new Error('ExpectedFeePerKwInChannelMessage');
   }
@@ -210,7 +215,6 @@ module.exports = args => {
     throw new Error('ExpectedUnsettledBalanceInChannelMessage');
   }
 
-  const chanType = args.commitment_type;
   const commitWeight = Number(args.commit_weight);
   const {height} = parseThawHeight({id: args.chan_id, thaw: args.thaw_height});
   const own = args.local_constraints;
@@ -266,6 +270,7 @@ module.exports = args => {
     time_online: uptime,
     transaction_id: transactionId,
     transaction_vout: Number(vout),
+    type: channelTypes[args.commitment_type],
     unsettled_balance: Number(args.unsettled_balance),
   };
 };

package/package.json

@@ -10,7 +10,7 @@
     "@grpc/grpc-js": "1.8.14",
     "@grpc/proto-loader": "0.7.6",
     "@types/express": "4.17.17",
-    "@types/node": "18.16.1",
+    "@types/node": "18.16.2",
     "@types/request": "2.48.8",
     "@types/ws": "8.5.4",
     "async": "3.2.4",
@@ -59,5 +59,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "9.1.0"
+  "version": "9.2.0"
 }

package/test/lnd_methods/offchain/test_get_channels.js

@@ -53,6 +53,7 @@ const makeExpected = overrides => {
     time_online: 1000,
     transaction_id: '00',
     transaction_vout: 1,
+    type: 'anchor',
     unsettled_balance: 1,
   };
 
@@ -71,7 +72,7 @@ const makeLnd = overrides => {
     close_address: 'cooperative_close_address',
     commit_fee: '1',
     commit_weight: '1',
-    commitment_type: 'LEGACY',
+    commitment_type: 'ANCHORS',
     fee_per_kw: '1',
     initiator: true,
     lifetime: 1,
@@ -174,6 +175,11 @@ const tests = [
     description: 'Channel commit weight is expected',
     error: [503, 'ExpectedCommitWeight'],
   },
+  {
+    args: {lnd: makeLnd({commitment_type: undefined})},
+    description: 'Channel commit type is expected',
+    error: [503, 'ExpectedChannelCommitmentTypeInChannelMessage'],
+  },
   {
     args: {lnd: makeLnd({fee_per_kw: undefined})},
     description: 'Channel fee per kw is expected',
@@ -242,7 +248,7 @@ const tests = [
   {
     args: {
       lnd: makeLnd({
-        commitment_type: 'STATIC_REMOTE_KEY',
+        commitment_type: 'ANCHORS',
         thaw_height: 1,
       }),
     },

package/test/lnd_methods/offchain/test_subscribe_to_channels.js

@@ -66,7 +66,7 @@ const makeLnd = ({data, err}) => {
               close_address: '',
               commit_fee: '1',
               commit_weight: '1',
-              commitment_type: 'LEGACY',
+              commitment_type: 'ANCHORS',
               csv_delay: 1,
               fee_per_kw: '1',
               initiator: true,
@@ -278,6 +278,7 @@ const tests = [
             time_online: 1000,
             transaction_id: '0000000000000000000000000000000000000000000000000000000000000000',
             transaction_vout: 0,
+            type: 'anchor',
             unsettled_balance: 1,
           },
         },

package/test/lnd_responses/test_rpc_channel_as_channel.js

@@ -13,7 +13,7 @@ const makeArgs = overrides => {
     close_address: undefined,
     commit_fee: '1',
     commit_weight: '1',
-    commitment_type: 'LEGACY',
+    commitment_type: 'ANCHORS',
     csv_delay: 1,
     fee_per_kw: '1',
     initiator: false,
@@ -112,6 +112,7 @@ const makeExpected = overrides => {
     time_online: 1000,
     transaction_id: '00',
     transaction_vout: 1,
+    type: 'anchor',
     unsettled_balance: 1,
   };
 
@@ -156,6 +157,11 @@ const tests = [
     description: 'Channel commit weight is expected',
     error: 'ExpectedCommitWeightInChannelMessage',
   },
+  {
+    args: makeArgs({commitment_type: undefined}),
+    description: 'Channel commit type is expected',
+    error: 'ExpectedChannelCommitmentTypeInChannelMessage',
+  },
   {
     args: makeArgs({fee_per_kw: undefined}),
     description: 'Channel fee per kw is expected',
@@ -242,7 +248,7 @@ const tests = [
     expected: makeExpected({id: '0x0x2', other_ids: ['0x0x3']}),
   },
   {
-    args: makeArgs({commitment_type: 'STATIC_REMOTE_KEY', initiator: true}),
+    args: makeArgs({commitment_type: 'ANCHORS', initiator: true}),
     description: 'Initiated RPC channel is mapped to channel',
     expected: makeExpected({
       is_partner_initiated: false,