balanceofsatoshis 12.26.0 → 12.26.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Versions
 
+## 12.26.3
+
+- `open-group-channel`: Fix sufficient balance check coordinating pair group
+
+## 12.26.2
+
+- `telegram`: Improve reliability of /commands if lnd connection is interrupted
+
+## 12.26.1
+
+- `open-group-channel`: Fix sufficient balance check for 2 party channel groups
+
 ## 12.26.0
 
 - `call`: Add support for `sendToChainAddress` to send coins on chain

package/package.json

@@ -33,14 +33,14 @@
     "grammy": "1.10.1",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
-    "ini": "3.0.0",
+    "ini": "3.0.1",
     "inquirer": "9.1.0",
     "ln-accounting": "5.0.7",
-    "ln-service": "53.17.5",
+    "ln-service": "53.20.0",
     "ln-sync": "3.13.1",
     "ln-telegram": "3.22.3",
     "moment": "2.29.4",
-    "paid-services": "3.20.1",
+    "paid-services": "3.20.3",
     "probing": "2.0.6",
     "psbt": "2.7.1",
     "qrcode-terminal": "0.12.0",
@@ -54,8 +54,8 @@
   "devDependencies": {
     "@alexbosworth/tap": "15.0.11",
     "invoices": "2.1.0",
-    "ln-docker-daemons": "2.3.2",
-    "mock-lnd": "1.4.1",
+    "ln-docker-daemons": "2.3.4",
+    "mock-lnd": "1.4.4",
     "tiny-secp256k1": "2.2.1"
   },
   "engines": {
@@ -83,5 +83,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/telegram/*.js test/wallets/*.js"
   },
-  "version": "12.26.0"
+  "version": "12.26.3"
 }

package/telegram/get_node_details.js

@@ -0,0 +1,77 @@
+const asyncAuto = require('async/auto');
+const asyncMap = require('async/map');
+const {returnResult} = require('asyncjs-util');
+const {getWalletInfo} = require('ln-service');
+
+const {getLnds} = require('./../lnd');
+
+const fromName = node => `${node.alias} ${node.public_key.substring(0, 8)}`;
+const {isArray} = Array;
+const sanitize = n => (n || '').replace(/_/g, '\\_').replace(/[*~`]/g, '');
+
+/** Get node details for telegram commands
+
+  {
+    logger: <Winston Logger Object>
+    nodes: [<Saved Node Name String>]
+  }
+
+  @returns via cbk or Promise
+  {
+    nodes: [{
+      lnd: <Authenticated LND API Object>
+      alias: <Node Alias String>
+      from: <Node Name String>
+      public_key: <Node Identity Public Key Hex String>
+    }]
+  }
+*/
+module.exports = ({logger, nodes}, cbk) => {
+  return new Promise((resolve, reject) => {
+    return asyncAuto({
+      // Check arguments
+      validate: cbk => {
+        if (!logger) {
+          return cbk([400, 'ExpectedWinstonLoggerGetGetTelegramNodeDetails']);
+        }
+
+        if (!isArray(nodes)) {
+          return cbk([400, 'ExpectedArrayOfSavedNodesToGetNodeDetailsFor']);
+        }
+
+        return cbk();
+      },
+
+      // Get associated LNDs
+      getLnds: ['validate', ({}, cbk) => getLnds({logger, nodes}, cbk)],
+
+      // Get node info for the nodes
+      getNodes: ['getLnds', ({getLnds}, cbk) => {
+        return asyncMap(getLnds.lnds, (lnd, cbk) => {
+          return getWalletInfo({lnd}, (err, res) => {
+            if (!!err) {
+              return cbk([503, 'FailedToGetNodeInfoForTelegramNode', {err}]);
+            }
+
+            const named = fromName({
+              alias: res.alias,
+              public_key: res.public_key,
+            });
+
+            return cbk(null, {
+              lnd,
+              alias: res.alias,
+              from: sanitize(named),
+              public_key: res.public_key,
+            });
+          });
+        },
+        cbk);
+      }],
+
+      // List of nodes with details
+      nodes: ['getNodes', ({getNodes}, cbk) => cbk(null, {nodes: getNodes})],
+    },
+    returnResult({reject, resolve, of: 'nodes'}, cbk));
+  });
+};

package/telegram/run_telegram_bot.js

@@ -98,6 +98,7 @@ module.exports = (args, cbk) => {
           min_forward_tokens: args.min_forward_tokens,
           lnds: getLnds.lnds,
           logger: args.logger,
+          nodes: args.nodes,
           payments_limit: args.payments_limit,
           proxy: args.proxy,
           request: args.request,

package/telegram/start_telegram_bot.js

@@ -49,12 +49,14 @@ const {subscribeToPastPayments} = require('ln-service');
 const {subscribeToPendingChannels} = require('ln-sync');
 const {subscribeToTransactions} = require('ln-service');
 
+const getNodeDetails = require('./get_node_details');
 const interaction = require('./interaction');
 const named = require('./../package').name;
 const {version} = require('./../package');
 
 const fileAsDoc = file => new InputFile(file.source, file.filename);
 const fromName = node => `${node.alias} ${node.public_key.substring(0, 8)}`;
+const getNodes = (logger, nodes) => getNodeDetails({logger, nodes});
 const {isArray} = Array;
 const isHash = n => /^[0-9A-F]{64}$/i.test(n);
 let isBotInit = false;
@@ -74,6 +76,7 @@ const sanitize = n => (n || '').replace(/_/g, '\\_').replace(/[*~`]/g, '');
     key: <Telegram API Key String>
     [min_forward_tokens]: <Minimum Forward Tokens To Notify Number>
     lnds: [<Authenticated LND API Object>]
+    nodes: [<Saved Nodes String>]
     logger: <Winston Logger Object>
     payments_limit: <Total Spendable Budget Tokens Limit Number>
     request: <Request Function>
@@ -115,6 +118,10 @@ module.exports = (args, cbk) => {
           return cbk([400, 'ExpectedLoggerToStartTelegramBot']);
         }
 
+        if (!isArray(args.nodes)) {
+          return cbk([400, 'ExpectedArrayOfSavedNodesToStartTelegramBot']);
+        }
+
         if (!isNumber(args.payments_limit)) {
           return cbk([400, 'ExpectedPaymentsLimitTokensNumberToStartBot']);
         }
@@ -150,29 +157,8 @@ module.exports = (args, cbk) => {
         cbk);
       }],
 
-      // Setup the bot commands
-      setCommands: ['validate', async ({}) => {
-        return await args.bot.api.setMyCommands([
-          {command: 'backup', description: 'Get node backup file'},
-          {command: 'blocknotify', description: 'Get notified on next block'},
-          {command: 'connect', description: 'Get connect code for the bot'},
-          {command: 'costs', description: 'Show costs over the week'},
-          {command: 'earnings', description: 'Show earnings over the week'},
-          {command: 'graph', description: 'Show info about a node'},
-          {command: 'help', description: 'Show the list of commands'},
-          {command: 'info', description: 'Show wallet info'},
-          {command: 'invoice', description: 'Create an invoice [amt] [memo]'},
-          {command: 'liquidity', description: 'Get liquidity [with-peer]'},
-          {command: 'mempool', description: 'Get info about the mempool'},
-          {command: 'pay', description: 'Pay a payment request'},
-          {command: 'pending', description: 'Get pending forwards, channels'},
-          {command: 'stop', description: 'Stop the bot'},
-          {command: 'version', description: 'View current bot version'},
-        ]);
-      }],
-
       // Setup the bot start action
-      initBot: ['getNodes', ({getNodes}, cbk) => {
+      initBot: ['validate', ({}, cbk) => {
         // Exit early when the bot was already setup
         if (!!isBotInit) {
           return cbk();
@@ -197,7 +183,7 @@ module.exports = (args, cbk) => {
             await handleBackupCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               reply: ctx.reply,
               send: (n, opts) => ctx.replyWithDocument(fileAsDoc(n), opts),
             });
@@ -232,7 +218,7 @@ module.exports = (args, cbk) => {
             await handleCostsCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               reply: n => ctx.reply(n, markdown),
               request: args.request,
               working: () => ctx.replyWithChatAction('typing'),
@@ -248,7 +234,7 @@ module.exports = (args, cbk) => {
             await handleEarningsCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               reply: n => ctx.reply(n, markdown),
               working: () => ctx.replyWithChatAction('typing'),
             });
@@ -263,7 +249,7 @@ module.exports = (args, cbk) => {
             await handleGraphCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               remove: () => ctx.deleteMessage(),
               reply: (message, options) => ctx.reply(message, options),
               text: ctx.message.text,
@@ -280,7 +266,7 @@ module.exports = (args, cbk) => {
             await handleInfoCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               remove: () => ctx.deleteMessage(),
               reply: (message, options) => ctx.reply(message, options),
             });
@@ -295,7 +281,7 @@ module.exports = (args, cbk) => {
             await handleInvoiceCommand({
               ctx,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
             });
           } catch (err) {
             args.logger.error({err});
@@ -331,7 +317,7 @@ module.exports = (args, cbk) => {
               await handleLiquidityCommand({
                 from: ctx.message.from.id,
                 id: connectedId,
-                nodes: getNodes,
+                nodes: (await getNodes(args.logger, args.nodes)).nodes,
                 reply: (n, opt) => ctx.reply(n, opt),
                 text: ctx.message.text,
                 working: () => ctx.replyWithChatAction('typing'),
@@ -360,7 +346,7 @@ module.exports = (args, cbk) => {
               budget,
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               reply: message => ctx.reply(message, markdown),
               request: args.request,
               text: ctx.message.text,
@@ -379,7 +365,7 @@ module.exports = (args, cbk) => {
             await handlePendingCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: getNodes,
+              nodes: (await getNodes(args.logger, args.nodes)).nodes,
               reply: (message, options) => ctx.reply(message, options),
               working: () => ctx.replyWithChatAction('typing'),
             });
@@ -530,6 +516,27 @@ module.exports = (args, cbk) => {
         });
       }],
 
+      // Setup the bot commands
+      setCommands: ['validate', async ({}) => {
+        return await args.bot.api.setMyCommands([
+          {command: 'backup', description: 'Get node backup file'},
+          {command: 'blocknotify', description: 'Get notified on next block'},
+          {command: 'connect', description: 'Get connect code for the bot'},
+          {command: 'costs', description: 'Show costs over the week'},
+          {command: 'earnings', description: 'Show earnings over the week'},
+          {command: 'graph', description: 'Show info about a node'},
+          {command: 'help', description: 'Show the list of commands'},
+          {command: 'info', description: 'Show wallet info'},
+          {command: 'invoice', description: 'Create an invoice [amt] [memo]'},
+          {command: 'liquidity', description: 'Get liquidity [with-peer]'},
+          {command: 'mempool', description: 'Get info about the mempool'},
+          {command: 'pay', description: 'Pay a payment request'},
+          {command: 'pending', description: 'Get pending forwards, channels'},
+          {command: 'stop', description: 'Stop the bot'},
+          {command: 'version', description: 'View current bot version'},
+        ]);
+      }],
+
       // Subscribe to backups
       backups: ['getNodes', 'userId', ({getNodes}, cbk) => {
         return asyncEach(getNodes, (node, cbk) => {

package/test/fixtures/list_channels_response.json

@@ -1,6 +1,7 @@
 {
   "channels": [{
     "active": true,
+    "alias_scids": [],
     "capacity": "1",
     "chan_id": "1",
     "chan_status_flags": "1",

package/test/network/test_get_peers.js

@@ -123,6 +123,7 @@ const tests = [
           pendingChannels: ({}, cbk) => cbk(null, pendingChannelsResponse),
           listChannels: ({}, cbk) => cbk(null, {channels: [{
             active: true,
+            alias_scids: [],
             capacity: '1',
             chan_id: '1',
             channel_point: '00:1',
@@ -222,6 +223,7 @@ const tests = [
           }),
           listChannels: ({}, cbk) => cbk(null, {channels: [{
             active: true,
+            alias_scids: [],
             capacity: '1',
             chan_id: '1',
             channel_point: '00:1',

package/test/network/test_reconnect.js

@@ -34,6 +34,7 @@ const tests = [
         channels: {
           "channels": [{
             "active": true,
+            "alias_scids": [],
             "capacity": "1",
             "chan_id": "1",
             "chan_status_flags": "1",

package/test/services/test_initiate_balanced_channel.js

@@ -199,7 +199,7 @@ const makeArgs = overrides => {
               settle_date: '1',
               settle_index: '1',
               settled: true,
-              state: '',
+              state: 'SETTLED',
               value: '1',
               value_msat: '1000',
             });