merge: resolve conflicts

.updater/latest.json

@@ -1,23 +1,23 @@
 {
-  "version": "0.6.17",
+  "version": "0.7.7",
   "notes": "Tari Universe - See the assets to download this version and install",
-  "pub_date": "2024-11-15T15:19:19.863Z",
+  "pub_date": "2024-11-24T09:24:28.921Z",
   "platforms": {
     "linux-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFN6bzUveUlhOG1ySFFiSC9EVmcxa1kvUnl0UllONWF3cjFDVzBtZExLbk9lM3Z2VlNPbFQ4RnJWTDI1QmduOFQwZXgrdVlBRTl6eEZtUFN4am5CTHcwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgyNzQ3CWZpbGU6dGFyaS11bml2ZXJzZV8wLjYuMTdfYW1kNjQuQXBwSW1hZ2UudGFyLmd6CmFsVzVkSnNEcEF0R2lVSktldXJCUS9maVpzd3pkdGJBUHBYQmZ0WDBLcWNCQVVod2gzQlNMZUY5YlVEMm9QaWVnYXhrRDRtM0V3eC9VQlVPM0M3bkRBPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.6.17/tari-universe_0.6.17_amd64.AppImage.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFpzN05JN3FFRUdxYlZKNjlXa0NLYUVHdFNIQmJQUitiTkRsWW9vTHc4MVpRdGlPUFRDNkdOZkFES3pIQ2ZtQ2VRUmtrNVdiOUY4aW5mWE14N3pJUUFVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDM5MTU3CWZpbGU6dGFyaS11bml2ZXJzZV8wLjcuN19hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKeXZ4enFaTEcxSHV0TXpkaVJFODJTSHRVVStGRmQ2bEpyM281aEtpNHFDejgyVHV4T1pBZmRDSFdMU2dOWnNNU2hqTkN4ZFQrYVg3Q2RoWkVUMjFlQ2c9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/tari-universe_0.7.7_amd64.AppImage.tar.gz"
     },
     "darwin-aarch64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFErbit3dTFSckNXRExOL0dnaGZtRDVXVzdPSnVPelVzVVFwcS90c2FYWHlPcVE0ZnBzWFhIZjVuVlhZOHR0Q1RJeWw5Rzc0dzZwYmVPNEIrdTJyb3dZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgzMzczCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClRNV3NGTmNVTmRpQjNkSXZuRnkvNjBZaHZtVGhwUDdxbVhpUG5KSFlpNmNlN09HR2YzZndJcktRL3NIWVZta3ZmZWtmSGpRTmZPZUprU281cHU3a0F3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.6.17/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlZOEZ4ckt1Skt4MzdhNnB5aVpSdmw0emNhem9NQkd4ck9jSUVTRndrUkRVcEt2eFRxVWZBRERDdlFZUHM4eGhLUUNOMEZrdVZsVG9wcmFpRzdHWmdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDM5NjE1CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClFJYjViNWxRcitWcmQ1ZW5MdmVPeDRkbGJ2ODBKWGMrbGRKSW5JUFNuNXR0RHJYczEvclI2L0VqVWdhZ2ZsemJocjdjVWxHdVpkRFo2cWhidnRPaUNRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/Tari.Universe_universal.app.tar.gz"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFErbit3dTFSckNXRExOL0dnaGZtRDVXVzdPSnVPelVzVVFwcS90c2FYWHlPcVE0ZnBzWFhIZjVuVlhZOHR0Q1RJeWw5Rzc0dzZwYmVPNEIrdTJyb3dZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgzMzczCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClRNV3NGTmNVTmRpQjNkSXZuRnkvNjBZaHZtVGhwUDdxbVhpUG5KSFlpNmNlN09HR2YzZndJcktRL3NIWVZta3ZmZWtmSGpRTmZPZUprU281cHU3a0F3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.6.17/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlZOEZ4ckt1Skt4MzdhNnB5aVpSdmw0emNhem9NQkd4ck9jSUVTRndrUkRVcEt2eFRxVWZBRERDdlFZUHM4eGhLUUNOMEZrdVZsVG9wcmFpRzdHWmdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDM5NjE1CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClFJYjViNWxRcitWcmQ1ZW5MdmVPeDRkbGJ2ODBKWGMrbGRKSW5JUFNuNXR0RHJYczEvclI2L0VqVWdhZ2ZsemJocjdjVWxHdVpkRFo2cWhidnRPaUNRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/Tari.Universe_universal.app.tar.gz"
     },
     "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFJUc25wNXVoaUdXY0ZaNmVXckZXT282dHhUV2tOMnZ0Z28wZExmZjhSSDBmQk5GWnpWcXQrUHEydUE2OWx1alBzZ3lvQmRETHhBRnVvNWJjUHpCWFFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgzOTU1CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjYuMTdfeDY0X2VuLVVTLm1zaS56aXAKWXNnL2QvbEtUVmhvc0pKWVNCRUlwbUJENWt4L2g1L0hrbkY0ZlM0eHdmbENZZ2N1QVcvRnZPdE1zcjRrZmpqNndaY1JMUFVjRmdwYzN0ZHNvR0p2Q1E9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.6.17/Tari.Universe_0.6.17_x64_en-US.msi.zip"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFhaWjJvS3pUUy93WkNpUUN5djZWUWNnSEJEWEVBSHp0SUt0ZVNhTkNLck9RazRxVmo2YTFtNjRTSTRsTXY1SDBKTjBZV1ZUWWprUktWR0MrRGxCQXdVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDQwMjY0CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjcuN194NjRfZW4tVVMubXNpLnppcAowSDlUVFVQVi9PNUFQRnhCbUhJTkdnMVduZFQzM1RjRVdrR0RwNG5NZlFucXRTbC9TMDVhYzZ3WXRQcTlYYUJTUkxJd1pJeGNrSVpkcmZTeCtBSDRCZz09Cg==",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/Tari.Universe_0.7.7_x64_en-US.msi.zip"
     }
   }
 }

