balanceofsatoshis 11.60.2 → 11.61.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 11.61.2
+
+- `chart-fees-paid`: Check HTLC attempts to confirm only counting paid fees
+
+## 11.61.0
+
+- `telegram`: add `--use-small-units` to avoid showing leading zeros on amounts
+
 ## 11.60.2
 
 - `trade-secret`: Fix listing of open trades that have dynamic fiat prices

package/README.md

@@ -705,5 +705,5 @@ bos inbound-channel-rules "capacity < 2*m"
 [docker-install-guide]: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-18-04
 [nodejs-install-guide]: https://gist.github.com/alexbosworth/8fad3d51f9e1ff67995713edf2d20126
 [raspiblitz-install-guide]: https://gist.github.com/openoms/823f99d1ab6e1d53285e489f7ba38602
-[raspibolt-install-guide]: https://raspibolt.org/bonus/lightning/balance-of-satoshis.html
+[raspibolt-install-guide]: https://raspibolt.org/guide/bonus/lightning/balance-of-satoshis.html
 [umbrel-install-guide]: https://plebnet.wiki/wiki/Umbrel_-_Installing_BoS

package/bos

@@ -1670,6 +1670,7 @@ prog
   .option('--node <node_name>', 'Node to connect to Telegram', REPEATABLE)
   .option('--reset-api-key', 'Reset the Telegram API key')
   .option('--use-proxy <path>', 'Proxy agent to connect to Telegram')
+  .option('--use-small-units', 'Avoid showing leading zeros on amounts')
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
@@ -1683,6 +1684,7 @@ prog
             makeDirectory: mkdir,
           },
           id: options.connect,
+          is_small_units: options.useSmallUnits || undefined,
           min_forward_tokens: options.ignoreForwardsBelow || undefined,
           nodes: flatten([options.node].filter(n => !!n)),
           payments: {limit: options.budget},

package/package.json

@@ -37,9 +37,9 @@
     "ln-accounting": "5.0.5",
     "ln-service": "53.9.3",
     "ln-sync": "3.11.0",
-    "ln-telegram": "3.19.2",
+    "ln-telegram": "3.20.0",
     "moment": "2.29.1",
-    "paid-services": "3.14.2",
+    "paid-services": "3.14.4",
     "probing": "2.0.3",
     "psbt": "2.0.0",
     "qrcode-terminal": "0.12.0",
@@ -81,5 +81,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": "11.60.2"
+  "version": "11.61.2"
 }

package/routing/get_fees_paid.js

@@ -146,8 +146,13 @@ module.exports = (args, cbk) => {
           .filter(payment => payment.is_confirmed !== false)
           .filter(payment => payment.confirmed_at > start.toISOString())
           .map(payment => {
-            const attempts = payment.attempts.filter(({route}) => {
-              const keys = route.hops.map(n => n.public_key);
+            const attempts = payment.attempts.filter(attempt => {
+              // Only consider attempts that confirmed
+              if (attempt.is_confirmed === false) {
+                return false;
+              }
+
+              const keys = attempt.route.hops.map(n => n.public_key);
 
               const [outHop] = keys;
 

package/telegram/connect_to_telegram.js

@@ -12,6 +12,7 @@ const runTelegramBot = require('./run_telegram_bot');
 const defaultPaymentsBudget = 0;
 const isNumber = n => !isNaN(n);
 const restartDelayMs = 1000 * 60 * 3;
+const smallUnitsType = 'full';
 
 /** Connect nodes to Telegram
 
@@ -23,6 +24,7 @@ const restartDelayMs = 1000 * 60 * 3;
       writeFile: <Write File Function>
     }
     [id]: <Authorized User Id Number>
+    is_small_units: <Formatting Should Use Small Units Bool>
     logger: <Winston Logger Object>
     [min_forward_tokens]: <Minimum Forward Tokens Number>
     [nodes]: [<Node Name String>]
@@ -93,8 +95,20 @@ module.exports = (args, cbk) => {
         return getTelegramBot({fs: args.fs, proxy: args.proxy}, cbk);
       }],
 
+      // Set the units formatting
+      setUnits: ['validate', ({}, cbk) => {
+        // Exit early when using default units formatting
+        if (!args.is_small_units) {
+          return cbk();
+        }
+
+        process.env.PREFERRED_TOKENS_TYPE = smallUnitsType;
+
+        return cbk();
+      }],
+
       // Start bot
-      start: ['getBot', 'getNodes', ({getBot, getNodes}, cbk) => {
+      start: ['getBot', 'getNodes', 'setUnits', ({getBot, getNodes}, cbk) => {
         let {limit} = args.payments;
         let online = getNodes.map(n => n.id);
 

package/telegram/start_telegram_bot.js

@@ -203,17 +203,14 @@ module.exports = (args, cbk) => {
         });
 
         // Handle command to get notified on the next block
-        args.bot.command('blocknotify', async ctx => {
-          try {
-            await handleBlocknotifyCommand({
-              from: ctx.message.from.id,
-              id: connectedId,
-              reply: n => ctx.reply(n, markdown),
-              request: args.request,
-            });
-          } catch (err) {
-            args.logger.error({err});
-          }
+        args.bot.command('blocknotify', ctx => {
+          handleBlocknotifyCommand({
+            from: ctx.message.from.id,
+            id: connectedId,
+            reply: n => ctx.reply(n, markdown),
+            request: args.request,
+          },
+          err => !!err ? logger.error({err}) : null);
         });
 
         // Handle command to get the connect id