From d1cbb317f2a86aede1b9915f838ff85cb7c97ced Mon Sep 17 00:00:00 2001 From: Juan <47256233+PanchoBubble@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:37:41 +0000 Subject: [PATCH 1/3] fix: p2p settings crash (#1298) Screenshot 2024-12-19 at 07 52 21 --- .../floating/Settings/sections/p2p/P2PConnectionData.tsx | 2 +- .../floating/Settings/sections/p2p/P2PoolStats.tsx | 9 +++++---- .../floating/Settings/sections/p2p/P2pMarkup.tsx | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/containers/floating/Settings/sections/p2p/P2PConnectionData.tsx b/src/containers/floating/Settings/sections/p2p/P2PConnectionData.tsx index f9a58c765..34f314372 100644 --- 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(); const { copyToClipboard } = useCopyToClipboard(); diff --git a/src/containers/floating/Settings/sections/p2p/P2PoolStats.tsx b/src/containers/floating/Settings/sections/p2p/P2PoolStats.tsx index 1b2466f40..1263be01f 100644 --- 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 index 67275db3c..461c94693 100644 --- 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) => { - setDisabledStats(true); await setP2poolEnabled(event.target.checked); + setDisabledStats(!event.target.checked); setDialogToShow('restart'); }, [setDialogToShow, setDisabledStats, setP2poolEnabled] From 093284bcfdd95ba009078f41a43f224fa5dec4e3 Mon Sep 17 00:00:00 2001 From: brianp Date: Thu, 19 Dec 2024 10:49:58 +0100 Subject: [PATCH 2/3] chore: downgrade p2pool to 0.15.4 --- src-tauri/binaries_versions_esmeralda.json | 2 +- src-tauri/binaries_versions_nextnet.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/binaries_versions_esmeralda.json b/src-tauri/binaries_versions_esmeralda.json index a6ccb9839..ea9990422 100644 --- 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 index ff88b8068..3ce5a4b90 100644 --- 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" } From cd8b00fc6b62d88423408df60d180630f40a1087 Mon Sep 17 00:00:00 2001 From: stringhandler Date: Thu, 19 Dec 2024 13:49:08 +0200 Subject: [PATCH 3/3] chore(release): v0.8.30 --- package.json | 4 ++-- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 14 ++++++++++---- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7ef6b2859..972f8ccf4 100644 --- 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" } -} +} \ No newline at end of file diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 25487bd19..016ab9fd7 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -6899,7 +6899,7 @@ dependencies = [ [[package]] name = "tari-universe" -version = "0.8.29" +version = "0.8.30" dependencies = [ "anyhow", "async-trait", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b48b566b6..d18bcb684 100644 --- 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/tauri.conf.json b/src-tauri/tauri.conf.json index 54cb4b538..95aab6aed 100644 --- 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" } } } -} +} \ No newline at end of file