Merge pull request #73 from GalaxyPay/dev

various minor fixes

Author: acfunk

Diff for: .github/workflows/go.yml

@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.4.1
+          tag: v3.4.2
           artifacts: "Output/*"

Diff for: FUNC.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FUNC"
-#define MyAppVersion "3.4.1"
+#define MyAppVersion "3.4.2"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

Diff for: FUNC/Controllers/GoalController.cs

@@ -95,17 +95,11 @@ public async Task<ActionResult<string>> GoalUpdate(Models.Release model)
 
                     var client = new GitHubClient(new ProductHeaderValue(repositoryName));
                     var latestInfo = await client.Repository.Release.GetLatest(workspaceName, repositoryName);
+                    bool isArm = RuntimeInformation.OSArchitecture == Architecture.Arm64;
 
-                    if (RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                    {
-                        url = latestInfo.Assets.FirstOrDefault(a => a.Name.Contains("node_stable_linux-arm64")
+                    url = latestInfo.Assets.FirstOrDefault(a =>
+                        a.Name.Contains($"node_stable_linux-{(isArm ? "arm" : "amd")}64")
                         && a.Name.EndsWith("tar.gz"))?.BrowserDownloadUrl;
-                    }
-                    else
-                    {
-                        url = latestInfo.Assets.FirstOrDefault(a => a.Name.Contains("node_stable_linux-amd64")
-                           && a.Name.EndsWith("tar.gz"))?.BrowserDownloadUrl;
-                    }
                 }
                 else if (IsMacOS())
                 {
@@ -117,8 +111,8 @@ public async Task<ActionResult<string>> GoalUpdate(Models.Release model)
                     var client = new GitHubClient(new ProductHeaderValue(repositoryName));
                     var latestInfo = await client.Repository.Release.GetLatest(workspaceName, repositoryName);
 
-                    url = latestInfo.Assets.FirstOrDefault(a => a.Name.Contains("node_stable_darwin")
-                       && a.Name.EndsWith("tar.gz"))?.BrowserDownloadUrl;
+                    url = latestInfo.Assets.FirstOrDefault(a => a.Name.Contains("node_stable_darwin-universal")
+                        && a.Name.EndsWith("tar.gz"))?.BrowserDownloadUrl;
                 }
 
                 string filePath = Path.Combine(Utils.appDataDir, "node.tar.gz");

Diff for: create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.4.1_linux-$1
+PKG=Output/func_3.4.2_linux-$1
 
 mkdir -p $PKG/lib/systemd/system
 mkdir -p $PKG/opt/func

Diff for: create-package-pkg.sh

@@ -5,4 +5,4 @@ pkgbuild --root publish \
     --install-location /opt/func \
     --scripts pkg/scripts \
     --identifier func.app \
-    Output/func_3.4.1_darwin-$1.pkg
+    Output/func_3.4.2_darwin-$1.pkg

Diff for: deb/amd64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.4.1
+Version: 3.4.2
 Section: base
 Priority: optional
 Architecture: amd64

Diff for: deb/arm64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.4.1
+Version: 3.4.2
 Section: base
 Priority: optional
 Architecture: arm64

Diff for: webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

Diff for: webui/src/components/AppBar.vue

@@ -26,7 +26,7 @@
     <v-btn
       color="primary"
       variant="tonal"
-      :icon="store.showMachineName && xs"
+      :icon="!!store.showMachineName && xs"
       class="mr-3"
     >
       <template v-if="!store.showMachineName || !xs">

Diff for: webui/src/components/Node.vue

@@ -352,7 +352,7 @@ let restartAttempted = false;
 
 async function getAlgodStatus() {
   try {
-    if (nodeStatus.value?.serviceStatus === "Running") {
+    if (nodeStatus.value?.serviceStatus === "Running" && !store.downloading) {
       algodStatus.value = await algodClient.value?.status().do();
     } else {
       algodStatus.value = undefined;
@@ -380,7 +380,7 @@ async function getAlgodStatus() {
     }
   } catch (err: any) {
     console.error(err);
-    if (err.status !== 502)
+    if (err.status !== 502 && !store.downloading)
       store.setSnackbar(err?.response?.data || err.message, "error");
   }
 }

Diff for: webui/src/components/Participation.vue

@@ -266,7 +266,7 @@ const keys = ref<Participation[]>();
 const showGenerate = ref(false);
 const form = ref();
 const addr = ref<string>();
-const gen = ref<{ first?: bigint; last?: bigint }>({});
+const gen = ref<{ first?: bigint | string; last?: bigint | string }>({});
 const lastRound = ref<bigint>();
 const acctInfos = ref<modelsv2.Account[]>([]);
 

Diff for: webui/src/stores/app.ts

@@ -19,8 +19,12 @@ export const useAppStore = defineStore("app", {
     downloading: false,
     stoppingReti: false,
     goalVersion: undefined as GoalVersion | undefined,
-    showNetworks: localStorage.getItem("showNetworks") === "true",
-    showMachineName: localStorage.getItem("showMachineName") === "true",
+    showNetworks: (localStorage.getItem("showNetworks") === "true") as
+      | boolean
+      | null,
+    showMachineName: (localStorage.getItem("showMachineName") === "true") as
+      | boolean
+      | null,
     machineName: undefined as string | undefined,
   }),
   actions: {