balanceofsatoshis 19.0.2 → 19.0.4

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 19.0.2
+## 19.0.4
 
 - `offer-channel-open`: Correct PPM fee pricing for custom lifetime lengths
 

package/README.md

@@ -7,7 +7,7 @@ Commands for working with LND balances.
 
 Supported LND versions:
 
-- v0.18.0-beta to v0.18.1-beta
+- v0.18.0-beta to v0.18.2-beta
 - v0.17.0-beta to v0.17.5-beta
 - v0.16.0-beta to v0.16.4-beta
 - v0.15.2-beta to v0.15.5-beta

package/lnd/find_record.js

@@ -112,11 +112,12 @@ module.exports = ({lnd, query}, cbk) => {
               channels: res.channels,
               nodes: [{
                 alias: res.alias,
+                capacity: res.capacity,
                 color: res.color,
                 features: res.features,
                 public_key: getKey.value.public_key,
                 sockets: res.sockets.map(n => n.socket),
-                updated_at: res.last_updated,
+                updated_at: res.updated_at,
               }],
             });
           });
@@ -192,7 +193,7 @@ module.exports = ({lnd, query}, cbk) => {
 
             return {
               alias: node.alias,
-              capacity: asBigUnit(getGraph.channels.reduce(
+              capacity: asBigUnit(node.capacity || getGraph.channels.reduce(
                 (sum, {capacity, policies}) => {
                   if (!policies.find(n => n.public_key === node.public_key)) {
                     return sum;

package/lsp/lsps1_client.js

@@ -145,6 +145,10 @@ module.exports = (args, cbk) => {
           return cbk([404, 'NoServicesOfferingChannelsFound']);
         }
 
+        args.logger.info({
+          services: services.map(n => `${n.alias} ${n.public_key}`.trim()),
+        });
+
         return args.ask({
           choices: services.map(node => ({
             name: `${node.alias} ${node.public_key}`,

package/package.json

@@ -31,19 +31,19 @@
     "csv-parse": "5.5.6",
     "ecpair": "2.1.0",
     "goldengate": "14.0.7",
-    "grammy": "1.26.1",
+    "grammy": "1.27.0",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
     "ini": "4.1.3",
-    "inquirer": "9.3.4",
+    "inquirer": "10.0.1",
     "ln-accounting": "8.0.3",
-    "ln-service": "57.14.4",
+    "ln-service": "57.15.0",
     "ln-sync": "6.0.4",
     "ln-telegram": "6.1.6",
     "minimist": "1.2.8",
     "moment": "2.30.1",
     "paid-services": "6.1.4",
-    "probing": "5.0.2",
+    "probing": "5.0.3",
     "psbt": "3.0.0",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.3",
@@ -56,7 +56,7 @@
   "description": "Lightning balance CLI",
   "devDependencies": {
     "invoices": "3.0.0",
-    "ln-docker-daemons": "6.0.20",
+    "ln-docker-daemons": "6.0.21",
     "mock-lnd": "1.4.4"
   },
   "engines": {
@@ -84,5 +84,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "npx nyc@15.1.0 node --experimental-test-coverage --test 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": "19.0.2"
+  "version": "19.0.4"
 }

package/swaps/manage_rebalance.js

@@ -61,6 +61,8 @@ module.exports = (args, cbk) => {
 
       // Run the rebalance
       rebalance: ['validate', ({}, cbk) => {
+        const start = new Date().toISOString();
+
         return asyncRetry({
           errorFilter: err => {
             // Do not retry on invalid errors
@@ -87,6 +89,7 @@ module.exports = (args, cbk) => {
         },
         cbk => {
           return rebalance({
+            start,
             avoid: args.avoid,
             fs: args.fs,
             in_filters: args.in_filters,

package/swaps/rebalance.js

@@ -11,6 +11,7 @@ const {getIdentity} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getPeerLiquidity} = require('ln-sync');
 const {getWalletVersion} = require('ln-service');
+const moment = require('moment');
 const {parseAmount} = require('ln-accounting');
 const {payViaRoutes} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
@@ -84,6 +85,7 @@ const uniq = arr => Array.from(new Set(arr));
     [out_filters]: [<Outbound Filter Formula String>]
     [out_inbound]: <Outbound Target Inbound Liquidity Tokens Number>
     [out_through]: <Pay Out Through Peer String>
+    [start]: <ISO 8601 Start Date String>
     [timeout_minutes]: <Deadline To Stop Rebalance Minutes Number>
   }
 
@@ -808,13 +810,21 @@ module.exports = (args, cbk) => {
 
         const dif = BigInt(route.fee_mtokens) - BigInt(discounted.fee_mtokens);
 
+        // Exit early when the inbound incluive fee rate is actually higher
+        if (BigInt(discounted.fee_mtokens) > BigInt(route.fee_mtokens)) {
+          return cbk(null, {route});
+        }
+
         return cbk(null, {
           lowered: tokAsBigTok(Number(dif / mtokensPerToken)),
+          route: discounted,
         });
       }],
 
       // Execute the rebalance
-      pay: ['invoice', 'lnd', 'routes', ({invoice, lnd, routes}, cbk) => {
+      pay: ['discount', 'invoice', 'lnd', ({discount, invoice, lnd}, cbk) => {
+        const routes = [discount.route];
+
         return payViaRoutes({lnd, routes, id: invoice.id}, (err, res) => {
           if (!!err) {
             return cbk([503, 'UnexpectedErrExecutingRebalance', {err}]);
@@ -828,6 +838,19 @@ module.exports = (args, cbk) => {
         });
       }],
 
+      // Calculate rebalance time
+      time: ['pay', ({}, cbk) => {
+        // Exit early when no start time was specified
+        if (!args.start) {
+          return cbk();
+        }
+
+        const end = new moment();
+        const start = new moment(new Date(args.start));
+
+        return cbk(null, moment.duration(end.diff(start)).humanize());
+      }],
+
       // Get adjusted inbound liquidity after rebalance
       getAdjustedInbound: ['getInbound', 'pay', ({getInbound, pay}, cbk) => {
         return getPeerLiquidity({
@@ -856,6 +879,7 @@ module.exports = (args, cbk) => {
         'getInbound',
         'getOutbound',
         'pay',
+        'time',
         ({
           discount,
           getAdjustedInbound,
@@ -863,6 +887,7 @@ module.exports = (args, cbk) => {
           getInbound,
           getOutbound,
           pay,
+          time,
         },
         cbk) =>
       {
@@ -880,6 +905,7 @@ module.exports = (args, cbk) => {
 
         return cbk(null, {
           got_inbound_fee_discount: discount.lowered,
+          total_execution_time: time,
           rebalance: [
             {
               increased_inbound_on: inOn,