Merge branch 'main' into release

tari-project · Dec 30, 2024 · 379ef9f · 379ef9f
2 parents c426127 + ed138e8
commit 379ef9f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.8.34",
+    "version": "0.8.35",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",

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.34"
+version = "0.8.35"
 
 # 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.1",
         "minotari_node": "=1.9.1-pre.1",
         "wallet": "=1.9.1-pre.1",
-        "sha-p2pool": "=0.16.2",
+        "sha-p2pool": "=0.17.1",
         "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.1",
         "minotari_node": "=1.9.1-rc.1",
         "wallet": "=1.9.1-rc.1",
-        "sha-p2pool": "=0.16.2",
+        "sha-p2pool": "=0.17.1",
         "xtrgpuminer": "=0.2.10",
         "tor": "=13.5.7"
     }

diff --git a/src-tauri/src/p2pool_adapter.rs b/src-tauri/src/p2pool_adapter.rs
@@ -36,7 +36,7 @@ use crate::process_adapter::HealthStatus;
 use crate::process_adapter::ProcessStartupSpec;
 use crate::process_adapter::{ProcessAdapter, ProcessInstance, StatusMonitor};
 use crate::utils::file_utils::convert_to_string;
-use tari_utilities::epoch_time::EpochTime;
+// use tari_utilities::epoch_time::EpochTime;
 
 #[cfg(target_os = "windows")]
 use crate::utils::setup_utils::setup_utils::add_firewall_rule;
@@ -164,27 +164,27 @@ impl P2poolStatusMonitor {
 impl StatusMonitor for P2poolStatusMonitor {
     async fn check_health(&self) -> HealthStatus {
         match self.stats_client.stats().await {
-            Ok(stats) => {
-                if stats
-                    .connection_info
-                    .network_info
-                    .connection_counters
-                    .established_outgoing
-                    + stats
-                        .connection_info
-                        .network_info
-                        .connection_counters
-                        .established_incoming
-                    < 1
-                {
-                    warn!(target: LOG_TARGET, "P2pool has no connections, health check warning");
-                    return HealthStatus::Warning;
-                }
-
-                if EpochTime::now().as_u64() - stats.last_gossip_message.as_u64() > 60 {
-                    warn!(target: LOG_TARGET, "P2pool last gossip message was more than 60 seconds ago, health check warning");
-                    return HealthStatus::Warning;
-                }
+            Ok(_stats) => {
+                // if stats
+                //     .connection_info
+                //     .network_info
+                //     .connection_counters
+                //     .established_outgoing
+                //     + stats
+                //         .connection_info
+                //         .network_info
+                //         .connection_counters
+                //         .established_incoming
+                //     < 1
+                // {
+                //     warn!(target: LOG_TARGET, "P2pool has no connections, health check warning");
+                //     return HealthStatus::Warning;
+                // }
+
+                // if EpochTime::now().as_u64() - stats.last_gossip_message.as_u64() > 60 {
+                //     warn!(target: LOG_TARGET, "P2pool last gossip message was more than 60 seconds ago, health check warning");
+                //     return HealthStatus::Warning;
+                // }
 
                 HealthStatus::Healthy
             }

diff --git a/src-tauri/src/p2pool_manager.rs b/src-tauri/src/p2pool_manager.rs
@@ -111,7 +111,8 @@ pub struct P2poolManager {
 impl P2poolManager {
     pub fn new() -> Self {
         let adapter = P2poolAdapter::new();
-        let process_watcher = ProcessWatcher::new(adapter);
+        let mut process_watcher = ProcessWatcher::new(adapter);
+        process_watcher.expected_startup_time = Duration::from_secs(300);
 
         Self {
             watcher: Arc::new(RwLock::new(process_watcher)),

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.8.34",
+    "version": "0.8.35",
     "productName": "Tari Universe (Alpha)",
     "mainBinaryName": "Tari Universe (Alpha)",
     "identifier": "com.tari.universe.alpha",