Merge branch 'main' into setup-screen-airdrop-login

tari-project · Jan 11, 2025 · b67a826 · b67a826
2 parents 0e2909c + a822b07
commit b67a826
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 821 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,9 +123,9 @@ jobs:
       - name: cargo tauri build
         working-directory: ./src-tauri
         run: |
-          cargo install tauri-cli --version "^2" --locked
+          cargo install tauri-cli --version "2.1.0" --locked
           cargo tauri --version
-          cargo tauri build --ci --bundles deb
+          cargo tauri build --ci --no-bundle
 
   file-licenses:
     name: file-licenses

diff --git a/.updater/latest.json b/.updater/latest.json
@@ -1,23 +1,23 @@
 {
-  "version": "0.8.27",
+  "version": "0.8.38",
   "notes": "Tari Universe - See the assets to download this version and install",
-  "pub_date": "2024-12-18T11:30:40.243Z",
+  "pub_date": "2024-12-31T16:46:47.059Z",
   "platforms": {
-    "linux-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJtOWdzNXVaUEZSekNtNUt4MUtkZGU3M2IxSm1FaGxQM2g0QmJKT0tsaUd5aWVkTkJhM2U5bER3VVlnbmh1a2RjbGhiUGZlTFpaV1JaK2pYcFQ5UVFFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTE5MjQ4CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjdfYW1kNjQuQXBwSW1hZ2UKUXlzZmZDbW5BRk91SXY1TXZmcVQ2dGkzdUs1ZDlER3djNHF2cjYwaEVRVnRYRXJYckN4UzBvRkhQMDZsYkg3bjdPV2FwaE00TS93L0t4V0hpYnFXQVE9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_0.8.27_amd64.AppImage"
-    },
-    "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFNZ3JMb0hhd0JHUmxtU0xWbEhlRmM4ZkVjRGlLSE1wcXB1MlIxbDcyZ2FWNTRHYXc3TkllQWYrK3ZCaDcxY2V6LzlzMHk2VldlbVhCOXRrZFUzK0FnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTIwMTYyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjdfeDY0X2VuLVVTLm1zaS56aXAKY2J0QzUycXBXR3hzWmxwMUNZUUcwQTRtZm5naW41bnQzQmozM1B6YVZuKzZGYm5NZ0J6SG12dGxEanFpcWRGZWsrSWZUUXRNSFhKOTNQRFc0OGxVQXc9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_0.8.27_x64_en-US.msi.zip"
-    },
     "darwin-aarch64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJyK2lyWmN5MlpFV3U5dFlZWk9oVS9yMUFFaXVxU29kK1NXR0crYzRWSXE2aDlCOVVFQkRJVGt5b3djOHRqSEdUUUdmWWRUUjg5OVVlc3dLT2Z3aUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTIxNDMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkFiblZ2STdGeFcreUFwZU14TnpUU1FKNzExVHYxUzRPY0FLVVY3eWp1MFhJcUxodWFOdFM5Q2R5dDh5dTdIdTJ6bU0zRTlTMXRCYVozY1JrZTM1ZEJ3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFLQUJtMnNxTk5OS21ld1Vvd2E3RHFGWEpFZ0YzV0J2LzZKd2lKaDFPT0lvRXNJa01lak9pTkh5ZTExSXIzckxaQWN4RmZqeUxCbHhFKzZJYzZjaXd3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NjU2ODE3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkNocytqYjVGVEp6SGxWT1orYnJQYVlhUUVsMG1INjM4NHBMTWdCdUFBa2Q4cHY1Vkl3R2VKUkJYQmhBMU5ta01xa3R0U3FaeXlucTVPSmZsUUlBVEF3PT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.38/Tari.Universe_universal.app.tar.gz"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJyK2lyWmN5MlpFV3U5dFlZWk9oVS9yMUFFaXVxU29kK1NXR0crYzRWSXE2aDlCOVVFQkRJVGt5b3djOHRqSEdUUUdmWWRUUjg5OVVlc3dLT2Z3aUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTIxNDMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkFiblZ2STdGeFcreUFwZU14TnpUU1FKNzExVHYxUzRPY0FLVVY3eWp1MFhJcUxodWFOdFM5Q2R5dDh5dTdIdTJ6bU0zRTlTMXRCYVozY1JrZTM1ZEJ3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFLQUJtMnNxTk5OS21ld1Vvd2E3RHFGWEpFZ0YzV0J2LzZKd2lKaDFPT0lvRXNJa01lak9pTkh5ZTExSXIzckxaQWN4RmZqeUxCbHhFKzZJYzZjaXd3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NjU2ODE3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkNocytqYjVGVEp6SGxWT1orYnJQYVlhUUVsMG1INjM4NHBMTWdCdUFBa2Q4cHY1Vkl3R2VKUkJYQmhBMU5ta01xa3R0U3FaeXlucTVPSmZsUUlBVEF3PT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.38/Tari.Universe_universal.app.tar.gz"
