Merge remote-tracking branch 'origin/development' into feature/p2pool…

…-coinbase-extra
ksrichard · Sep 23, 2024 · b2360a5 · b2360a5
2 parents 6ac6fb5 + bb7f128
commit b2360a5
Show file tree

Hide file tree

Showing 82 changed files with 996 additions and 405 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.4.2-pre.2"
+version = "1.5.0-pre.0"
 edition = "2018"
 
 [dependencies]
@@ -32,8 +32,10 @@ tonic = { version = "0.8.3", features = ["tls"] }
 zeroize = "1"
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.4.2-pre.2" }
+tari_features = { path = "../../common/tari_features", version = "1.5.0-pre.0" }
 tonic-build = "0.8.4"
 
 [package.metadata.cargo-machete]
-ignored = ["prost"] # this is so we can run cargo machete without getting false positive about macro dependancies
+ignored = [
+    "prost",
+] # this is so we can run cargo machete without getting false positive about macro dependancies
diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minotari_app_utilities"
-version = "1.4.2-pre.2"
+version = "1.5.0-pre.0"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
@@ -13,7 +13,9 @@ tari_utilities = { version = "0.7" }
 minotari_app_grpc = { path = "../minotari_app_grpc", optional = true }
 
 clap = { version = "3.2", features = ["derive", "env"] }
-futures = { version = "^0.3.16", default-features = false, features = ["alloc"] }
+futures = { version = "^0.3.16", default-features = false, features = [
+    "alloc",
+] }
 json5 = "0.4"
 log = { version = "0.4.8", features = ["std"] }
 rand = "0.8"
@@ -25,8 +27,11 @@ tonic = "0.8.3"
 
 
 [build-dependencies]
-tari_common = { path = "../../common", features = ["build", "static-application-info"] }
-tari_features = { path = "../../common/tari_features", version = "1.4.2-pre.2" }
+tari_common = { path = "../../common", features = [
+    "build",
+    "static-application-info",
+] }
+tari_features = { path = "../../common/tari_features", version = "1.5.0-pre.0" }
 
 [features]
 miner_input = ["minotari_app_grpc"]
diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "minotari_console_wallet"
-version = "1.4.2-pre.2"
+version = "1.5.0-pre.0"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
 
 [dependencies]
 minotari_app_grpc = { path = "../minotari_app_grpc" }
 minotari_app_utilities = { path = "../minotari_app_utilities" }
-minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.4.2-pre.2", optional = true }
+minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.5.0-pre.0", optional = true }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
@@ -84,7 +84,7 @@ default-features = false
 features = ["crossterm"]
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.4.2-pre.2" }
+tari_features = { path = "../../common/tari_features", version = "1.5.0-pre.0" }
 
 [features]
 default = ["libtor", "ledger"]