chore: nextnext build fixes (#6192)

Description --- Fixes the build of clean build of nextnet due to tari log4rs package rename
tari-project · Mar 7, 2024 · 6aa09e7 · 6aa09e7
1 parent 3992de8
commit 6aa09e7
Show file tree

Hide file tree

Showing 49 changed files with 504 additions and 188 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ The recommended running versions of each network are:
 | Network   | Version     |
 |-----------|-------------|
 | Stagenet  | ---         |
-| Nextnet   | 1.0.0-rc.5  |
+| Nextnet   | 1.0.0-rc.5a  |
 | Esmeralda | 1.0.0-pre.8 |
 
 For more detail about versioning, see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md).

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.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [dependencies]

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.0.0-rc.5"
+version = "1.0.0-rc.5a"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"

diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minotari_console_wallet"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
@@ -39,7 +39,7 @@ digest = "0.10"
 futures = { version = "^0.3.16", default-features = false, features = [
   "alloc",
 ] }
-log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = [
+log4rs = {  package = "tari-log4rs", version = "1.2.0", default_features = false, features = [
   "config_parsing",
   "threshold_filter",
   "yaml_format",

diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The Tari merge mining proxy for xmrig"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [features]

diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The tari miner implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [dependencies]
@@ -28,7 +28,7 @@ derivative = "2.2.0"
 futures = "0.3"
 hex = "0.4.2"
 log = { version = "0.4", features = ["std"] }
-log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
+log4rs = {  package = "tari-log4rs", version = "1.2.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
 native-tls = "0.2"
 num_cpus = "1.13"
 rand = "0.8"

diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The tari full base node implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [dependencies]
@@ -38,7 +38,7 @@ futures = { version = "^0.3.16", default-features = false, features = ["alloc"]
 qrcode = { version = "0.12" }
 log = { version = "0.4.8", features = ["std"] }
 log-mdc = "0.1.0"
-log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
+log4rs = { package = "tari-log4rs", version = "1.2.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
 nom = "7.1"
 rustyline = "9.0"
 rustyline-derive = "0.5"

diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml
@@ -3,7 +3,7 @@ name = "minotari_chat_ffi"
 authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency chat C FFI bindings"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [dependencies]
@@ -19,7 +19,7 @@ tari_utilities = { version = "0.7" }
 libc = "0.2.65"
 libsqlite3-sys = { version = "0.25.1", features = ["bundled"], optional = true }
 log = "0.4.6"
-log4rs = { git = "https://github.com/tari-project/log4rs.git", features = ["console_appender", "file_appender", "yaml_format"] }
+log4rs = {  package = "tari-log4rs", version = "1.2.0", features = ["console_appender", "file_appender", "yaml_format"] }
 thiserror = "1.0.26"
 tokio = "1.23"
 

diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -3,13 +3,13 @@ name = "tari_common_types"
 authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency common types"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [dependencies]
 tari_crypto = { version = "0.20" }
 tari_utilities = { version = "0.7" }
-tari_common = {  path = "../../common" }
+tari_common = {  path = "../../common", version = "1.0.0-rc.5a" }
 
 
 chacha20poly1305 = "0.10.1"

diff --git a/base_layer/common_types/README.md b/base_layer/common_types/README.md
@@ -0,0 +1,5 @@
+# tari_common_types
+
+Implementation of common types throughout the Tari code base
+
+This crate is part of the [Tari Cryptocurrency](https://tari.com) project.
diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml
@@ -3,19 +3,19 @@ name = "tari_contacts"
 authors = ["The Tari Development Community"]
 description = "Tari contacts library"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [dependencies]
-tari_common = { path = "../../common" }
-tari_common_sqlite = { path = "../../common_sqlite" }
-tari_common_types = {  path = "../../base_layer/common_types" }
-tari_comms = {  path = "../../comms/core" }
-tari_comms_dht = { path = "../../comms/dht" }
+tari_common = { path = "../../common", version = "1.0.0-rc.5a" }
+tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" }
+tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-rc.5a" }
+tari_comms = {  path = "../../comms/core", version = "1.0.0-rc.5a" }
+tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.5a" }
 tari_crypto = { version = "0.20" }
-tari_p2p = {  path = "../p2p", features = ["auto-update"] }
-tari_service_framework = {  path = "../service_framework" }
-tari_shutdown = {  path = "../../infrastructure/shutdown" }
+tari_p2p = {  path = "../p2p", features = ["auto-update"], version = "1.0.0-rc.5a" }
+tari_service_framework = {  path = "../service_framework", version = "1.0.0-rc.5a" }
+tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" }
 tari_utilities = { version = "0.7" }
 
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
@@ -40,7 +40,7 @@ tari_test_utils = {  path = "../../infrastructure/test_utils" }
 tempfile = "3.1.0"
 
 [build-dependencies]
-tari_common = { path = "../../common" }
+tari_common = { path = "../../common", version = "1.0.0-rc.5a" }
 
 [package.metadata.cargo-machete]
 ignored = ["prost"] # this is so we can run cargo machete without getting false positive about macro dependancies
diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml
@@ -3,7 +3,7 @@ name = "tari_chat_client"
 authors = ["The Tari Development Community"]
 description = "Tari cucumber chat client"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 
 edition = "2018"
 

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari"
 homepage = "https://tari.com"
 readme = "README.md"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [features]
@@ -26,26 +26,26 @@ benches = ["base_node"]
 metrics = ["tari_metrics"]
 
 [dependencies]
-tari_common = { path = "../../common" }
-tari_common_types = { path = "../../base_layer/common_types" }
-tari_comms = { path = "../../comms/core" }
-tari_comms_dht = { path = "../../comms/dht" }
-tari_comms_rpc_macros = { path = "../../comms/rpc_macros" }
+tari_common = { path = "../../common", version = "1.0.0-rc.5a" }
+tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.5a" }
+tari_comms = { path = "../../comms/core", version = "1.0.0-rc.5a" }
+tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.5a" }
+tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-rc.5a" }
 tari_crypto = { version = "0.20", features = ["borsh"] }
-tari_metrics = { path = "../../infrastructure/metrics", optional = true }
-tari_mmr = { path = "../../base_layer/mmr", optional = true }
-tari_p2p = { path = "../../base_layer/p2p" }
-tari_script = { path = "../../infrastructure/tari_script" }
-tari_service_framework = { path = "../service_framework" }
-tari_shutdown = { path = "../../infrastructure/shutdown" }
-tari_storage = { path = "../../infrastructure/storage" }
-tari_test_utils = { path = "../../infrastructure/test_utils" }
+tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-rc.5a" }
+tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-rc.5a"}
+tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-rc.5a" }
+tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-rc.5a" }
+tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.5a" }
+tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" }
+tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.5a" }
+tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-rc.5a" }
 tari_utilities = { version = "0.7", features = ["borsh"] }
 tari_key_manager = { path = "../key_manager", features = [
   "key_manager_service",
-] }
-tari_common_sqlite = { path = "../../common_sqlite" }
-tari_hash_domains = { path = "../../hash_domains" }
+], version = "1.0.0-rc.5a" }
+tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" }
+tari_hash_domains = { path = "../../hash_domains", version = "1.0.0-rc.5a" }
 
 async-trait = { version = "0.1.50" }
 bincode = "1.1.4"
@@ -86,7 +86,7 @@ tokio = { version = "1.23", features = ["time", "sync", "macros"] }
 tracing = "0.1.26"
 zeroize = "1"
 primitive-types = { version = "0.12", features = ["serde"] }
-tiny-keccak = { git = "https://github.com/tari-project/tiny-keccak", rev = "bcddc65530d8646de7282cd8d18d891dc434b643", features = [
+tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
   "keccak",
 ] }
 
@@ -104,7 +104,7 @@ toml = { version = "0.5" }
 quickcheck = "1.0"
 
 [build-dependencies]
-tari_common = { path = "../../common", features = ["build"] }
+tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.5a" }
 
 [[bench]]
 name = "mempool"

diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency wallet key management"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2021"
 
 [lib]
@@ -13,9 +13,9 @@ crate-type = ["lib", "cdylib"]
 [dependencies]
 tari_crypto = { version = "0.20" }
 tari_utilities = { version = "0.7" }
-tari_common_sqlite = { path = "../../common_sqlite" }
-tari_common_types = {  path = "../../base_layer/common_types"}
-tari_service_framework = {  path = "../service_framework" }
+tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" }
+tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-rc.5a"}
+tari_service_framework = {  path = "../service_framework", version = "1.0.0-rc.5a" }
 
 async-trait = {version = "0.1.50"}
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }

diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "A Merkle Mountain Range implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a"
 edition = "2018"
 
 [features]
@@ -13,7 +13,7 @@ default = []
 [dependencies]
 tari_utilities = { version = "0.7" }
 tari_crypto = { version = "0.20" }
-tari_common = { path = "../../common" }
+tari_common = { path = "../../common", version = "1.0.0-rc.5a" }
 thiserror = "1.0"
 borsh = "1.2"
 digest = "0.10"

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_p2p"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.5a.a"
 authors = ["The Tari Development community"]
 description = "Tari base layer-specific peer-to-peer communication features"
 repository = "https://github.com/tari-project/tari"
@@ -10,13 +10,13 @@ license = "BSD-3-Clause"
 edition = "2018"
 
 [dependencies]
-tari_comms = {  path = "../../comms/core" }
-tari_comms_dht = {  path = "../../comms/dht" }
-tari_common = {  path = "../../common" }
+tari_comms = {  path = "../../comms/core", version = "1.0.0-rc.5a" }
+tari_comms_dht = {  path = "../../comms/dht", version = "1.0.0-rc.5a" }
+tari_common = {  path = "../../common", version = "1.0.0-rc.5a" }
 tari_crypto = { version = "0.20" }
-tari_service_framework = {  path = "../service_framework" }
-tari_shutdown = {  path = "../../infrastructure/shutdown" }
-tari_storage = {  path = "../../infrastructure/storage" }
+tari_service_framework = {  path = "../service_framework", version = "1.0.0-rc.5a" }
+tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" }
+tari_storage = {  path = "../../infrastructure/storage", version = "1.0.0-rc.5a" }
 tari_utilities = { version = "0.7" }
 
 anyhow = "1.0.53"
@@ -46,7 +46,7 @@ clap = "3.2"
 tempfile = "3.1.0"
 
 [build-dependencies]
-tari_common = {  path = "../../common", features = ["build"] }
+tari_common = {  path = "../../common", features = ["build"], version = "1.0.0-rc.5a" }
 
 [features]
 test-mocks = []

diff --git a/base_layer/p2p/src/auto_update/gpg_keys/CjS77.asc b/base_layer/p2p/src/auto_update/gpg_keys/CjS77.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+j9ja6ui3CzaqjE8AjAvjInf7HWkqcEE=
+=p1f+
+-----END PGP PUBLIC KEY BLOCK-----