Merge branch 'main' into release

tari-project · Dec 19, 2024 · 8508711 · 8508711
2 parents bfc14f2 + cd8b00f
commit 8508711
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.8.29",
+    "version": "0.8.30",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",
@@ -70,4 +70,4 @@
         "typescript-eslint": "^8.17.0",
         "vite": "^5.4.11"
     }
-}
+}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -4,7 +4,7 @@ description = "Tari Universe"
 edition = "2021"
 name = "tari-universe"
 repository = "https://github.com/tari-project/universe"
-version = "0.8.29"
+version = "0.8.30"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/src-tauri/binaries_versions_esmeralda.json b/src-tauri/binaries_versions_esmeralda.json
@@ -4,7 +4,7 @@
         "mmproxy": "=1.9.1-pre.0",
         "minotari_node": "=1.9.1-pre.0",
         "wallet": "=1.9.1-pre.0",
-        "sha-p2pool": "=0.16.0",
+        "sha-p2pool": "=0.15.4",
         "xtrgpuminer": "=0.2.10",
         "tor": "=13.5.7"
     }

diff --git a/src-tauri/binaries_versions_nextnet.json b/src-tauri/binaries_versions_nextnet.json
@@ -4,7 +4,7 @@
         "mmproxy": "=1.9.1-rc.0",
         "minotari_node": "=1.9.1-rc.0",
         "wallet": "=1.9.1-rc.0",
-        "sha-p2pool": "=0.16.0",
+        "sha-p2pool": "=0.15.4",
         "xtrgpuminer": "=0.2.10",
         "tor": "=13.5.7"
     }

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.8.29",
+    "version": "0.8.30",
     "productName": "Tari Universe (Alpha)",
     "mainBinaryName": "Tari Universe (Alpha)",
     "identifier": "com.tari.universe.alpha",
@@ -35,7 +35,11 @@
     },
     "app": {
         "security": {
-            "capabilities": ["desktop-capability", "default", "migrated"],
+            "capabilities": [
+                "desktop-capability",
+                "default",
+                "migrated"
+            ],
             "csp": null
         },
         "trayIcon": {
@@ -74,10 +78,12 @@
     "plugins": {
         "updater": {
             "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEYxNUJBOEFEQkQ4RjJBMjYKUldRbUtvKzlyYWhiOFJIUmFFditENVV3d3hRbjNlZm1DMi9aMjluRUpVdHhQTytadTV3ODN3bUMK",
-            "endpoints": ["https://raw.githubusercontent.com/tari-project/universe/main/.updater/alpha-latest.json"],
+            "endpoints": [
+                "https://raw.githubusercontent.com/tari-project/universe/main/.updater/alpha-latest.json"
+            ],
             "windows": {
                 "installMode": "passive"
             }
         }
     }
-}
+}
diff --git a/src/containers/floating/Settings/sections/p2p/P2PConnectionData.tsx b/src/containers/floating/Settings/sections/p2p/P2PConnectionData.tsx
@@ -20,7 +20,7 @@ import { useEffect, useState } from 'react';
 import { CardComponent } from '@app/containers/floating/Settings/components/Card.component.tsx';
 
 export default function P2PConnectionData() {
-    const { t } = useTranslation('p2p');
+    const { t } = useTranslation('p2p', { useSuspense: false });
     const [copiedId, setCopiedId] = useState<string>();
     const { copyToClipboard } = useCopyToClipboard();
 

diff --git a/src/containers/floating/Settings/sections/p2p/P2PoolStats.tsx b/src/containers/floating/Settings/sections/p2p/P2PoolStats.tsx
@@ -29,11 +29,12 @@ const P2PoolStats = () => {
     const fetchP2poolConnections = useP2poolStatsStore((s) => s?.fetchP2poolConnections);
 
     useEffect(() => {
-        const fetchP2pStatsInterval = setInterval(async () => {
+        const handleFetchP2pStats = async () => {
             await fetchP2pStats?.();
             await fetchP2poolConnections?.();
-        }, 5000);
-
+        };
+        handleFetchP2pStats();
+        const fetchP2pStatsInterval = setInterval(handleFetchP2pStats, 5000);
         return () => {
             clearInterval(fetchP2pStatsInterval);
         };
@@ -43,7 +44,7 @@ const P2PoolStats = () => {
         const sha3Height = sha3Stats?.height;
         const randomXHeight = randomXStats?.height;
         return peers?.map((peer) => {
-            const { current_sha3x_height, current_random_x_height } = peer.peer_info || {};
+            const { current_sha3x_height, current_random_x_height } = peer?.peer_info || {};
             const sha3Diff = sha3Height ? sha3Height - current_sha3x_height : undefined;
             const randomxDiff = randomXHeight ? randomXHeight - current_random_x_height : undefined;
 

diff --git a/src/containers/floating/Settings/sections/p2p/P2pMarkup.tsx b/src/containers/floating/Settings/sections/p2p/P2pMarkup.tsx
@@ -29,8 +29,8 @@ const P2pMarkup = ({ setDisabledStats }: P2pMarkupProps) => {
 
     const handleP2poolEnabled = useCallback(
         async (event: React.ChangeEvent<HTMLInputElement>) => {
-            setDisabledStats(true);
             await setP2poolEnabled(event.target.checked);
+            setDisabledStats(!event.target.checked);
             setDialogToShow('restart');
         },
         [setDialogToShow, setDisabledStats, setP2poolEnabled]