balanceofsatoshis 11.32.0 → 11.35.0

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Versions
 
-## 11.32.0
+## 11.35.0
+
+- `graph`: Add `HOPS` variable to `--filter` for node peer distance from self
+
+## 11.34.0
+
+- `telegram`: Allow switching the node of a trade-secret
+
+## 11.33.0
+
+- `telegram`: Allow adjusting the expiration date of a trade-secret
+
+## 11.32.1
 
 - `change-channel-capacity`: Add support for moving a channel to a different
     saved node.

package/bos

@@ -761,6 +761,8 @@ prog
   // Get the edges of a given node
   .command('graph', 'List out the connections a node has with other nodes')
   .argument('<alias_or_public_key>', 'Node in the graph to look up')
+  .help('--filter variables: AGE/CAPACITY/HOPS/IN_FEE_RATE/OUT_FEE_RATE')
+  .help('Example: --filter "age<7*144" for connections in the last week')
   .option('--filter <formula>', 'Filter formula to apply', REPEATABLE)
   .option('--node <node_name>', 'Node to use for lookup')
   .option('--sort <sort_connections_by', 'Sort peers by field')

package/network/get_forwards.js

@@ -270,7 +270,7 @@ module.exports = (args, cbk) => {
             }
 
             if (args.sort === 'earned_out') {
-              return a.earned_inbound_fees - b.earned_outbound_fees;
+              return a.earned_outbound_fees - b.earned_outbound_fees;
             }
 
             if (args.sort === 'earned_total') {

package/network/get_graph_entry.js

@@ -9,6 +9,7 @@ const {getHeight} = require('ln-service');
 const {getNetworkGraph} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getNodeAlias} = require('ln-sync');
+const {getRouteToDestination} = require('ln-service');
 const moment = require('moment');
 const {returnResult} = require('asyncjs-util');
 
@@ -24,7 +25,10 @@ const defaultSort = 'age';
 const disableTag = isDisabled => isDisabled ? `${emojiIcons.disabled} ` : '';
 const displayFee = (n, rate) => n.length ? formatFeeRate({rate}).display : ' ';
 const displayTokens = tokens => formatTokens({tokens}).display;
+const distanceTokens = 100;
+const hasDistanceFilter = filters => /hops/gim.test(filters.join(' '));
 const header = [['Alias','Age','In Fee','Capacity','Out Fee','Public Key']];
+const hopsTitle = 'Hops';
 const {isArray} = Array;
 const isClear = sockets => !!sockets.find(n => !!isIP(n.socket.split(':')[0]));
 const isLarge = features => !!features.find(n => n.type === 'large_channels');
@@ -144,17 +148,49 @@ module.exports = ({filters, fs, lnd, logger, query, sort}, cbk) => {
         return cbk();
       }],
 
+      // Get distances
+      getDistances: ['peerKeys', ({peerKeys}, cbk) => {
+        // Exit early when there is no distance filter
+        if (!hasDistanceFilter(filters)) {
+          return cbk(null, peerKeys.map(destination => ({destination})));
+        }
+
+        return asyncMap(peerKeys, (destination, cbk) => {
+          return getRouteToDestination({
+            destination,
+            lnd,
+            is_ignoring_past_failure: true,
+            tokens: distanceTokens,
+          },
+          (err, res) => {
+            if (!!err) {
+              return cbk(err);
+            }
+
+            if (!res.route) {
+              return cbk(null, {destination, hops: Infinity});
+            }
+
+            return cbk(null, {destination, hops: --res.route.hops.length});
+          });
+        },
+        cbk);
+      }],
+
       // Final set of peers
       peers: [
+        'getDistances',
         'getHeight',
         'getIcons',
         'getNode',
         'peerKeys',
-        ({getHeight, getIcons, getNode, peerKeys}, cbk) =>
+        ({getDistances, getHeight, getIcons, getNode, peerKeys}, cbk) =>
       {
         const sorting = sort || defaultSort;
 
         const peers = peerKeys.map(peerKey => {
+          const {hops} = getDistances.find(n => n.destination === peerKey);
+
           const capacity = getNode.channels
             .filter(n => !!n.policies.find(n => n.public_key === peerKey))
             .reduce((sum, {capacity}) => sum + capacity, Number());
@@ -192,6 +228,7 @@ module.exports = ({filters, fs, lnd, logger, query, sort}, cbk) => {
             filters,
             variables: {
               capacity,
+              hops,
               age: getHeight.current_block_height - connectHeight,
               height: connectHeight,
               in_fee_rate: inboundFeeRate,
@@ -217,6 +254,10 @@ module.exports = ({filters, fs, lnd, logger, query, sort}, cbk) => {
             peerKey,
           ];
 
+          if (!!hasDistanceFilter(filters)) {
+            row.unshift(hops);
+          }
+
           return {sorts, row};
         })
         .filter(n => !!n);
@@ -258,7 +299,20 @@ module.exports = ({filters, fs, lnd, logger, query, sort}, cbk) => {
 
       // Final set of rows
       rows: ['getRowsWithAliases', ({getRowsWithAliases}, cbk) => {
-        return cbk(null, {rows: [].concat(header).concat(getRowsWithAliases)});
+        const [titles] = header;
+
+        const headers = titles.slice();
+
+        if (!!hasDistanceFilter(filters)) {
+          const first = headers.shift();
+
+          headers.unshift(hopsTitle);
+          headers.unshift(first);
+        }
+
+        const rows = [].concat([headers]).concat(getRowsWithAliases);
+
+        return cbk(null, {rows});
       }],
     },
     returnResult({reject, resolve, of: 'rows'}, cbk));

package/package.json

@@ -35,9 +35,9 @@
     "inquirer": "8.2.0",
     "invoices": "2.0.3",
     "ln-accounting": "5.0.5",
-    "ln-service": "53.5.1",
+    "ln-service": "53.5.2",
     "ln-sync": "3.7.0",
-    "ln-telegram": "3.8.0",
+    "ln-telegram": "3.10.0",
     "moment": "2.29.1",
     "paid-services": "3.11.0",
     "probing": "2.0.2",
@@ -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.32.0"
+  "version": "11.35.0"
 }