ln-service 56.12.0 → 56.13.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 56.13.0
+
+- `openChannels`: Add `is_simplified_taproot` to make a simplified taproot chan
+
 ## 56.12.0
 
 - `openChannel`: Add `is_simplified_taproot` to make a simplified taproot chan

package/README.md

@@ -3830,6 +3830,9 @@ as well as a channel open request listener to accept the trusted funding.
 
 `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>
@@ -3839,6 +3842,7 @@ as well as a channel open request listener to accept the trusted funding.
         [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>

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "3.0.0",
-    "lightning": "9.12.0",
+    "lightning": "9.13.0",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
@@ -69,5 +69,5 @@
     "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && node test/runner"
   },
-  "version": "56.12.0"
+  "version": "56.13.0"
 }

package/test/integration/test_open_simplified_taproot.js

@@ -5,8 +5,13 @@ const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 
 const {addPeer} = require('./../../');
+const {broadcastChainTransaction} = require('./../../');
+const {fundPendingChannels} = require('./../../');
+const {fundPsbt} = require('./../../');
 const {getChannels} = require('./../../');
 const {openChannel} = require('./../../');
+const {openChannels} = require('./../../');
+const {signPsbt} = require('./../../');
 
 const channelCapacityTokens = 1e6;
 const count = 100;
@@ -107,5 +112,63 @@ test(`Open simplified taproot channel`, async () => {
     await kill({});
   }
 
+  // Try opening a simplified taproot channel via PSBT funding
+  {
+    const {kill, nodes} = await spawnLightningCluster({
+      size,
+      lnd_configuration: ['--protocol.simple-taproot-chans'],
+    });
+
+    const [{generate, id, lnd}, target] = nodes;
+
+    await generate({count});
+
+    await addPeer({lnd, public_key: target.id, socket: target.socket});
+
+    const channelOpen = await asyncRetry({interval, times}, async () => {
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
+
+      return await openChannels({
+        lnd,
+        channels: [{
+          capacity: channelCapacityTokens,
+          is_private: true,
+          is_simplified_taproot: true,
+          partner_public_key: target.id,
+        }],
+      });
+    });
+
+    const funded = await fundPsbt({lnd, outputs: channelOpen.pending});
+
+    const signed = await signPsbt({lnd, psbt: funded.psbt});
+
+    await fundPendingChannels({
+      lnd,
+      channels: channelOpen.pending.map(n => n.id),
+      funding: signed.psbt,
+    });
+
+    await broadcastChainTransaction({lnd, transaction: signed.transaction});
+
+    const channel = await asyncRetry({interval, times}, async () => {
+      await generate({});
+
+      const {channels} = await getChannels({lnd});
+
+      const [channel] = channels;
+
+      if (!channel) {
+        throw new Error('ExpectedChannelOpened');
+      }
+
+      return channel;
+    });
+
+    equal(channel.type, 'simplified_taproot', 'Opened simplified taproot');
+
+    await kill({});
+  }
+
   return;
 });