balanceofsatoshis 12.27.0 → 12.28.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Versions
 
+## 12.28.2
+
+- `remove-peer`: Set high tolerance for peer max fee when coop closing channel
+
+## 12.28.1
+
+- `chart-payments-received`: Optimize reporting speed for short times
+- `chart-payments-received`: Add `--count` to report on count of payments
+- `chart-payments-received`: Add `--for` to filter for a matching description
+
 ## 12.27.0
 
 - `rebalance`: `--in-filter`, `--out-filter`: add `INBOUND_FEE_RATE` variable

package/README.md

@@ -6,7 +6,7 @@ Commands for working with LND balances.
 
 Supported LND versions:
 
-- v0.11.0-beta to v0.15.0-beta
+- v0.12.0-beta to v0.15.1-beta
 
 ## Install
 

package/bos

@@ -452,8 +452,10 @@ prog
   // Chart earnings from payments received
   .command('chart-payments-received', 'Get a chart of received payments')
   .help('Show chart for settled invoices from external parties')
+  .option('--count', 'Show count of settled instead of amount received')
   .option('--days <days>', 'Chart over the past number of days', INT)
   .option('--end <end_date>', 'Final date for chart as YYYY-MM-DD', STRING)
+  .option('--for <query>', 'Only consider payments including a specific query')
   .option('--node <node_name>', 'Get payments from saved node(s)', REPEATABLE)
   .option('--start <start_date>', 'Start date for chart as YYYY-MM-DD', STRING)
   .action((args, options, logger) => {
@@ -462,7 +464,9 @@ prog
         return wallets.getReceivedChart({
           days: options.days,
           end_date: options.end,
+          is_count: options.count,
           lnds: (await lnd.getLnds({logger, nodes: options.node})).lnds,
+          query: options.for,
           start_date: options.start,
         },
         responses.returnChart({logger, reject, resolve, data: 'data'}));

package/network/remove_peer.js

@@ -21,6 +21,7 @@ const iconDisabled = channel => !channel.is_active ? '💀 ' : '';
 const iconPending = channel => channel.pending_payments.length ? '💸 ' : ''
 const {isArray} = Array;
 const isPublicKey = n => !!n && /^0[2-3][0-9A-F]{64}$/i.test(n);
+const maxFeeRate = (chan, rate) => !!chan.is_active ? rate * 100 : undefined;
 const maxMempoolSize = 2e6;
 const regularConf = 72;
 const slowConf = 144;
@@ -435,6 +436,7 @@ module.exports = (args, cbk) => {
             address: !isLocked && !!address ? address : undefined,
             is_force_close: !channel.is_active,
             lnd: args.lnd,
+            max_tokens_per_vbyte: maxFeeRate(channel, feeRate),
             tokens_per_vbyte: !!channel.is_active ? feeRate : undefined,
             transaction_id: channel.transaction_id,
             transaction_vout: channel.transaction_vout,

package/package.json

@@ -30,14 +30,14 @@
     "csv-parse": "5.3.0",
     "ecpair": "2.0.1",
     "goldengate": "11.2.3",
-    "grammy": "1.10.1",
+    "grammy": "1.11.0",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
     "ini": "3.0.1",
-    "inquirer": "9.1.0",
+    "inquirer": "9.1.1",
     "ln-accounting": "5.0.7",
-    "ln-service": "53.21.0",
-    "ln-sync": "3.13.1",
+    "ln-service": "53.22.0",
+    "ln-sync": "3.14.0",
     "ln-telegram": "3.22.3",
     "moment": "2.29.4",
     "paid-services": "3.20.3",
@@ -53,8 +53,8 @@
   "description": "Lightning balance CLI",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.11",
-    "invoices": "2.1.0",
-    "ln-docker-daemons": "2.3.5",
+    "invoices": "2.2.0",
+    "ln-docker-daemons": "2.3.6",
     "mock-lnd": "1.4.4",
     "tiny-secp256k1": "2.2.1"
   },
@@ -83,5 +83,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis --push .",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 test/arrays/*.js test/balances/*.js test/chain/*.js test/display/*.js test/encryption/*.js test/lnd/*.js test/network/*.js test/nodes/*.js test/peers/*.js test/responses/*.js test/routing/*.js test/services/*.js test/swaps/*.js test/tags/*.js test/telegram/*.js test/wallets/*.js"
   },
-  "version": "12.27.0"
+  "version": "12.28.2"
 }

package/test/integration/test_open_balanced_channel.js

@@ -32,7 +32,7 @@ const maturityBlocks = 100;
 const rate = 1;
 const size = 2;
 const slow = 100;
-const times = 1000;
+const times = 2000;
 const tokens = 500095;
 
 // Opening a balanced channel with a peer should open a balanced channel
@@ -61,7 +61,7 @@ test(`Open balanced channel`, async ({end, equal, strictSame}) => {
 
     // Make sure the channel is open and the wallet is sync'ed to chain
     await asyncEach([lnd, target.lnd], async lnd => {
-      await asyncRetry(({times}), async () => {
+      await asyncRetry(({interval, times}), async () => {
         await generate({});
         await target.generate({});
 
@@ -86,7 +86,7 @@ test(`Open balanced channel`, async ({end, equal, strictSame}) => {
     });
 
     // Make sure that the nodes see each other in the graph to see TLV support
-    await asyncRetry(({times}), async () => {
+    await asyncRetry(({interval, times}), async () => {
       const graph = await getNetworkGraph({lnd});
 
       // Force graph resync in case it gets stuck
@@ -110,10 +110,12 @@ test(`Open balanced channel`, async ({end, equal, strictSame}) => {
         throw new Error('ExpectedSyncChain');
       }
 
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
+
       const [channel] = (await getChannels({lnd: target.lnd})).channels;
 
       if (!channel.is_active) {
-        throw new Error('ExpectedActiveChannel');
+        throw new Error('ExpectedActiveChannelForSetup');
       }
     });
 

package/wallets/get_received_chart.js

@@ -28,6 +28,7 @@ const parseDate = n => Date.parse(n);
     [days]: <Received Over Days Count Number>
     [end_date]: <End Date YYYY-MM-DD String>
     lnds: [<Authenticated LND API Object>]
+    [query]: <Match Description String>
     [start_date]: <Start Date YYYY-MM-DD String>
   }
 
@@ -140,6 +141,7 @@ module.exports = (args, cbk) => {
           return getAllInvoices({
             lnd,
             confirmed_after: start.toISOString(),
+            created_after: start.toISOString(),
           },
           cbk);
         },
@@ -149,6 +151,10 @@ module.exports = (args, cbk) => {
           }
 
           const settled = flatten(res.map(n => n.invoices)).filter(invoice => {
+            if (!!args.query && !invoice.description.includes(args.query)) {
+              return false;
+            }
+
             // Exit early when considering all invoices without an end point
             if (!args.end_date) {
               return true;
@@ -240,10 +246,16 @@ module.exports = (args, cbk) => {
 
       // Total activity
       data: ['description', 'sum', ({description, sum}, cbk) => {
+        const title = [
+          !!args.is_count ? 'Received' : 'Payments',
+          !!args.query ? `for “${args.query}”` : '',
+          !!args.is_count ? 'count' : 'received',
+        ];
+
         return cbk(null, {
           description,
           data: !args.is_count ? sum.sum : sum.count,
-          title: !args.is_count ? 'Payments received' : 'Received count',
+          title: title.filter(n => !!n).join(' '),
         });
       }],
     },