lightning 10.3.1 → 10.4.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 10.4.0
+
+- `getConnectedWatchtowers`: Add `is_taproot` to get P2TR channels
+
 ## 10.3.1
 
 - `getConfiguration`: Add method to get the configuration file options

package/grpc/protos/wtclient.proto

@@ -193,6 +193,9 @@ enum PolicyType {
 
     // Selects the policy from the anchor tower client.
     ANCHOR = 1;
+
+    // Selects the policy from the taproot tower client.
+    TAPROOT = 2;
 }
 
 message PolicyRequest {

package/lnd_methods/offchain/get_connected_watchtowers.d.ts

@@ -6,6 +6,8 @@ import {
 export type GetConnectedWatchTowersArgs = AuthenticatedLightningArgs<{
   /** Get Anchor Type Tower Info Bool */
   is_anchor?: boolean;
+  /** Get Taproot Type Tower Info Bool */
+  is_taproot?: boolean;
 }>;
 
 export type GetConnectedWatchTowersResult = {
@@ -53,6 +55,8 @@ export type GetConnectedWatchTowersResult = {
  * Requires `offchain:read` permission
  *
  * `is_anchor` flag is not supported on LND 0.11.1 and below
+ *
+ * `is_taproot` flag is not supported on LND 0.17.3 and below
  */
 export const getConnectedWatchtowers: AuthenticatedLightningMethod<
   GetConnectedWatchTowersArgs,

package/lnd_methods/offchain/get_connected_watchtowers.js

@@ -18,8 +18,11 @@ const unimplementedError = '12 UNIMPLEMENTED: unknown service wtclientrpc.Watcht
 
   `is_anchor` flag is not supported on LND 0.11.1 and below
 
+  `is_taproot` flag is not supported on LND 0.17.3 and below
+
   {
     [is_anchor]: <Get Anchor Type Tower Info Bool>
+    [is_taproot]: <Get Taproot Type Tower Info Bool>
     lnd: <Authenticated LND API Object>
   }
 
@@ -57,39 +60,6 @@ module.exports = (args, cbk) => {
         return cbk();
       },
 
-      // Get policy
-      getPolicy: ['validate', ({}, cbk) => {
-        return args.lnd[type].policy({
-          policy_type: !!args.is_anchor ? 'ANCHOR' : 'LEGACY',
-        },
-        (err, res) => {
-          if (!!err && err.message === unimplementedError) {
-            return cbk([503, 'ExpectedWatchtowerClientLndToGetPolicy']);
-          }
-
-          if (!!err) {
-            return cbk([503, 'UnexpectedErrorGettingWatchtowerPolicy', {err}]);
-          }
-
-          if (!res) {
-            return cbk([503, 'ExpectedResultForWatchtowerPolicy']);
-          }
-
-          if (res.max_updates === undefined) {
-            return cbk([503, 'ExpectedMaxUpdateCountInWatchtowerPolicyInfo']);
-          }
-
-          if (res.sweep_sat_per_byte === undefined) {
-            return cbk([503, 'ExpectedSweepSatsPerByteInWatchtowerPolicy']);
-          }
-
-          return cbk(null, {
-            max_session_update_count: res.max_updates,
-            sweep_tokens_per_vbyte: res.sweep_sat_per_byte,
-          });
-        });
-      }],
-
       // Get stats
       getStats: ['validate', ({}, cbk) => {
         return args.lnd[type].stats({}, (err, res) => {
@@ -181,6 +151,49 @@ module.exports = (args, cbk) => {
         });
       }],
 
+      // Determine the policy type
+      policyType: ['validate', ({}, cbk) => {
+        if (!!args.is_anchor) {
+          return cbk(null, 'ANCHOR');
+        }
+
+        if (!!args.is_taproot) {
+          return cbk(null, 'TAPROOT');
+        }
+
+        return cbk(null, 'LEGACY');
+      }],
+
+      // Get policy
+      getPolicy: ['policyType', ({policyType}, cbk) => {
+        return args.lnd[type].policy({policy_type: policyType}, (err, res) => {
+          if (!!err && err.message === unimplementedError) {
+            return cbk([503, 'ExpectedWatchtowerClientLndToGetPolicy']);
+          }
+
+          if (!!err) {
+            return cbk([503, 'UnexpectedErrorGettingWatchtowerPolicy', {err}]);
+          }
+
+          if (!res) {
+            return cbk([503, 'ExpectedResultForWatchtowerPolicy']);
+          }
+
+          if (res.max_updates === undefined) {
+            return cbk([503, 'ExpectedMaxUpdateCountInWatchtowerPolicyInfo']);
+          }
+
+          if (res.sweep_sat_per_byte === undefined) {
+            return cbk([503, 'ExpectedSweepSatsPerByteInWatchtowerPolicy']);
+          }
+
+          return cbk(null, {
+            max_session_update_count: res.max_updates,
+            sweep_tokens_per_vbyte: res.sweep_sat_per_byte,
+          });
+        });
+      }],
+
       // Connected watchtowers
       watchtowers: [
         'getPolicy',

package/package.json

@@ -22,7 +22,7 @@
     "invoices": "3.0.0",
     "psbt": "3.0.0",
     "tiny-secp256k1": "2.2.3",
-    "type-fest": "4.9.0"
+    "type-fest": "4.10.0"
   },
   "description": "Lightning Network client library",
   "devDependencies": {
@@ -53,5 +53,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "10.3.1"
+  "version": "10.4.0"
 }

package/test/lnd_methods/offchain/test_get_connected_watchtowers.js

@@ -198,7 +198,7 @@ const tests = [
     error: [503, 'ExpectedResultForWatchtowerListing'],
   },
   {
-    args: {lnd: makeLnd({towersRes: {}})},
+    args: {is_taproot: true, lnd: makeLnd({towersRes: {}})},
     description: 'Towers array is expected',
     error: [503, 'ExpectedArrayOfTowersForWatchtowerListing'],
   },

package/test/typescript/get_connected_watchtowers.test-d.ts

@@ -7,6 +7,7 @@ import {
 
 const lnd = {} as AuthenticatedLnd;
 const is_anchor = true;
+const is_taproot = true;
 
 expectError(getConnectedWatchtowers());
 expectError(getConnectedWatchtowers({}));
@@ -16,6 +17,9 @@ expectType<GetConnectedWatchTowersResult>(await getConnectedWatchtowers({lnd}));
 expectType<GetConnectedWatchTowersResult>(
   await getConnectedWatchtowers({lnd, is_anchor})
 );
+expectType<GetConnectedWatchTowersResult>(
+  await getConnectedWatchtowers({lnd, is_taproot})
+);
 
 expectType<void>(
   getConnectedWatchtowers({lnd}, (error, result) => {
@@ -27,3 +31,8 @@ expectType<void>(
     expectType<GetConnectedWatchTowersResult>(result);
   })
 );
+expectType<void>(
+  getConnectedWatchtowers({lnd, is_taproot}, (error, result) => {
+    expectType<GetConnectedWatchTowersResult>(result);
+  })
+);