Fixes

hsjoberg · Jan 21, 2024 · b106abc · b106abc
1 parent 7fcc5f4
commit b106abc
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/src/migration/app-migration.ts b/src/migration/app-migration.ts
@@ -343,10 +343,12 @@ export const appMigration: IAppMigration[] = [
   // Version 39
   {
     async beforeLnd(db, i) {
-      if (Chain === "testnet" || Chain === "mainnet") {
-        const neutrinoPeers = DEFAULT_NEUTRINO_NODE?.split(",");
-
-        await setItemObject<string[]>(StorageItem.neutrinoPeers, neutrinoPeers || []);
+      if (Chain === "mainnet") {
+        // Change the peers if the user hasn't manually changed it
+        const peers = await getItemObject<string[]>(StorageItem.neutrinoPeers);
+        if (peers.length === 1 && peers[0] === "node.blixtwallet.com") {
+          await setItemObject<string[]>(StorageItem.neutrinoPeers, DEFAULT_NEUTRINO_NODE);
+        }
       }
     },
   },

diff --git a/src/state/index.ts b/src/state/index.ts
@@ -535,6 +535,16 @@ export const model: IStoreModel = {
 
     const nodeBackend = lndChainBackend === "neutrino" ? "neutrino" : "bitcoind";
 
+    let neutrinoPeerConfig = "";
+    if (nodeBackend === "neutrino") {
+      // If there is only 1 peer, use `neutrino.connect`, otherwise `neutrino.addpeer`
+      if (neutrinoPeers.length === 1) {
+        neutrinoPeerConfig = `neutrino.connect=${neutrinoPeers[0]}`;
+      } else {
+        neutrinoPeerConfig = neutrinoPeers.map((peer) => `neutrino.addpeer=${peer}`).join("\n");
+      }
+    }
+
     const config = `
 [Application Options]
 debuglevel=${lndLogLevel}
@@ -563,13 +573,13 @@ ${
   lndChainBackend === "neutrino"
     ? `
 [Neutrino]
+${neutrinoPeerConfig}
 neutrino.feeurl=${neutrinoFeeUrl}
 neutrino.broadcasttimeout=11s
 neutrino.persistfilters=true
 `
     : ""
 }
-${`${neutrinoPeers.map((peer) => `neutrino.addpeer=${peer}`).join("\n")}`}
 
 ${
   lndChainBackend === "bitcoindWithZmq"

diff --git a/src/storage/app.ts b/src/storage/app.ts
@@ -201,8 +201,7 @@ export const setupApp = async () => {
   let neutrinoFeeUrl = "";
   if (Chain === "mainnet" || Chain === "testnet") {
     lndChainBackend = "neutrino";
-    neutrinoPeers = DEFAULT_NEUTRINO_NODE?.split(",").map((peer) => peer.trim()) || [];
-
+    neutrinoPeers = DEFAULT_NEUTRINO_NODE;
     neutrinoFeeUrl = "https://nodes.lightning.computer/fees/v1/btc-fee-estimates.json";
   }
 

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -21,11 +21,16 @@ export const PLATFORM = Platform.OS;
 export const MATH_PAD_NATIVE_ID = "MATH_PAD";
 
 export const DEFAULT_NEUTRINO_NODE = chainSelect({
-  mainnet:
-    "node.blixtwallet.com,btcd.lnolymp.us,neutrino.noderunner.wtf,node.eldamar.icu,btcd-mainnet.lightning.computer",
-  testnet: "testnet.blixtwallet.com",
-  regtest: "",
-  signet: "",
+  mainnet: [
+    "node.blixtwallet.com",
+    "btcd.lnolymp.us",
+    "neutrino.noderunner.wtf",
+    "node.eldamar.icu",
+    "btcd-mainnet.lightning.computer",
+  ],
+  testnet: ["testnet.blixtwallet.com"],
+  regtest: [],
+  signet: [],
 });
 export const DEFAULT_INVOICE_EXPIRY = 3600;
 export const DEFAULT_MAX_LN_FEE_PERCENTAGE = 2;

diff --git a/src/windows/InitProcess/DEV_Commands.tsx b/src/windows/InitProcess/DEV_Commands.tsx
@@ -910,6 +910,9 @@ export default function DEV_Commands({ navigation, continueCallback }: IProps) {
           <Button small onPress={async () => await setItemObject(StorageItem.appVersion, 28)}>
             <Text style={styles.buttonText}>appVersion = 28</Text>
           </Button>
+          <Button small onPress={async () => await setItemObject(StorageItem.appVersion, 38)}>
+            <Text style={styles.buttonText}>appVersion = 38</Text>
+          </Button>
           <Button
             small
             onPress={async () => {

diff --git a/src/windows/Settings/Settings.tsx b/src/windows/Settings/Settings.tsx
@@ -747,7 +747,7 @@ ${t("LN.inbound.dialog.msg3")}`;
         },
       ],
       "plain-text",
-      neutrinoPeers[0] ?? "",
+      neutrinoPeers.join(",") ?? "",
     );
   };
   const onSetBitcoinNodeLongPress = async () => {
@@ -763,7 +763,7 @@ ${t("LN.inbound.dialog.msg3")}`;
           style: "default",
           text: t("buttons.yes", { ns: namespaces.common }),
           onPress: async () => {
-            await changeNeutrinoPeers([DEFAULT_NEUTRINO_NODE]);
+            await changeNeutrinoPeers(DEFAULT_NEUTRINO_NODE);
             await writeConfig();
             restartNeeded();
           },