index.html

@@ -163,7 +163,14 @@
           glApp.setSize(window.innerWidth, window.innerHeight);
         }
 
-        document.addEventListener('DOMContentLoaded', preload);
+        document.addEventListener('DOMContentLoaded', () => {
+          if (!window.WebGL2RenderingContext && !window.WebGLRenderingContext) {
+            console.error('WebGL not supported!');
+            return;
+          }
+
+          preload();
+        });
       </script>
     </main>
 </body>

package.json

@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.7.1",
+    "version": "0.7.7",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",
@@ -68,4 +68,4 @@
         "typescript-eslint": "^8.14.0",
         "vite": "^5.4.11"
     }
-}
+}

public/locales/af/common.json

@@ -25,5 +25,6 @@
   "usage": "Gebruik",
   "utilization": "Benutting",
   "version": "Weergawe",
-  "versions": "Weergawes"
+  "versions": "Weergawes",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/cn/common.json

@@ -25,5 +25,6 @@
   "usage": "使用",
   "utilization": "利用率",
   "version": "版本",
-  "versions": "版本"
+  "versions": "版本",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/de/common.json

@@ -25,5 +25,6 @@
   "usage": "Nutzung",
   "utilization": "Auslastung",
   "version": "Version",
-  "versions": "Versionen"
+  "versions": "Versionen",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/en/common.json

@@ -25,5 +25,6 @@
   "usage": "Usage",
   "utilization": "Utilization",
   "version": "Version",
-  "versions": "Versions"
+  "versions": "Versions",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/fr/common.json

@@ -25,5 +25,6 @@
   "usage": "Utilisation",
   "utilization": "Utilisation",
   "version": "Version",
-  "versions": "Versions"
+  "versions": "Versions",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/hi/common.json

@@ -25,5 +25,6 @@
   "usage": "उपयोग",
   "utilization": "उपयोग",
   "version": "संस्करण",
-  "versions": "संस्करण"
+  "versions": "संस्करण",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/id/common.json