+    },
+    "windows-x86_64": {
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFNUeHZ5a1FyRysvVUpTdWVzVUVkMWNvYjFVS1hKNDdkTHpiVnFrdnNqREtSNjdTL2xUcDVLc1R6Qkg5Y1NpMVFURlNWRnFzT1RCVTZzTHFzZllSUkFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NjU3NTAyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzhfeDY0X2VuLVVTLm1zaS56aXAKbzBkODlzMEdUc2dNRVd5TnRrOFl6RzU2YjRMV3BSbzhqdVhYQUNid2dEWGpvTDVkVllvMWp6WTJsVEsrRkRkc1lYTnppSllKVlNjREoxUi9kSUNmQnc9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.38/Tari.Universe_0.8.38_x64_en-US.msi.zip"
+    },
+    "linux-x86_64": {
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFKQlNlalhxTWFNWnQ1RWRhTFNjYkorRHMvdHpVWG5vdGUyQUUrTTkyeEYrcWgwS1NkbVhBNkhhbzZSVld4RC9CRE9xdExwYXZWbmJEMVp5Z0NoREF3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NjYzNTc0CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzhfYW1kNjQuQXBwSW1hZ2UKdTNKSDJjand6dGs1cEFHT29yOVhPWmc2NlBMT1ZCS3R0Y0FlNUFFb0U2dk5VNi9OUXBhbVJJUlk0bHZQZHJMZk5nWTViWkEzZjc5eUt3WEZxZkR6QXc9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.38/Tari.Universe_0.8.38_amd64.AppImage"
     }
   }
 }
diff --git a/ci/windows-dev-environment-notes.md b/ci/windows-dev-environment-notes.md
@@ -268,16 +268,15 @@ found 0 vulnerabilities
 ```
 
 # Install Cargo tools - tauri-cli
-```PowerShell
-cd src/universe
-cargo install tauri-cli --version "1.6.4"
+```Pow/universe
+cargo install tauri-cli --version "2.1.0"
 ```
 sample output:
 ```
-PS C:\Users\leet\src\universe> cargo install tauri-cli --version "1.6.4"
+PS C:\Users\leet\src\universe> cargo install tauri-cli --version "2.1.0"
 >>
     Updating crates.io index
-  Installing tauri-cli v1.6.4
+  Installing tauri-cli v2.1.0
     Updating crates.io index
        Fetch [===========>                     ] 48 complete; 1 pending
 ```
@@ -291,14 +290,14 @@ PS C:\Users\leet\src\universe> cargo install tauri-cli --version "1.6.4"
     Building [=======================> ] 491/492: cargo-tauri(bin)
     Finished `release` profile [optimized] target(s) in 13m 14s
   Installing C:\Users\leet\.cargo\bin\cargo-tauri.exe
-   Installed package `tauri-cli v1.6.4` (executable `cargo-tauri.exe`)
+   Installed package `tauri-cli v2.1.0` (executable `cargo-tauri.exe`)
 ```
 ```PowerShell
 cargo tauri --version
 ```
 sample output:
 ```
