Merge pull request #2751 from kaloudis/activity-500

Activity: LND: limit to 500 invoices + payments
ZeusLN · Jan 27, 2025 · be83aaa · be83aaa
2 parents b1a3211 + f4a88dc
commit be83aaa
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 37 deletions.
diff --git a/backends/CLNRest.ts b/backends/CLNRest.ts
@@ -215,9 +215,11 @@ export default class CLNRest {
         return this.postRequest('/v1/withdraw', request);
     };
     getMyNodeInfo = () => this.postRequest('/v1/getinfo');
-    getInvoices = () =>
+    getInvoices = (data?: any) =>
         this.postRequest('/v1/sql', {
-            query: "SELECT label, bolt11, bolt12, payment_hash, amount_msat, status, amount_received_msat, paid_at, payment_preimage, description, expires_at FROM invoices WHERE status = 'paid' ORDER BY created_index DESC LIMIT 150;"
+            query: `SELECT label, bolt11, bolt12, payment_hash, amount_msat, status, amount_received_msat, paid_at, payment_preimage, description, expires_at FROM invoices WHERE status = 'paid' ORDER BY created_index DESC LIMIT ${
+                data?.limit ? data.limit : 150
+            };`
         }).then((data: any) => {
             const invoiceList: any[] = [];
             data.rows.forEach((invoice: any) => {

diff --git a/backends/LND.ts b/backends/LND.ts
@@ -330,7 +330,11 @@ export default class LND {
                 : undefined,
             route_hints: data.route_hints
         });
-    getPayments = (params?: { maxPayments?: number; reversed?: boolean }) =>
+    getPayments = (
+        params: { maxPayments?: number; reversed?: boolean } = {
+            maxPayments: 500
+        }
+    ) =>
         this.getRequest(
             `/v1/payments?include_incomplete=true${
                 params?.maxPayments ? `&max_payments=${params.maxPayments}` : ''

diff --git a/backends/LightningNodeConnect.ts b/backends/LightningNodeConnect.ts
@@ -154,9 +154,12 @@ export default class LightningNodeConnect {
         await this.lnc.lnd.lightning
             .getNetworkInfo({})
             .then((data: lnrpc.NetworkInfo) => snakeize(data));
-    getInvoices = async () =>
+    getInvoices = async (data: any) =>
         await this.lnc.lnd.lightning
-            .listInvoices({ reversed: true, num_max_invoices: 100 })
+            .listInvoices({
+                reversed: true,
+                num_max_invoices: data?.limit || 500
+            })
             .then((data: lnrpc.ListInvoiceResponse) => snakeize(data));
     createInvoice = async (data: any) =>
         await this.lnc.lnd.lightning
@@ -173,10 +176,14 @@ export default class LightningNodeConnect {
                 route_hints: data.route_hints
             })
             .then((data: lnrpc.AddInvoiceResponse) => snakeize(data));
-    getPayments = async (params?: {
-        maxPayments?: number;
-        reversed?: boolean;
-    }) =>
+    getPayments = async (
+        params: {
+            maxPayments?: number;
+            reversed?: boolean;
+        } = {
+            maxPayments: 500
+        }
+    ) =>
         await this.lnc.lnd.lightning
             .listPayments({
                 include_incomplete: true,

diff --git a/views/Receive.tsx b/views/Receive.tsx
@@ -1013,36 +1013,33 @@ export default class Receive extends React.Component<
         if (implementation === 'lndhub') {
             if (rHash) {
                 this.lnInterval = setInterval(() => {
-                    // only fetch the last 10 invoices
-                    BackendUtils.getInvoices({ limit: 10 }).then(
-                        (response: any) => {
-                            const invoices = response.invoices;
-                            for (let i = 0; i < invoices.length; i++) {
-                                const result = new Invoice(invoices[i]);
-                                if (
-                                    result.getFormattedRhash === rHash &&
-                                    result.ispaid &&
-                                    Number(result.amt) >= Number(value) &&
-                                    Number(result.amt) !== 0
-                                ) {
-                                    setWatchedInvoicePaid(result.amt);
-                                    if (orderId)
-                                        PosStore.recordPayment({
-                                            orderId,
-                                            orderTotal,
-                                            orderTip,
-                                            exchangeRate,
-                                            rate,
-                                            type: 'ln',
-                                            tx: result.payment_request,
-                                            preimage: result.r_preimage
-                                        });
-                                    this.clearIntervals();
-                                    break;
-                                }
+                    BackendUtils.getInvoices().then((response: any) => {
+                        const invoices = response.invoices;
+                        for (let i = 0; i < invoices.length; i++) {
+                            const result = new Invoice(invoices[i]);
+                            if (
+                                result.getFormattedRhash === rHash &&
+                                result.ispaid &&
+                                Number(result.amt) >= Number(value) &&
+                                Number(result.amt) !== 0
+                            ) {
+                                setWatchedInvoicePaid(result.amt);
+                                if (orderId)
+                                    PosStore.recordPayment({
+                                        orderId,
+                                        orderTotal,
+                                        orderTip,
+                                        exchangeRate,
+                                        rate,
+                                        type: 'ln',
+                                        tx: result.payment_request,
+                                        preimage: result.r_preimage
+                                    });
+                                this.clearIntervals();
+                                break;
                             }
                         }
-                    );
+                    });
                 }, 5000);
             }
         }