@@ -25,5 +25,6 @@
   "usage": "Penggunaan",
   "utilization": "Pemanfaatan",
   "version": "Versi",
-  "versions": "Versi"
+  "versions": "Versi",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/ja/common.json

@@ -25,5 +25,6 @@
   "usage": "使用量",
   "utilization": "利用率",
   "version": "バージョン",
-  "versions": "バージョン"
+  "versions": "バージョン",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/ko/common.json

@@ -25,5 +25,6 @@
   "usage": "사용량",
   "utilization": "활용도",
   "version": "버전",
-  "versions": "버전"
+  "versions": "버전",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/pl/common.json

@@ -25,5 +25,6 @@
   "usage": "Użycie",
   "utilization": "Wykorzystanie",
   "version": "Wersja",
-  "versions": "Wersje"
+  "versions": "Wersje",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/ru/common.json

@@ -25,5 +25,6 @@
   "usage": "Использование",
   "utilization": "Использование",
   "version": "Версия",
-  "versions": "Версии"
+  "versions": "Версии",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

public/locales/tr/common.json

@@ -25,5 +25,6 @@
   "usage": "Kullanım",
   "utilization": "Fayda",
   "version": "Versiyon",
-  "versions": "Versiyon"
+  "versions": "Versiyon",
+  "webgl-not-supported": "WebGL not supported. Disabled visual mode."
 }

src-tauri/Cargo.toml

@@ -4,11 +4,12 @@ description = "Tari Universe"
 edition = "2021"
 name = "tari-universe"
 repository = "https://github.com/tari-project/universe"
-version = "0.7.1"
+version = "0.7.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
+embed-resource = "2.5.0"
 tauri-build = { version = "2", features = ["isolation"] }
 
 [dependencies]

src-tauri/binaries_versions_esmeralda.json

@@ -4,8 +4,8 @@
         "mmproxy": "=1.9.0-pre.0",
         "minotari_node": "=1.9.0-pre.0",
         "wallet": "=1.9.0-pre.0",
-        "sha-p2pool": "=0.9.2",
-        "xtrgpuminer": "=0.1.22",
+        "sha-p2pool": "=0.11.0",
+        "xtrgpuminer": "=0.2.8",
         "tor": "=13.5.7"
     }
 }

src-tauri/binaries_versions_nextnet.json

@@ -4,8 +4,8 @@
         "mmproxy": "=1.9.0-rc.0",
         "minotari_node": "=1.9.0-rc.0",
         "wallet": "=1.9.0-rc.0",
-        "sha-p2pool": "=0.9.2",
-        "xtrgpuminer": "=0.1.22",
+        "sha-p2pool": "=0.11.0",
+        "xtrgpuminer": "=0.2.8",
         "tor": "=13.5.7"
     }
 }

src-tauri/build.rs

@@ -1,3 +1,35 @@
 fn main() {
-    tauri_build::build()
+    if cfg!(target_os = "windows") {
+        let mut windows = tauri_build::WindowsAttributes::new();
+        // Require Administrator permissions to handle Firewall prompts
+        windows = windows.app_manifest(
+            r#"
+      <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+        <dependency>
+          <dependentAssembly>
+            <assemblyIdentity
+              type="win32"
+              name="Microsoft.Windows.Common-Controls"
+              version="6.0.0.0"
+              processorArchitecture="*"
+              publicKeyToken="6595b64144ccf1df"
+              language="*"
+            />
+          </dependentAssembly>
+        </dependency>
+        <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+          <security>
+              <requestedPrivileges>
+                  <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+              </requestedPrivileges>
+          </security>
+        </trustInfo>
+      </assembly>
+    "#,
+        );
+        let attrs = tauri_build::Attributes::new().windows_attributes(windows);
+        tauri_build::try_build(attrs).expect("failed to run build script")
+    } else {
+        tauri_build::build()
+    }
 }

src-tauri/src/app_config.rs

