balanceofsatoshis 18.2.6 → 18.2.8

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 18.2.6
+## 18.2.8
 
 - `graph`: represent inbound fees in policy display
 - `rebalance`: fix support for 0.18.0 inbound fees

package/package.json

@@ -24,20 +24,20 @@
     "bitcoinjs-lib": "6.1.6",
     "bolt01": "2.0.0",
     "bolt03": "1.3.2",
-    "bolt07": "1.9.3",
+    "bolt07": "1.9.4",
     "cbor": "9.0.2",
     "colorette": "2.0.20",
     "crypto-js": "4.2.0",
     "csv-parse": "5.5.6",
     "ecpair": "2.1.0",
     "goldengate": "14.0.7",
-    "grammy": "1.24.1",
+    "grammy": "1.25.0",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
     "ini": "4.1.3",
     "inquirer": "9.2.23",
     "ln-accounting": "8.0.3",
-    "ln-service": "57.14.2",
+    "ln-service": "57.14.3",
     "ln-sync": "6.0.4",
     "ln-telegram": "6.1.6",
     "moment": "2.30.1",
@@ -82,5 +82,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": "18.2.6"
+  "version": "18.2.8"
 }

package/swaps/rebalance.js

@@ -10,7 +10,6 @@ const {getHeight} = require('ln-service');
 const {getIdentity} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getPeerLiquidity} = require('ln-sync');
-const {getRouteThroughHops} = require('ln-service');
 const {getWalletVersion} = require('ln-service');
 const {parseAmount} = require('ln-accounting');
 const {payViaRoutes} = require('ln-service');
