From d9ebb7af02fbc277bb5d4ab1510871bcf1358ec9 Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Sat, 15 Jun 2024 23:39:19 -0400
Subject: [PATCH 1/2] Settings: Neutrino: add optimize peers button

---
 locales/en.json                               |  1 +
 .../EmbeddedNode/Peers/NeutrinoPeers.tsx      | 54 ++++++++++++++-----
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 5551cd6e1..fee1c92b4 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -822,6 +822,7 @@
     "views.Settings.EmbeddedNode.NeutrinoPeers.allowingOtherPeers": "Allowing connections to other peers.",
     "views.Settings.EmbeddedNode.NeutrinoPeers.notAllowingOtherPeers": "Not allowing connections to other peers.",
     "views.Settings.EmbeddedNode.NeutrinoPeers.timedOut": "Ping timed out",
+    "views.Settings.EmbeddedNode.NeutrinoPeers.optimize": "Optimize peers selection",
     "views.Settings.EmbeddedNode.ZeroConfPeers.title": "Zero conf Peers",
     "views.Settings.EmbeddedNode.ZeroConfPeers.subtitle": "Set the peers you would like to accept zero conf lightning channels from, other than the LSP.",
     "views.Settings.EmbeddedNode.ExpressGraphSync.title": "Express Graph Sync",
diff --git a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
index f35fb5cb4..5c8b40b57 100644
--- a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
+++ b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
@@ -24,6 +24,7 @@ import SettingsStore, {
     DEFAULT_NEUTRINO_PEERS_TESTNET
 } from '../../../../stores/SettingsStore';
 
+import { chooseNeutrinoPeers } from '../../../../utils/LndMobileUtils';
 import { localeString } from '../../../../utils/LocaleUtils';
 import { restartNeeded } from '../../../../utils/RestartUtils';
 import { themeColor } from '../../../../utils/ThemeUtils';
@@ -46,7 +47,7 @@ interface NeutrinoPeersState {
     pingTime: number;
     pingTimeout: boolean;
     pingHost: string;
-    pinging: boolean;
+    loading: boolean;
 }
 
 @inject('SettingsStore')
@@ -62,7 +63,7 @@ export default class NeutrinoPeers extends React.Component<
         pingTime: 0,
         pingTimeout: false,
         pingHost: '',
-        pinging: false
+        loading: false
     };
 
     remove = (arrOriginal, elementToRemove) => {
@@ -95,7 +96,7 @@ export default class NeutrinoPeers extends React.Component<
             pingTime,
             pingTimeout,
             pingHost,
-            pinging
+            loading
         } = this.state;
         const { updateSettings, embeddedLndNetwork }: any = SettingsStore;
 
@@ -128,9 +129,9 @@ export default class NeutrinoPeers extends React.Component<
                         navigation={navigation}
                     />
                     <View style={{ flex: 1 }}>
-                        {pinging && <LoadingIndicator />}
+                        {loading && <LoadingIndicator />}
                         {!pingTimeout &&
-                            !pinging &&
+                            !loading &&
                             pingHost &&
                             pingTime <= 200 && (
                                 <SuccessMessage
@@ -139,7 +140,7 @@ export default class NeutrinoPeers extends React.Component<
                                 />
                             )}
                         {!pingTimeout &&
-                            !pinging &&
+                            !loading &&
                             pingHost &&
                             pingTime < NEUTRINO_PING_THRESHOLD_MS &&
                             pingTime > 200 && (
@@ -149,7 +150,7 @@ export default class NeutrinoPeers extends React.Component<
                                 />
                             )}
                         {!pingTimeout &&
-                            !pinging &&
+                            !loading &&
                             pingHost &&
                             pingTime >= NEUTRINO_PING_THRESHOLD_MS && (
                                 <ErrorMessage
@@ -157,7 +158,7 @@ export default class NeutrinoPeers extends React.Component<
                                     dismissable
                                 />
                             )}
