balanceofsatoshis 11.20.1 → 11.22.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Versions
 
+## 11.22.2
+
+- `telegram`: Fix issue when moving a created invoice to a saved node
+
+## 11.22.0
+
+- `accounting`: Add summation total as secondary table
+
+## 11.20.2
+
+- `change-channel-capacity`: Increase RBF fee buffer when increasing capacity
+- `telegram`: Redesign /invoice user interface to be button based
+
 ## 11.20.1
 
 - `fees`: Correct issue where fee rate could not be set to zero

package/README.md

@@ -89,6 +89,9 @@ bos chart-fees-paid
 # Show a chart of payments received
 bos chart-payments-received
 
+# Remove old failed payment data for probes and other failed payments
+bos clean-failed-payments
+
 # See details on how closed channels resolved on-chain
 bos closed
 

package/balances/get_accounting_report.js

@@ -12,6 +12,13 @@ const {notFoundIndex} = require('./constants');
 const rangeForDate = require('./range_for_date');
 const tableRowsFromCsv = require('./table_rows_from_csv');
 
+const assetType = 'BTC';
+const currentDate = new Date().toISOString();
+const empty = '';
+const round = n => parseFloat(n).toFixed(2);
+const sumOf = arr => arr.reduce((sum, n) => sum + n, 0);
+const summaryHeadings = ['Total', 'Asset', 'Report Date', 'Total Fiat'];
+
 /** Get an accounting report
 
   {
@@ -20,7 +27,7 @@ const tableRowsFromCsv = require('./table_rows_from_csv');
     [fiat]: <Fiat Type String>
     [is_csv]: <Return CSV Output Bool>
     [is_fiat_disabled]: <Omit Fiat Conversion Bool>
-    lnd: <Authenticated LND gRPC API Object>
+    lnd: <Authenticated LND API Object>
     [month]: <Month for Report String>
     [node]: <Node Name String>
     [rate_provider]: <Rate Provider String>
@@ -31,6 +38,7 @@ const tableRowsFromCsv = require('./table_rows_from_csv');
   @returns via cbk or Promise
   {
     [rows]: [[<Column String>]]
+    [rows_summary]: [[<Column String>]]
   }
 */
 module.exports = (args, cbk) => {
@@ -97,8 +105,31 @@ module.exports = (args, cbk) => {
         return tableRowsFromCsv({csv: getAccounting[csvType]}, cbk);
       }],
 
+      // Calculate total amounts
+      total: ['getAccounting', ({getAccounting}, cbk) => {
+        // Exit early when a CSV dump is requested
+        if (!!args.is_csv) {
+          return cbk();
+        }
+
+        const rows = getAccounting[categories[args.category]];
+
+        // Token values are represented as amounts
+        const tokens = sumOf(rows.map(n => n.amount));
+
+        // Exit early when there is no fiat data
+        if (!!args.is_fiat_disabled) {
+          return cbk(null, {tokens, fiat: empty});
+        }
+
+        // Fiat values are represented as fiat amounts
+        const fiat = round(sumOf(rows.map(n => n.fiat_amount)));
+
+        return cbk(null, {fiat, tokens});
+      }],
+
       // Clean rows for display if necessary
-      report: ['accounting', ({accounting}, cbk) => {
+      report: ['accounting', 'total',({accounting, total}, cbk) => {
         // Exit early when there is no cleaning necessary
         if (!!args.is_csv) {
           return cbk(null, accounting);
@@ -115,14 +146,19 @@ module.exports = (args, cbk) => {
             }
 
             if (j === fiatIndex && !!col) {
-              return parseFloat(col).toFixed(2);
+              return round(col);
             }
 
             return col.substring(0, 32);
           });
         });
 
-        return cbk(null, {rows});
+        const summary = [
+          summaryHeadings,
+          [total.tokens, assetType, currentDate, total.fiat],
+        ];
+
+        return cbk(null, {rows, rows_summary: summary});
       }],
     },
     returnResult({reject, resolve, of: 'report'}, cbk));

package/package.json

@@ -37,9 +37,9 @@
     "ln-accounting": "5.0.5",
     "ln-service": "53.2.0",
     "ln-sync": "3.6.1",
-    "ln-telegram": "3.4.3",
+    "ln-telegram": "3.5.1",
     "moment": "2.29.1",
-    "paid-services": "3.5.0",
+    "paid-services": "3.5.1",
     "probing": "2.0.1",
     "psbt": "1.1.10",
     "qrcode-terminal": "0.12.0",
@@ -53,7 +53,7 @@
     "@alexbosworth/tap": "15.0.10",
     "ln-docker-daemons": "2.1.0",
     "mock-lnd": "1.4.1",
