balanceofsatoshis 11.29.2 → 11.32.1

package/.prettierignore

@@ -0,0 +1,2 @@
+bos
+*.js

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Versions
 
+## 11.32.1
+
+- `change-channel-capacity`: Add support for moving a channel to a different
+    saved node.
+
+## 11.31.0
+
+- `forwards`: Add `--sort` option to sort forwarding peers
+
+## 11.30.0
+
+- `telegram`: Add support for setting the description of a created trade-secret
+
 ## 11.29.2
 
 - `increase-outbound-liquidity`: Change seed node backing endpoint for API EOL

package/bos

@@ -300,10 +300,31 @@ prog
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
+        const {lnd} = await lndForNode(logger, options.node);
+
+        const saved = await nodes.manageSavedNodes({
+          logger,
+          spawn,
+          ask: (n, cbk) => inquirer.prompt([n]).then(res => cbk(res)),
+          fs: {
+            writeFile,
+            getDirectoryFiles: readdir,
+            getFile: readFile,
+            getFileStatus: lstat,
+            makeDirectory: mkdir,
+            removeDirectory: rmdir,
+            removeFile: unlink,
+          },
+          is_including_lnd_api: true,
+          lock_credentials_to: [],
+          network: (await lnSync.getNetwork({lnd})).network,
+        });
+
         return paidServices.changeChannelCapacity({
+          lnd,
           logger,
           ask: (n, cbk) => inquirer.prompt([n]).then(res => cbk(res)),
-          lnd: (await lnd.authenticatedLnd({logger, node: options.node})).lnd,
+          nodes: saved.nodes,
         },
         responses.returnObject({exit, logger, reject, resolve}));
       } catch (err) {
@@ -585,7 +606,7 @@ prog
   .option('--node <node_name>', 'Saved node (not peer to set fees on)')
   .option('--set-cltv-delta <count>', 'Set the number of blocks for CLTV', INT)
   .option('--set-fee-rate <rate>', 'Fee in parts per million or use a formula')
-  .option('--to <peer>', 'Peer public key or alias to set fees', REPEATABLE)
+  .option('--to <peer>', 'Peer key/alias/tag to set fees', REPEATABLE)
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
@@ -627,12 +648,14 @@ prog
   // Get forwards
   .command('forwards', 'Show recent forwarding earnings')
   .help('Peers where routing has taken place from inbound and outbound sides')
+  .help('Sorts: earned_in/earned_out/earned_total/inbound/liquidity/outbound')
   .option('--complete', 'Show complete set of records in non table view')
   .option('--days <days>', 'Number of past days to evaluate', INT)
   .option('--in <from>', 'Forwards that originated from a specific peer')
   .option('--no-color', 'Mute all colors')
   .option('--node <node_name>', 'Node to get forwards for')
   .option('--out <to>', 'Forwards that sent out to a specified peer')
+  .option('--sort <type>', 'Sort forward-active peers by earnings/liquidity')
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
@@ -646,6 +669,7 @@ prog
           fs: {getFile: readFile},
           is_monochrome: !!options.noColor,
           is_table: !options.complete,
+          sort: options.sort || undefined,
           to: (await lnSync.findKey({lnd, query: options.out})).public_key,
         },
         responses.returnObject({logger, reject, resolve, table}));
