Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: hotfix v0.8.8 #1215

Merged
merged 3 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src-tauri/binaries_versions_esmeralda.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions src-tauri/binaries_versions_nextnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
29 changes: 20 additions & 9 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"),
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Tari Universe (Alpha)",
"version": "0.8.7"
"version": "0.8.8"
},
"tauri": {
"systemTray": {
Expand Down
Loading