ln-service 59.2.5 → 59.3.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Versions
 
+## 59.3.0
+
+- `parsePaymentRequest`: Add `signet` support
+
+## 59.2.6
+
+- Add support for LND 0.21.2
+- Add support for LND 0.20.3
+
 ## 59.2.5
 
 - Add support for LND 0.20.2

package/README.md

@@ -9,8 +9,8 @@ through npm.
 
 Supported LND versions:
 
-- v0.21.0-beta to v0.21.1-beta
-- v0.20.0-beta to v0.20.2-beta
+- v0.21.0-beta to v0.21.2-beta
+- v0.20.0-beta to v0.20.3-beta
 
 For typescript-ready methods, check out https://github.com/alexbosworth/lightning#readme
 

package/package.json

@@ -8,13 +8,13 @@
   },
   "dependencies": {
     "bolt07": "1.9.5",
-    "invoices": "6.0.5",
-    "lightning": "12.2.4",
+    "invoices": "6.1.0",
+    "lightning": "12.2.5",
     "macaroon": "3.0.4"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
-    "@alexbosworth/blockchain": "4.0.0",
+    "@alexbosworth/blockchain": "4.1.0",
     "@alexbosworth/node-fetch": "2.6.2",
     "async": "3.2.6",
     "asyncjs-util": "1.2.12",
@@ -51,12 +51,14 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.21.2": "DOCKER_LND_VERSION=v0.21.2-beta npm run test",
     "integration-test-0.21.1": "DOCKER_LND_VERSION=v0.21.1-beta npm run test",
     "integration-test-0.21.0": "DOCKER_LND_VERSION=v0.21.0-beta npm run test",
+    "integration-test-0.20.3": "DOCKER_LND_VERSION=v0.20.3-beta npm run test",
     "integration-test-0.20.2": "DOCKER_LND_VERSION=v0.20.2-beta npm run test",
     "integration-test-0.20.1": "DOCKER_LND_VERSION=v0.20.1-beta npm run test",
     "integration-test-0.20.0": "DOCKER_LND_VERSION=v0.20.0-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && node test/runner"
   },
-  "version": "59.2.5"
+  "version": "59.3.0"
 }

package/test/integration/test_propose_channel.js

@@ -10,6 +10,8 @@ const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
 const {idForTransaction} = require('@alexbosworth/blockchain');
 const {networks} = require('bitcoinjs-lib');
+const {p2msScript} = require('@alexbosworth/blockchain');
+const {p2wshOutputScript} = require('@alexbosworth/blockchain');
 const {payments} = require('bitcoinjs-lib');
 const {script} = require('bitcoinjs-lib');
 const {spawnLightningCluster} = require('ln-docker-daemons');
@@ -31,6 +33,7 @@ const {proposeChannel} = require('./../../');
 const {signPsbt} = require('./../../');
 const {signTransaction} = require('./../../');
 
+const bufferAsHex = buffer => buffer.toString('hex');
 const capacity = 1e6;
 const {ceil} = Math;
 const cooperativeCloseDelay = 2016;
@@ -42,7 +45,6 @@ const idForTx = transaction => idForTransaction({transaction}).id;
 const interval = 100;
 const keyIndex = 0;
 const network = 'regtest';
-const {p2ms} = payments;
 const {p2pkh} = payments;
 const {regtest} = networks;
 const reserveRatio = 0.01;
@@ -158,19 +160,19 @@ test(`Propose a channel with a coop delay`, async () => {
     ];
 
     // Make the channel 2:2 funding output from control and target keys
-    const dualFundingChannelAddress = payments.p2wsh({
-      redeem: p2ms({
-        m: fundingMultiSigKeys.length,
-        pubkeys: fundingMultiSigKeys.sort().map(n => Buffer.from(n, 'hex')),
-      }),
+    const dualFundingChannelOutputScript = p2wshOutputScript({
+      hash: p2msScript({
+        keys: fundingMultiSigKeys.sort().map(n => Buffer.from(n, 'hex')),
+        required: fundingMultiSigKeys.length,
+      }).hash,
     });
 
-    const pendingChannelId = dualFundingChannelAddress.hash;
+    const pendingChannelId = dualFundingChannelOutputScript.script.slice(2);
 
     // Create the basic PSBT that spends temporary funds to the 2:2 funding
     const dualFundPsbt = createPsbt({
       outputs: [{
-        script: dualFundingChannelAddress.output.toString('hex'),
+        script: bufferAsHex(dualFundingChannelOutputScript.script),
         tokens: capacity,
       }],
       utxos: [
@@ -235,7 +237,7 @@ test(`Propose a channel with a coop delay`, async () => {
       inputs: [{
         key_family: temporaryFamily,
         key_index: controlDerivedKey.index,
-        output_script: dualFundingChannelAddress.output.toString('hex'),
+        output_script: bufferAsHex(dualFundingChannelOutputScript.script),
         output_tokens: giveTokens + ceil(fundingFee / temporaryKeys.length),
         sighash: Transaction.SIGHASH_ALL,
         vin: controlVin,
@@ -267,7 +269,7 @@ test(`Propose a channel with a coop delay`, async () => {
       inputs: [{
         key_family: temporaryFamily,
         key_index: targetDerivedKey.index,
-        output_script: dualFundingChannelAddress.output.toString('hex'),
+        output_script: bufferAsHex(dualFundingChannelOutputScript.script),
         output_tokens: giveTokens + ceil(fundingFee / temporaryKeys.length),
         sighash: Transaction.SIGHASH_ALL,
         vin: targetVin,