balanceofsatoshis 13.1.7 → 13.3.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 13.3.0
+
+- `telegram`: Support multiple word queries in /graph and /liquidity
+
+## 13.2.0
+
+- `telegram`: Support formulas in /invoice command, including *USD and *EUR
+
 ## 13.1.7
 
 - `open-group-channel`: Fix support for LND 0.15.3 when using P2TR inputs

package/bos

@@ -11,6 +11,7 @@ const {writeFile} = require('fs');
 
 const importLazy = require('import-lazy')(require);
 
+const accounting = importLazy('ln-accounting');
 const fetch = importLazy('@alexbosworth/node-fetch');
 const fiat = importLazy('@alexbosworth/fiat');
 const lnService = importLazy('ln-service');
@@ -1007,7 +1008,7 @@ prog
           spend_address: options.spendAddress || undefined,
           spend_tokens: options.spendAmount || undefined,
           timeout: 1000 * 60 * 60 * 10,
-          tokens: display.parseAmount({amount: options.amount}).tokens,
+          tokens: accounting.parseAmount({amount: options.amount}).tokens,
         },
         responses.returnObject({exit, logger, reject, resolve}));
       } catch (err) {

package/chain/fund_transaction.js

@@ -10,13 +10,12 @@ const {getMaxFundAmount} = require('ln-sync');
 const {getNetwork} = require('ln-sync');
 const {getUtxos} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
+const {parseAmount} = require('ln-accounting');
 const {returnResult} = require('asyncjs-util');
 const {signPsbt} = require('ln-service');
 const {Transaction} = require('bitcoinjs-lib');
 const {unlockUtxo} = require('ln-service');
 
-const {parseAmount} = require('./../display');
-
 const asBigUnit = n => (n / 1e8).toFixed(8);
 const asOutpoint = utxo => `${utxo.transaction_id}:${utxo.transaction_vout}`;
 const asInput = n => ({transaction_id: n.id, transaction_vout: n.vout});

package/display/index.js

@@ -6,7 +6,6 @@ const describeRoutingFailure = require('./describe_routing_failure');
 const formatFeeRate = require('./format_fee_rate');
 const getIcons = require('./get_icons');
 const isMatchingFilters = require('./is_matching_filters');
-const parseAmount = require('./parse_amount');
 const segmentMeasure = require('./segment_measure');
 const sumsForSegment = require('./sums_for_segment');
 
@@ -19,7 +18,6 @@ module.exports = {
   formatFeeRate,
   getIcons,
   isMatchingFilters,
-  parseAmount,
   segmentMeasure,
   sumsForSegment,
 };

package/network/probe.js

@@ -9,6 +9,7 @@ const {getIdentity} = require('ln-service');
 const {getNode} = require('ln-service');
 const {getSyntheticOutIgnores} = require('probing');
 const {getWalletVersion} = require('ln-service');
+const {parseAmount} = require('ln-accounting');
 const {parsePaymentRequest} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 const {subscribeToMultiPathProbe} = require('probing');
@@ -17,7 +18,6 @@ const {describeRoute} = require('./../display');
 const {describeRoutingFailure} = require('./../display');
 const {getIgnores} = require('./../routing');
 const {getTags} = require('./../tags');
-const {parseAmount} = require('./../display');
 const probeDestination = require('./probe_destination');
 
 const defaultFinalCltvDelta = 144;

package/network/push_payment.js

@@ -6,13 +6,13 @@ const {getIdentity} = require('ln-service');
 const {getNetwork} = require('ln-sync');
 const {getPeerLiquidity} = require('ln-sync');
 const {getPrices} = require('@alexbosworth/fiat');
+const {parseAmount} = require('ln-accounting');
 const {parsePaymentRequest} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const {getIgnores} = require('./../routing');
 const getLnurlRequest = require('./../lnurl/get_lnurl_request');
 const {getTags} = require('./../tags');
-const {parseAmount} = require('./../display');
 const parseUrl = require('./../lnurl/parse_url');
 const probeDestination = require('./probe_destination');
 

package/network/transfer_funds.js

@@ -5,9 +5,9 @@ const {formatTokens} = require('ln-sync');
 const {getChannels} = require('ln-service');
 const {getIdentity} = require('ln-service');
 const {getPeerLiquidity} = require('ln-sync');
+const {parseAmount} = require('ln-accounting');
 const {returnResult} = require('asyncjs-util');
 
-const {parseAmount} = require('./../display');
 const probeDestination = require('./probe_destination');
 
 const defaultDescription = 'bos transfer between saved nodes';

package/package.json

@@ -35,10 +35,10 @@
     "import-lazy": "4.0.0",
     "ini": "3.0.1",
     "inquirer": "9.1.4",
-    "ln-accounting": "6.0.0",
+    "ln-accounting": "6.1.0",
     "ln-service": "54.2.3",
     "ln-sync": "4.0.4",
-    "ln-telegram": "4.0.0",
+    "ln-telegram": "4.2.0",
     "moment": "2.29.4",
     "paid-services": "4.0.1",
     "probing": "2.0.6",
@@ -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": "13.1.7"
+  "version": "13.3.0"
 }

package/peers/open_channels.js

@@ -25,6 +25,7 @@ const {getWalletVersion} = require('ln-service');
 const {openChannels} = require('ln-service');
 const {maintainUtxoLocks} = require('ln-sync');
 const moment = require('moment');
+const {parseAmount} = require('ln-accounting');
 const {returnResult} = require('asyncjs-util');
 const {Transaction} = require('bitcoinjs-lib');
 const {unlockUtxo} = require('ln-service');
