balanceofsatoshis 11.18.1 → 11.20.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Versions
 
+## 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
+
+## 11.20.0
+
+- `send`: Add support for paying to zero-amount BOLT 11 payment requests
+
+## 11.19.0
+
+- `change-channel-capacity`: Allow changing private/public status of channel
+
 ## 11.18.1
 
 This release fixes an important issue with the experimental

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

@@ -1390,11 +1390,11 @@ prog
   })
 
   // Send funds to a destination
-  .command('send', 'Send funds to a node')
+  .command('send', 'Send funds to a node off-chain')
   .help('Formulas supported in amount, and N*USD or N*EUR')
   .help('Also supported in formulas: LIQUIDITY, INBOUND, OUTBOUND (with peer)')
   .help('OUT_INBOUND, OUT_OUTBOUND (when specifying outbound peer)')
-  .argument('<to>', 'Send to node with public key')
+  .argument('<to>', 'Send to node with public key, or zero amount pay request')
   .option('--amount <amount>', 'Amount to send to destination', STRING, '1')
   .option('--avoid <avoid>', 'Avoid forwarding via node/chan/tag', REPEATABLE)
   .option('--dryrun', 'Avoid actually sending funds')
@@ -1409,20 +1409,16 @@ prog
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
-        const {lnd} = await lndForNode(logger, options.node);
-
-        const destination = await lnSync.findKey({lnd, query: args.to});
-
         return network.pushPayment({
-          lnd,
           logger,
           amount: options.amount,
           avoid: flatten([options.avoid].filter(n => !!n)),
-          destination: destination.public_key,
+          destination: args.to,
           fs: {getFile: readFile},
           in_through: options.in,
           is_dry_run: options.dryrun,
           is_omitting_message_from: options.messageOmitFromKey,
+          lnd: (await lndForNode(logger, options.node)).lnd,
           max_fee: options.maxFee,
           message: options.message,
           quiz_answers: flatten([options.quiz].filter(n => !!n)),
@@ -1587,6 +1583,7 @@ prog
   .help('Connect to a Telegram bot. Create bot: tg://resolve?domain=botfather')
   .help('After creating the bot start chatting with the bot for connect code')
   .help('Supported updates: forwards, received payments, etc')
+  .help('Multiple nodes are supported by repeating the `--node` flag')
   .help('See README for info on persisting the bot through Docker/nohup')
   .option('--budget <amount>', 'Spending amount to allow', INT, Number())
   .option('--connect <connect_code>', 'Connection code', INT)
@@ -1639,7 +1636,7 @@ prog
   })
 
   // Transfer funds between own nodes
-  .command('transfer', 'Send funds to a saved node')
+  .command('transfer', 'Send funds off-chain to a saved node')
   .argument('<to>', 'Saved node name')
   .argument('[amount]', 'Amount to transfer', STRING, '1')
   .help('Formulas are supported in amount')

package/network/pay.js

@@ -82,6 +82,10 @@ module.exports = (args, cbk) => {
           return cbk([400, 'PaymentRequestExpired']);
         }
 
+        if (!BigInt(parsePaymentRequest({request: args.request}).mtokens)) {
+          return cbk([400, 'UseSendToPayZeroAmountPaymentRequests']);
+        }
+
         return cbk();
       },
 

package/network/probe_destination.js

@@ -157,6 +157,20 @@ module.exports = (args, cbk) => {
             return cbk([400, 'InvoiceIsExpired']);
           }
 
+          // Exit early when tokens are specified for a request
+          if (!!args.tokens) {
+            return cbk(null, {
+              cltv_delta: details.cltv_delta,
+              destination: details.destination,
+              features: details.features,
+              id: details.id,
+              mtokens: tokAsMtok(args.tokens),
+              payment: details.payment,
+              routes: details.routes,
+              tokens: args.tokens,
+            });
+          }
+
           args.logger.info({
             description: details.description || undefined,
             destination: details.destination,
@@ -175,8 +189,6 @@ module.exports = (args, cbk) => {
             routes: details.routes,
             tokens: details.tokens,
           });
-
-          return cbk(null, parsePaymentRequest({request: args.request}));
         } catch (err) {
           return cbk([400, 'FailedToDecodePaymentRequest', {err}]);
         }

package/network/push_payment.js

@@ -6,6 +6,7 @@ const {getIdentity} = require('ln-service');
 const {getNetwork} = require('ln-sync');
 const {getPeerLiquidity} = require('ln-sync');
 const {getPrices} = require('@alexbosworth/fiat');
+const {parsePaymentRequest} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const {getIgnores} = require('./../routing');
@@ -64,10 +65,6 @@ module.exports = (args, cbk) => {
           return cbk([400, 'ExpectedArrayOfAvoidDirectivesToSendPushPayment']);
         }
 
-        if (!isPublicKey(args.destination)) {
-          return cbk([400, 'ExpectedDestinationToPushPaymentTo']);
-        }
-
         if (!args.fs) {
           return cbk([400, 'ExpectedFileSystemMethodsToPushPayment']);
         }
