ln-service 53.2.0 → 53.3.0

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## 54.2.0
+## 53.3.0
+
+- `getInvoices`: Add `is_unconfirmed` to filter out canceled/settled invoices
+
+## 53.2.0
 
 - `getPendingChannels`: Add support for channel `capacity`
 

package/README.md

@@ -1952,6 +1952,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>

package/package.json

@@ -7,30 +7,31 @@
     "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.2.1",
+    "lightning": "5.3.0",
     "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"
   },
@@ -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.2.0"
+  "version": "53.3.0"
 }

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/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/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,