@@ -34,7 +35,6 @@ const {authenticatedLnd} = require('./../lnd');
 const channelsFromArguments = require('./channels_from_arguments');
 const {getAddressUtxo} = require('./../chain');
 const getChannelOutpoints = require('./get_channel_outpoints');
-const {parseAmount} = require('./../display');
 
 const bech32AsData = bech32 => address.fromBech32(bech32).data;
 const description = 'bos open';

package/swaps/rebalance.js

@@ -12,6 +12,7 @@ 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');
 const {returnResult} = require('asyncjs-util');
 const {routeFromChannels} = require('ln-service');
@@ -20,7 +21,6 @@ const {findTagMatch} = require('./../peers');
 const {formatFeeRate} = require('./../display');
 const {getIgnores} = require('./../routing');
 const {homePath} = require('../storage');
-const {parseAmount} = require('./../display');
 const {probeDestination} = require('./../network');
 const {sortBy} = require('./../arrays');
 

package/telegram/start_telegram_bot.js

@@ -288,6 +288,7 @@ module.exports = (args, cbk) => {
               ctx,
               id: connectedId,
               nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
+              request: args.request,
             });
           } catch (err) {
             args.logger.error({err});
@@ -467,6 +468,7 @@ module.exports = (args, cbk) => {
                 api: args.bot.api,
                 id: connectedId,
                 nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
+                request: args.request,
               });
             } catch (err) {
               args.logger.error({err});

package/display/parse_amount.js

@@ -1,76 +0,0 @@
-const {Parser} = require('hot-formula-parser');
-
-const {ceil} = Math;
-const {isArray} = Array;
-const {keys} = Object;
-const {round} = Math;
-
-/** Parse a described amount into tokens
-
-  {
-    amount: <Amount String>
-    [variables]: {
-      <Name String>: <Amount Number>
-    }
-  }
-
-  @throws
-  <Error>
-
-  @returns
-  {
-    tokens: <Tokens Number>
-  }
-*/
-module.exports = ({amount, variables}) => {
-  if (isArray(amount)) {
-    throw new Error('CannotParseMultipleAmounts');
-  }
-
-  const parser = new Parser();
-
-  keys(variables || {}).forEach(key => {
-    parser.setVariable(key.toLowerCase(), variables[key]);
-    parser.setVariable(key.toUpperCase(), variables[key]);
-
-    return;
-  });
-
-  parser.setVariable('BTC', 1e8);
-  parser.setVariable('btc', 1e8);
-  parser.setVariable('m', 1e6);
-  parser.setVariable('M', 1e6);
-  parser.setVariable('mm', 1e6);
-  parser.setVariable('MM', 1e6);
-  parser.setVariable('k', 1e3);
-  parser.setVariable('K', 1e3);
-
-  const parsed = parser.parse(amount);
-
-  switch (parsed.error) {
-  case '#DIV/0!':
-    throw new Error('CannotDivideByZeroInSpecifiedAmount');
-
-  case '#ERROR!':
-    throw new Error('FailedToParseSpecifiedAmount');
-
-  case '#N/A':
-  case '#NAME?':
-    throw new Error('UnrecognizedVariableOrFunctionInSpecifiedAmount');
-
-  case '#NUM!':
-    throw new Error('InvalidNumberFoundInSpecifiedAmount');
-
-  case '#VALUE!':
-    throw new Error('UnexpectedValueTypeInSpecifiedAmount');
-
-  default:
-    break;
-  }
-
-  if (!!parsed.error) {
-    throw new Error(parsed.error);
-  }
-
-  return {tokens: round(parsed.result)};
-};

package/test/display/test_parse_amount.js

@@ -1,55 +0,0 @@
-const {test} = require('@alexbosworth/tap');
-
-const {parseAmount} = require('./../../display');
-
-const tests = [
-  {
-    args: {amount: 'amount'},
-    description: 'A value is required',
-    error: 'UnrecognizedVariableOrFunctionInSpecifiedAmount',
-  },
-  {
-    args: {amount: '1/0'},
-    description: 'Dividing by zero is not allowed',
-    error: 'CannotDivideByZeroInSpecifiedAmount',
-  },
-  {
-    args: {amount: '0.0.0'},
-    description: 'A generic invalid amount is rejected',
-    error: 'FailedToParseSpecifiedAmount',
-  },
-  {
-    args: {amount: 'OCT2DEC()'},
-    description: 'Invalid numbers are rejected',
-    error: 'InvalidNumberFoundInSpecifiedAmount',
-  },
-  {
-    args: {amount: '"string" + 1'},
-    description: 'Invalid formulas are rejected',
-    error: 'UnexpectedValueTypeInSpecifiedAmount',
-  },
-  {
-    args: {amount: '1.20969468*btc', variables: {variable: 'value'}},
-    description: 'A long precision BTC value is parsed',
-    expected: {tokens: 120969468},
-  },
-  {
-    args: {amount: '1.20969465*btc'},
-    description: 'A long precision BTC value that rounds down is parsed',
-    expected: {tokens: 120969465},
-  },
-];
-
-tests.forEach(({args, description, error, expected}) => {
-  return test(description, ({end, equal, throws}) => {
-    if (!!error) {
-      throws(() => parseAmount(args), new Error(error), 'Got expected error');
-    } else {
-      const {tokens} = parseAmount(args);
-
-      equal(tokens, expected.tokens, 'Got expected output');
-    }
-
-    return end();
-  });
-});