@@ -956,7 +980,7 @@ prog
   .option('--unlock', 'Remove encryption from auth macaroon')
   .action((args, options, logger) => {
     return new Promise((resolve, reject) => {
-      return nodes.adjustSavedNodes({
+      return nodes.manageSavedNodes({
         logger,
         spawn,
         ask: (n, cbk) => inquirer.prompt([n]).then(res => cbk(res)),

package/network/get_forwards.js

@@ -28,6 +28,8 @@ const {now} = Date;
 const numDays = 1;
 const {parse} = Date;
 const sort = (a, b) => a > b ? 1 : ((b > a) ? -1 : 0);
+const sortsForEarning = ['earned_in', 'earned_out', 'earned_total'];
+const sortsForCapital = ['inbound', 'liquidity', 'outbound'];
 const tokensAsBigTokens = tokens => !!tokens ? (tokens / 1e8).toFixed(8) : '';
 const uniq = arr => Array.from(new Set(arr));
 const wideSizeCols = 155;
@@ -41,7 +43,8 @@ const wideSizeCols = 155;
     }
     [is_monochrome]: <Mute Colors Bool>
     [is_table]: <Return Results As Table Bool>
-    lnd: <Authenticated LND gRPC API Object>
+    lnd: <Authenticated LND API Object>
+    [sort]: <Sort By Field String>
   }
 
   @returns via cbk or Promise
@@ -71,6 +74,12 @@ module.exports = (args, cbk) => {
           return cbk([400, 'ExpectedLndToGetForwardingInformation']);
         }
 
+        const sorts = [].concat(sortsForCapital).concat(sortsForEarning);
+
+        if (!!args.sort && !sorts.includes(args.sort)) {
+          return cbk([400, 'ExpectedKnownSortToSortForwards', {sorts}]);
+        }
+
         return cbk();
       },
 
@@ -256,6 +265,36 @@ module.exports = (args, cbk) => {
 
         const sorted = peers
           .sort((a, b) => {
+            if (args.sort === 'earned_in') {
+              return a.earned_inbound_fees - b.earned_inbound_fees;
+            }
+
+            if (args.sort === 'earned_out') {
+              return a.earned_outbound_fees - b.earned_outbound_fees;
+            }
+
+            if (args.sort === 'earned_total') {
+              const aTotal = a.earned_inbound_fees + a.earned_outbound_fees;
+              const bTotal = b.earned_inbound_fees + b.earned_outbound_fees;
+
+              return aTotal - bTotal;
+            }
+
+            if (args.sort === 'inbound') {
+              return a.liquidity_inbound - b.liquidity_inbound;
+            }
+
+            if (args.sort === 'liquidity') {
+              const aTotal = a.liquidity_inbound + a.liquidity_outbound;
+              const bTotal = b.liquidity_inbound + b.liquidity_outbound;
+
+              return aTotal - bTotal;
+            }
+
+            if (args.sort === 'outbound') {
+              return a.liquidity_outbound - b.liquidity_outbound;
+            }
+
             const aEvents = [a.last_outbound_at, a.last_inbound_at];
             const bEvents = [b.last_outbound_at, b.last_inbound_at];
 

package/nodes/get_saved_nodes.js

@@ -5,6 +5,7 @@ const asyncAuto = require('async/auto');
 const asyncFilter = require('async/filter');
 const asyncMap = require('async/map');
 const {authenticatedLndGrpc} = require('ln-service');
+const {getNetwork} = require('ln-sync');
 const {getWalletInfo} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
@@ -19,17 +20,20 @@ const {home} = require('./constants');
       getFile: <Read File Contents Function> (path, cbk) => {}
       getFileStatus: <File Status Function> (path, cbk) => {}
     }
+    [network]: <Required Network Name String>
   }
 
   @returns via cbk or Promise
   {
     nodes: [{
       [is_online]: <Node is Online Bool>
+      lnd: <Authenticated LND API Object>
       node_name: <Node Name String>
+      public_key: <Node Identity Public Key Hex String>
     }]
   }
 */
-module.exports = ({fs}, cbk) => {
+module.exports = ({fs, network}, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
       // Check arguments
@@ -121,16 +125,39 @@ module.exports = ({fs}, cbk) => {
             }
 
             return cbk(null, {
-              node_name: node,
+              lnd,
               is_online: res.is_synced_to_chain,
+              node_name: node,
+              public_key: res.public_key,
             });
           });
         },
         cbk);
       }],
 
+      // Filter out nodes not on the specified network
+      filter: ['getNodes', ({getNodes}, cbk) => {
+        // Exit early when no network is specified
+        if (!network) {
+          return cbk(null, getNodes);
+        }
+
+        const nodes = getNodes.filter(n => !!n.is_online);
+
+        return asyncFilter(nodes, ({lnd}, cbk) => {
+          return getNetwork({lnd}, (err, res) => {
+            if (!!err) {
+              return cbk(err);
+            }
+
+            return cbk(null, res.network === network);
+          });
+        },
+        cbk);
+      }],
+
       // Final list of nodes
-      nodes: ['getNodes', ({getNodes}, cbk) => cbk(null, {nodes: getNodes})],
+      nodes: ['filter', ({filter}, cbk) => cbk(null, {nodes: filter})],
     },
     returnResult({reject, resolve, of: 'nodes'}, cbk));
   });

package/nodes/index.js

@@ -1,11 +1,11 @@
-const adjustSavedNodes = require('./adjust_saved_nodes');
 const adjustTags = require('./adjust_tags');
 const getSavedCredentials = require('./get_saved_credentials');
 const getSavedNodes = require('./get_saved_nodes');
+const manageSavedNodes = require('./manage_saved_nodes');
 
 module.exports = {
-  adjustSavedNodes,
   adjustTags,
   getSavedCredentials,
   getSavedNodes,
+  manageSavedNodes,
 };

package/nodes/{adjust_saved_nodes.js → manage_saved_nodes.js}

