ln-accounting 10.0.6 → 10.0.7

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## Version 10.0.6
+## Version 10.0.7
 
 ### Breaking Changes
 

package/package.json

@@ -10,13 +10,13 @@
     "url": "https://github.com/alexbosworth/ln-accounting/issues"
   },
   "dependencies": {
+    "@alexbosworth/blockchain": "4.8.0",
+    "@alexbosworth/formulas": "1.4.0",
     "@json2csv/plainjs": "7.0.8",
     "async": "3.2.6",
     "asyncjs-util": "1.2.12",
-    "bitcoinjs-lib": "6.1.7",
     "goldengate": "16.0.7",
-    "hot-formula-parser": "4.0.0",
-    "ln-service": "59.4.1"
+    "ln-service": "59.5.0"
   },
   "description": "lnd accounting reports",
   "engines": {
@@ -36,5 +36,5 @@
   "scripts": {
     "test": "node --experimental-test-coverage --test"
   },
-  "version": "10.0.6"
+  "version": "10.0.7"
 }

package/records/get_chain_transactions.js

@@ -1,18 +1,17 @@
 const asyncAuto = require('async/auto');
 const asyncMapSeries = require('async/mapSeries');
 const asyncRetry = require('async/retry');
+const {componentsOfTransaction} = require('@alexbosworth/blockchain');
 const {getChainTransactions} = require('ln-service');
 const {getClosedChannels} = require('ln-service');
 const {getHeight} = require('ln-service');
 const {getSweepTransactions} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
-const {Transaction} = require('bitcoinjs-lib');
 
 const {getProxyTx} = require('./../esplora');
 const {getProxyVout} = require('./../esplora');
 
 const dateAsMs = date => new Date(date).getTime();
-const {fromHex} = Transaction;
 const interval = 200;
 const {isArray} = Array;
 const msAsBlocks = ms => Math.ceil(ms / 1000 / 60 / 2.5);
@@ -141,9 +140,11 @@ module.exports = ({after, before, lnd, network, request}, cbk) => {
               return cbk(err);
             }
 
-            const {outs} = fromHex(tx.transaction);
+            const {outputs} = componentsOfTransaction({
+              transaction: tx.transaction,
+            });
 
-            const totalOut = outs.reduce((sum, n) => sum + n.value, Number());
+            const totalOut = sumOf(outputs.map(n => n.tokens));
 
             return cbk(null, {
               spends,
@@ -194,17 +195,17 @@ module.exports = ({after, before, lnd, network, request}, cbk) => {
             return tx.id === channel.close_transaction_id;
           });
 
+          const components = !tx ? null : componentsOfTransaction({
+            transaction: tx.transaction,
+          });
+
           const hasMissingLocalData = (() => {
-            if (!tx) {
+            if (!components) {
               return true;
             }
 
-            const inputs = fromHex(tx.transaction).ins;
-
             // Confirm that the inputs to the tx are local
-            return !!inputs.find(({hash, index}) => {
-              const id = hash.slice().reverse().toString('hex');
-
+            return !!components.inputs.find(({id}) => {
               return !getTx.transactions.find(n => n.id === id);
             });
           })();
@@ -239,20 +240,22 @@ module.exports = ({after, before, lnd, network, request}, cbk) => {
             cbk);
           }
 
-          const inputs = fromHex(tx.transaction).ins.map(({hash, index}) => {
-            const id = hash.slice().reverse().toString('hex');
-
+          const inputs = components.inputs.map(({id, vout}) => {
             const matching = getTx.transactions.find(n => n.id === id);
 
+            const {outputs} = componentsOfTransaction({
+              transaction: matching.transaction,
+            });
+
             return {
-              tokens: fromHex(matching.transaction).outs[index].value,
+              tokens: outputs[vout].tokens,
               transaction_id: id,
-              transaction_vout: index,
+              transaction_vout: vout,
             };
           });
 
           const inputsValue = sumOf(inputs.map(n => n.tokens));
-          const outputsValue = fromHex(tx.transaction).outs.map(n => n.value);
+          const outputsValue = components.outputs.map(n => n.tokens);
 
           return cbk(null, {
             block_id: tx.block_id,

package/report/parse_amount.js

@@ -1,6 +1,5 @@
-const {Parser} = require('hot-formula-parser');
+const {evaluateFormula} = require('@alexbosworth/formulas');
 
-const {ceil} = Math;
 const {isArray} = Array;
 const {keys} = Object;
 const {round} = Math;
@@ -27,50 +26,20 @@ module.exports = ({amount, variables}) => {
     throw new Error('CannotParseMultipleAmounts');
   }
 
-  const parser = new Parser();
+  const constants = {};
 
   keys(variables || {}).forEach(key => {
-    parser.setVariable(key.toLowerCase(), variables[key]);
-    parser.setVariable(key.toUpperCase(), variables[key]);
+    constants[key.toLowerCase()] = 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);
+  constants.btc = 1e8;
+  constants.m = 1e6;
+  constants.mm = 1e6;
+  constants.k = 1e3;
 
-  const parsed = parser.parse(amount);
+  const {result} = evaluateFormula({constants, formula: 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)};
+  return {tokens: round(result)};
 };

package/test/report/test_parse_amount.js

@@ -8,27 +8,27 @@ const tests = [
   {
     args: {amount: 'amount'},
     description: 'A value is required',
-    error: 'UnrecognizedVariableOrFunctionInSpecifiedAmount',
+    error: 'ExpectedAllKnownConstantsInFormulaToEvaluate',
   },
   {
     args: {amount: '1/0'},
     description: 'Dividing by zero is not allowed',
-    error: 'CannotDivideByZeroInSpecifiedAmount',
+    error: 'ExpectedNonZeroDivisorForFormulaEvaluation',
   },
   {
     args: {amount: '0.0.0'},
     description: 'A generic invalid amount is rejected',
-    error: 'FailedToParseSpecifiedAmount',
+    error: 'UnexpectedInvalidDecimalNumberValue',
   },
   {
     args: {amount: 'OCT2DEC()'},
-    description: 'Invalid numbers are rejected',
-    error: 'InvalidNumberFoundInSpecifiedAmount',
+    description: 'Invalid functions are rejected',
+    error: 'UnexpectedFunctionForFormulaEvaluation',
   },
   {
     args: {amount: '"string" + 1'},
     description: 'Invalid formulas are rejected',
-    error: 'UnexpectedValueTypeInSpecifiedAmount',
+    error: 'ExpectedBoolOrFiniteNumberForNumberConversion',
   },
   {
     args: {amount: '1.20969468*btc', variables: {variable: 'value'}},