chore: fixes for crates release (#6143)

Description --- Fixes to release all packages to crates.io
tari-project · Feb 20, 2024 · d52bb98 · d52bb98
1 parent ae1e379
commit d52bb98
Show file tree

Hide file tree

Showing 27 changed files with 228 additions and 88 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -9,7 +9,7 @@ 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-pre.8" }
 
 
 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
@@ -7,15 +7,15 @@ version = "1.0.0-pre.8"
 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-pre.8" }
+tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.8" }
+tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.8" }
+tari_comms = {  path = "../../comms/core", version = "1.0.0-pre.8" }
+tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.8" }
 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-pre.8" }
+tari_service_framework = {  path = "../service_framework", version = "1.0.0-pre.8" }
+tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-pre.8" }
 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-pre.8" }
 
 [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/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -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-pre.8" }
+tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.8" }
+tari_comms = { path = "../../comms/core", version = "1.0.0-pre.8" }
+tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.8" }
+tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-pre.8" }
 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-pre.8" }
+tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-pre.8"}
+tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-pre.8" }
+tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-pre.8" }
+tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.8" }
+tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.8" }
+tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-pre.8" }
+tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-pre.8" }
 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-pre.8" }
+tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.8" }
+tari_hash_domains = { path = "../../hash_domains", version = "1.0.0-pre.8" }
 
 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-pre.8" }
 
 [[bench]]
 name = "mempool"

diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml
@@ -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-pre.8" }
+tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.8"}
+tari_service_framework = {  path = "../service_framework", version = "1.0.0-pre.8" }
 
 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
@@ -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-pre.8" }
 thiserror = "1.0"
 borsh = "1.2"
 digest = "0.10"

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -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-pre.8" }
+tari_comms_dht = {  path = "../../comms/dht", version = "1.0.0-pre.8" }
+tari_common = {  path = "../../common", version = "1.0.0-pre.8" }
 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-pre.8" }
+tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-pre.8" }
+tari_storage = {  path = "../../infrastructure/storage", version = "1.0.0-pre.8" }
 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-pre.8" }
 
 [features]
 test-mocks = []

diff --git a/base_layer/p2p/src/auto_update/gpg_keys/README.md b/base_layer/p2p/src/auto_update/gpg_keys/README.md
@@ -0,0 +1,42 @@
+# Tari developer public keys
+
+This folder contains the public keys for Tari developers
+
+## Why use public keys
+
+Here's a
+[long, but interesting read](https://mikegerwitz.com/2012/05/a-git-horror-story-repository-integrity-with-signed-commits).
+
+## Creating a public key
+
+If you don't already have a GPG key, follow the steps
+[described here](https://help.github.com/articles/generating-a-new-gpg-key/) to create one.
+
+## Importing keys into your keyring
+
+Lot of detail on how to import keys into your keyring is given in the
+[Redhat docs](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/4/html/Step_by_Step_Guide/s1-gnupg-import.html),
+but here is a tl;dr:
+
+    gpg --import key.asc 
+
+The output looks similar to the following:
+
+```text
+gpg: key F78FFE84: public key imported
+gpg: Total number processed: 1
+gpg:               imported: 1
+```
+
+## Signing commits with your key
+
+https://help.github.com/articles/signing-commits/
+
+## Submitting your public key
+
+To add your GPG key to the list, export your **public** key with
+
+    gpg --armor --export <your_email_address>
+
+then, create a pull request with your GPG public key in a single file in this folder with the name
+`<your-github-handle>.asc`
diff --git a/base_layer/p2p/src/auto_update/gpg_keys/swvheerden.asc b/base_layer/p2p/src/auto_update/gpg_keys/swvheerden.asc
@@ -0,0 +1,53 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+xDOnOQ==
+=VupM
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/base_layer/p2p/src/auto_update/mod.rs b/base_layer/p2p/src/auto_update/mod.rs
@@ -202,12 +202,7 @@ async fn http_download<T: IntoUrl>(url: T) -> Result<reqwest::Response, AutoUpda
     Ok(resp)
 }
 
-const MAINTAINERS: &[&str] = &[
-    include_str!("../../../../meta/gpg_keys/CjS77.asc"),
-    include_str!("../../../../meta/gpg_keys/hansieodendaal.asc"),
-    include_str!("../../../../meta/gpg_keys/sdbondi.asc"),
-    include_str!("../../../../meta/gpg_keys/swvheerden.asc"),
-];
+const MAINTAINERS: &[&str] = &[include_str!("gpg_keys/swvheerden.asc")];
 
 fn maintainers() -> impl Iterator<Item = pgp::SignedPublicKey> {
     MAINTAINERS.iter().map(|s| {

diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml
@@ -10,14 +10,14 @@ license = "BSD-3-Clause"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tari_shutdown = {  path = "../../infrastructure/shutdown" }
+tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-pre.8" }
 
 anyhow = "1.0.53"
 async-trait = "0.1.50"
 futures = { version = "^0.3.16", features = ["async-await"] }
 log = "0.4.8"
 thiserror = "1.0.26"
-tokio = { version = "1.23", features = ["rt"] }
+tokio = { version = "1.23", features = ["rt", "sync"] }
 tower-service = { version = "0.3" }
 
 [dev-dependencies]

diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -7,20 +7,20 @@ version = "1.0.0-pre.8"
 edition = "2018"
 
 [dependencies]
-tari_core = { path = "../../base_layer/core",  default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"] }
-tari_common = { path = "../../common" }
-tari_common_types = {  path = "../../base_layer/common_types" }
-tari_comms = {  path = "../../comms/core" }
-tari_comms_dht = {  path = "../../comms/dht" }
+tari_core = { path = "../../base_layer/core",  default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.0.0-pre.8" }
+tari_common = { path = "../../common", version = "1.0.0-pre.8" }
+tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.8" }
+tari_comms = {  path = "../../comms/core", version = "1.0.0-pre.8" }
+tari_comms_dht = {  path = "../../comms/dht", version = "1.0.0-pre.8" }
 tari_crypto = { version = "0.20" }
-tari_key_manager = {  path = "../key_manager", features = ["key_manager_service"] }
-tari_p2p = {  path = "../p2p", features = ["auto-update"] }
-tari_script = { path = "../../infrastructure/tari_script" }
-tari_service_framework = {  path = "../service_framework" }
-tari_shutdown = {  path = "../../infrastructure/shutdown" }
-tari_common_sqlite = { path = "../../common_sqlite" }
+tari_key_manager = {  path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-pre.8" }
+tari_p2p = {  path = "../p2p", features = ["auto-update"] , version = "1.0.0-pre.8"}
+tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-pre.8" }
+tari_service_framework = {  path = "../service_framework", version = "1.0.0-pre.8" }
+tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-pre.8" }
+tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.8" }
 tari_utilities = { version = "0.7" }
-tari_contacts = { path = "../../base_layer/contacts" }
+tari_contacts = { path = "../../base_layer/contacts", version = "1.0.0-pre.8" }
 
 # Uncomment for tokio tracing via tokio-console (needs "tracing" features)
 #console-subscriber = "0.1.3"
@@ -57,7 +57,7 @@ chacha20poly1305 = "0.10.1"
 zeroize = "1"
 
 [build-dependencies]
-tari_common = { path = "../../common", features = ["build", "static-application-info"] }
+tari_common = { path = "../../common", features = ["build", "static-application-info"], version = "1.0.0-pre.8" }
 
 [dev-dependencies]
 tari_p2p = {  path = "../p2p", features = ["test-mocks"] }

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -40,4 +40,4 @@ tari_test_utils = {  path = "../infrastructure/test_utils"}
 toml = "0.5.8"
 
 [build-dependencies]
-tari_features = { path = "./tari_features"}
+tari_features = { path = "./tari_features", version = "1.0.0-pre.8"}