ln-service 59.2.3 → 59.2.5

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 59.2.3
+## 59.2.5
 
 - Add support for LND 0.20.2
 

package/package.json

@@ -8,13 +8,13 @@
   },
   "dependencies": {
     "bolt07": "1.9.5",
-    "invoices": "5.0.2",
-    "lightning": "12.2.3",
+    "invoices": "6.0.5",
+    "lightning": "12.2.4",
     "macaroon": "3.0.4"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
-    "@alexbosworth/blockchain": "3.2.0",
+    "@alexbosworth/blockchain": "4.0.0",
     "@alexbosworth/node-fetch": "2.6.2",
     "async": "3.2.6",
     "asyncjs-util": "1.2.12",
@@ -58,5 +58,5 @@
     "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.3"
+  "version": "59.2.5"
 }

package/test/integration/test_propose_channel.js

@@ -8,6 +8,7 @@ const {combinePsbts} = require('psbt');
 const {decodePsbt} = require('psbt');
 const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
+const {idForTransaction} = require('@alexbosworth/blockchain');
 const {networks} = require('bitcoinjs-lib');
 const {payments} = require('bitcoinjs-lib');
 const {script} = require('bitcoinjs-lib');
@@ -37,6 +38,7 @@ const family = 0;
 const feeRate = 1;
 const {fromHex} = Transaction;
 const fundingFee = 190; // Vsize of 2 input, 1 output tx
+const idForTx = transaction => idForTransaction({transaction}).id;
 const interval = 100;
 const keyIndex = 0;
 const network = 'regtest';
@@ -144,18 +146,6 @@ test(`Propose a channel with a coop delay`, async () => {
       psbt: targetFundPsbt.psbt,
     });
 
-    // Decode the control funded PSBT
-    const controlPsbt = decodePsbt({ecp, psbt: controlFundPsbt.psbt});
-
-    // Decode the target funded PSBT
-    const targetPsbt = decodePsbt({ecp, psbt: targetFundPsbt.psbt});
-
-    // Derive the id of the control pre-funding tx
-    const controlId = fromHex(controlPsbt.unsigned_transaction).getId();
-
-    // Derive the id of the target pre-funding tx
-    const targetId = fromHex(targetPsbt.unsigned_transaction).getId();
-
     // Derive a new control key for a 2:2 multisig
     const controlMultiSigKey = await getPublicKey({family, lnd});
 
@@ -185,11 +175,11 @@ test(`Propose a channel with a coop delay`, async () => {
       }],
       utxos: [
         {
-          id: fromHex(controlSignPsbt.transaction).getId(),
+          id: idForTx(controlSignPsbt.transaction),
           vout: controlFundPsbt.outputs.findIndex(n => !n.is_change),
         },
         {
-          id: fromHex(targetSignPsbt.transaction).getId(),
+          id: idForTx(targetSignPsbt.transaction),
           vout: targetFundPsbt.outputs.findIndex(n => !n.is_change),
         },
       ],
@@ -221,7 +211,7 @@ test(`Propose a channel with a coop delay`, async () => {
 
     const fundingTx = fromHex(finalFundingPsbt.unsigned_transaction);
 
-    const fundingTxId = fundingTx.getId();
+    const fundingTxId = idForTx(finalFundingPsbt.unsigned_transaction);
 
     const fundingTxVout = fundingTx.outs.findIndex(n => n.value === capacity);