Merge pull request #2779 from kaloudis/activity-limit-regression

LND: limit to 500 invoices + payments regression fix
ZeusLN · Jan 29, 2025 · 881b539 · 881b539
2 parents 27e88bc + 6e32baa
commit 881b539
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/backends/LND.ts b/backends/LND.ts
@@ -311,11 +311,16 @@ export default class LND {
     };
     getNetworkInfo = () => this.getRequest('/v1/graph/info');
     getMyNodeInfo = () => this.getRequest('/v1/getinfo');
-    getInvoices = (data: any) =>
+    getInvoices = (
+        params: { limit?: number; reversed?: boolean } = {
+            limit: 500,
+            reversed: true
+        }
+    ) =>
         this.getRequest(
-            `/v1/invoices?reversed=true&num_max_invoices=${
-                (data && data.limit) || 500
-            }`
+            `/v1/invoices?reversed=${
+                params?.reversed !== undefined ? params.reversed : true
+            }${params?.limit ? `&num_max_invoices=${params.limit}` : ''}`
         );
     createInvoice = (data: any) =>
         this.postRequest('/v1/invoices', {
@@ -332,13 +337,16 @@ export default class LND {
         });
     getPayments = (
         params: { maxPayments?: number; reversed?: boolean } = {
-            maxPayments: 500
+            maxPayments: 500,
+            reversed: true
         }
     ) =>
         this.getRequest(
             `/v1/payments?include_incomplete=true${
                 params?.maxPayments ? `&max_payments=${params.maxPayments}` : ''
-            }${params?.reversed ? `&reversed=${params.reversed}` : ''}`
+            }&reversed=${
+                params?.reversed !== undefined ? params.reversed : true
+            }`
         );
 
     getNewAddress = (data: any) => this.getRequest('/v1/newaddress', data);

diff --git a/backends/LightningNodeConnect.ts b/backends/LightningNodeConnect.ts
@@ -154,11 +154,19 @@ export default class LightningNodeConnect {
         await this.lnc.lnd.lightning
             .getNetworkInfo({})
             .then((data: lnrpc.NetworkInfo) => snakeize(data));
-    getInvoices = async (data: any) =>
+    getInvoices = async (
+        params: { limit?: number; reversed?: boolean } = {
+            limit: 500,
+            reversed: true
+        }
+    ) =>
         await this.lnc.lnd.lightning
             .listInvoices({
-                reversed: true,
-                num_max_invoices: data?.limit || 500
+                reversed:
+                    params?.reversed !== undefined ? params.reversed : true,
+                ...(params?.limit && {
+                    num_max_invoices: params.limit
+                })
             })
             .then((data: lnrpc.ListInvoiceResponse) => snakeize(data));
     createInvoice = async (data: any) =>
@@ -181,7 +189,8 @@ export default class LightningNodeConnect {
             maxPayments?: number;
             reversed?: boolean;
         } = {
-            maxPayments: 500
+            maxPayments: 500,
+            reversed: true
         }
     ) =>
         await this.lnc.lnd.lightning
@@ -190,7 +199,8 @@ export default class LightningNodeConnect {
                 ...(params?.maxPayments && {
                     max_payments: params.maxPayments
                 }),
-                ...(params?.reversed && { reversed: params.reversed })
+                reversed:
+                    params?.reversed !== undefined ? params.reversed : true
             })
             .then((data: lnrpc.ListPaymentsResponse) => snakeize(data));
     getNewAddress = async (data: any) =>