ln-service 56.4.0 → 56.5.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 56.5.1
+
+- `getPendingChannels`: Fix returning closing transaction id for waiting close
+
+## 56.5.0
+
+- `getWalletInfo`: Add support for LND 0.16.3
+
 ## 56.4.0
 
 - `getChannels`: Add `description` to show the channel description

package/README.md

@@ -9,7 +9,7 @@ through npm.
 
 Supported LND versions:
 
-- v0.16.0-beta to v0.16.2-beta
+- v0.16.0-beta to v0.16.3-beta
 - v0.15.2-beta to v0.15.5-beta
 - v0.14.4-beta to v0.14.5-beta
 

package/package.json

@@ -11,31 +11,31 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.3",
-    "lightning": "9.4.0",
+    "lightning": "9.5.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
-    "@alexbosworth/blockchain": "1.3.0",
+    "@alexbosworth/blockchain": "1.4.0",
     "@alexbosworth/tap": "15.0.12",
     "@alexbosworth/node-fetch": "2.6.2",
     "async": "3.2.4",
     "asyncjs-util": "1.2.11",
     "bip32": "4.0.0",
     "bip66": "1.1.5",
-    "bitcoinjs-lib": "6.1.0",
+    "bitcoinjs-lib": "6.1.2",
     "bn.js": "5.2.1",
     "bs58check": "3.0.1",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "5.0.4",
+    "ln-docker-daemons": "5.0.5",
     "p2tr": "1.3.3",
     "portfinder": "1.0.32",
     "psbt": "2.7.2",
     "rimraf": "5.0.1",
     "secp256k1": "5.0.0",
-    "tiny-secp256k1": "2.2.1",
+    "tiny-secp256k1": "2.2.2",
     "uuid": "9.0.0",
     "varuint-bitcoin": "1.1.2"
   },
@@ -57,6 +57,7 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.16.3": "DOCKER_LND_VERSION=v0.16.3-beta npm run test",
     "integration-test-0.16.2": "DOCKER_LND_VERSION=v0.16.2-beta npm run test",
     "integration-test-0.16.1": "DOCKER_LND_VERSION=v0.16.1-beta npm run test",
     "integration-test-0.16.0": "DOCKER_LND_VERSION=v0.16.0-beta npm run test",
@@ -68,5 +69,5 @@
     "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 200 test/autopilotrpc-integration/*.js test/chainrpc-integration/*.js test/integration/*.js test/invoicesrpc-integration/*.js test/peersrpc-integration/*.js test/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "56.4.0"
+  "version": "56.5.1"
 }

package/test/integration/test_delete_pending_channel.js

@@ -2,6 +2,7 @@ const {once} = require('events');
 
 const asyncEach = require('async/each');
 const asyncRetry = require('async/retry');
+const asyncTimeout = require('async/timeout');
 const {extractTransaction} = require('psbt');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
@@ -63,11 +64,13 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
     const channels = [{capacity, partner_public_key: target.id}];
 
     // Propose a channel to target