@@ -29,11 +29,13 @@ const {isArray} = Array;
       removeFile: <Remove File Function> (path, cbk) => {}
       writeFile: <Write File Contents Function> (path, contents, cbk) => {}
     }
+    [is_including_lnd_api]: <Include Node LND API Object Bool>
     [is_registering]: <Add Node Credentials Bool>
     [is_removing]: <Remove Node Credentials Bool>
     [is_unlocking]: <Change Credentials To Decrypted Copy Bool>
     lock_credentials_to: [<Encrypt Macaroon to GPG Key With Id String>]
     logger: <Winston Logger Object>
+    [network]: <Return Nodes On Specified Network String>
     [node]: <Node Name String>
     spawn: <Spawn Function>
   }
@@ -42,8 +44,9 @@ const {isArray} = Array;
   {
     nodes: [{
       [is_online]: <Node is Online Bool>
-      [encrypted_to]: [<Encrypted To GPG Id String>]
+      [lnd]: <Authenticated LND API Object>
       node_name: <Node Name String>
+      public_key: <Node Identity Public Key Hex String>
     }]
   }
 */
@@ -149,7 +152,9 @@ module.exports = (args, cbk) => {
       }],
 
       // Get existing set of nodes
-      getNodes: ['remove', ({}, cbk) => getSavedNodes({fs: args.fs}, cbk)],
+      getNodes: ['remove', ({}, cbk) => {
+        return getSavedNodes({fs: args.fs, network: args.network}, cbk);
+      }],
 
       // Encrypt macaroons
       lock: ['getNodes', ({getNodes}, cbk) => {
@@ -189,10 +194,26 @@ module.exports = (args, cbk) => {
       }],
 
       // Get saved nodes
-      getSaved: ['lock', 'unlock', ({}, cbk) => {
-        return getSavedNodes({fs: args.fs}, cbk);
+      getSaved: ['getNodes', 'lock', 'unlock', ({getNodes}, cbk) => {
+        if (!args.is_registering && !args.is_removing && !args.is_unlocking) {
+          return cbk(null, getNodes);
+        }
+
+        return getSavedNodes({fs: args.fs, network: args.network}, cbk);
+      }],
+
+      // Final set of saved nodes
+      nodes: ['getSaved', ({getSaved}, cbk) => {
+        const nodes = getSaved.nodes.map(node => ({
+          is_online: node.is_online,
+          lnd: !!args.is_including_lnd_api ? node.lnd : undefined,
+          node_name: node.node_name,
+          public_key: node.public_key,
+        }));
+
+        return cbk(null, {nodes});
       }],
     },
-    returnResult({reject, resolve, of: 'getSaved'}, cbk));
+    returnResult({reject, resolve, of: 'nodes'}, cbk));
   });
 };

package/package.json

@@ -35,11 +35,11 @@
     "inquirer": "8.2.0",
     "invoices": "2.0.3",
     "ln-accounting": "5.0.5",
-    "ln-service": "53.5.0",
+    "ln-service": "53.5.1",
     "ln-sync": "3.7.0",
-    "ln-telegram": "3.7.0",
+    "ln-telegram": "3.8.1",
     "moment": "2.29.1",
-    "paid-services": "3.9.1",
+    "paid-services": "3.11.0",
     "probing": "2.0.2",
     "psbt": "1.1.10",
     "qrcode-terminal": "0.12.0",
@@ -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.29.2"
+  "version": "11.32.1"
 }

package/telegram/start_telegram_bot.js

@@ -1,6 +1,7 @@
 const {homedir} = require('os');
 const {join} = require('path');
 
+const {actOnMessageReply} = require('ln-telegram');
 const asyncAuto = require('async/auto');
 const asyncEach = require('async/each');
 const asyncForever = require('async/forever');
@@ -25,7 +26,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 {isMessageReplyAction} = require('ln-telegram');
 const {notifyOfForwards} = require('ln-telegram');
 const {postChainTransaction} = require('ln-telegram');
 const {postClosedMessage} = require('ln-telegram');
@@ -44,7 +45,6 @@ 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'};
@@ -457,10 +457,10 @@ module.exports = ({fs, id, limits, lnds, logger, payments, request}, cbk) => {
 
         // Listen for replies to created invoice messages
         bot.on('message').filter(
-          ctx => isMessageReplyToInvoice({ctx, nodes: getNodes}),
+          ctx => isMessageReplyAction({ctx, nodes: getNodes}),
           async ctx => {
             try {
-              return await updateInvoiceFromReply({
+              return await actOnMessageReply({
                 ctx,
                 api: bot.api,
                 id: connectedId,