diff --git a/package-lock.json b/package-lock.json index 7b597e509..56757ea32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tari-universe", - "version": "0.8.7", + "version": "0.8.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tari-universe", - "version": "0.8.7", + "version": "0.8.8", "dependencies": { "@floating-ui/react": "^0.26.28", "@lottiefiles/dotlottie-react": "^0.10.1", diff --git a/package.json b/package.json index f2c7f8f60..350d07e1f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tari-universe", "private": true, - "version": "0.8.7", + "version": "0.8.8", "type": "module", "scripts": { "dev": "vite dev --mode development", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6ec57c9a1..c9d7fb522 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -6649,7 +6649,7 @@ dependencies = [ [[package]] name = "tari-universe" -version = "0.8.7" +version = "0.8.8" dependencies = [ "anyhow", "async-trait", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 628db7845..4e18c4e33 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.7" +version = "0.8.8" # 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 index 65cbb22ae..1a3b07c2f 100644 --- a/src-tauri/binaries_versions_esmeralda.json +++ b/src-tauri/binaries_versions_esmeralda.json @@ -4,8 +4,8 @@ "mmproxy": "=1.9.1-pre.0", "minotari_node": "=1.9.1-pre.0", "wallet": "=1.9.1-pre.0", - "sha-p2pool": "=0.15.0", - "xtrgpuminer": "=0.2.9", + "sha-p2pool": "=0.15.1", + "xtrgpuminer": "=0.2.10", "tor": "=13.5.7" } } \ No newline at end of file diff --git a/src-tauri/binaries_versions_nextnet.json b/src-tauri/binaries_versions_nextnet.json index 486cf1226..bf1b7ea75 100644 --- a/src-tauri/binaries_versions_nextnet.json +++ b/src-tauri/binaries_versions_nextnet.json @@ -4,8 +4,8 @@ "mmproxy": "=1.9.1-rc.0", "minotari_node": "=1.9.1-rc.0", "wallet": "=1.9.1-rc.0", - "sha-p2pool": "=0.15.0", - "xtrgpuminer": "=0.2.9", + "sha-p2pool": "=0.15.1", + "xtrgpuminer": "=0.2.10", "tor": "=13.5.7" } } \ No newline at end of file diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index accd03f11..dd3d63d07 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -6,7 +6,7 @@ use hardware::hardware_status_monitor::HardwareStatusMonitor; use log::trace; use log::{debug, error, info, warn}; use p2pool::models::Connections; -use std::fs::{remove_dir_all, remove_file}; +use std::fs::{create_dir_all, remove_dir_all, remove_file, File}; use tokio::sync::watch::{self}; use log4rs::config::RawConfig; @@ -673,11 +673,26 @@ fn main() { })) .manage(app_state.clone()) .setup(|app| { + let config_path = app + .path_resolver() + .app_config_dir() + .expect("Could not get config dir"); + + // Remove this after it's been rolled out for a few versions + let log_path = app.path_resolver().app_log_dir().expect("Could not get log dir"); + let logs_cleared_file = log_path.join("logs_cleared"); + if !logs_cleared_file.exists() { + match remove_dir_all(&log_path) { + Ok(()) => { + create_dir_all(&log_path).map_err(|e| e.to_string())?; + File::create(&logs_cleared_file).map_err(|e| e.to_string())?; + }, + Err(e) => warn!(target: LOG_TARGET, "Could not clear log folder: {}", e) + } + } + let contents = setup_logging( - &app.path_resolver() - .app_config_dir() - .expect("Could not get config dir") - .join("logs") + &log_path .join("universe") .join("configs") .join("log4rs_config_universe.yml"), @@ -694,10 +709,6 @@ fn main() { let splash_window = app .get_window("splashscreen") .expect("Main window not found"); - let config_path = app - .path_resolver() - .app_config_dir() - .expect("Could not get config dir"); // The start of needed restart operations. Break this out into a module if we need n+1 let tcp_tor_toggled_file = config_path.join("tcp_tor_toggled"); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 97e5f8639..e021c50ff 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Tari Universe (Alpha)", - "version": "0.8.7" + "version": "0.8.8" }, "tauri": { "systemTray": {