Skip to content

Commit

Permalink
Merge branch 'main' into setup-screen-airdrop-login
Browse files Browse the repository at this point in the history
  • Loading branch information
peps committed Dec 26, 2024
2 parents fa66afa + 94188ef commit a43ae71
Show file tree
Hide file tree
Showing 55 changed files with 586 additions and 572 deletions.
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.31",
"version": "0.8.34",
"type": "module",
"scripts": {
"dev": "vite dev --mode development",
Expand Down
86 changes: 43 additions & 43 deletions src-tauri/Cargo.lock

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

16 changes: 8 additions & 8 deletions 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.31"
version = "0.8.34"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down Expand Up @@ -38,8 +38,8 @@ libsqlite3-sys = { version = "0.25.1", features = [
] } # Required for tari_wallet
log = "0.4.22"
log4rs = "1.3.0"
minotari_node_grpc_client = { git = "https://github.com/tari-project/tari.git", rev = "37c30be" }
minotari_wallet_grpc_client = { git = "https://github.com/tari-project/tari.git", rev = "37c30be" }
minotari_node_grpc_client = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
minotari_wallet_grpc_client = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
monero-address-creator = { git = "https://github.com/tari-project/monero-address-creator.git", rev = "6129ca0" }
nix = { version = "0.29.0", features = ["signal"] }
nvml-wrapper = "0.10.0"
Expand All @@ -58,15 +58,15 @@ sha2 = "0.10.8"
sys-locale = "0.3.1"
sysinfo = "0.31.2"
tar = "0.4.26"
tari_common = { git = "https://github.com/tari-project/tari.git", rev = "37c30be" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", rev = "37c30be" }
tari_core = { git = "https://github.com/tari-project/tari.git", rev = "37c30be", features = [
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1", features = [
"transactions",
] }
tauri-plugin-single-instance = { git = "https://github.com/tari-project/tauri-plugins-workspace", rev = "09f29b0abe2cb1eb81365b65a3aa3f73325e4e17" }
tari_crypto = "0.21.0"
tari_key_manager = { git = "https://github.com/tari-project/tari.git", rev = "37c30be" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", rev = "37c30be" }
tari_key_manager = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v1.9.1-rc.1" }
tari_utilities = "0.8.0"
tauri = { git = "https://github.com/tari-project/tauri.git", rev = "67a06c8a9bae94f412b8059dfa8b4d8dd8ea0a25", features = [
"macos-private-api",
Expand Down
8 changes: 4 additions & 4 deletions src-tauri/binaries_versions_esmeralda.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"binaries": {
"xmrig": "=6.22.0",
"mmproxy": "=1.9.1-pre.0",
"minotari_node": "=1.9.1-pre.0",
"wallet": "=1.9.1-pre.0",
"sha-p2pool": "=0.15.4",
"mmproxy": "=1.9.1-pre.1",
"minotari_node": "=1.9.1-pre.1",
"wallet": "=1.9.1-pre.1",
"sha-p2pool": "=0.16.2",
"xtrgpuminer": "=0.2.10",
"tor": "=13.5.7"
}
Expand Down
8 changes: 4 additions & 4 deletions src-tauri/binaries_versions_nextnet.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"binaries": {
"xmrig": "=6.22.0",
"mmproxy": "=1.9.1-rc.0",
"minotari_node": "=1.9.1-rc.0",
"wallet": "=1.9.1-rc.0",
"sha-p2pool": "=0.15.4",
"mmproxy": "=1.9.1-rc.1",
"minotari_node": "=1.9.1-rc.1",
"wallet": "=1.9.1-rc.1",
"sha-p2pool": "=0.16.2",
"xtrgpuminer": "=0.2.10",
"tor": "=13.5.7"
}
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/binaries/binaries_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use super::{
Binaries,
};

use log::{error, info, warn};
use log::{debug, error, info, warn};

pub const LOG_TARGET: &str = "tari::universe::binary_manager";

Expand Down Expand Up @@ -102,7 +102,7 @@ impl BinaryManager {
VersionReq::default()
});

info!(target: LOG_TARGET, "Version requirements for {:?}: {:?}", binary_name, version_requirement);
debug!(target: LOG_TARGET, "Version requirements for {:?}: {:?}", binary_name, version_requirement);

version_requirement
}
Expand Down Expand Up @@ -514,7 +514,7 @@ impl BinaryManager {
}

pub async fn read_local_versions(&mut self) {
info!(target: LOG_TARGET,"Reading local versions for binary: {:?}", self.binary_name);
debug!(target: LOG_TARGET,"Reading local versions for binary: {:?}", self.binary_name);

let binary_folder = match self.adapter.get_binary_folder() {
Ok(path) => path,
Expand Down
Loading

0 comments on commit a43ae71

Please sign in to comment.