-                        {!pinging && pingHost && !!pingTimeout && (
+                        {!loading && pingHost && !!pingTimeout && (
                             <ErrorMessage
                                 message={`${pingHost}: ${localeString(
                                     'views.Settings.EmbeddedNode.NeutrinoPeers.timedOut'
@@ -272,7 +273,7 @@ export default class NeutrinoPeers extends React.Component<
                                                             pingTime: 0,
                                                             pingTimeout: false,
                                                             pingHost: addPeer,
-                                                            pinging: true
+                                                            loading: true
                                                         });
 
                                                         const ms =
@@ -285,12 +286,12 @@ export default class NeutrinoPeers extends React.Component<
                                                             );
                                                         this.setState({
                                                             pingTime: ms,
-                                                            pinging: false
+                                                            loading: false
                                                         });
                                                     } catch (e) {
                                                         this.setState({
                                                             pingTimeout: true,
-                                                            pinging: false
+                                                            loading: false
                                                         });
                                                     }
                                                 }}
@@ -386,7 +387,7 @@ export default class NeutrinoPeers extends React.Component<
                                                                                 false,
                                                                             pingHost:
                                                                                 item,
-                                                                            pinging:
+                                                                            loading:
                                                                                 true
                                                                         }
                                                                     );
@@ -403,7 +404,7 @@ export default class NeutrinoPeers extends React.Component<
                                                                         {
                                                                             pingTime:
                                                                                 ms,
-                                                                            pinging:
+                                                                            loading:
                                                                                 false
                                                                         }
                                                                     );
@@ -412,7 +413,7 @@ export default class NeutrinoPeers extends React.Component<
                                                                         {
                                                                             pingTimeout:
                                                                                 true,
-                                                                            pinging:
+                                                                            loading:
                                                                                 false
                                                                         }
                                                                     );
@@ -507,6 +508,31 @@ export default class NeutrinoPeers extends React.Component<
                             </View>
                         </ScrollView>
                     </View>
+                    {embeddedLndNetwork === 'Mainnet' && (
+                        <View style={{ marginBottom: 10, marginTop: 10 }}>
+                            <Button
+                                title={localeString(
+                                    'views.Settings.EmbeddedNode.NeutrinoPeers.optimize'
+                                )}
+                                onPress={async () => {
+                                    this.setState({
+                                        loading: true
+                                    });
+                                    await chooseNeutrinoPeers();
+                                    const { getSettings } = SettingsStore;
+                                    const settings = await getSettings();
+                                    this.setState({
+                                        loading: false,
+                                        neutrinoPeers:
+                                            settings.neutrinoPeersMainnet
+                                    });
+
+                                    restartNeeded();
+                                }}
+                                tertiary
+                            />
+                        </View>
+                    )}
                     {(dontAllowOtherPeers ||
                         mainnetPeersChanged ||
                         testnetPeersChanged) && (

From 92229b956bb1ce3087f72ac080f0e5e8b034d605 Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Mon, 17 Jun 2024 21:15:10 -0400
Subject: [PATCH 2/2] optimizeNeutrinoPeers: add three tiers of ping thresholds

---
 utils/LndMobileUtils.ts                       | 117 ++++++++++++++----
 views/Intro.tsx                               |   7 +-
 views/IntroSplash.tsx                         |   7 +-
 .../EmbeddedNode/Peers/NeutrinoPeers.tsx      |   4 +-
 views/Settings/NodeConfiguration.tsx          |   4 +-
 views/Settings/SeedRecovery.tsx               |   4 +-
 6 files changed, 106 insertions(+), 37 deletions(-)

diff --git a/utils/LndMobileUtils.ts b/utils/LndMobileUtils.ts
index 19dfa176f..c726fcf68 100644
--- a/utils/LndMobileUtils.ts
+++ b/utils/LndMobileUtils.ts
@@ -31,6 +31,12 @@ import {
 
 import { lnrpc } from '../proto/lightning';
 
+export const NEUTRINO_PING_TIMEOUT_MS = 1500;
+
+export const NEUTRINO_PING_OPTIMAL_MS = 200;
+export const NEUTRINO_PING_LAX_MS = 500;
+export const NEUTRINO_PING_THRESHOLD_MS = 1000;
+
 export const LndMobileEventEmitter =
     Platform.OS == 'android'
         ? DeviceEventEmitter
@@ -70,9 +76,6 @@ export function checkLndStreamErrorResponse(
     return null;
 }
 
-export const NEUTRINO_PING_TIMEOUT_MS = 1500;
-export const NEUTRINO_PING_THRESHOLD_MS = 1000;
-
 const writeLndConfig = async (
     isTestnet?: boolean,
     rescan?: boolean,
@@ -289,15 +292,13 @@ export async function startLnd(
     });
 }
 
-export async function chooseNeutrinoPeers(isTestnet?: boolean) {
-    console.log(
-        `Selecting Neutrino peers with ping times <${NEUTRINO_PING_THRESHOLD_MS}ms`
-    );
+export async function optimizeNeutrinoPeers(isTestnet?: boolean) {
+    console.log('Optimizing Neutrino peers');
     let peers = isTestnet
         ? DEFAULT_NEUTRINO_PEERS_TESTNET
         : DEFAULT_NEUTRINO_PEERS_MAINNET;
 
-    const results: any = [];
+    const resultsMain: any = [];
     for (let i = 0; i < peers.length; i++) {
         const peer = peers[i];
         await new Promise(async (resolve) => {
@@ -306,14 +307,14 @@ export async function chooseNeutrinoPeers(isTestnet?: boolean) {
                     timeout: NEUTRINO_PING_TIMEOUT_MS
                 });
                 console.log(`# ${peer} - ${ms}`);
-                results.push({
+                resultsMain.push({
                     peer,
                     ms
                 });
                 resolve(true);
             } catch (e) {
                 console.log('e', e);
-                results.push({
+                resultsMain.push({
                     peer,
                     ms: 'Timed out'
                 });
@@ -322,14 +323,75 @@ export async function chooseNeutrinoPeers(isTestnet?: boolean) {
         });
     }
 
-    let filteredResults = results.filter((result: any) => {
+    // Optimal
+
+    const selectedPeers: string[] = [];
+
+    console.log(
+        `Adding Neutrino peers with ping times <${NEUTRINO_PING_OPTIMAL_MS}ms`
+    );
+
+    const optimalResults = resultsMain.filter((result: any) => {
         return (
-            Number.isInteger(result.ms) &&
-            result.ms < NEUTRINO_PING_THRESHOLD_MS
+            Number.isInteger(result.ms) && result.ms < NEUTRINO_PING_OPTIMAL_MS
         );
     });
 
-    if (filteredResults.length < 3 && !isTestnet) {
+    optimalResults.forEach((result: any) => {
+        selectedPeers.push(result.peer);
+    });
+
+    console.log('Peers count:', selectedPeers.length);
+
+    // Lax
+
+    if (selectedPeers.length < 3) {
+        console.log(
+            `Adding Neutrino peers with ping times <${NEUTRINO_PING_LAX_MS}ms`
+        );
+
+        const laxResults = resultsMain.filter((result: any) => {
+            return (
+                Number.isInteger(result.ms) && result.ms < NEUTRINO_PING_LAX_MS
+            );
+        });
+
+        laxResults.forEach((result: any) => {
+            selectedPeers.push(result.peer);
+        });
+
+        console.log('Peers count:', selectedPeers.length);
+    }
+
+    // Threshold
+
+    if (selectedPeers.length < 3) {
+        console.log(
+            `Selecting Neutrino peers with ping times <${NEUTRINO_PING_THRESHOLD_MS}ms`
+        );
+
+        const thresholdResults = resultsMain.filter((result: any) => {
+            return (
+                Number.isInteger(result.ms) &&
+                result.ms < NEUTRINO_PING_THRESHOLD_MS
+            );
+        });
+
+        thresholdResults.forEach((result: any) => {
+            selectedPeers.push(result.peer);
+        });
+
+        console.log('Peers count:', selectedPeers.length);
+    }
+
+    // Extra external peers
+    const resultsSecondary: any = [];
+
+    if (selectedPeers.length < 3 && !isTestnet) {
+        console.log(
+            `Selecting Neutrino peers with ping times <${NEUTRINO_PING_THRESHOLD_MS}ms from alternate set`
+        );
+
         peers = SECONDARY_NEUTRINO_PEERS_MAINNET;
         for (let i = 0; i < peers.length; i++) {
             const peer = peers[i];
@@ -339,14 +401,14 @@ export async function chooseNeutrinoPeers(isTestnet?: boolean) {
                         timeout: NEUTRINO_PING_TIMEOUT_MS
                     });
                     console.log(`# ${peer} - ${ms}`);
-                    results.push({
+                    resultsSecondary.push({
                         peer,
                         ms
                     });
                     resolve(true);
                 } catch (e) {
                     console.log('e', e);
-                    results.push({
+                    resultsSecondary.push({
                         peer,
                         ms: 'Timed out'
                     });
@@ -354,19 +416,20 @@ export async function chooseNeutrinoPeers(isTestnet?: boolean) {
                 }
             });
         }
-    }
 
-    filteredResults = results.filter((result: any) => {
-        return (
-            Number.isInteger(result.ms) &&
-            result.ms < NEUTRINO_PING_THRESHOLD_MS
-        );
-    });
+        const filteredResults = resultsMain.filter((result: any) => {
+            return (
+                Number.isInteger(result.ms) &&
+                result.ms < NEUTRINO_PING_THRESHOLD_MS
+            );
+        });
 
-    const selectedPeers: string[] = [];
-    filteredResults.forEach((result: any) => {
-        selectedPeers.push(result.peer);
-    });
+        filteredResults.forEach((result: any) => {
+            selectedPeers.push(result.peer);
+        });
+
+        console.log('Peers count:', selectedPeers.length);
+    }
 
     if (selectedPeers.length > 0) {
         if (isTestnet) {
diff --git a/views/Intro.tsx b/views/Intro.tsx
index 88dfc7e5c..0db40bd1f 100644
--- a/views/Intro.tsx
+++ b/views/Intro.tsx
@@ -18,7 +18,10 @@ import LoadingIndicator from '../components/LoadingIndicator';
 import Screen from '../components/Screen';
 import { ErrorMessage } from '../components/SuccessErrorMessage';
 
-import { chooseNeutrinoPeers, createLndWallet } from '../utils/LndMobileUtils';
+import {
+    optimizeNeutrinoPeers,
+    createLndWallet
+} from '../utils/LndMobileUtils';
 import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 import UrlUtils from '../utils/UrlUtils';
@@ -180,7 +183,7 @@ const Intro: React.FC<IntroProps> = (props) => {
 
                                     setChoosingPeers(true);
 
-                                    await chooseNeutrinoPeers(undefined);
+                                    await optimizeNeutrinoPeers(undefined);
 
                                     setCreatingWallet(true);
                                     setChoosingPeers(false);
diff --git a/views/IntroSplash.tsx b/views/IntroSplash.tsx
index 0e73baf8d..acbe90f2f 100644
--- a/views/IntroSplash.tsx
+++ b/views/IntroSplash.tsx
@@ -21,7 +21,10 @@ import { ErrorMessage } from '../components/SuccessErrorMessage';
 
 import SettingsStore, { LOCALE_KEYS } from '../stores/SettingsStore';
 
-import { chooseNeutrinoPeers, createLndWallet } from '../utils/LndMobileUtils';
+import {
+    optimizeNeutrinoPeers,
+    createLndWallet
+} from '../utils/LndMobileUtils';
 import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
@@ -252,7 +255,7 @@ export default class IntroSplash extends React.Component<
                                         } = SettingsStore;
 
                                         try {
-                                            await chooseNeutrinoPeers(
+                                            await optimizeNeutrinoPeers(
                                                 undefined
                                             );
                                         } catch (e) {
diff --git a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
index 5c8b40b57..0c2e9529a 100644
--- a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
+++ b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
@@ -24,7 +24,7 @@ import SettingsStore, {
     DEFAULT_NEUTRINO_PEERS_TESTNET
 } from '../../../../stores/SettingsStore';
 
-import { chooseNeutrinoPeers } from '../../../../utils/LndMobileUtils';
+import { optimizeNeutrinoPeers } from '../../../../utils/LndMobileUtils';
 import { localeString } from '../../../../utils/LocaleUtils';
 import { restartNeeded } from '../../../../utils/RestartUtils';
 import { themeColor } from '../../../../utils/ThemeUtils';
@@ -518,7 +518,7 @@ export default class NeutrinoPeers extends React.Component<
                                     this.setState({
                                         loading: true
                                     });
-                                    await chooseNeutrinoPeers();
+                                    await optimizeNeutrinoPeers();
                                     const { getSettings } = SettingsStore;
                                     const settings = await getSettings();
                                     this.setState({
diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx
index d8ac02cfe..fb6c47808 100644
--- a/views/Settings/NodeConfiguration.tsx
+++ b/views/Settings/NodeConfiguration.tsx
@@ -52,7 +52,7 @@ import AddIcon from '../../assets/images/SVG/Add.svg';
 
 import { getPhoto } from '../../utils/PhotoUtils';
 import {
-    chooseNeutrinoPeers,
+    optimizeNeutrinoPeers,
     createLndWallet
 } from '../../utils/LndMobileUtils';
 
@@ -600,7 +600,7 @@ export default class NodeConfiguration extends React.Component<
             creatingWallet: true
         });
 
-        await chooseNeutrinoPeers(network === 'Testnet');
+        await optimizeNeutrinoPeers(network === 'Testnet');
 
         const response = await createLndWallet(
             recoveryCipherSeed,
diff --git a/views/Settings/SeedRecovery.tsx b/views/Settings/SeedRecovery.tsx
index 7f80207c5..4b61607a6 100644
--- a/views/Settings/SeedRecovery.tsx
+++ b/views/Settings/SeedRecovery.tsx
@@ -22,7 +22,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import { localeString } from '../../utils/LocaleUtils';
 
 import {
-    chooseNeutrinoPeers,
+    optimizeNeutrinoPeers,
     createLndWallet
 } from '../../utils/LndMobileUtils';
 
@@ -880,7 +880,7 @@ export default class SeedRecovery extends React.PureComponent<
                                         loading: true
                                     });
 
-                                    await chooseNeutrinoPeers(
+                                    await optimizeNeutrinoPeers(
                                         network === 'testnet'
                                     );