-    "secp256k1": "4.0.2"
+    "secp256k1": "4.0.3"
   },
   "engines": {
     "node": ">=12.20"
@@ -69,6 +69,9 @@
   "license": "MIT",
   "main": "index.js",
   "name": "balanceofsatoshis",
+  "resolutions": {
+    "colors": "1.1.2"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/alexbosworth/balanceofsatoshis.git"
@@ -78,7 +81,8 @@
     "integration-tests": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 120 test/integration/*.js",
     "postpack": "PACKAGE_VERSION=$(cat package.json | grep \\\"version\\\" | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag -s v$PACKAGE_VERSION -m v$PACKAGE_VERSION && git push github --tags",
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis --push .",
+    "preinstall": "npx npm-force-resolutions",
     "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/wallets/*.js"
   },
-  "version": "11.20.1"
+  "version": "11.22.2"
 }

package/responses/return_object.js

@@ -7,7 +7,9 @@ const writeJsonFile = require('./write_json_file');
 
 const border = getBorderCharacters('norc');
 const emptyCell = ' ';
+const {isArray} = Array;
 const notifier = updateNotifier({pkg});
+const summary = n => `${n}_summary`;
 
 /** Return an object result to a logger in a promise
 
@@ -59,6 +61,10 @@ module.exports = ({exit, file, logger, reject, resolve, table, write}) => {
     if (!!table) {
       logger.info(renderTable(res[table], {border}));
 
+      if (isArray(res[summary(table)])) {
+        logger.info(renderTable(res[summary(table)], {border}));
+      }
+
       return resolve();
     }
 

package/services/initiate_balanced_channel.js

@@ -8,7 +8,6 @@ const asyncDetectSeries = require('async/detectSeries');
 const {cancelHodlInvoice} = require('ln-service');
 const {connectPeer} = require('ln-sync');
 const {createInvoice} = require('ln-service');
-const {createPsbt} = require('psbt');
 const {getChainFeeRate} = require('ln-service');
 const {getChannels} = require('ln-service');
 const {getNode} = require('ln-service');

package/telegram/start_telegram_bot.js

@@ -12,6 +12,7 @@ const {getTransactionRecord} = require('ln-sync');
 const {getWalletInfo} = require('ln-service');
 const {handleBackupCommand} = require('ln-telegram');
 const {handleBlocknotifyCommand} = require('ln-telegram');
+const {handleButtonPush} = require('ln-telegram');
 const {handleConnectCommand} = require('ln-telegram');
 const {handleCostsCommand} = require('ln-telegram');
 const {handleEarningsCommand} = require('ln-telegram');
@@ -23,6 +24,7 @@ const {handlePendingCommand} = require('ln-telegram');
 const {handleVersionCommand} = require('ln-telegram');
 const {InputFile} = require('grammy');
 const inquirer = require('inquirer');
+const {isMessageReplyToInvoice} = require('ln-telegram');
 const {notifyOfForwards} = require('ln-telegram');
 const {postChainTransaction} = require('ln-telegram');
 const {postClosedMessage} = require('ln-telegram');
@@ -38,6 +40,7 @@ const {subscribeToChannels} = require('ln-service');
 const {subscribeToInvoices} = require('ln-service');
 const {subscribeToPastPayments} = require('ln-service');
 const {subscribeToTransactions} = require('ln-service');
+const {updateInvoiceFromReply} = require('ln-telegram');
 
 const interaction = require('./interaction');
 const markdown = {parse_mode: 'Markdown'};
@@ -298,19 +301,17 @@ module.exports = ({fs, id, limits, lnds, logger, payments, request}, cbk) => {
           return;
         });
 
-        bot.command('invoice', ({message, reply}) => {
-          handleInvoiceCommand({
-            reply,
-            request,
-            from: message.from.id,
-            id: connectedId,
-            key: apiKey.key,
-            nodes: allNodes,
-            text: message.text,
-          },
-          err => !!err && !!err[0] >= 500 ? logger.error({err}) : null);
-
-          return;
+        // Handle creation of an invoice
+        bot.command('invoice', async ctx => {
+          try {
+            await handleInvoiceCommand({
+              ctx,
+              id: connectedId,
+              nodes: getNodes,
+            });
+          } catch (err) {
+            logger.error({err});
+          }
         });
 
         bot.command('mempool', async ctx => {
@@ -425,7 +426,7 @@ module.exports = ({fs, id, limits, lnds, logger, payments, request}, cbk) => {
           '/connect - Connect bot',
           '/costs - View costs over the past week',
           '/earnings - View earnings over the past week',
-          '/invoice - Make an invoice',
+          '/invoice [amount] [memo] - Make an invoice',
           '/liquidity [with] - View node liquidity',
           '/mempool - BTC mempool report',
           '/pay - Pay an invoice',
@@ -441,6 +442,32 @@ module.exports = ({fs, id, limits, lnds, logger, payments, request}, cbk) => {
           }
         });
 
+        // Handle button push type commands
+        bot.on('callback_query:data', async ctx => {
+          try {
+            await handleButtonPush({ctx, id: connectedId, nodes: getNodes});
+          } catch (err) {
+            logger.error({err});
+          }
+        });
+
+        // Listen for replies to created invoice messages
+        bot.on('message').filter(
+          ctx => isMessageReplyToInvoice({ctx, nodes: getNodes}),
+          async ctx => {
+            try {
+              return await updateInvoiceFromReply({
+                ctx,
+                api: bot.api,
+                id: connectedId,
+                nodes: getNodes,
+              });
+            } catch (err) {
+              logger.error({err});
+            }
+          },
+        );
+
         bot.start();
 
         return cbk();