-    const proposeToTarget = await asyncRetry({interval, times}, async () => {
-      return await race([
-        delay(timeout),
-        openChannels({channels, lnd, is_avoiding_broadcast: true}),
-      ]);
+    const proposeToTarget = await asyncRetry({interval, times}, cbk => {
+      return asyncTimeout(openChannels, 1000 * 10)({
+        channels,
+        lnd,
+        is_avoiding_broadcast: true,
+      },
+      cbk);
     });
 
     // Setup funding for the target
@@ -93,14 +96,13 @@ test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {
     });
 
     // Propose a channel to remote
-    const proposeToRemote = await asyncRetry({interval, times}, async () => {
-      return await race([
-        delay(timeout),
-        openChannels({lnd,
-          channels: [{capacity, partner_public_key: remote.id}],
-          is_avoiding_broadcast: true,
-        }),
-      ]);
+    const proposeToRemote = await asyncRetry({interval, times}, cbk => {
+      return asyncTimeout(openChannels, 1000 * 10)({
+        lnd,
+        channels: [{capacity, partner_public_key: remote.id}],
+        is_avoiding_broadcast: true,
+      },
+      cbk);
     });
 
     // Setup funding for the remote, using the same inputs

package/test/integration/test_get_pending_coop.js

@@ -53,7 +53,6 @@ test(`Get pending channels`, async ({end, equal}) => {
     }
 
     equal(channel.capacity, 1000000, 'Got channel capacity');
-    equal(channel.close_transaction_id, undefined, 'No close tx id');
     equal(channel.is_active, false, 'Ended');
     equal(channel.is_closing, true, 'Closing');
     equal(channel.is_opening, false, 'Not Opening');

package/test/integration/test_get_pending_force.js

@@ -69,7 +69,6 @@ test(`Get pending channels`, async ({end, equal}) => {
   }
 
   equal(pendingOpen.capacity, 1000000, 'Got channel opening capacity');
-  equal(pendingOpen.close_transaction_id, undefined, 'Not closing');
   equal(pendingOpen.is_active, false, 'Not active yet');
   equal(pendingOpen.is_closing, false, 'Not closing yet');
   equal(pendingOpen.is_opening, true, 'Channel is opening');
@@ -113,7 +112,6 @@ test(`Get pending channels`, async ({end, equal}) => {
   }
 
   equal(waitClose.capacity, 1000000, 'Got channel closing capacity');
-  equal(waitClose.close_transaction_id, undefined, 'Waiting for close tx');
   equal(waitClose.is_active, false, 'Not active yet');
   equal(waitClose.is_closing, true, 'Channel is closing');
   equal(waitClose.is_opening, false, 'Not opening channel');

package/test/integration/test_send_to_chain_address.js

@@ -1,5 +1,4 @@
 const asyncRetry = require('async/retry');
-const {address} = require('bitcoinjs-lib');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 

package/test/macros/wait_for_utxo.js

@@ -1,5 +1,4 @@
 const asyncRetry = require('async/retry');
-const {Transaction} = require('bitcoinjs-lib');
 
 const {getUtxos} = require('./../../');
 
@@ -10,9 +9,8 @@ const times = 10;
 
   {
     [confirmations]: <Confirmations Count Number>
-    [id]: <Transaction Id Hex String>
+    id: <Transaction Id Hex String>
     lnd: <Authenticated LND gRPC API Object>
-    [transaction]: <Raw Transaction Hex String>
   }
 
   @returns via cbk
@@ -26,24 +24,22 @@ const times = 10;
     transaction_vout: <Transaction Output Index Number>
   }
 */
-module.exports = ({confirmations, id, lnd, transaction}, cbk) => {
+module.exports = ({confirmations, id, lnd}, cbk) => {
   if (!lnd || !lnd.default) {
     return cbk([400, 'ExpectedAuthenticatedLndToWaitForUtxo']);
   }
 
-  if (!transaction && !id) {
+  if (!id) {
     return cbk([400, 'ExpectedTransactionOrIdToWaitForUtxo']);
   }
 
-  const txId = id || Transaction.fromHex(transaction).getId();
-
   return asyncRetry({interval, times}, cbk => {
     return getUtxos({lnd}, (err, res) => {
       if (!!err) {
         return cbk(err);
       }
 
-      const utxo = res.utxos.find(n => n.transaction_id === txId);
+      const utxo = res.utxos.find(n => n.transaction_id === id);
 
       if (!utxo) {
         return cbk([503, 'ExpectedToFindUtxoButUtxoNotFound']);

package/test/signerrpc-integration/test_begin_group_signing_session.js

@@ -5,7 +5,7 @@ const {createPsbt} = require('psbt');
 const {hashForTree} = require('p2tr');
 const {leafHash} = require('p2tr');
 const {networks} = require('bitcoinjs-lib');
-const {script} = require('bitcoinjs-lib');
+const {scriptElementsAsScript} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
@@ -21,7 +21,7 @@ const {getUtxos} = require('./../../');
 const {signPsbt} = require('./../../');
 const {updateGroupSigningSession} = require('./../../');
 
-const {compile} = script;
+const compile = elements => scriptElementsAsScript({elements}).script;
 const count = 100;
 const defaultInternalKey = '0350929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0';
 const {from} = Buffer;
@@ -189,7 +189,7 @@ test(`Begin group signing session`, async ({end, equal}) => {
 
     const witnessScript = compile([xOnlyUnused, OP_CHECKSIG]);
 
-    const branches = [{script: witnessScript.toString('hex')}];
+    const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 
@@ -329,7 +329,7 @@ test(`Begin group signing session`, async ({end, equal}) => {
 
     const witnessScript = compile([scriptKey, OP_CHECKSIG]);
 
-    const branches = [{script: witnessScript.toString('hex')}];
+    const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 
@@ -376,7 +376,7 @@ test(`Begin group signing session`, async ({end, equal}) => {
         [hexAsBuffer(output.script)],
         [tokens],
         Transaction.SIGHASH_DEFAULT,
-        hexAsBuffer(leafHash({script: witnessScript.toString('hex')}).hash),
+        hexAsBuffer(leafHash({script: witnessScript}).hash),
       );
     });
 
@@ -404,7 +404,7 @@ test(`Begin group signing session`, async ({end, equal}) => {
 
     const {block} = controlBlock({
       external_key: output.external_key,
-      leaf_script: witnessScript.toString('hex'),
+      leaf_script: witnessScript,
       script_branches: branches,
     });
 
@@ -412,7 +412,7 @@ test(`Begin group signing session`, async ({end, equal}) => {
     tx.ins.forEach((input, i) => {
       return tx.setWitness(i, [
         hexAsBuffer(signature),
-        witnessScript,
+        hexAsBuffer(witnessScript),
         hexAsBuffer(block),
       ]);
     });

package/test/signerrpc-integration/test_sign_taproot.js

@@ -5,6 +5,7 @@ const {createPsbt} = require('psbt');
 const {hashForTree} = require('p2tr');
 const {networks} = require('bitcoinjs-lib');
 const {script} = require('bitcoinjs-lib');
+const {scriptElementsAsScript} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
@@ -20,7 +21,7 @@ const {getUtxos} = require('./../../');
 const {signPsbt} = require('./../../');
 const {signTransaction} = require('./../../');
 
-const {compile} = script;
+const compile = elements => scriptElementsAsScript({elements}).script;
 const count = 100;
 const defaultInternalKey = '0350929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0';
 const {fromHex} = Transaction;
@@ -93,7 +94,7 @@ test(`Sign a taproot transaction`, async ({end, equal}) => {
 
     const witnessScript = compile([publicKey.slice(1), OP_CHECKSIG]);
 
-    const branches = [{script: witnessScript.toString('hex')}];
+    const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 
@@ -144,7 +145,7 @@ test(`Sign a taproot transaction`, async ({end, equal}) => {
         root_hash: hash,
         sighash: Transaction.SIGHASH_DEFAULT,
         vin: 0,
-        witness_script: witnessScript.toString('hex'),
+        witness_script: witnessScript,
       }],
       transaction: tx.toHex(),
     });
@@ -153,7 +154,7 @@ test(`Sign a taproot transaction`, async ({end, equal}) => {
 
     const {block} = controlBlock({
       external_key: output.external_key,
-      leaf_script: witnessScript.toString('hex'),
+      leaf_script: witnessScript,
       script_branches: branches,
     });
 
@@ -161,7 +162,7 @@ test(`Sign a taproot transaction`, async ({end, equal}) => {
     tx.ins.forEach((input, i) => {
       return tx.setWitness(i, [
         signature,
-        witnessScript,
+        hexAsBuffer(witnessScript),
         hexAsBuffer(block),
       ]);
     });
@@ -193,7 +194,7 @@ test(`Sign a taproot transaction`, async ({end, equal}) => {
 
     const witnessScript = compile([unusedKey.publicKey.slice(1), OP_CHECKSIG]);
 
-    const branches = [{script: witnessScript.toString('hex')}];
+    const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 

package/test/walletrpc-integration/test_fund_psbt.js

@@ -8,7 +8,7 @@ const {leafHash} = require('p2tr');
 const {networks} = require('bitcoinjs-lib');
 const {pointAdd} = require('tiny-secp256k1');
 const {privateAdd} = require('tiny-secp256k1');
-const {script} = require('bitcoinjs-lib');
+const {scriptElementsAsScript} = require('@alexbosworth/blockchain');
 const {signHash} = require('p2tr');
 const {signSchnorr} = require('tiny-secp256k1');
 const {spawnLightningCluster} = require('ln-docker-daemons');
@@ -27,7 +27,7 @@ const {sendToChainAddress} = require('./../../');
 const {signPsbt} = require('./../../');
 
 const chainAddressRowType = 'chain_address';
-const {compile} = script;
+const compile = elements => scriptElementsAsScript({elements}).script;
 const confirmationCount = 6;
 const count = 100;
 const defaultInternalKey = '0350929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0';
@@ -135,7 +135,7 @@ test(`Fund PSBT`, async ({end, equal}) => {
 
     const witnessScript = compile([unusedKey.publicKey.slice(1), OP_CHECKSIG]);
 
-    const branches = [{script: witnessScript.toString('hex')}];
+    const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 
@@ -231,7 +231,7 @@ test(`Fund PSBT`, async ({end, equal}) => {
 
     const witnessScript = compile([keyPair.publicKey.slice(1), OP_CHECKSIG]);
 
-    const branches = [{script: witnessScript.toString('hex')}];
+    const branches = [{script: witnessScript}];
 
     const {hash} = hashForTree({branches});
 
@@ -278,7 +278,7 @@ test(`Fund PSBT`, async ({end, equal}) => {
         [hexAsBuffer(output.script)],
         [tokens],
         Transaction.SIGHASH_DEFAULT,
-        hexAsBuffer(leafHash({script: witnessScript.toString('hex')}).hash),
+        hexAsBuffer(leafHash({script: witnessScript}).hash),
       );
     });
 
@@ -286,7 +286,7 @@ test(`Fund PSBT`, async ({end, equal}) => {
 
     const {block} = controlBlock({
       external_key: output.external_key,
-      leaf_script: witnessScript.toString('hex'),
+      leaf_script: witnessScript,
       script_branches: branches,
     });
 
@@ -294,7 +294,7 @@ test(`Fund PSBT`, async ({end, equal}) => {
     tx.ins.forEach((input, i) => {
       return tx.setWitness(i, [
         signature,
-        witnessScript,
+        hexAsBuffer(witnessScript),
         hexAsBuffer(block),
       ]);
     });

package/test/walletrpc-integration/test_send_to_chain_output_scripts.js

@@ -1,6 +1,6 @@
 const asyncRetry = require('async/retry');
 const {componentsOfTransaction} = require('@alexbosworth/blockchain');
-const {script} = require('bitcoinjs-lib');
+const {scriptElementsAsScript} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
@@ -9,7 +9,6 @@ const {sendToChainOutputScripts} = require('./../../');
 
 const asBuf = hex => Buffer.from(hex, 'hex');
 const asHex = buffer => buffer.toString('hex');
-const {compile} = script;
 const confirmationCount = 6;
 const count = 100;
 const interval = 10;
@@ -26,9 +25,11 @@ test(`Send to chain output scripts`, async ({end, equal, strictSame}) => {
 
   await generate({count});
 
-  const script = [].concat(OP_RETURN).concat(asBuf(target.id));
+  const elements = [].concat(OP_RETURN).concat(asBuf(target.id));
 
-  const sendTo = [{tokens, script: asHex(compile(script))}];
+  const {script} = scriptElementsAsScript({elements});
+
+  const sendTo = [{script, tokens}];
 
   const sent = await sendToChainOutputScripts({lnd, send_to: sendTo});
 

package/test/walletrpc-integration/test_sign_psbt.js

@@ -1,9 +1,9 @@
 const asyncRetry = require('async/retry');
+const {componentsOfTransaction} = require('@alexbosworth/blockchain');
 const {decodePsbt} = require('psbt');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
-const {Transaction} = require('bitcoinjs-lib');
 
 const {broadcastChainTransaction} = require('./../../');
 const {createChainAddress} = require('./../../');
@@ -70,7 +70,7 @@ test(`Sign PSBT`, async ({end, equal}) => {
 
   const finalized = await signPsbt({lnd: control.lnd, psbt: funded.psbt});
 
-  const tx = Transaction.fromHex(finalized.transaction);
+  const tx = componentsOfTransaction({transaction: finalized.transaction});
 
   const decoded = decodePsbt({ecp, psbt: finalized.psbt});