lightning 9.11.3 → 9.13.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 9.13.0
+
+- `openChannels`: Add `is_simplified_taproot` to make a simplified taproot chan
+
+## 9.12.0
+
+- `openChannel`: Add `is_simplified_taproot` to make a simplified taproot chan
+
 ## 9.11.3
 
 - `openChannel`: Add `inputs` to select inputs for channel open funding

package/grpc/protos/lightning.proto

@@ -1352,6 +1352,13 @@ enum CommitmentType {
     channel before its maturity date.
     */
     SCRIPT_ENFORCED_LEASE = 4;
+
+    /*
+    A channel that uses musig2 for the funding output, and the new tapscript
+    features where relevant.
+    */
+    // TODO(roasbeef): need script enforce mirror type for the above as well?
+    SIMPLE_TAPROOT = 5;
 }
 
 message ChannelConstraints {
@@ -2828,6 +2835,9 @@ message WalletAccountBalance {
 }
 
 message WalletBalanceRequest {
+    // The wallet account the balance is shown for.
+    // If this is not specified, the balance of the "default" account is shown.
+    string account = 1;
 }
 
 message WalletBalanceResponse {

package/lnd_methods/onchain/open_channel.d.ts

@@ -28,6 +28,8 @@ export type ChannelOpenOptions = {
   is_max_funding?: boolean;
   /** Channel is Private */
   is_private?: boolean;
+  /** Create Simplified Taproot Type Channel */
+  is_simplified_taproot?: boolean;
   /** Peer Should Avoid Waiting For Confirmation */
   is_trusted_funding?: boolean;
   /** Local Tokens */

package/lnd_methods/onchain/open_channel.js

@@ -11,6 +11,7 @@ const errMemoLength = /^provided memo \(.*\) is of length \d*, exceeds (\d*)$/;
 const {isArray} = Array;
 const minChannelTokens = 20000;
 const method = 'openChannel';
+const simplifiedTaprootChannelType = 'SIMPLE_TAPROOT';
 const type = 'default';
 
 /** Open a new channel.
@@ -36,6 +37,9 @@ const type = 'default';
 
   `inputs` is not supported on LND 0.16.4 and below
 
+  `is_simplified_taproot` is not supported on LND 0.16.4 and below and requires
+  `--protocol.simple-taproot-chans` set on both sides.
+
   {
     [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
     [chain_fee_tokens_per_vbyte]: <Chain Fee Tokens Per VByte Number>
@@ -49,6 +53,7 @@ const type = 'default';
     }]
     [is_max_funding]: <Use Maximal Chain Funds For Local Funding Bool>
     [is_private]: <Channel is Private Bool> // Defaults to false
+    [is_simplified_taproot]: <Channel is Simplified Taproot Type Bool>
     [is_trusted_funding]: <Accept Funding as Trusted Bool>
     lnd: <Authenticated LND API Object>
     [local_tokens]: <Total Channel Capacity Tokens Number>
@@ -171,6 +176,10 @@ module.exports = (args, cbk) => {
           options.push_sat = args.give_tokens;
         }
 
+        if (!!args.is_simplified_taproot) {
+          options.commitment_type = simplifiedTaprootChannelType;
+        }
+
         const channelOpen = args.lnd.default.openChannel(options);
 
         channelOpen.on('data', chan => {

package/lnd_methods/onchain/open_channels.js

@@ -18,6 +18,7 @@ const isPublicKey = n => /^[0-9A-F]{66}$/i.test(n);
 const makeId = () => randomBytes(32);
 const method = 'openChannel';
 const notEnoughOutputs = 'not enough witness outputs to create funding';
+const taproot = 'SIMPLE_TAPROOT';
 const type = 'default';
 
 /** Open one or more channels
@@ -42,6 +43,9 @@ const type = 'default';
 
   `description` is not supported on LND 0.16.4 and below
 
+  `is_simplified_taproot` is not supported on LND 0.16.4 and below and requires
+  `--protocol.simple-taproot-chans` set on both sides.
+
   {
     channels: [{
       [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
@@ -51,6 +55,7 @@ const type = 'default';
       [fee_rate]: <Routing Fee Rate In Millitokens Per Million Number>
       [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
       [is_private]: <Channel is Private Bool> // Defaults to false
+      [is_simplified_taproot]: <Channel is Simplified Taproot Type Bool>
       [is_trusted_funding]: <Peer Should Avoid Waiting For Confirmation Bool>
       [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
       [partner_csv_delay]: <Peer Output CSV Delay Number>
@@ -108,6 +113,7 @@ module.exports = (args, cbk) => {
           cooperative_close_address: channel.cooperative_close_address,
           give_tokens: channel.give_tokens,
           is_private: channel.is_private,
+          is_simplified_taproot: channel.is_simplified_taproot,
           is_trusted_funding: channel.is_trusted_funding,
           min_htlc_mtokens: channel.min_htlc_mtokens,
           partner_public_key: channel.partner_public_key,
@@ -120,13 +126,16 @@ module.exports = (args, cbk) => {
         const [lastChannel] = toOpen.map(n => n.id).reverse();
 
         return asyncMap(toOpen, (channel, cbk) => {
+          const baseType = !!channel.is_trusted_funding ? anchors : undefined;
           let isDone = false;
           const isSelfPublish = !!args.is_avoiding_broadcast;
 
+          const commit = !!channel.is_simplified_taproot ? taproot : baseType;
+
           const channelOpen = args.lnd[type][method]({
             base_fee: channel.base_fee_mtokens || undefined,
             close_address: channel.cooperative_close_address || undefined,
-            commitment_type: channel.is_trusted_funding ? anchors : undefined,
+            commitment_type: commit,
             fee_rate: channel.fee_rate,
             funding_shim: {
               psbt_shim: {

package/lnd_responses/constants.json

@@ -18,10 +18,12 @@
     "ANCHORS": "anchor",
     "LEGACY": "original",
     "SCRIPT_ENFORCED_LEASE": "anchor_with_lease_constraint",
+    "SIMPLE_TAPROOT": "simplified_taproot",
     "STATIC_REMOTE_KEY": "original_with_static_to_remote"
   },
   "commitmentTypes": {
     "anchor": "ANCHORS",
+    "simplified_taproot": "SIMPLE_TAPROOT",
     "static_remote_key": "STATIC_REMOTE_KEY",
     "variable_remote_key": "LEGACY"
   },

package/package.json

@@ -8,9 +8,9 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "1.9.1",
-    "@grpc/proto-loader": "0.7.8",
+    "@grpc/proto-loader": "0.7.9",
     "@types/express": "4.17.17",
-    "@types/node": "20.5.3",
+    "@types/node": "20.5.7",
     "@types/request": "2.48.8",
     "@types/ws": "8.5.5",
     "async": "3.2.4",
@@ -26,13 +26,13 @@
     "invoices": "3.0.0",
     "psbt": "3.0.0",
     "tiny-secp256k1": "2.2.3",
-    "type-fest": "4.2.0"
+    "type-fest": "4.3.1"
   },
   "description": "Lightning Network client library",
   "devDependencies": {
     "@alexbosworth/node-fetch": "2.6.2",
-    "tsd": "0.28.1",
-    "typescript": "5.1.6",
+    "tsd": "0.29.0",
+    "typescript": "5.2.2",
     "ws": "8.13.0"
   },
   "engines": {
@@ -59,5 +59,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "9.11.3"
+  "version": "9.13.0"
 }