Merge pull request #47 from GalaxyPay/dev

fix: isIncentiveReady

.github/workflows/go.yml

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

FUNC.iss

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

create-package-deb.sh

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

create-package-pkg.sh

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

deb/amd64/control

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

deb/arm64/control

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

webui/package.json

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

webui/src/components/Config.vue

@@ -17,7 +17,7 @@
           variant="outlined"
           density="comfortable"
           :items="[...Array(6).keys()]"
-          hint="Must be 3 or greater for telemetry to work. For best performance, set to 0."
+          hint="Must be 4 or greater for telemetry to work. For best performance, set to 0."
           persistent-hint
           class="pb-2"
         />

webui/src/components/Node.vue

@@ -327,6 +327,15 @@ const algodClient = computed(() => {
   );
 });
 
+watch(
+  () => algodStatus.value,
+  (val) => {
+    if (!val?.["last-version"].includes("/925a464")) {
+      store.isIncentiveReady = true;
+    }
+  }
+);
+
 onBeforeMount(async () => {
   await getNodeStatus();
 });

webui/src/components/Participation.vue

@@ -252,7 +252,7 @@ const props = defineProps({
 const emit = defineEmits(["partDetails", "generatingKey"]);
 
 const store = useAppStore();
-const { activeAccount, transactionSigner } = useWallet();
+const { activeAccount, activeNetwork, transactionSigner } = useWallet();
 
 const loading = ref();
 const keys = ref<Participation[]>();
@@ -383,7 +383,8 @@ function isKeyActive(item: Participation) {
 }
 
 function incentiveIneligible(addr: string) {
-  if (!store.isIncentiveReady) return false;
+  if (!store.isIncentiveReady || activeNetwork.value !== "mainnet")
+    return false;
   const acctInfo = acctInfos.value.find((ai) => ai.address === addr);
   return (
     (acctInfo?.amount || 0) >= 3 * 10 ** 10 &&

webui/src/stores/app.ts

@@ -20,12 +20,8 @@ export const useAppStore = defineStore("app", {
     stoppingReti: false,
     goalVersion: undefined as GoalVersion | undefined,
     showNetworks: localStorage.getItem("showNetworks") === "true",
+    isIncentiveReady: false,
   }),
-  getters: {
-    isIncentiveReady(state) {
-      return Number(state.goalVersion?.installed.split(".")[0]) >= 4;
-    },
-  },
   actions: {
     async setSnackbar(text: string, color = "info", timeout = 4000) {
       if (color == "error") timeout = 15000;