Merge pull request #68 from GalaxyPay/dev

parameterize DEFAULT_NETWORK

Author: acfunk

Diff for: .github/workflows/go.yml

@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.3.3
+          tag: v3.3.4
           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.3.3"
+#define MyAppVersion "3.3.4"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

Diff for: create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.3.3_linux-$1
+PKG=Output/func_3.3.4_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.3.3_darwin-$1.pkg
+    Output/func_3.3.4_darwin-$1.pkg

Diff for: deb/amd64/control

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

Diff for: deb/arm64/control

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

Diff for: webui/package.json

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

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

@@ -113,13 +113,7 @@
             </div>
             <div>Online Stake</div>
           </v-col>
-          <v-col
-            cols="12"
-            sm="6"
-            md="3"
-            class="text-center"
-            align-self="center"
-          >
+          <v-col cols="12" sm="6" md="3" class="text-center">
             <div class="text-h4">
               {{
                 partDetails?.votes == null

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

@@ -238,7 +238,7 @@
 </template>
 
 <script lang="ts" setup>
-import { networks } from "@/data";
+import { DEFAULT_NETWORK, networks } from "@/data";
 import { PartDetails, Participation } from "@/types";
 import { b64, delay, execAtc, formatAddr } from "@/utils";
 import { mdiChevronDown, mdiClose, mdiContentCopy, mdiPlus } from "@mdi/js";
@@ -310,26 +310,15 @@ const statsClient = axios.create({
 const partStats = ref<any>({});
 
 async function getKeys(): Promise<Participation[]> {
-  const { data } = await partClient.get("");
-  return (
-    data
-      // TODO: there's got to be a better way algosdk!
-      ?.map((p: any) => ({
-        ...p,
-        key: new modelsv2.AccountParticipation({
-          voteParticipationKey: p.key["vote-participation-key"],
-          selectionParticipationKey: p.key["selection-participation-key"],
-          stateProofKey: p.key["state-proof-key"],
-          voteFirstValid: p.key["vote-first-valid"],
-          voteLastValid: p.key["vote-last-valid"],
-          voteKeyDilution: p.key["vote-key-dilution"],
-        }),
-      }))
-      .sort(
-        (a: Participation, b: Participation) =>
-          Number(b.key.voteLastValid) - Number(a.key.voteLastValid)
-      )
-  );
+  const { data }: { data: Participation[] } = await partClient.get("");
+  return data
+    ?.map((p) => ({
+      ...p,
+      key: modelsv2.AccountParticipation.fromEncodingData(
+        new Map(Object.entries(p.key))
+      ),
+    }))
+    .sort((a, b) => Number(b.key.voteLastValid) - Number(a.key.voteLastValid));
 }
 
 async function refreshData() {
@@ -425,7 +414,7 @@ function isKeyActive(item: Participation) {
 }
 
 function incentiveIneligible(addr: string) {
-  if (activeNetwork.value !== "mainnet")
+  if (activeNetwork.value !== DEFAULT_NETWORK)
     return { val: false, reason: "Not Supported" };
   const acctInfo = acctInfos.value.find((ai) => ai.address === addr);
   if ((acctInfo?.amount || 0) < 3 * 10 ** 10)

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

@@ -90,6 +90,7 @@
 </template>
 
 <script lang="ts" setup>
+import { DEFAULT_NETWORK } from "@/data";
 import FUNC from "@/services/api";
 import { mdiClose } from "@mdi/js";
 import { NetworkId, useNetwork } from "@txnlab/use-wallet-vue";
@@ -117,7 +118,7 @@ const url = ref();
 let init = false;
 
 onBeforeMount(async () => {
-  if (activeNetwork.value !== "mainnet") setShowNetworks(true);
+  if (activeNetwork.value !== DEFAULT_NETWORK) setShowNetworks(true);
   await getVersion();
   if (store.funcUpdateAvailable) {
     url.value = (await FUNC.api.get("func/latest")).data;
@@ -176,7 +177,7 @@ async function updateNode(release: string) {
 async function setShowNetworks(val: boolean) {
   store.showNetworks = val;
   localStorage.setItem("showNetworks", val.toString());
-  if (!val) setActiveNetwork("mainnet" as NetworkId);
+  if (!val) setActiveNetwork(DEFAULT_NETWORK as NetworkId);
 }
 
 async function setShowMachineName(val: boolean) {

Diff for: webui/src/data/index.ts

@@ -1,3 +1,7 @@
 import networks from "./networks.json";
 
+export const DEFAULT_NETWORK = "mainnet";
+
+networks[0].id = DEFAULT_NETWORK;
+
 export { networks };

Diff for: webui/src/plugins/index.ts

@@ -16,6 +16,7 @@ import pinia from "../stores";
 
 // Types
 import type { App } from "vue";
+import { DEFAULT_NETWORK } from "@/data";
 
 const networks = new NetworkConfigBuilder()
   .addNetwork("voimain", {
@@ -40,7 +41,7 @@ export function registerPlugins(app: App) {
         WalletId.PERA,
         WalletId.KIBISIS,
       ],
-      defaultNetwork: NetworkId.MAINNET,
+      defaultNetwork: DEFAULT_NETWORK as NetworkId,
       networks,
     });
 }