Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
stringhandler committed Jan 6, 2025
2 parents bc58896 + ed4a6d3 commit e208f04
Show file tree
Hide file tree
Showing 20 changed files with 51 additions and 765 deletions.
20 changes: 10 additions & 10 deletions .updater/alpha-latest.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"version": "0.8.37",
"version": "0.8.38",
"notes": "Tari Universe - See the assets to download this version and install",
"pub_date": "2024-12-30T20:12:32.000Z",
"pub_date": "2024-12-31T16:46:47.059Z",
"platforms": {
"darwin-aarch64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFdsWndkL1VHeFN2aHkyU2dyUFBZdkxSVFJBa2NUVFhxcHNFYkRSK2NwNHVrQzliUGt1T0tOU1luRXh2SkFPUENDM3YyMU5rSStaQXc2RHZMeTJBUEFZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NTgyODgwCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkpXZ3RVUTN4OUFvdXVUS1p2VTBLR2JZN2M3Z1RHamVvalZGeGNXTWFYWlhIUDlndm1aUFBDa0YzVGlyNVd6TkVLK3YyUGgvZFczOFlxK0FWS2VNTkFBPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.37/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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFdsWndkL1VHeFN2aHkyU2dyUFBZdkxSVFJBa2NUVFhxcHNFYkRSK2NwNHVrQzliUGt1T0tOU1luRXh2SkFPUENDM3YyMU5rSStaQXc2RHZMeTJBUEFZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NTgyODgwCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkpXZ3RVUTN4OUFvdXVUS1p2VTBLR2JZN2M3Z1RHamVvalZGeGNXTWFYWlhIUDlndm1aUFBDa0YzVGlyNVd6TkVLK3YyUGgvZFczOFlxK0FWS2VNTkFBPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.37/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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGVtNjBySlBRaEQ2V2xXcE14RnhMZjc4NE5oWHcyQVQxdHBzcmlHa0l6TWRxNlpZb3dlOVVpalRSL2YwRGVkL1hvZUlacExLaGRKZkNiK1dzT2tvY2c4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NTgzNTg5CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzdfeDY0X2VuLVVTLm1zaS56aXAKVDJmZ2VhMExWU2dBVHdvTzYvYmkza3Myai9GU1BMNU9OaFJkakFPRFhMdWhPajhOcVRSZ0lTNlpvRmhwZjRXNjIwZTBoTm9Kck1WblF4a2tCM3JNQ2c9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.37/Tari.Universe_0.8.37_x64_en-US.msi.zip"
"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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGVZRTFLZkRyNXZlZUd4Vm9OUjdvT1pyMmhyTDBHeGtjV1lwQ2t2K2VZSmFqSkZ6OHdKUE9yUlVrcG9HL3VUNHJ4L3dKYlQzcGZyek1zR2s2WGNmQUFNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NTg5NTMyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzdfYW1kNjQuQXBwSW1hZ2UKRkwxTHVzMFIvTy9jSGlnUTk0aUZVTUcrVGRwMm9xVVF1bU1kS3NrQUsveTE3S09IWldWTktjNkJoTnpDL2E3K1daWm92cjVZeXArS2lxQUhYcGREQnc9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.37/Tari.Universe_0.8.37_amd64.AppImage"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFKQlNlalhxTWFNWnQ1RWRhTFNjYkorRHMvdHpVWG5vdGUyQUUrTTkyeEYrcWgwS1NkbVhBNkhhbzZSVld4RC9CRE9xdExwYXZWbmJEMVp5Z0NoREF3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM1NjYzNTc0CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzhfYW1kNjQuQXBwSW1hZ2UKdTNKSDJjand6dGs1cEFHT29yOVhPWmc2NlBMT1ZCS3R0Y0FlNUFFb0U2dk5VNi9OUXBhbVJJUlk0bHZQZHJMZk5nWTViWkEzZjc5eUt3WEZxZkR6QXc9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.38/Tari.Universe_0.8.38_amd64.AppImage"
}
}
}
28 changes: 14 additions & 14 deletions .updater/latest.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
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.38",
"version": "0.8.39",
"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.38"
version = "0.8.39"

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

Expand Down
2 changes: 1 addition & 1 deletion src-tauri/binaries_versions_esmeralda.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.18.0",
"xtrgpuminer": "=0.2.10",
"tor": "=13.5.7"
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/binaries_versions_nextnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.18.0",
"xtrgpuminer": "=0.2.10",
"tor": "=13.5.7"
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.80.0
1.81.0
3 changes: 1 addition & 2 deletions src-tauri/src/binaries/binaries_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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!(
Expand Down
11 changes: 0 additions & 11 deletions src-tauri/src/hardware/hardware_status_monitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
Loading

0 comments on commit e208f04

Please sign in to comment.