@@ -52,8 +52,11 @@ pub struct AppConfigFromFile {
     reset_earnings: bool,
     eco_mode_cpu_threads: Option<u32>,
     ludicrous_mode_cpu_threads: Option<u32>,
+    #[serde(default = "default_vec_string")]
     eco_mode_cpu_options: Vec<String>,
+    #[serde(default = "default_vec_string")]
     ludicrous_mode_cpu_options: Vec<String>,
+    #[serde(default = "default_vec_string")]
     custom_mode_cpu_options: Vec<String>,
     #[serde(default = "default_false")]
     mmproxy_use_monero_fail: bool,
@@ -62,7 +65,7 @@ pub struct AppConfigFromFile {
     #[serde(default = "default_custom_max_cpu_usage")]
     custom_max_cpu_usage: Option<u32>,
     #[serde(default = "default_custom_max_gpu_usage")]
-    custom_max_gpu_usage: Vec<GpuThreads>,
+    custom_max_gpu_usage: Option<Vec<GpuThreads>>,
     #[serde(default = "default_true")]
     auto_update: bool,
     #[serde(default = "default_true")]
@@ -92,7 +95,7 @@ impl Default for AppConfigFromFile {
             should_auto_launch: false,
             application_language: default_application_language(),
             custom_max_cpu_usage: None,
-            custom_max_gpu_usage: vec![],
+            custom_max_gpu_usage: Some(vec![]),
             paper_wallet_enabled: true,
             use_tor: true,
             eco_mode_cpu_options: Vec::new(),
@@ -295,7 +298,7 @@ impl AppConfig {
                 self.mmproxy_monero_nodes = config.mmproxy_monero_nodes;
                 self.mmproxy_use_monero_fail = config.mmproxy_use_monero_fail;
                 self.custom_max_cpu_usage = config.custom_max_cpu_usage;
-                self.custom_max_gpu_usage = config.custom_max_gpu_usage.clone();
+                self.custom_max_gpu_usage = config.custom_max_gpu_usage.unwrap_or(vec![]);
                 self.auto_update = config.auto_update;
                 self.reset_earnings = config.reset_earnings;
                 self.custom_power_levels_enabled = config.custom_power_levels_enabled;
@@ -628,7 +631,7 @@ impl AppConfig {
             application_language: self.application_language.clone(),
             paper_wallet_enabled: self.paper_wallet_enabled,
             custom_max_cpu_usage: self.custom_max_cpu_usage,
-            custom_max_gpu_usage: self.custom_max_gpu_usage.clone(),
+            custom_max_gpu_usage: Some(self.custom_max_gpu_usage.clone()),
             use_tor: self.use_tor,
             reset_earnings: self.reset_earnings,
             eco_mode_cpu_options: self.eco_mode_cpu_options.clone(),
@@ -659,8 +662,8 @@ fn default_custom_max_cpu_usage() -> Option<u32> {
     None
 }
 
-fn default_custom_max_gpu_usage() -> Vec<GpuThreads> {
-    vec![]
+fn default_custom_max_gpu_usage() -> Option<Vec<GpuThreads>> {
+    Some(vec![])
 }
 
 fn default_mode() -> String {
@@ -691,6 +694,10 @@ fn default_monero_address() -> String {
     DEFAULT_MONERO_ADDRESS.to_string()
 }
 
+fn default_vec_string() -> Vec<String> {
+    vec![]
+}
+
 fn default_application_language() -> String {
     "en".to_string()
 }

src-tauri/src/commands.rs

@@ -1333,7 +1333,10 @@ pub async fn get_max_consumption_levels(
 
     let mut max_gpus_threads = Vec::new();
     for gpu_device in gpu_devices {
-        let max_gpu_threads = gpu_device.max_grid_size;
+        // let max_gpu_threads = gpu_device.max_grid_size;
+        // For some reason this is always return 256, even when the cards can do more like
+        // 4096 or 8192
+        let max_gpu_threads = 8192;
         max_gpus_threads.push(GpuThreads {
             gpu_name: gpu_device.device_name,
             max_gpu_threads,