@@ -150,6 +147,33 @@ module.exports = (args, cbk) => {
       // Get tags for figuring out avoid flags
       getTags: ['validate', ({}, cbk) => getTags({fs: args.fs}, cbk)],
 
+      // Payment details
+      payment: ['validate', ({}, cbk) => {
+        try {
+          const {destination, mtokens} = parsePaymentRequest({
+            request: args.destination,
+          });
+
+          if (!!BigInt(mtokens)) {
+            return cbk([400, 'ExpectedZeroAmountPayRequestToSendFunds']);
+          }
+
+          return cbk(null, {destination, request: args.destination});
+        } catch (_) {
+          return findKey({
+            lnd: args.lnd,
+            query: args.destination,
+          },
+          (err, res) => {
+            if (!!err) {
+              return cbk(err);
+            }
+
+            return cbk(null, {destination: res.public_key, is_push: true});
+          });
+        }
+      }],
+
       // Get ignores
       getIgnores: [
         'getChannels',
@@ -241,11 +265,12 @@ module.exports = (args, cbk) => {
         'getChannels',
         'getNetwork',
         'getOutKey',
-        ({fiatRates, getChannels, getNetwork, getOutKey}, cbk) =>
+        'payment',
+        ({fiatRates, getChannels, getNetwork, getOutKey, payment}, cbk) =>
       {
         // Total remote balance including pending if pending fails
         const inbound = getChannels.channels
-          .filter(n => n.partner_public_key === args.destination)
+          .filter(n => n.partner_public_key === payment.destination)
           .reduce((sum, chan) => {
             // Treat incoming payment as if they were still remote balance
             const inbound = chan.pending_payments.filter(n => !n.is_outgoing);
@@ -285,7 +310,7 @@ module.exports = (args, cbk) => {
 
         // Total local balance including pending if pending fails
         const outbound = getChannels.channels
-          .filter(n => n.partner_public_key === args.destination)
+          .filter(n => n.partner_public_key === payment.destination)
           .reduce((sum, chan) => {
             // Treat outgoing payment as if they were still local balance
             const outbound = chan.pending_payments
@@ -307,7 +332,7 @@ module.exports = (args, cbk) => {
           eur: !!eur ? eur.unit : undefined,
           liquidity: sumOf(
             getChannels.channels
-              .filter(n => n.partner_public_key === args.destination)
+              .filter(n => n.partner_public_key === payment.destination)
               .map(n => n.capacity)
           ),
           out_inbound: outInbound,
@@ -333,7 +358,8 @@ module.exports = (args, cbk) => {
         'getInKey',
         'getOutKey',
         'parseAmount',
-        ({getIgnores, getInKey, getOutKey, parseAmount}, cbk) =>
+        'payment',
+        ({getIgnores, getInKey, getOutKey, parseAmount, payment}, cbk) =>
       {
         if (parseAmount.tokens < minTokens) {
           return cbk([400, 'ExpectedNonZeroAmountToPushPayment']);
@@ -341,7 +367,7 @@ module.exports = (args, cbk) => {
 
         args.logger.info({
           paying: formatTokens({tokens: parseAmount.tokens}).display,
-          to: args.destination,
+          to: payment.destination,
         });
 
         if (!!args.is_dry_run) {
@@ -349,14 +375,14 @@ module.exports = (args, cbk) => {
         }
 
         return probeDestination({
-          destination: args.destination,
+          destination: payment.destination,
           fs: args.fs,
           ignore: getIgnores.ignore,
           lnd: args.lnd,
           logger: args.logger,
           in_through: getInKey,
           is_omitting_message_from: args.is_omitting_message_from,
-          is_push: true,
+          is_push: payment.is_push,
           is_real_payment: true,
           max_fee: args.max_fee,
           message: args.message,
@@ -365,6 +391,7 @@ module.exports = (args, cbk) => {
             value: utf8AsHex(answer),
           })),
           out_through: getOutKey,
+          request: payment.request,
           timeout_minutes: args.timeout_minutes,
           tokens: parseAmount.tokens,
         },

package/package.json

@@ -36,15 +36,15 @@
     "invoices": "2.0.2",
     "ln-accounting": "5.0.5",
     "ln-service": "53.2.0",
-    "ln-sync": "3.6.0",
-    "ln-telegram": "3.4.3",
+    "ln-sync": "3.6.1",
+    "ln-telegram": "3.5.0",
     "moment": "2.29.1",
-    "paid-services": "3.4.0",
+    "paid-services": "3.5.1",
     "probing": "2.0.1",
     "psbt": "1.1.10",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.3",
-    "table": "6.7.5",
+    "table": "6.8.0",
     "update-notifier": "5.1.0",
     "window-size": "1.1.1"
   },
@@ -80,5 +80,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/wallets/*.js"
   },
-  "version": "11.18.1"
+  "version": "11.20.2"
 }

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();