ln-accounting 6.1.0 → 6.1.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## Version 6.1.0
+## Version 6.1.1
 
 - `parseAmount`: Add method to parse a human readable amount into tokens
 

package/package.json

@@ -13,7 +13,7 @@
     "goldengate": "11.4.0",
     "hot-formula-parser": "4.0.0",
     "json2csv": "5.0.7",
-    "ln-service": "54.2.3"
+    "ln-service": "54.2.6"
   },
   "description": "lnd accounting reports",
   "devDependencies": {
@@ -36,5 +36,5 @@
   "scripts": {
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 test/blockstream/*.js test/fiat/*.js test/harmony/*.js test/records/*.js test/report/*.js"
   },
-  "version": "6.1.0"
+  "version": "6.1.1"
 }

package/records/get_all_invoices.js

@@ -3,10 +3,14 @@ const asyncUntil = require('async/until');
 const {getInvoices} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
-/** Get all invoices
+const limit = 1000;
+
+/** Get all confirmed invoices
 
   {
-    lnd: <Authenticated LND gRPC API Object>
+    [after]: <Invoices Confirmed After ISO 8601 Date String>
+    [before]: <Invoices Confirmed Before ISO 8601 Date String>
+    lnd: <Authenticated LND API Object>
   }
 
   @returns via cbk or Promise
@@ -39,7 +43,7 @@ const {returnResult} = require('asyncjs-util');
     }]
   }
 */
-module.exports = ({lnd}, cbk) => {
+module.exports = ({after, before, lnd}, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
       // Check arguments
@@ -60,14 +64,32 @@ module.exports = ({lnd}, cbk) => {
         return asyncUntil(
           cbk => cbk(null, token === false),
           cbk => {
-            return getInvoices({lnd, token}, (err, res) => {
+            return getInvoices({
+              lnd,
+              token,
+              limit: !token ? limit : undefined,
+            },
+            (err, res) => {
               if (!!err) {
                 return cbk(err);
               }
 
               token = res.next || false;
 
-              res.invoices.forEach(invoice => invoices.push(invoice));
+              res.invoices
+                .filter(n => !!n.confirmed_at && !!n.is_confirmed)
+                .filter(invoice => {
+                  if (!!after && invoice.confirmed_at <= after) {
+                    return false;
+                  }
+
+                  if (!!before && invoice.confirmed_at > before) {
+                    return false;
+                  }
+
+                  return true;
+                })
+                .forEach(invoice => invoices.push(invoice));
 
               return cbk(null, invoices);
             });

package/report/get_accounting_report.js

@@ -34,8 +34,8 @@ const times = 10;
   Note: Chain fees does not include chain fees paid to close channels
 
   {
-    [after]: <Records Created After ISO 8601 Date>
-    [before]: <Records Created Before ISO 8601 Date>
+    [after]: <Records Created After ISO 8601 Date String>
+    [before]: <Records Created Before ISO 8601 Date String>
     [category]: <Category Filter String>
     currency: <Base Currency Type String>
     [fiat]: <Fiat Currency Type String>
@@ -191,7 +191,12 @@ module.exports = (args, cbk) => {
         }
 
         // Since there is no way to page by settle date, get all the invoices
-        return getAllInvoices({lnd: args.lnd}, cbk);
+        return getAllInvoices({
+          after: args.after,
+          before: args.before,
+          lnd: args.lnd,
+        },
+        cbk);
       }],
 
       // Get payments