balanceofsatoshis 18.2.0 → 18.2.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Versions
 
+## 18.2.2
+
+- `graph`: represent inbound fees in policy display
+- `rebalance`: fix support for 0.18.0 inbound fees
+
+## 18.2.1
+
+- Support LND 0.18.0
+
 ## 18.2.0
 
 - `call`: Add support for `inbound_base_discount_mtokens` and

package/README.md

@@ -7,6 +7,7 @@ Commands for working with LND balances.
 
 Supported LND versions:
 
+- v0.18.0-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/bos

@@ -887,6 +887,7 @@ prog
   .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')
+  .help(' ←-PPM will represent a source-based inbound discount when present')
   .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_graph_entry.js

@@ -23,6 +23,7 @@ const ageMs = time => moment(new Date(Date.now() - time)).fromNow(true);
 const blockTime = (current, start) => 1000 * 60 * 10 * (current - start);
 const defaultSort = 'age';
 const disableTag = isDisabled => isDisabled ? `${emojiIcons.disabled} ` : '';
+const displayDiscount = fee => !!fee && isFinite(fee) ? ` ←${-fee}` : '';
 const displayFee = (n, rate) => n.length ? formatFeeRate({rate}).display : ' ';
 const displayTokens = tokens => formatTokens({tokens}).display;
 const distanceTokens = 100;
@@ -34,6 +35,7 @@ const isClear = sockets => !!sockets.find(n => !!isIP(n.socket.split(':')[0]));
 const isLarge = features => !!features.find(n => n.type === 'large_channels');
 const isOnion = sockets => !!sockets.find(n => /onion/.test(n.socket));
 const isPublicKey = n => !!n && /^0[2-3][0-9A-F]{64}$/i.test(n);
+const join = arr => arr.join('');
 const {max} = Math;
 const {min} = Math;
 const sortBy = (a, b) => a > b ? 1 : (a !== b ? -1 : 0);
@@ -208,10 +210,12 @@ module.exports = ({filters, fs, lnd, logger, query, sort}, cbk) => {
             .map(n => n.policies.find(n => n.public_key !== peerKey))
             .filter(n => n.fee_rate !== undefined);
 
+          const backFee = min(...inPolicies.map(n => n.inbound_rate_discount));
           const inDisabled = inPolicies.filter(n => n.is_disabled === true);
           const inboundFeeRate = max(...inPolicies.map(n => n.fee_rate));
           const outDisabled = outPolicies.filter(n => n.is_disabled === true);
           const outFeeRate = max(...outPolicies.map(n => n.fee_rate));
+          const rebate = min(...outPolicies.map(n => n.inbound_rate_discount));
 
           const isInDisabled = inDisabled.length === inPolicies.length;
           const isOutDisabled = outDisabled.length === outPolicies.length;
@@ -246,11 +250,23 @@ module.exports = ({filters, fs, lnd, logger, query, sort}, cbk) => {
             return;
           }
 
+          const displayInPolicy = [
+            disableTag(isInDisabled),
+            displayFee(inPolicies, inboundFeeRate),
+            displayDiscount(backFee),
+          ];
+
+          const displayOutPolicy = [
+            disableTag(isOutDisabled),
+            displayFee(outPolicies, outFeeRate),
+            displayDiscount(rebate),
+          ];
+
           const row = [
             ageMs(blockTime(getHeight.current_block_height, connectHeight)),
-            disableTag(isInDisabled) + displayFee(inPolicies, inboundFeeRate),
+            join(displayInPolicy),
             displayTokens(capacity),
-            disableTag(isOutDisabled) + displayFee(outPolicies, outFeeRate),
+            join(displayOutPolicy),
             peerKey,
           ];
 

package/package.json

@@ -24,25 +24,25 @@
     "bitcoinjs-lib": "6.1.5",
     "bolt01": "2.0.0",
     "bolt03": "1.3.2",
-    "bolt07": "1.8.4",
+    "bolt07": "1.9.0",
     "cbor": "9.0.2",
     "colorette": "2.0.20",
     "crypto-js": "4.2.0",
-    "csv-parse": "5.5.5",
+    "csv-parse": "5.5.6",
     "ecpair": "2.1.0",
-    "goldengate": "14.0.4",
-    "grammy": "1.23.0",
+    "goldengate": "14.0.5",
+    "grammy": "1.24.1",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
-    "ini": "4.1.2",
-    "inquirer": "9.2.20",
-    "ln-accounting": "8.0.0",
-    "ln-service": "57.11.0",
-    "ln-sync": "6.0.2",
-    "ln-telegram": "6.1.3",
+    "ini": "4.1.3",
+    "inquirer": "9.2.23",
+    "ln-accounting": "8.0.1",
+    "ln-service": "57.13.1",
+    "ln-sync": "6.0.3",
+    "ln-telegram": "6.1.4",
     "moment": "2.30.1",
-    "paid-services": "6.1.2",
-    "probing": "5.0.0",
+    "paid-services": "6.1.3",
+    "probing": "5.0.1",
     "psbt": "3.0.0",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.3",
@@ -54,7 +54,7 @@
   "description": "Lightning balance CLI",
   "devDependencies": {
     "invoices": "3.0.0",
-    "ln-docker-daemons": "6.0.15",
+    "ln-docker-daemons": "6.0.17",
     "mock-lnd": "1.4.4"
   },
   "engines": {
@@ -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.0"
+  "version": "18.2.2"
 }

package/swaps/rebalance.js

@@ -699,6 +699,26 @@ module.exports = (args, 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,