ln-service 53.1.1 → 53.4.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Versions
 
+## 53.4.0
+
+- `deletePendingChannel`: Add method to remove a stuck pending channel open
+
+## 53.3.0
+
+- `getInvoices`: Add `is_unconfirmed` to filter out canceled/settled invoices
+
+## 53.2.0
+
+- `getPendingChannels`: Add support for channel `capacity`
+
+## 53.1.2
+
+- `openChannels`: Fix `cooperative_close_address` not being set on channels
+
 ## 53.1.0
 
 - Add support for LND 0.14.1

package/README.md

@@ -74,8 +74,8 @@ the LND directory. (~/.lnd or ~/Library/Application Support/Lnd)
 
 Be careful to avoid copying any newline characters in creds. To exclude them:
 
-    base64 ~/.lnd/tls.cert | tr -d '\n'
-    base64 ~/.lnd/data/chain/bitcoin/mainnet/admin.macaroon | tr -d '\n'
+    base64 -w0 ~/.lnd/tls.cert
+    base64 -w0 ~/.lnd/data/chain/bitcoin/mainnet/admin.macaroon
 
 You can then use these to interact with your LND node directly:
 
@@ -102,7 +102,7 @@ for `unlocker` methods.
 
 ## All Methods
 
-- [addPeer](#addPeer) - Connect to a peer
+- [addPeer](#addpeer) - Connect to a peer
 - [authenticatedLndGrpc](#authenticatedlndgrpc) - LND API Object
 - [broadcastChainTransaction](#broadcastchaintransaction) - Push a chain tx
 - [cancelHodlInvoice](#cancelhodlinvoice) - Cancel a held or any open invoice
@@ -118,17 +118,22 @@ for `unlocker` methods.
 - [createUnsignedRequest](#createunsignedrequest) - create an unsigned invoice
 - [createWallet](#createwallet) - Make a new wallet
 - [decodePaymentRequest](#decodepaymentrequest) - Decode a Lightning invoice
-- [deleteFailedPayAttempts](#deletefailedpayattempts) - Remove records of failed pay attempts
-- [deleteFailedPayments](#deletefailedpayments) - Remove records of payments that failed
+- [deleteFailedPayAttempts](#deletefailedpayattempts) - Remove records of 
+    failed pay attempts
+- [deleteFailedPayments](#deletefailedpayments) - Remove records of payments 
+    that failed
 - [deleteForwardingReputations](#deleteforwardingreputations) - Wipe node reps
 - [deletePayment](#deletepayment) - Delete the record of a single past payment
 - [deletePayments](#deletepayments) - Delete entire history of past payments
+- [deletePendingChannel](#deletependingchannel) - Delete a pending channel that
+    will never confirm due to a conflicting confirmed transaction
 - [diffieHellmanComputeSecret](#diffiehellmancomputesecret) - Get DH shared key
 - [disableChannel](#disablechannel) - Disable a channel for outgoing payments
 - [disconnectWatchtower](#disconnectwatchtower) - Disconnect a watchtower
 - [enableChannel](#enablechannel) - Enable a channel for outgoing payments
 - [fundPendingChannels](#fundpendingchannels) - Fund pending open channels
-- [fundPsbt](#fundpsbt) - Create an unsigned PSBT with funding inputs and spending outputs
+- [fundPsbt](#fundpsbt) - Create an unsigned PSBT with funding inputs and 
+    spending outputs
 - [getAccessIds](#getaccessids) - Get granted macaroon root access ids
 - [getAutopilot](#getautopilot) - Get autopilot status or node scores
 - [getBackup](#getbackup) - Get a backup of a channel
@@ -157,48 +162,53 @@ for `unlocker` methods.
 - [getNetworkGraph](#getnetworkgraph) - Get the channels and nodes of the graph
 - [getNetworkInfo](#getnetworkinfo) - Get high-level graph info
 - [getNode](#getnode) - Get graph info about a single node and its channels
-- [getPathfindingSettings](#getpathfindingsettings) - Get pathfinding system settings
+- [getPathfindingSettings](#getpathfindingsettings) - Get pathfinding system
+    settings
 - [getPayment](#getpayment) - Get a past payment
 - [getPayments](#getpayments) - Get all past payments
 - [getPeers](#getpeers) - Get all connected peers
 - [getPendingChainBalance](#getpendingchainbalance) - Get pending chain balance
 - [getPendingChannels](#getpendingchannels) - Get channels in pending states
 - [getPublicKey](#getpublickey) - Get a public key out of the seed
-- [getRouteConfidence](#getRouteConfidence) - Get confidence in a route
-- [getRouteThroughHops](#getRouteThroughHops) - Get a route through nodes
-- [getRouteToDestination](#getRouteToDestination) - Get a route to a destination
-- [getSweepTransactions](#getSweepTransactions) - Get transactions sweeping to self
-- [getTowerServerInfo](#getTowerServerInfo) - Get information about tower server
-- [getUtxos](#getUtxos) - Get on-chain unspent outputs
-- [getWalletInfo](#getWalletInfo) - Get general wallet info
+- [getRouteConfidence](#getrouteconfidence) - Get confidence in a route
+- [getRouteThroughHops](#getroutethroughhops) - Get a route through nodes
+- [getRouteToDestination](#getroutetodestination) - Get a route to a destination
+- [getSweepTransactions](#getsweeptransactions) - Get transactions sweeping to
+    self
+- [getTowerServerInfo](#gettowerserverinfo) - Get information about tower server
+- [getUtxos](#getutxos) - Get on-chain unspent outputs
+- [getWalletInfo](#getwalletinfo) - Get general wallet info
 - [getWalletStatus](#getwalletstatus) - Get the status of the wallet
-- [getWalletVersion](#getWalletVersion) - Get the build and version of the LND
-- [grantAccess](#grantAccess) - Grant an access credential macaroon
-- [grpcProxyServer](#grpcProxyServer) - REST proxy server for calling to gRPC
-- [isDestinationPayable](#isDestinationPayable) - Check can pay to destination
-- [lockUtxo](#lockUtxo) - Lock a UTXO temporarily to prevent it being used
-- [openChannel](#openChannel) - Open a new channel
-- [openChannels](#openChannels) - Open channels with external funding
-- [parsePaymentRequest](#parsePaymentRequest) - Parse a BOLT11 Payment Request
+- [getWalletVersion](#getwalletversion) - Get the build and version of the LND
+- [grantAccess](#grantaccess) - Grant an access credential macaroon
+- [grpcProxyServer](#grpcproxyserver) - REST proxy server for calling to gRPC
+- [isDestinationPayable](#isdestinationpayable) - Check can pay to destination
+- [lockUtxo](#lockutxo) - Lock a UTXO temporarily to prevent it being used
+- [openChannel](#openchannel) - Open a new channel
+- [openChannels](#openchannels) - Open channels with external funding
+- [parsePaymentRequest](#parsepaymentrequest) - Parse a BOLT11 Payment Request
 - [pay](#pay) - Send a payment
-- [payViaPaymentDetails](#payViaPaymentDetails) - Pay using decomposed details
-- [payViaPaymentRequest](#payViaPaymentRequest) - Pay using a payment request
-- [payViaRoutes](#payViaRoutes) - Make a payment over specified routes
-- [prepareForChannelProposal](#prepareForChannelProposal) - setup for a channel proposal
+- [payViaPaymentDetails](#payviapaymentdetails) - Pay using decomposed details
+- [payViaPaymentRequest](#payviapaymentrequest) - Pay using a payment request
+- [payViaRoutes](#payviaroutes) - Make a payment over specified routes
+- [prepareForChannelProposal](#prepareforchannelproposal) - setup for a channel
+    proposal
 - [probe](#probe) - Find a payable route by attempting a fake payment
-- [probeForRoute](#probeForRoute) - Actively probe to find a payable route
+- [probeForRoute](#probeforroute) - Actively probe to find a payable route
 - [proposeChannel](#proposechannel) - Offer a channel proposal to a peer
-- [recoverFundsFromChannel](#recoverFundsFromChannel) - Restore a channel
-- [recoverFundsFromChannels](#recoverFundsFromChannels) - Restore all channels
-- [removePeer](#removePeer) - Disconnect from a connected peer
-- [requestChainFeeIncrease](#requestchainfeeincrease) - Request a CPFP spend on a UTXO
+- [recoverFundsFromChannel](#recoverfundsfromchannel) - Restore a channel
+- [recoverFundsFromChannels](#recoverfundsfromchannels) - Restore all channels
+- [removePeer](#removepeer) - Disconnect from a connected peer
+- [requestChainFeeIncrease](#requestchainfeeincrease) - Request a CPFP spend on
+    a UTXO
 - [restrictMacaroon](#restrictmacaroon) - Add limitations to a macaroon
 - [revokeAccess](#revokeaccess) - Revoke all access macaroons given to an id
 - [routeFromChannels](#routefromchannels) - Convert channel series to a route
 - [sendMessageToPeer](#sendmessagetopeer) - Send a custom message to a peer
 - [sendToChainAddress](#sendtochainaddress) - Send on-chain to an address
 - [sendToChainAddresses](#sendtochainaddresses) - Send on-chain to addresses
-- [sendToChainOutputScripts](#sendtochainoutputscripts) - Send to on-chain script outputs
+- [sendToChainOutputScripts](#sendtochainoutputscripts) - Send to on-chain
+    script outputs
 - [setAutopilot](#setautopilot) - Turn autopilot on and set autopilot scores
 - [settleHodlInvoice](#settlehodlinvoice) - Accept a HODL HTLC invoice
 - [signBytes](#signbytes) -  Sign over arbitrary bytes with node keys
@@ -211,18 +221,21 @@ for `unlocker` methods.
 - [subscribeToChainAddress](#subscribetochainaddress) - Subscribe to receives
 - [subscribeToChainSpend](#subscribetochainspend) - Subscribe to chain spends
 - [subscribeToChannels](#subscribetochannels) - Subscribe to channel statuses
-- [subscribeToForwardRequests](#subscribetoforwardrequests) - Interactively route
+- [subscribeToForwardRequests](#subscribetoforwardrequests) - Interactively
+    route
 - [subscribeToForwards](#subscribetoforwards) - Subscribe to HTLC events
 - [subscribeToGraph](#subscribetograph) - Subscribe to network graph updates
 - [subscribeToInvoice](#subscribetoinvoice) - Subscribe to invoice updates
 - [subscribeToInvoices](#subscribetoinvoices) - Subscribe to all invoices
 - [subscribeToOpenRequests](#subscribetoopenrequests) - Approve open requests
 - [subscribeToPastPayment](#subscribetopastpayment) - Subscribe to a payment
-- [subscribeToPastPayments](#subscribetopastpayments) - Subscribe to all sent payments
+- [subscribeToPastPayments](#subscribetopastpayments) - Subscribe to all sent
+    payments
 - [subscribeToPayViaDetails](#subscribetopayviadetails) - Pay using details
 - [subscribeToPayViaRequest](#subscribetopayviarequest) - Pay using a request
 - [subscribeToPayViaRoutes](#subscribetopayviaroutes) - Pay using routes
-- [subscribeToPeerMessages](#subscribetopeermessages) - Listen to incoming custom messages
+- [subscribeToPeerMessages](#subscribetopeermessages) - Listen to incoming
+    custom messages
 - [subscribeToPeers](#subscribetopeers) - Subscribe to peers connectivity
 - [subscribeToProbe](#subscribetoprobe) - Subscribe to a probe for a route
 - [subscribeToProbeForRoute](#subscribetoprobeforroute) - Probe for a route
@@ -230,11 +243,14 @@ for `unlocker` methods.
 - [subscribeToTransactions](#subscribetotransactions) - Subscribe to chain tx
 - [subscribeToWalletStatus](#subscribetowalletstatus) - Subscribe to node state
 - [unauthenticatedLndGrpc](#unauthenticatedLndGrpc) - LND for locked lnd APIs
-- [unlockUtxo](#unlockUtxo) - Release a locked UTXO so that it can be used again
-- [unlockWallet](#unlockWallet) - Unlock a locked lnd
-- [updateChainTransaction](#updateChainTransaction) - Update a chain transaction
+- [unlockUtxo](#unlockutxo) - Release a locked UTXO so that it can be used
+    again
+- [unlockWallet](#unlockwallet) - Unlock a locked lnd
+- [updateChainTransaction](#updatechaintransaction) - Update a chain
+    transaction
 - [updateConnectedWatchtower](#updateconnectedwatchtower) - Update watchtower
-- [updatePathfindingSettings](#updatepathfindingsettings) - Update pathfinding configuration
+- [updatePathfindingSettings](#updatepathfindingsettings) - Update pathfinding
+    configuration
 - [updateRoutingFees](#updateroutingfees) - Change routing fees
 - [verifyAccess](#verifyaccess) - Verify a macaroon has access
 - [verifyBackup](#verifybackup) - Verify a channel backup
@@ -256,6 +272,7 @@ for `unlocker` methods.
     - run regtest integration tests
 - [ln-pathfinding](https://npmjs.com/package/ln-accounting) - pathfinding
     utilities
+- [ln-sync](https://www.npmjs.com/package/ln-sync) - metadata helper methods
 - [probing](https://npmjs.com/package/probing) - payment probing utilities
 - [psbt](https://www.npmjs.com/package/psbt) - BIP 174 PSBT utilities
 
@@ -918,6 +935,36 @@ const {deletePayments} = require('ln-service');
 await deletePayments({lnd});
 ```
 
+### deletePendingChannel
+
+Delete a pending channel
+
+Pass the confirmed conflicting transaction that spends the same input to
+make sure that no funds are being deleted.
+
+This method is not supported on LND 0.13.3 and below
+
+    {
+      confirmed_transaction: <Hex Encoded Conflicting Transaction String>
+      lnd: <Authenticated LND API Object>
+      pending_transaction: <Hex Encoded Pending Transaction String>
+      pending_transaction_vout: <Pending Channel Output Index Number>
+    }
+
+    @returns via cbk or Promise
+
+```node
+const {deletePendingChannel} = require('ln-service');
+
+// Delete a stuck pending channel
+await deletePendingChannel({
+  lnd,
+  confirmed_transaction: confirmedTransactionHex,
+  pending_transaction: stuckPendingChannelOpenTxHex,
+  pending_transaction_vout: pendingChannelOutputIndexNumber,
+});
+```
+
 ### diffieHellmanComputeSecret
 
 Derive a shared secret
@@ -1952,6 +1999,7 @@ Requires `invoices:read` permission
 Invoice `payment` is not supported on LND 0.11.1 and below
 
     {
+      [is_unconfirmed]: <Omit Canceled and Settled Invoices Bool>
       [limit]: <Page Result Limit Number>
       lnd: <Authenticated LND API Object>
       [token]: <Opaque Paging Token String>
@@ -2535,6 +2583,7 @@ Requires `offchain:read` permission
     @returns via cbk or Promise
     {
       pending_channels: [{
+        capacity: <Channel Capacity Tokens Number>
         [close_transaction_id]: <Channel Closing Transaction Id String>
         is_active: <Channel Is Active Bool>
         is_closing: <Channel Is Closing Bool>
@@ -3205,11 +3254,11 @@ Requires `offchain:write`, `onchain:write`, `peers:write` permissions
       [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
       [is_private]: <Channel is Private Bool> // Defaults to false
       lnd: <Authenticated LND API Object>
-      local_tokens: <Local Tokens Number>
+      local_tokens: <Total Channel Capacity Tokens Number>
       [min_confirmations]: <Spend UTXOs With Minimum Confirmations Number>
       [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
-      partner_public_key: <Public Key Hex String>
       [partner_csv_delay]: <Peer Output CSV Delay Number>
+      partner_public_key: <Public Key Hex String>
       [partner_socket]: <Peer Connection Host:Port String>
     }
 
@@ -3250,11 +3299,11 @@ after the funding step.
         [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
         [is_private]: <Channel is Private Bool> // Defaults to false
         [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
-        partner_public_key: <Public Key Hex String>
         [partner_csv_delay]: <Peer Output CSV Delay Number>
+        partner_public_key: <Public Key Hex String>
         [partner_socket]: <Peer Connection Host:Port String>
       }]
-      is_avoiding_broadcast: <Avoid Broadcast of All Channels Bool>
+      [is_avoiding_broadcast]: <Avoid Broadcast of All Channels Bool>
       lnd: <Authenticated LND API Object>
     }
 
@@ -6060,8 +6109,8 @@ This method is not supported in LND 0.13.4 and below
         local_tokens: <Local Tokens Number>
         [min_confirmations]: <Spend UTXOs With Minimum Confirmations Number>
         [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
-        partner_public_key: <Public Key Hex String>
         [partner_csv_delay]: <Peer Output CSV Delay Number>
+        partner_public_key: <Public Key Hex String>
       }
       uri: <RPC URI String>
     }

package/index.js

@@ -19,6 +19,7 @@ const {deleteFailedPayAttempts} = require('lightning');
 const {deleteFailedPayments} = require('lightning');
 const {deletePayment} = require('lightning');
 const {deletePayments} = require('lightning');
+const {deletePendingChannel} = require('lightning');
 const {diffieHellmanComputeSecret} = require('lightning');
 const {disableChannel} = require('lightning');
 const {disconnectWatchtower} = require('lightning');
@@ -157,6 +158,7 @@ module.exports = {
   deleteForwardingReputations,
   deletePayment,
   deletePayments,
+  deletePendingChannel,
   diffieHellmanComputeSecret,
   disableChannel,
   disconnectWatchtower,

package/package.json

@@ -7,35 +7,36 @@
     "url": "https://github.com/alexbosworth/ln-service/issues"
   },
   "dependencies": {
-    "bolt07": "1.7.4",
+    "bolt07": "1.8.0",
     "cors": "2.8.5",
-    "express": "4.17.1",
+    "express": "4.17.2",
     "invoices": "2.0.2",
-    "lightning": "5.1.0",
+    "lightning": "5.3.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
-    "ws": "8.3.0"
+    "ws": "8.4.0"
   },
   "description": "Interaction helper for your Lightning Network daemon",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.10",
     "@alexbosworth/node-fetch": "2.6.2",
-    "async": "3.2.2",
+    "async": "3.2.3",
     "asyncjs-util": "1.2.7",
     "bip66": "1.1.5",
     "bitcoinjs-lib": "6.0.1",
     "bn.js": "5.2.0",
-    "ecpair": "1.0.1",
+    "ecpair": "2.0.1",
     "ln-docker-daemons": "2.1.0",
     "portfinder": "1.0.28",
     "psbt": "1.1.10",
     "rimraf": "3.0.2",
-    "secp256k1": "4.0.2",
+    "secp256k1": "4.0.3",
+    "tiny-secp256k1": "2.1.2",
     "uuid": "8.3.2",
     "varuint-bitcoin": "1.1.2"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=12.20"
   },
   "keywords": [
     "bitcoin",
@@ -54,5 +55,5 @@
   "scripts": {
     "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/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "53.1.1"
+  "version": "53.4.0"
 }

package/test/integration/test_delete_pending_channel.js

@@ -0,0 +1,144 @@
+const {once} = require('events');
+
+const asyncEach = require('async/each');
+const asyncRetry = require('async/retry');
+const {extractTransaction} = require('psbt');
+const {spawnLightningCluster} = require('ln-docker-daemons');
+const {test} = require('@alexbosworth/tap');
+
+const {addPeer} = require('./../../');
+const {broadcastChainTransaction} = require('./../../');
+const {createCluster} = require('./../macros');
+const {delay} = require('./../macros');
+const {deletePendingChannel} = require('./../../');
+const {fundPendingChannels} = require('./../../');
+const {fundPsbt} = require('./../../');
+const {getChainBalance} = require('./../../');
+const {getChannels} = require('./../../');
+const {getLockedUtxos} = require('./../../');
+const {getPendingChannels} = require('./../../');
+const {openChannels} = require('./../../');
+const {signPsbt} = require('./../../');
+const {unlockUtxo} = require('./../../');
+
+const capacity = 1e6;
+const count = 100;
+const interval = 100;
+const race = promises => Promise.race(promises);
+const size = 3;
+const timeout = 1000 * 5;
+const times = 200;
+
+// Forfeiting a pending channel should remove the pending channel
+test(`Forfeit pending channel`, async ({end, equal}) => {
+  const {kill, nodes} = await spawnLightningCluster({size});
+
+  const [control, target, remote] = nodes;
+
+  const {generate, lnd} = control;
+
+  try {
+    await control.generate({count});
+
+    await asyncEach([target, remote], async node => {
+      return await addPeer({lnd, public_key: node.id, socket: node.socket});
+    });
+
+    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}),
+      ]);
+    });
+
+    // Setup funding for the target
+    const fundTarget = await fundPsbt({lnd, outputs: proposeToTarget.pending});
+
+    // Sign the funding to the target
+    const signTarget = await signPsbt({lnd, psbt: fundTarget.psbt});
+
+    // Fund the target channel
+    await fundPendingChannels({
+      lnd,
+      channels: proposeToTarget.pending.map(n => n.id),
+      funding: signTarget.psbt,
+    });
+
+    await asyncEach((await getLockedUtxos({lnd})).utxos, async utxo => {
+      return await unlockUtxo({
+        lnd,
+        id: utxo.lock_id,
+        transaction_id: utxo.transaction_id,
+        transaction_vout: utxo.transaction_vout,
+      });
+    });
+
+    // 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,
+        }),
+      ]);
+    });
+
+    // Setup funding for the remote, using the same inputs
+    const fundRemote = await fundPsbt({
+      lnd,
+      inputs: fundTarget.inputs,
+      outputs: proposeToRemote.pending
+    });
+
+    // Sign the funding to the target
+    const signRemote = await signPsbt({lnd, psbt: fundRemote.psbt});
+
+    // Fund the remote channel
+    await fundPendingChannels({
+      lnd,
+      channels: proposeToRemote.pending.map(n => n.id),
+      funding: signRemote.psbt,
+    });
+
+    const {transaction} = extractTransaction({psbt: signRemote.psbt});
+
+    await broadcastChainTransaction({lnd, transaction});
+
+    const channel = await asyncRetry({interval, times}, async () => {
+      const [channel] = (await getChannels({lnd})).channels;
+
+      if (!!channel) {
+        return channel;
+      }
+
+      await generate({});
+
+      throw new Error('ExpectedNewChannelCreated');
+    });
+
+    const [pending] = (await getPendingChannels({lnd})).pending_channels;
+
+    const stuckTx = extractTransaction({psbt: signTarget.psbt});
+
+    await deletePendingChannel({
+      lnd,
+      confirmed_transaction: transaction,
+      pending_transaction: stuckTx.transaction,
+      pending_transaction_vout: pending.transaction_vout,
+    });
+
+    const [stillPending] = (await getPendingChannels({lnd})).pending_channels;
+
+    equal(stillPending, undefined, 'Conflicting pending channel deleted');
+  } catch (err) {
+    equal(err, null, 'No error is expected');
+  } finally {
+    await kill({});
+  }
+
+  return end();
+});

package/test/integration/test_get_invoices.js

@@ -1,13 +1,15 @@
+const asyncEach = require('async/each');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
+const {cancelHodlInvoice} = require('./../../');
 const {createInvoice} = require('./../../');
 const {getInvoices} = require('./../../');
 
 const limit = 1;
 
 // createInvoice should result in a created invoice
-test(`Create an invoice`, async ({end, equal}) => {
+test(`Create an invoice`, async ({end, equal, strictSame}) => {
   const {kill, nodes} = await spawnLightningCluster({});
 
   try {
@@ -48,6 +50,16 @@ test(`Create an invoice`, async ({end, equal}) => {
       equal(invoice.secret, expected.secret, 'Payment secret');
       equal(invoice.tokens, expected.tokens, 'Tokens');
     });
+
+    const reversed = invoices.slice().reverse();
+
+    await asyncEach(reversed.filter((n, i) => !!i), async (invoice) => {
+      return await cancelHodlInvoice({lnd, id: invoice.id});
+    });
+
+    const unconfirmed = await getInvoices({limit, lnd, is_unconfirmed: true});
+
+    strictSame(unconfirmed, thirdPage, 'Pending invoices are ignored');
   } catch (err) {
     equal(err, null, 'No error is expected');
   }

package/test/integration/test_get_pending_coop.js

@@ -51,6 +51,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(channel.pending_balance, 980950, 'Waiting on balance');
   }
 
+  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');

package/test/integration/test_get_pending_force.js

@@ -68,6 +68,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(pendingOpen.transaction_weight, 724, 'Channel tx weight');
   }
 
+  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');
@@ -111,6 +112,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(waitClose.pending_balance, 980950, 'Waiting on balance');
   }
 
+  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');
@@ -166,6 +168,7 @@ test(`Get pending channels`, async ({end, equal}) => {
     equal(forceClose.pending_balance, 980950, 'Waiting on balance');
   }
 
+  equal(forceClose.capacity, 1000000, 'Got channel close capacity');
   equal(forceClose.close_transaction_id, channelClose.transaction_id, 'Txid');
   equal(forceClose.is_active, false, 'Not active anymore');
   equal(forceClose.is_closing, true, 'Channel is force closing');

package/test/integration/test_open_channels.js

@@ -1,3 +1,4 @@
+const asyncMap = require('async/map');
 const asyncRetry = require('async/retry');
 const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
@@ -6,22 +7,25 @@ const {test} = require('@alexbosworth/tap');
 const {transactionAsPsbt} = require('psbt');
 
 const {addPeer} = require('./../../');
+const {createChainAddress} = require('./../../');
 const {delay} = require('./../macros');
 const {fundPendingChannels} = require('./../../');
 const {getChainBalance} = require('./../../');
 const {getChainTransactions} = require('./../../');
 const {getChannels} = require('./../../');
+const {getHeight} = require('./../../');
 const {getPeers} = require('./../../');
 const {openChannels} = require('./../../');
 const {sendToChainAddresses} = require('./../../');
 
 const capacity = 1e6;
 const count = 10;
-const interval = 1;
+const interval = 10;
+const maturity = 100;
 const race = promises => Promise.race(promises);
 const size = 3;
 const timeout = 250 * 10;
-const times = 200;
+const times = 2000;
 
 // Opening channels should open up channels
 test(`Open channels`, async ({end, equal}) => {
@@ -29,11 +33,19 @@ test(`Open channels`, async ({end, equal}) => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  await asyncRetry({times}, async () => {
-    if (!(await getChainBalance({lnd})).chain_balance) {
-      await generate({});
+  await generate({count: maturity});
+
+  await asyncRetry({interval, times}, async () => {
+    const lnds = [lnd, target.lnd, remote.lnd];
+
+    const heights = await asyncMap(lnds, async lnd => {
+      return (await getHeight({lnd})).current_block_height;
+    });
+
+    const [controlHeight, targetHeight, remoteHeight] = heights;
 
-      throw new Error('ExpectedChainBalanceToOpenChannel');
+    if (controlHeight !== targetHeight || controlHeight !== remoteHeight) {
+      throw new Error('ExpectedSyncHeights');
     }
   });
 
@@ -42,11 +54,12 @@ test(`Open channels`, async ({end, equal}) => {
 
     const spending = chainTx.map(({transaction}) => transaction);
 
-    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+    const {address} = await createChainAddress({lnd});
 
-    const channels = [target, remote].map(node => ({
+    const channels = [target, remote].map(({id}) => ({
       capacity,
-      partner_public_key: node.id,
+      cooperative_close_address: address,
+      partner_public_key: id,
     }));
 
     let pending;
@@ -54,6 +67,7 @@ test(`Open channels`, async ({end, equal}) => {
     // Wait for peers to be connected
     await asyncRetry({interval, times}, async () => {
       await addPeer({lnd, public_key: remote.id, socket: remote.socket});
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
 
       if ((await getPeers({lnd})).peers.length !== channels.length) {
         throw new Error('ExpectedConnectedPeersToOpenChannels');
@@ -67,13 +81,13 @@ test(`Open channels`, async ({end, equal}) => {
     });
 
     // Normally funding would involve an un-broadcast transaction
-    await sendToChainAddresses({lnd, send_to: pending});
+    const {id} = await sendToChainAddresses({lnd, send_to: pending});
 
-    await asyncRetry({interval, times}, async() => {
+    await asyncRetry({interval, times}, async () => {
       const {transactions} = await getChainTransactions({lnd});
 
-      if (transactions.length !== pending.length) {
-        throw new Error('ExpectedMultipleChainTransactions');
+      if (!transactions.find(n => n.id === id)) {
+        throw new Error('ExpectedChainTransaction');
       }
 
       return;
@@ -96,7 +110,7 @@ test(`Open channels`, async ({end, equal}) => {
     });
 
     await asyncRetry({interval, times}, async () => {
-      await generate({count});
+      await generate({});
 
       const {channels} = await getChannels({lnd});
 
@@ -104,8 +118,14 @@ test(`Open channels`, async ({end, equal}) => {
         throw new Error('ExpectedNewChannelsCreatedAndActive');
       }
 
+      const [channel] = channels;
+
+      equal(channel.cooperative_close_address, address, 'Channel close addr');
+
       return;
     });
+  } catch (err) {
+    equal(err, null, 'No error is reported');
   } finally {
     return await kill({});
   }

package/test/integration/test_propose_channel.js

@@ -359,6 +359,7 @@ test(`Propose a channel with a coop delay`, async ({end, equal, ok}) => {
     equal(incoming.transaction_weight, 724, 'Funding tx weight');
   }
 
+  equal(incoming.capacity, 1000000, 'Incoming capacity is defined');
   equal(incoming.close_transaction_id, undefined, 'Not a closing tx');
   equal(incoming.is_active, false, 'Not active yet');
   equal(incoming.is_closing, false, 'Channel is not closing');

package/test/integration/test_subscribe_to_open_requests.js

@@ -105,14 +105,16 @@ test(`Subscribe to open requests`, async ({end, equal, fail, ok}) => {
   });
 
   try {
-    await openChannel({
-      lnd: target.lnd,
-      chain_fee_tokens_per_vbyte: defaultFee,
-      give_tokens: giftTokens,
-      is_private: true,
-      local_tokens: channelCapacityTokens,
-      partner_public_key: control.id,
-      socket: control.socket,
+    await asyncRetry({interval, times}, async () => {
+      return await openChannel({
+        lnd: target.lnd,
+        chain_fee_tokens_per_vbyte: defaultFee,
+        give_tokens: giftTokens,
+        is_private: true,
+        local_tokens: channelCapacityTokens,
+        partner_public_key: control.id,
+        socket: control.socket,
+      });
     });
   } catch (err) {
     equal(err, null, 'Expected no error when a channel is accepted');

package/test/integration/test_subscribe_to_peers.js

@@ -1,5 +1,6 @@
 const {once} = require('events');
 
+const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
@@ -9,7 +10,9 @@ const {removePeer} = require('./../../');
 const {subscribeToPeers} = require('./../../');
 
 const all = promise => Promise.all(promise);
+const interval = 10;
 const size = 2;
+const times = 1000;
 
 // Subscribing to peer events should trigger reception of peer status changes
 test(`Subscribe to peers`, async ({end, equal}) => {
@@ -21,7 +24,9 @@ test(`Subscribe to peers`, async ({end, equal}) => {
 
   sub.on('error', () => {});
 
-  await addPeer({lnd, public_key: target.id, socket: target.socket});
+  await asyncRetry({interval, times}, async () => {
+    await addPeer({lnd, public_key: target.id, socket: target.socket});
+  });
 
   const disconnect = removePeer({lnd, public_key: target.id});
   const receiveDisconnect = once(sub, 'disconnected');
@@ -32,7 +37,9 @@ test(`Subscribe to peers`, async ({end, equal}) => {
 
   equal(disconnected.public_key, target.id, 'Got d/c event');
 
-  const connect = addPeer({lnd, public_key: target.id, socket: target.socket});
+  const connect = asyncRetry({interval, times}, async () => {
+    return addPeer({lnd, public_key: target.id, socket: target.socket});
+  });
 
   const receiveConnectMessage = once(sub, 'connected');
 

package/test/macros/btcsuite_type_daemon.js

@@ -2,12 +2,11 @@ const {join} = require('path');
 const {spawn} = require('child_process');
 
 const asyncAuto = require('async/auto');
-const {ECPair} = require('ecpair');
 const openPortFinder = require('portfinder');
 const {networks} = require('bitcoinjs-lib');
 const {payments} = require('bitcoinjs-lib');
+const tinysecp = require('tiny-secp256k1');
 
-const {fromPublicKey} = ECPair;
 const knownDaemons = ['btcd'];
 const localhost = '127.0.0.1';
 const notFoundIndex = -1;
@@ -37,6 +36,9 @@ const unableToStartServer = /Unable.to.start.server/;
 */
 module.exports = (args, cbk) => {
   return asyncAuto({
+    // Import ECPair library
+    ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
+
     // Check arguments
     validate: cbk => {
       if (knownDaemons.indexOf(args.daemon) === notFoundIndex) {
@@ -85,11 +87,16 @@ module.exports = (args, cbk) => {
     }],
 
     // Spin up the chain daemon
-    spawnDaemon: ['listenPort', 'rpcPort', ({listenPort, rpcPort}, cbk) => {
+    spawnDaemon: [
+      'ecp',
+      'listenPort',
+      'rpcPort',
+      ({ecp, listenPort, rpcPort}, cbk) =>
+    {
       const miningKey = Buffer.from(args.mining_public_key, 'hex');
       const network = networks.testnet;
 
-      const pubkey = fromPublicKey(miningKey, network).publicKey;
+      const pubkey = ecp.fromPublicKey(miningKey, network).publicKey;
 
       const daemon = spawn(args.daemon, [
         '--datadir', args.dir,

package/test/macros/chain_send_transaction.js

@@ -2,13 +2,13 @@ const {encode} = require('varuint-bitcoin');
 
 const {address} = require('bitcoinjs-lib');
 const {crypto} = require('bitcoinjs-lib');
-const {ECPair} = require('ecpair');
 const {networks} = require('bitcoinjs-lib');
 const {payments} = require('bitcoinjs-lib');
 const {script} = require('bitcoinjs-lib');
-const scriptBufAsScript = require('./script_buffers_as_script');
 const {Transaction} = require('bitcoinjs-lib');
 
+const scriptBufAsScript = require('./script_buffers_as_script');
+
 const defaultNetwork = 'testnet';
 const encodeSignature = script.signature.encode;
 const hexBase = 16;
@@ -20,6 +20,7 @@ const {toOutputScript} = address;
 
   {
     destination: <Destination Address String>
+    ecp: <ECPair Object>
     fee: <Fee Tokens To Remove From Spend Number>
     private_key: <WIF Serialized Private Key String>
     spend_transaction_id: <Transaction Id to Spend Hex String>
@@ -32,11 +33,15 @@ const {toOutputScript} = address;
     transaction: <Transaction Hex Serialized String>
   }
 */
-module.exports = (args, cbk) => {
+module.exports = args => {
   if (!args.destination) {
     throw new Error('ExpectedDestinationAddressToSendTokensTo');
   }
 
+  if (!args.ecp) {
+    throw new Error('ExpectedEcpairObjectToChainSendTransaction');
+  }
+
   if (!args.private_key) {
     throw new Error('ExpectedPrivateKeyToAuthorizeSend');
   }
@@ -55,7 +60,7 @@ module.exports = (args, cbk) => {
 
   const network = networks[defaultNetwork];
 
-  const keyPair = ECPair.fromWIF(args.private_key, network);
+  const keyPair = args.ecp.fromWIF(args.private_key, network);
   const outputScript = toOutputScript(args.destination, network);
   const tx = new Transaction();
 

package/test/macros/change_password.js

@@ -6,9 +6,9 @@ const {spawn} = require('child_process');
 const asyncAuto = require('async/auto');
 const asyncMapSeries = require('async/mapSeries');
 const asyncRetry = require('async/retry');
-const {ECPair} = require('ecpair');
 const {networks} = require('bitcoinjs-lib');
 const openPortFinder = require('portfinder');
+const tinysecp = require('tiny-secp256k1');
 
 const {changePassword} = require('./../../');
 const {createSeed} = require('./../../');
@@ -53,6 +53,9 @@ const times = 100;
 */
 module.exports = ({network}, cbk) => {
   return asyncAuto({
+    // Import ECPair library
+    ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
+
     // Find open ports for the listen, REST and RPC ports
     getPorts: cbk => {
       return asyncMapSeries(['listen', 'rest', 'rpc'], (_, cbk) => {
@@ -77,14 +80,14 @@ module.exports = ({network}, cbk) => {
     },
 
     // Make a private key for mining rewards
-    miningKey: cbk => {
-      const keyPair = ECPair.makeRandom({network: networks.testnet});
+    miningKey: ['ecp', ({ecp}, cbk) => {
+      const keyPair = ecp.makeRandom({network: networks.testnet});
 
       return cbk(null, {
         private_key: keyPair.toWIF(),
         public_key: keyPair.publicKey.toString('hex'),
       });
-    },
+    }],
 
     // Spawn a backing chain daemon for lnd
     spawnChainDaemon: ['miningKey', ({miningKey}, cbk) => {

package/test/macros/create_cluster.js

@@ -3,6 +3,7 @@ const {promisify} = require('util');
 const asyncAuto = require('async/auto');
 const asyncEach = require('async/each');
 const asyncRetry = require('async/retry');
+const tinysecp = require('tiny-secp256k1');
 
 const {addPeer} = require('./../../');
 const chainSendTransaction = require('./chain_send_transaction');
@@ -62,6 +63,9 @@ const tokens = 50e8;
 */
 module.exports = (args, cbk) => {
   return asyncAuto({
+    // Import ECPair library
+    ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
+
     // Create control lnd
     control: cbk => {
       return spawnLnd({
@@ -225,11 +229,13 @@ module.exports = (args, cbk) => {
     funding: [
       'control',
       'controlChainAddress',
+      'ecp',
       'generateBlocks',
       'targetChainAddress',
       ({
         control,
         controlChainAddress,
+        ecp,
         generateBlocks,
         targetChainAddress,
       },
@@ -243,6 +249,7 @@ module.exports = (args, cbk) => {
       const [targetCoinbase] = targetBlock.transaction_ids;
 
       const controlChainSend = chainSendTransaction({
+        ecp,
         tokens,
         destination: controlChainAddress.address,
         fee: defaultFee,
@@ -252,6 +259,7 @@ module.exports = (args, cbk) => {
       });
 
       const targetChainSend = chainSendTransaction({
+        ecp,
         tokens,
         destination: targetChainAddress.address,
         fee: defaultFee,

package/test/macros/generate_blocks.js

@@ -2,14 +2,13 @@ const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
 const asyncTimesSeries = require('async/timesSeries');
 const asyncRetry = require('async/retry');
-const {ECPair} = require('ecpair');
 const {networks} = require('bitcoinjs-lib');
 const {payments} = require('bitcoinjs-lib');
 const {returnResult} = require('asyncjs-util');
+const tinysecp = require('tiny-secp256k1');
 
 const rpc = require('./rpc');
 
-const {fromPublicKey} = ECPair;
 const interval = retryCount => 2000 * Math.random();
 const {p2pkh} = payments;
 const retryTimes = 50;
@@ -35,6 +34,9 @@ const retryTimes = 50;
 module.exports = ({cert, chain, count, host, key, pass, port, user}, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
+      // Import ECPair library
+      ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
+
       // Check arguments
       validate: cbk => {
         if (!host) {
@@ -57,7 +59,7 @@ module.exports = ({cert, chain, count, host, key, pass, port, user}, cbk) => {
       },
 
       // Generate blocks
-      generate: ['validate', ({}, cbk) => {
+      generate: ['ecp', 'validate', ({ecp}, cbk) => {
         let cmd;
         let params;
 
@@ -66,7 +68,7 @@ module.exports = ({cert, chain, count, host, key, pass, port, user}, cbk) => {
           const miningKey = Buffer.from(key, 'hex');
           const network = networks.testnet;
 
-          const pubkey = fromPublicKey(miningKey, network).publicKey;
+          const pubkey = ecp.fromPublicKey(miningKey, network).publicKey;
 
           cmd = 'generatetoaddress';
           params = [[count].length, p2pkh({network, pubkey}).address];

package/test/macros/spawn_lnd.js

@@ -7,9 +7,9 @@ const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
 const asyncMapSeries = require('async/mapSeries');
 const asyncRetry = require('async/retry');
-const {ECPair} = require('ecpair');
 const {networks} = require('bitcoinjs-lib');
 const openPortFinder = require('portfinder');
+const tinysecp = require('tiny-secp256k1');
 
 const {authenticatedLndGrpc} = require('./../../');
 const {createSeed} = require('./../../');
@@ -79,6 +79,9 @@ const times = 30;
 */
 module.exports = (args, cbk) => {
   return asyncAuto({
+    // Import ECPair library
+    ecp: async () => (await import('ecpair')).ECPairFactory(tinysecp),
+
     // Find open ports for the listen, REST and RPC ports
     getPorts: cbk => {
       return asyncRetry({interval: n => round(random() * 100), times: 1000}, cbk => {
@@ -112,14 +115,14 @@ module.exports = (args, cbk) => {
     },
 
     // Make a private key for mining rewards
-    miningKey: cbk => {
-      const keyPair = ECPair.makeRandom({network: networks.testnet});
+    miningKey: ['ecp', ({ecp}, cbk) => {
+      const keyPair = ecp.makeRandom({network: networks.testnet});
 
       return cbk(null, {
         private_key: keyPair.toWIF(),
         public_key: keyPair.publicKey.toString('hex'),
       });
-    },
+    }],
 
     // Spawn a backing chain daemon for lnd
     spawnChainDaemon: ['miningKey', ({miningKey}, cbk) => {

package/test/routerrpc-integration/test_multipath_payment.js

@@ -103,7 +103,7 @@ test(`Pay with multiple paths`, async ({end, equal, rejects, strictSame}) => {
     total_mtokens: parsed.mtokens,
   });
 
-  // Pay using routes. Multiple channels must be used too avoid tempChanFail
+  // Pay using routes. Multiple channels must be used to avoid tempChanFail
   try {
     const routes = [route1.route, route2.route];
 

package/test/walletrpc-integration/test_broadcast_chain_transaction.js

@@ -1,4 +1,5 @@
 const {test} = require('@alexbosworth/tap');
+const tinysecp = require('tiny-secp256k1');
 
 const {broadcastChainTransaction} = require('./../../');
 const {chainSendTransaction} = require('./../macros');
@@ -32,6 +33,7 @@ test(`Send chain transaction`, async ({end, equal}) => {
     fee,
     tokens,
     destination: (await createChainAddress({format, lnd})).address,
+    ecp: (await import('ecpair')).ECPairFactory(tinysecp),
     private_key: node.mining_key,
     spend_transaction_id: coinbaseTransactionId,
     spend_vout: defaultVout,

package/test/walletrpc-integration/test_request_chain_fee_increase.js

@@ -1,4 +1,5 @@
 const {test} = require('@alexbosworth/tap');
+const tinysecp = require('tiny-secp256k1');
 
 const {broadcastChainTransaction} = require('./../../');
 const {chainSendTransaction} = require('./../macros');
@@ -31,6 +32,7 @@ test(`Request chain fee increase`, async ({end, equal}) => {
     fee,
     tokens,
     destination: (await createChainAddress({format, lnd})).address,
+    ecp: (await import('ecpair')).ECPairFactory(tinysecp),
     private_key: node.mining_key,
     spend_transaction_id: coinbaseTransactionId,
     spend_vout: defaultVout,