-  tauri-cli 1.6.4
+  tauri-cli 2.1.0
 ```
 
 # Build from source for ```Tari Universe Alpha```

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.8.38",
+    "version": "0.8.41",
     "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.38"
+version = "0.8.41"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -74,7 +74,6 @@ tauri = { git = "https://github.com/tari-project/tauri.git", rev = "67a06c8a9bae
   "image-ico",
   "tray-icon",
   "devtools",          # TODO: Remove this before mainnet
-  "tracing",           # TODO: Remove this before mainnet
 ] }
 tauri-plugin-cli = { git = "https://github.com/tari-project/tauri-plugins-workspace", rev = "09f29b0abe2cb1eb81365b65a3aa3f73325e4e17" }
 tauri-plugin-os = { git = "https://github.com/tari-project/tauri-plugins-workspace", rev = "09f29b0abe2cb1eb81365b65a3aa3f73325e4e17" }

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.2",
         "minotari_node": "=1.9.1-pre.2",
         "wallet": "=1.9.1-pre.2",
-        "sha-p2pool": "=0.17.3",
+        "sha-p2pool": "=0.19.0",
         "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.3",
         "minotari_node": "=1.9.1-rc.3",
         "wallet": "=1.9.1-rc.3",
-        "sha-p2pool": "=0.17.3",
+        "sha-p2pool": "=0.19.0",
         "xtrgpuminer": "=0.2.10",
         "tor": "=13.5.7"
     }

diff --git a/src-tauri/rust-toolchain b/src-tauri/rust-toolchain
@@ -1 +1 @@
-1.80.0
+1.81.0
diff --git a/src-tauri/src/app_config.rs b/src-tauri/src/app_config.rs
@@ -566,18 +566,19 @@ impl AppConfig {
         Ok(())
     }
 
-    pub async fn set_window_settings(
-        &mut self,
-        window_settings: WindowSettings,
-    ) -> Result<(), anyhow::Error> {
-        self.window_settings = Some(window_settings);
-        self.update_config_file().await?;
-        Ok(())
-    }
-
-    pub fn window_settings(&self) -> &Option<WindowSettings> {
-        &self.window_settings
-    }
+    // Config temporarily unused
+    // pub async fn set_window_settings(
+    //     &mut self,
+    //     window_settings: WindowSettings,
+    // ) -> Result<(), anyhow::Error> {
+    //     self.window_settings = Some(window_settings);
+    //     self.update_config_file().await?;
+    //     Ok(())
+    // }
+
+    // pub fn window_settings(&self) -> &Option<WindowSettings> {
+    //     &self.window_settings
+    // }
 
     pub async fn set_show_experimental_settings(
         &mut self,

diff --git a/src-tauri/src/binaries/binaries_manager.rs b/src-tauri/src/binaries/binaries_manager.rs
@@ -211,9 +211,8 @@ impl BinaryManager {
 
         self.adapter
             .find_version_for_platform(version_info)
-            .map(|asset| {
+            .inspect(|_asset| {
                 debug!(target: LOG_TARGET, "Found asset for version: {:?}", selected_version);
-                asset
             })
             .map_err(|error| {
                 anyhow!(

diff --git a/src-tauri/src/hardware/hardware_status_monitor.rs b/src-tauri/src/hardware/hardware_status_monitor.rs
@@ -58,17 +58,6 @@ pub enum HardwareVendor {
 }
 
 impl HardwareVendor {
-    #[allow(clippy::inherent_to_string)]
-    pub fn to_string(&self) -> String {
-        match self {
-            HardwareVendor::Nvidia => "Nvidia".to_string(),
-            HardwareVendor::Amd => "Amd".to_string(),
-            HardwareVendor::Intel => "Intel".to_string(),
-            HardwareVendor::Apple => "Apple".to_string(),
-            HardwareVendor::Unknown => "Unknown".to_string(),
-        }
-    }
-
     pub fn is_nvidia(&self, vendor: &str) -> bool {
         vendor.to_lowercase().contains("nvidia")
     }