ln-service 56.3.1 → 56.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Versions
 
+## 56.5.0
+
+- `getWalletInfo`: Add support for LND 0.16.3
+
+## 56.4.0
+
+- `getChannels`: Add `description` to show the channel description
+- `openChannel`, `openChannels`, `proposeChannel`: Add `description` to set
+    the channel description
+- `subscribeToChannels`: Add `description` to `channel_opened`
+- `subscribeToRpcRequests`: Add `description` to `open_channel_request`
+
 ## 56.3.1
 
 - `subscribeToPastPayment`, `subscribeToPayViaDetails`,

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
 
@@ -1684,6 +1684,8 @@ Requires `offchain:read` permission
 
 `is_trusted_funding` is not supported on LND 0.15.0 and below
 
+`description` is not supported on LND 0.16.3 and below
+
     {
       [is_active]: <Limit Results To Only Active Channels Bool> // false
       [is_offline]: <Limit Results To Only Offline Channels Bool> // false
@@ -1701,6 +1703,7 @@ Requires `offchain:read` permission
         commit_transaction_weight: <Commit Transaction Weight Number>
         [cooperative_close_address]: <Coop Close Restricted to Address String>
         [cooperative_close_delay_height]: <Prevent Coop Close Until Height Number>
+        [description]: <Channel Description String>
         id: <Standard Format Channel Id String>
         is_active: <Channel Active Bool>
         is_closing: <Channel Is Closing Bool>
@@ -3698,12 +3701,15 @@ Requires `offchain:write`, `onchain:write`, `peers:write` permissions
 `base_fee_mtokens` is not supported on LND 0.15.5 and below
 `fee_rate` is not supported on LND 0.15.5 and below
 
-`is_max_funding` is not supported on LND 0.16.0 and below
+`is_max_funding` is not supported on LND 0.16.3 and below
+
+`description` is not supported on LND 0.16.3 and below
 
     {
       [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
       [chain_fee_tokens_per_vbyte]: <Chain Fee Tokens Per VByte Number>
       [cooperative_close_address]: <Restrict Cooperative Close To Address String>
+      [description]: <Immutable Channel Description String>
       [fee_rate]: <Routing Fee Rate In Millitokens Per Million Number>
       [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
       [is_max_funding]: <Use Maximal Chain Funds For Local Funding Bool>
@@ -3754,11 +3760,14 @@ as well as a channel open request listener to accept the trusted funding.
 `base_fee_mtokens` is not supported on LND 0.15.5 and below
 `fee_rate` is not supported on LND 0.15.5 and below
 
+`description` is not supported on LND 0.16.3 and below
+
     {
       channels: [{
         [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
         capacity: <Channel Capacity Tokens Number>
         [cooperative_close_address]: <Restrict Coop Close To Address String>
+        [description]: <Immutable Channel Description String>
         [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
@@ -4384,10 +4393,13 @@ Requires `address:read`, `offchain:write`, `onchain:write` permissions
 
 Requires LND compiled with `walletrpc` build tag
 
+`description` is not supported on LND 0.16.3 and below
+
     {
       capacity: <Channel Capacity Tokens Number>
       [cooperative_close_address]: <Restrict Cooperative Close To Address String>
       [cooperative_close_delay]: <Cooperative Close Relative Delay Number>
+      [description]: <Immutable Channel Description String>
       [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
       id: <Pending Channel Id Hex String>
       [is_private]: <Channel is Private Bool> // Defaults to false
@@ -5251,6 +5263,8 @@ Requires `offchain:read` permission
 
 `is_trusted_funding`, `other_ids` are not supported on LND 0.15.0 and below
 
+`description` is not supported on LND 0.16.3 and below
+
     {
       lnd: <Authenticated LND API Object>
     }
@@ -5308,6 +5322,7 @@ Requires `offchain:read` permission
       commit_transaction_weight: <Commit Transaction Weight Number>
       [cooperative_close_address]: <Coop Close Restricted to Address String>
       [cooperative_close_delay_height]: <Prevent Coop Close Until Height Number>
+      [description]: <Channel Description String>
       id: <Standard Format Channel Id String>
       is_active: <Channel Active Bool>
       is_closing: <Channel Is Closing Bool>
@@ -6790,6 +6805,8 @@ LND must be running with "RPC middleware" enabled: `rpcmiddleware.enable=1`
 
 This method is not supported in LND 0.13.4 and below
 
+`description` is not supported on LND 0.16.3 and below
+
     {
       [id]: <RPC Middleware Interception Name String>
       [is_intercepting_close_channel_requests]: <Intercept Channel Closes Bool>
@@ -6833,6 +6850,7 @@ This method is not supported in LND 0.13.4 and below
         [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
         [chain_fee_tokens_per_vbyte]: <Chain Fee Tokens Per VByte Number>
         [cooperative_close_address]: <Prefer Cooperative Close To Address String>
+        [description]: <Immutable Channel Description String>
         [fee_rate]: <Routing Fee Rate In Millitokens Per Million Number>
         [give_tokens]: <Tokens to Gift To Partner Number>
         [is_private]: <Channel is Private Bool>

package/package.json

@@ -11,30 +11,31 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.3",
-    "lightning": "9.3.1",
+    "lightning": "9.5.0",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
+    "@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.3",
+    "ln-docker-daemons": "5.0.5",
     "p2tr": "1.3.3",
     "portfinder": "1.0.32",
     "psbt": "2.7.2",
-    "rimraf": "5.0.0",
+    "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"
   },
@@ -56,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",
@@ -67,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.3.1"
+  "version": "56.5.0"
 }

package/test/chainrpc-integration/test_get_block.js

@@ -1,15 +1,10 @@
-const asyncRetry = require('async/retry');
-const {Block} = require('bitcoinjs-lib');
+const {idForBlock} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const {getBlock} = require('./../../');
 const {getHeight} = require('./../../');
 
-const confirmationCount = 6;
-const {fromHex} = Block;
-const times = 100;
-
 // Get height should return height
 test(`Get height`, async ({end, equal, fail}) => {
   const {nodes} = await spawnLightningCluster({});
@@ -25,7 +20,7 @@ test(`Get height`, async ({end, equal, fail}) => {
   try {
     const {block} = await getBlock({lnd, id: blockchain.current_block_hash});
 
-    equal(fromHex(block).getId(), hash, 'Got block');
+    equal(idForBlock({block}).id, hash, 'Got block');
   } catch (err) {
     const [code, message] = err;
 
@@ -40,8 +35,7 @@ test(`Get height`, async ({end, equal, fail}) => {
   // Try getting a block by the height
   try {
     const {block} = await getBlock({height, lnd});
-
-    equal(fromHex(block).getId(), hash, 'Got block for height');
+    equal(idForBlock({block}).id, hash, 'Got block for height');
   } catch (err) {
     equal(err, null, 'Expected no error');
   }
@@ -50,7 +44,7 @@ test(`Get height`, async ({end, equal, fail}) => {
   try {
     const {block} = await getBlock({lnd});
 
-    equal(fromHex(block).getId(), hash, 'Got chain tip block');
+    equal(idForBlock({block}).id, hash, 'Got chain tip block');
   } catch (err) {
     equal(err, null, 'Expected no error');
   }

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_open_channel.js

@@ -15,6 +15,7 @@ const count = 100;
 const defaultBaseFee = '1000';
 const defaultFee = 1e3;
 const defaultVout = 0;
+const description = 'description';
 const feeRate = 420;
 const giftTokens = 1000;
 const interval = 250;
@@ -36,6 +37,7 @@ test(`Open channel`, async ({end, equal}) => {
     await addPeer({lnd, public_key: target.id, socket: target.socket});
 
     return await openChannel({
+      description,
       lnd,
       base_fee_mtokens: baseFee,
       chain_fee_tokens_per_vbyte: defaultFee,
@@ -62,6 +64,10 @@ test(`Open channel`, async ({end, equal}) => {
       throw new Error('ExpectedChannelOpened');
     }
 
+    if (!!channel.description) {
+      equal(channel.description, description, 'Description set');
+    }
+
     const {policies} = await getChannel({lnd, id: channel.id});
 
     const policy = policies.find(n => n.public_key === id);

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/integration/test_subscribe_to_channels.js

@@ -12,6 +12,7 @@ const {subscribeToChannels} = require('./../../');
 
 const channelCapacityTokens = 1e6;
 const defaultFee = 1e3;
+const description = 'description';
 const giveTokens = 1e5;
 const interval = 100;
 const size = 2;
@@ -56,6 +57,7 @@ test('Subscribe to channels', async ({end, equal, fail}) => {
 
     // Create a channel from the control to the target node
     return await openChannel({
+      description,
       lnd,
       socket,
       chain_fee_tokens_per_vbyte: defaultFee,
@@ -105,6 +107,11 @@ test('Subscribe to channels', async ({end, equal, fail}) => {
     equal(openEvent.local_balance, 890950, 'Channel local balance returned');
   }
 
+  // LND 0.16.3 and below do not support channel descriptions
+  if (!!openEvent.description) {
+    equal(openEvent.description, description, 'Got channel open description');
+  }
+
   equal(openEvent.capacity, channelCapacityTokens, 'Channel open capacity');
   equal(!!openEvent.id, true, 'Channel id is returned');
   equal(openEvent.is_active, true, 'Channel is active');

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,18 +1,16 @@
 const asyncRetry = require('async/retry');
-const {script} = require('bitcoinjs-lib');
+const {componentsOfTransaction} = require('@alexbosworth/blockchain');
+const {scriptElementsAsScript} = require('@alexbosworth/blockchain');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
-const {Transaction} = require('bitcoinjs-lib');
 
 const {getChainTransactions} = require('./../../');
 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 {fromHex} = Transaction;
 const interval = 10;
 const OP_RETURN = 0x6a;
 const size = 2;
@@ -27,15 +25,16 @@ 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});
 
-  const outs = fromHex(sent.transaction).outs
-    .filter(n => n.value === tokens)
-    .map(({script, value}) => ({script: asHex(script), tokens: value}));
+  const outs = componentsOfTransaction({transaction: sent.transaction}).outputs
+    .filter(n => n.tokens === tokens);
 
   // The OP_RETURN is present in the output
   strictSame(outs, sendTo, 'Got expected outputs');

package/test/walletrpc-integration/test_sign_psbt.js

@@ -1,10 +1,9 @@
 const asyncRetry = require('async/retry');
-const {address} = require('bitcoinjs-lib');
+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('./../../');
@@ -19,7 +18,6 @@ const confirmationCount = 6;
 const count = 100;
 const description = 'description';
 const format = 'p2wpkh';
-const {fromBech32} = address;
 const interval = 10;
 const regtestBech32AddressHrp = 'bcrt';
 const size = 2;
@@ -72,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});