@@ -697,59 +696,17 @@ module.exports = (args, cbk) => {
       // Get the current height
       getHeight: ['channels', 'lnd', ({lnd}, cbk) => getHeight({lnd}, cbk)],
 
-      // Get route for rebalance
-      getRoute: ['channels', 'invoice', ({channels, invoice}, cbk) => {
-        // Find any inbound policy, LND 0.18.0 miscalculates fees here
-        const hasInboundPolicy = channels.find(channel => {
-          return channel.policies.find(policy => {
-            if (policy.inbound_base_discount_mtokens !== '0') {
-              return true;
-            }
-
-            if (policy.inbound_rate_discount !== 0) {
-              return true;
-            }
-
-            return false;
-          });
-        });
-
-        // Exit early when there is an inbound fee that needs a recalc
-        if (!!hasInboundPolicy) {
-          return cbk(null, {});
-        }
-
-        return getRouteThroughHops({
-          cltv_delta: cltvDelta,
-          lnd: args.lnd,
-          mtokens: invoice.mtokens,
-          payment: invoice.payment,
-          public_keys: channels.map(n => n.destination),
-          total_mtokens: !!invoice.payment ? invoice.mtokens : undefined,
-        },
-        (err, res) => {
-          // Exit early when there is an error and use local route calculation
-          if (!!err) {
-            return cbk(null, {});
-          }
-
-          return cbk(null, {route: res.route});
-        });
-      }],
-
       // Calculate route for rebalance
       routes: [
         'channels',
         'getHeight',
         'getPublicKey',
-        'getRoute',
         'invoice',
         'tokens',
         ({
           channels,
           getHeight,
           getPublicKey,
-          getRoute,
           invoice,
           tokens,
         },
@@ -766,16 +723,15 @@ module.exports = (args, cbk) => {
             total_mtokens: !!invoice.payment ? invoice.mtokens : undefined,
           });
 
-          const endRoute = getRoute.route || route;
           const maxFee = args.max_fee || defaultMaxFee;
           const maxFeeRate = args.max_fee_rate || defaultMaxFeeRate;
 
-          if (endRoute.tokens < minRebalanceAmount) {
+          if (route.tokens < minRebalanceAmount) {
             return cbk([503, 'EncounteredUnexpectedRouteLiquidityFailure']);
           }
 
           const [highFeeAt] = sortBy({
-            array: endRoute.hops.map(hop => ({
+            array: route.hops.map(hop => ({
               to: hop.public_key,
               fee: hop.fee,
             })),
@@ -783,15 +739,15 @@ module.exports = (args, cbk) => {
           }).sorted.reverse().map(n => n.to);
 
           // Exit early when a max fee is specified and exceeded
-          if (!!maxFee && endRoute.fee > maxFee) {
+          if (!!maxFee && route.fee > maxFee) {
             return cbk([
               400,
               'RebalanceTotalFeeTooHigh',
-              {needed_max_fee: endRoute.fee.toString(), high_fee: highFeeAt},
+              {needed_max_fee: route.fee.toString(), high_fee: highFeeAt},
             ]);
           }
 
-          const feeRate = ceil(endRoute.fee / endRoute.tokens * rateDivisor);
+          const feeRate = ceil(route.fee / route.tokens * rateDivisor);
 
           // Exit early when the max fee rate is specified and exceeded
           if (!!maxFeeRate && feeRate > maxFeeRate) {
@@ -802,12 +758,61 @@ module.exports = (args, cbk) => {
             ]);
           }
 
-          return cbk(null, [endRoute]);
+          return cbk(null, [route]);
         } catch (err) {
           return cbk([500, 'FailedToConstructRebalanceRoute', {err}]);
         }
       }],
 
+      // Calculate the total inbound fee discount
+      discount: [
+        'channels',
+        'getHeight',
+        'getPublicKey',
+        'invoice',
+        'routes',
+        ({
+          channels,
+          getHeight,
+          getPublicKey,
+          invoice,
+          routes,
+          tokens,
+        },
+        cbk) =>
+      {
+        const {route} = routeFromChannels({
+          channels: channels.map(channel => ({
+            capacity: channel.capacity,
+            destination: channel.destination,
+            id: channel.id,
+            policies: channel.policies.map(policy => ({
+              base_fee_mtokens: policy.base_fee_mtokens,
+              cltv_delta: policy.cltv_delta,
+              fee_rate: policy.fee_rate,
+              is_disabled: policy.is_disabled,
+              max_htlc_mtokens: policy.max_htlc_mtokens,
+              min_htlc_mtokens: policy.min_htlc_mtokens,
+              public_key: policy.public_key,
+            })),
+          })),
+          cltv_delta: cltvDelta,
+          destination: getPublicKey.public_key,
+          height: getHeight.current_block_height,
+          mtokens: (BigInt(invoice.tokens) * mtokensPerToken).toString(),
+          payment: invoice.payment,
+          total_mtokens: !!invoice.payment ? invoice.mtokens : undefined,
+        });
+
+        const [discounted] = routes;
+
+        const dif = BigInt(route.fee_mtokens) - BigInt(discounted.fee_mtokens);
+
+        return cbk(null, {
+          lowered: tokAsBigTok(Number(dif / mtokensPerToken)),
+        });
+      }],
+
       // Execute the rebalance
       pay: ['invoice', 'lnd', 'routes', ({invoice, lnd, routes}, cbk) => {
         return payViaRoutes({lnd, routes, id: invoice.id}, (err, res) => {
@@ -845,12 +850,14 @@ module.exports = (args, cbk) => {
 
       // Final rebalancing outcome
       rebalance: [
+        'discount',
         'getAdjustedInbound',
         'getAdjustedOutbound',
         'getInbound',
         'getOutbound',
         'pay',
         ({
+          discount,
           getAdjustedInbound,
           getAdjustedOutbound,
           getInbound,
@@ -872,6 +879,7 @@ module.exports = (args, cbk) => {
         const outPendingOut = getAdjustedOutbound.outbound_pending;
 
         return cbk(null, {
+          got_inbound_fee_discount: discount.lowered,
           rebalance: [
             {
               increased_inbound_on: inOn,