Skip to content

Commit

Permalink
Merge branch 'main' into fix_aidrop_tokens_flow
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmrrnn
mmrrnn authored Nov 18, 2024
2 parents 91f5778 + 1149c7d commit 063c2a7
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 43 deletions.
24 changes: 12 additions & 12 deletions .updater/latest.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"version": "0.6.4",
"version": "0.6.17",
"notes": "Tari Universe - See the assets to download this version and install",
"pub_date": "2024-11-07T20:53:46.621Z",
"pub_date": "2024-11-15T15:19:19.863Z",
"platforms": {
"linux-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFRqMEJBOHhvbVJzMTdtaTBBVkVzbmNLQTgzNDdrUVRPWmNSMUJ3RXVlSmk3dXo3ZVBNaEhoTUxuNmZpNmpYU2FDZFp4eXlMTWpQUzJWb2xBdllpN2dnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxMDExNTM3CWZpbGU6dGFyaS11bml2ZXJzZV8wLjYuNF9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKWDNaUWZ3MnQzWHRWMm1LV1dSTERPb3B5eHNYb3hIbUJ0bDRxNzJPdGE4K0pOYmpXdWNQSTdOMThKQXpEN3dzRGQ3emxQbjNnN05pYTRnVW5FZU1LQ2c9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.4/tari-universe_0.6.4_amd64.AppImage.tar.gz"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFM5YVl1UHBDcldOUEpKbVVCVk9rRmJnbHpuOEpVTDl1QzNzdHpJTDlIN1ZZVjVZWHd2em9jZENGWlhvejc1aEVBM0VvRzJPcmVvMVlvOURKckVCdUFBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxMDEyNDEwCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjYuNF94NjRfZW4tVVMubXNpLnppcApuQ0xabVBINGkzVm5SZ1NON056R0VaUitCbHFsRXBmUXJyaFhtK1ZVcjJmL0lISGxuYnVDUHdJTENIZ0hmUkF5b1dSV1NnWkR3NTBWWmQ5ZkVHWS9Ddz09Cg==",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.4/Tari.Universe_0.6.4_x64_en-US.msi.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFN6bzUveUlhOG1ySFFiSC9EVmcxa1kvUnl0UllONWF3cjFDVzBtZExLbk9lM3Z2VlNPbFQ4RnJWTDI1QmduOFQwZXgrdVlBRTl6eEZtUFN4am5CTHcwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgyNzQ3CWZpbGU6dGFyaS11bml2ZXJzZV8wLjYuMTdfYW1kNjQuQXBwSW1hZ2UudGFyLmd6CmFsVzVkSnNEcEF0R2lVSktldXJCUS9maVpzd3pkdGJBUHBYQmZ0WDBLcWNCQVVod2gzQlNMZUY5YlVEMm9QaWVnYXhrRDRtM0V3eC9VQlVPM0M3bkRBPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.17/tari-universe_0.6.17_amd64.AppImage.tar.gz"
},
"darwin-aarch64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFYvcXl2cERSUVUrSzcvWkM1NC9rbzZhdm1vUm5scythNjA1YnRFTjlGVGpJNEtEVmdIL3NsTlVUajMyZWxqbGIyeERSaEVwMWdHYTlBRzNwQ3Y3bkFvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxMDEyODE3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CjNVbkVhTzBlVWNKU0Q3VUROMnQyZ1VqNUhzUnNaQlhhbk5FNE1ZNktJcGJ6TnJyQzlNNzRyU0pFKyt2SkZXOXBINis2bzBML29uSTZWWUVOc3pCUERnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.4/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFErbit3dTFSckNXRExOL0dnaGZtRDVXVzdPSnVPelVzVVFwcS90c2FYWHlPcVE0ZnBzWFhIZjVuVlhZOHR0Q1RJeWw5Rzc0dzZwYmVPNEIrdTJyb3dZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgzMzczCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClRNV3NGTmNVTmRpQjNkSXZuRnkvNjBZaHZtVGhwUDdxbVhpUG5KSFlpNmNlN09HR2YzZndJcktRL3NIWVZta3ZmZWtmSGpRTmZPZUprU281cHU3a0F3PT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.17/Tari.Universe_universal.app.tar.gz"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFYvcXl2cERSUVUrSzcvWkM1NC9rbzZhdm1vUm5scythNjA1YnRFTjlGVGpJNEtEVmdIL3NsTlVUajMyZWxqbGIyeERSaEVwMWdHYTlBRzNwQ3Y3bkFvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxMDEyODE3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CjNVbkVhTzBlVWNKU0Q3VUROMnQyZ1VqNUhzUnNaQlhhbk5FNE1ZNktJcGJ6TnJyQzlNNzRyU0pFKyt2SkZXOXBINis2bzBML29uSTZWWUVOc3pCUERnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.4/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFErbit3dTFSckNXRExOL0dnaGZtRDVXVzdPSnVPelVzVVFwcS90c2FYWHlPcVE0ZnBzWFhIZjVuVlhZOHR0Q1RJeWw5Rzc0dzZwYmVPNEIrdTJyb3dZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNjgzMzczCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClRNV3NGTmNVTmRpQjNkSXZuRnkvNjBZaHZtVGhwUDdxbVhpUG5KSFlpNmNlN09HR2YzZndJcktRL3NIWVZta3ZmZWtmSGpRTmZPZUprU281cHU3a0F3PT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.17/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"
}
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tari-universe",
"private": true,
"version": "0.6.17",
"version": "0.6.18",
"type": "module",
"scripts": {
"dev": "vite dev --mode development",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock
View file

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

52 changes: 26 additions & 26 deletions src-tauri/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ description = "Tari Universe"
edition = "2021"
name = "tari-universe"
repository = "https://github.com/tari-project/universe"
version = "0.6.17"
version = "0.6.18"

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

[build-dependencies]
tauri-build = { version = "1.5.5", features = ["isolation"] }
tauri-build = {version = "1.5.5", features = ["isolation"]}

[dependencies]
anyhow = "1"
async-trait = "0.1.81"
async_zip = { version = "0.0.17", features = ["full"] }
async_zip = {version = "0.0.17", features = ["full"]}
auto-launch = "0.5.0"
base64 = "0.22.1"
blake2 = "0.10"
Expand All @@ -27,46 +27,46 @@ futures-lite = "2.3.0"
futures-util = "0.3.30"
human_format = "1.1.0"
jsonwebtoken = "9.3.0"
keyring = { version = "3.0.5", features = [
keyring = {version = "3.0.5", features = [
"windows-native",
"apple-native",
"linux-native",
] }
libsqlite3-sys = { version = "0.25.1", features = [
]}
libsqlite3-sys = {version = "0.25.1", features = [
"bundled",
] } # Required for tari_wallet
]}# Required for tari_wallet
log = "0.4.22"
log4rs = "1.3.0"
minotari_node_grpc_client = { git = "https://github.com/tari-project/tari.git", branch = "development" }
minotari_wallet_grpc_client = { git = "https://github.com/tari-project/tari.git", branch = "development" }
nix = { version = "0.29.0", features = ["signal"] }
minotari_node_grpc_client = {git = "https://github.com/tari-project/tari.git", branch = "development"}
minotari_wallet_grpc_client = {git = "https://github.com/tari-project/tari.git", branch = "development"}
nix = {version = "0.29.0", features = ["signal"]}
nvml-wrapper = "0.10.0"
open = "5"
phraze = "0.3.15"
rand = "0.8.5"
regex = "1.10.5"
reqwest = { version = "0.12.5", features = ["stream", "json", "multipart"] }
reqwest = {version = "0.12.5", features = ["stream", "json", "multipart"]}
sanitize-filename = "0.5"
semver = "1.0.23"
sentry = { version = "0.34.0", features = ["anyhow"] }
sentry = {version = "0.34.0", features = ["anyhow"]}
sentry-tauri = "0.3.0"
serde = { version = "1", features = ["derive"] }
serde = {version = "1", features = ["derive"]}
serde_json = "1"
serde_yaml = "0.9.10"
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", branch = "development" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" }
tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", features = [
tari_common = {git = "https://github.com/tari-project/tari.git", branch = "development"}
tari_common_types = {git = "https://github.com/tari-project/tari.git", branch = "development"}
tari_core = {git = "https://github.com/tari-project/tari.git", branch = "development", features = [
"transactions",
] }
]}
tari_crypto = "0.21.0"
tari_key_manager = { git = "https://github.com/tari-project/tari.git", branch = "development" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development" }
tari_key_manager = {git = "https://github.com/tari-project/tari.git", branch = "development"}
tari_shutdown = {git = "https://github.com/tari-project/tari.git", branch = "development"}
tari_utilities = "0.8.0"
tauri = { version = "1.8.0", features = [
tauri = {version = "1.8.0", features = [
"window-unmaximize",
"window-unminimize",
"os-all",
Expand All @@ -86,12 +86,12 @@ tauri = { version = "1.8.0", features = [
"icon-ico",
"icon-png",
"process-command-api",
] }
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
]}
tauri-plugin-single-instance = {git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1"}
thiserror = "1.0.26"
tokio = { version = "1", features = ["full"] }
tokio-util = { version = "0.7.11", features = ["compat"] }
xz2 = { version = "0.1.7", features = ["static"] } # static bind lzma
tokio = {version = "1", features = ["full"]}
tokio-util = {version = "0.7.11", features = ["compat"]}
xz2 = {version = "0.1.7", features = ["static"]}# static bind lzma
zip = "2.2.0"

[target.'cfg(windows)'.dependencies]
Expand All @@ -100,7 +100,7 @@ winreg = "0.52.0"
# needed for keymanager. TODO: Find a way of creating a keymanager without bundling sqlite
chrono = "0.4.38"
device_query = "2.1.0"
libsqlite3-sys = { version = "0.25.1", features = ["bundled"] }
libsqlite3-sys = {version = "0.25.1", features = ["bundled"]}
log = "0.4.22"
nvml-wrapper = "0.10.0"
rand = "0.8.5"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/binaries_versions_esmeralda.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"mmproxy": "=1.8.0-pre.0",
"minotari_node": "=1.8.0-pre.0",
"wallet": "=1.8.0-pre.0",
"sha-p2pool": "=0.7.15",
"sha-p2pool": "=0.8.0",
"xtrgpuminer": "=0.1.17",
"tor": "=13.5.7"
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/binaries_versions_nextnet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"mmproxy": "=1.8.0-rc.0",
"minotari_node": "=1.8.0-rc.0",
"wallet": "=1.8.0-rc.0",
"sha-p2pool": "=0.7.15",
"sha-p2pool": "=0.8.0",
"xtrgpuminer": "=0.1.17",
"tor": "=13.5.7"
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Tari Universe (Alpha)",
"version": "0.6.17"
"version": "0.6.18"
},
"tauri": {
"systemTray": {
Expand Down

0 comments on commit 063c2a7

Please sign in to comment.