chore: use git tagged tari_utilities and tari-crypto deps (#3913)

Description --- Changes tari_utilities to use v0.3.1 tag Changes tari-crypto to use v0.12.1 tag Motivation and Context --- Allows changes to main branch without breaking the tari build How Has This Been Tested? --- CI
tari-project · Mar 14, 2022 · 80b70bb · 80b70bb
1 parent 1279773
commit 80b70bb
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml
@@ -10,9 +10,9 @@ edition = "2018"
 [dependencies]
 tari_common_types = { version = "^0.29", path = "../../base_layer/common_types"}
 tari_core = {  path = "../../base_layer/core"}
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_comms = { path = "../../comms"}
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 chrono = { version = "0.4.19", default-features = false }
 prost = "0.9"

diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml
@@ -7,11 +7,11 @@ license = "BSD-3-Clause"
 
 [dependencies]
 tari_comms = { path = "../../comms" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 config = { version = "0.9.3" }
 futures = { version = "^0.3.16", default-features = false, features = ["alloc"] }

diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml
@@ -15,13 +15,13 @@ tari_comms = { path = "../../comms", features = ["rpc"] }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_libtor = { path = "../../infrastructure/libtor" }
 tari_mmr = { path = "../../base_layer/mmr", features = ["native_bitmap"] }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_service_framework = { path = "../../base_layer/service_framework" }
 tari_shutdown = { path = "../../infrastructure/shutdown" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 anyhow = "1.0.53"
 bincode = "1.3.1"

diff --git a/applications/tari_collectibles/src-tauri/Cargo.toml b/applications/tari_collectibles/src-tauri/Cargo.toml
@@ -19,10 +19,10 @@ tari_app_grpc = { path = "../../tari_app_grpc" }
 tari_app_utilities = { path = "../../tari_app_utilities" }
 tari_common = { path = "../../../common" }
 tari_common_types = { path = "../../../base_layer/common_types" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_key_manager = { path = "../../../base_layer/key_manager" }
 tari_mmr = { path = "../../../base_layer/mmr"}
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 tari_dan_common_types = { path = "../../../dan_layer/common_types"}
 
 blake2 = "^0.9.0"

diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml
@@ -7,7 +7,7 @@ license = "BSD-3-Clause"
 
 [dependencies]
 tari_wallet = { path = "../../base_layer/wallet", features = ["bundled_sqlite"] }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_common = { path = "../../common" }
 tari_app_utilities = { path = "../tari_app_utilities" }
 tari_comms = { path = "../../comms" }
@@ -18,7 +18,7 @@ tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_app_grpc = { path = "../tari_app_grpc" }
 tari_shutdown = { path = "../../infrastructure/shutdown" }
 tari_key_manager = { path = "../../base_layer/key_manager" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 sha2 = "0.9.5"
 digest = "0.9.0"

diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml
@@ -17,8 +17,8 @@ tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
 tari_app_utilities = { path = "../tari_app_utilities" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 anyhow = "1.0.53"
 bincode = "1.3.1"

diff --git a/applications/tari_mining_node/Cargo.toml b/applications/tari_mining_node/Cargo.toml
@@ -13,8 +13,8 @@ tari_common = {  path = "../../common" }
 tari_comms = {  path = "../../comms" }
 tari_app_utilities = { path = "../tari_app_utilities"}
 tari_app_grpc = {  path = "../tari_app_grpc" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 crossbeam = "0.8"
 futures = "0.3"

diff --git a/applications/tari_stratum_transcoder/Cargo.toml b/applications/tari_stratum_transcoder/Cargo.toml
@@ -16,8 +16,8 @@ tari_comms = { path = "../../comms" }
 tari_app_grpc = { path = "../tari_app_grpc" }
 tari_common = { path = "../../common" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 bincode = "1.3.1"
 bytes = "0.5"

diff --git a/applications/tari_validator_node/Cargo.toml b/applications/tari_validator_node/Cargo.toml
@@ -14,7 +14,7 @@ tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_comms_rpc_macros = { path = "../../comms/rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_mmr = { path = "../../base_layer/mmr" }
 tari_p2p = { path = "../../base_layer/p2p" }
 tari_service_framework = { path = "../../base_layer/service_framework" }

diff --git a/applications/tari_validator_node/src/dan_node.rs b/applications/tari_validator_node/src/dan_node.rs
@@ -89,6 +89,7 @@ impl DanNode {
             .ok_or_else(|| ExitError::new(ExitCode::ConfigError, "Missing dan section"))?;
 
         let mut base_node_client = GrpcBaseNodeClient::new(dan_config.base_node_grpc_address);
+        #[allow(clippy::mutable_key_type)]
         let mut tasks = HashMap::new();
         let mut next_scanned_height = 0u64;
         loop {

diff --git a/applications/test_faucet/Cargo.toml b/applications/test_faucet/Cargo.toml
@@ -10,8 +10,8 @@ simd = ["tari_crypto/simd"]
 avx2 = ["simd"]
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 tari_common_types = { path = "../../base_layer/common_types" }
 
 rand = "0.8"

diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -7,8 +7,8 @@ version = "0.29.0"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 digest = "0.9.0"
 lazy_static = "1.4.0"

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -23,15 +23,15 @@ tari_common_types = { version = "^0.29", path = "../../base_layer/common_types"
 tari_comms = { version = "^0.29", path = "../../comms" }
 tari_comms_dht = { version = "^0.29", path = "../../comms/dht" }
 tari_comms_rpc_macros = { version = "^0.29", path = "../../comms/rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_metrics = { path = "../../infrastructure/metrics" }
 tari_mmr = { version = "^0.29", path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] }
 tari_p2p = { version = "^0.29", path = "../../base_layer/p2p" }
 tari_service_framework = { version = "^0.29", path = "../service_framework" }
 tari_shutdown = { version = "^0.29", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.29", path = "../../infrastructure/storage" }
 tari_test_utils = { version = "^0.29", path = "../../infrastructure/test_utils" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 async-trait = "0.1.50"
 bincode = "1.1.4"

diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 tari_common_types = { version = "^0.29", path = "../../base_layer/common_types" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 
 arrayvec = "0.7.1"
 argon2 = { version = "0.2", features = ["std"] }

diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml
@@ -13,7 +13,7 @@ native_bitmap = ["croaring"]
 benches = ["criterion"]
 
 [dependencies]
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 thiserror = "1.0.26"
 digest = "0.9.0"
 log = "0.4"
@@ -24,7 +24,7 @@ criterion = { version="0.2", optional = true }
 [dev-dependencies]
 rand="0.8.0"
 blake2 = "0.9.0"
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 serde_json = "1.0"
 bincode = "1.1"
 [lib]

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -13,11 +13,11 @@ edition = "2018"
 tari_comms = { version = "^0.29", path = "../../comms" }
 tari_comms_dht = { version = "^0.29", path = "../../comms/dht" }
 tari_common = { version = "^0.29", path = "../../common" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_service_framework = { version = "^0.29", path = "../service_framework" }
 tari_shutdown = { version = "^0.29", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.29", path = "../../infrastructure/storage" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 anyhow = "1.0.53"
 bytes = "0.5"

diff --git a/base_layer/tari_stratum_ffi/Cargo.toml b/base_layer/tari_stratum_ffi/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 
 [dependencies]
 tari_comms = { version = "^0.29", path = "../../comms" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_common = {  path = "../../common" }
 tari_core = {  path = "../../base_layer/core", default-features = false, features = ["transactions"]}
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 libc = "0.2.65"
 thiserror = "1.0.26"
 hex = "0.4.2"

diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -11,14 +11,14 @@ tari_common = { path = "../../common" }
 tari_common_types = { version = "^0.29", path = "../../base_layer/common_types" }
 tari_comms = { version = "^0.29", path = "../../comms" }
 tari_comms_dht = { version = "^0.29", path = "../../comms/dht" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_key_manager = { version = "^0.29", path = "../key_manager" }
 tari_p2p = { version = "^0.29", path = "../p2p", features = ["auto-update"] }
 tari_service_framework = { version = "^0.29", path = "../service_framework" }
 tari_shutdown = { version = "^0.29", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.29", path = "../../infrastructure/storage" }
 tari_common_sqlite = { path = "../../common_sqlite" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 aes-gcm = "^0.8"
 async-trait = "0.1.50"

diff --git a/base_layer/wallet/src/transaction_service/protocols/transaction_validation_protocol.rs b/base_layer/wallet/src/transaction_service/protocols/transaction_validation_protocol.rs
@@ -284,6 +284,7 @@ where
     > {
         let mut mined = vec![];
         let mut unmined = vec![];
+        #[allow(clippy::mutable_key_type)]
         let mut batch_signatures = HashMap::new();
         for tx_info in batch.iter() {
             // Imported transactions do not have a signature; this is represented by the default signature in info

diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml
@@ -10,12 +10,12 @@ edition = "2018"
 tari_comms = { version = "^0.29", path = "../../comms", features = ["c_integration"]}
 tari_comms_dht = { version = "^0.29", path = "../../comms/dht", default-features = false }
 tari_common_types = {path="../common_types"}
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_key_manager = { version = "^0.29", path = "../key_manager" }
 tari_p2p = { version = "^0.29", path = "../p2p" }
 tari_wallet = { version = "^0.29", path = "../wallet", features = ["c_integration"]}
 tari_shutdown = { version = "^0.29", path = "../../infrastructure/shutdown" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
 futures =  { version = "^0.3.1", features =["compat", "std"]}

diff --git a/clippy.toml b/clippy.toml
@@ -1,2 +1,4 @@
 cognitive-complexity-threshold = 15
 too-many-arguments-threshold = 12
+# Set from 200 to size of a RistrettoPublicKey
+enum-variant-size-threshold = 216
diff --git a/comms/Cargo.toml b/comms/Cargo.toml
@@ -10,7 +10,7 @@ version = "0.29.0"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_metrics = { path = "../infrastructure/metrics" }
 tari_storage = { version = "^0.29", path = "../infrastructure/storage" }
 tari_shutdown = { version = "^0.29", path = "../infrastructure/shutdown" }

diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml
@@ -12,8 +12,8 @@ edition = "2018"
 [dependencies]
 tari_comms = { version = "^0.29", path = "../", features = ["rpc"] }
 tari_comms_rpc_macros = { version = "^0.29", path = "../rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 tari_shutdown = { version = "^0.29", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.29", path = "../../infrastructure/storage" }
 tari_common_sqlite = { path = "../../common_sqlite" }

diff --git a/comms/src/peer_manager/peer_storage.rs b/comms/src/peer_manager/peer_storage.rs
@@ -62,6 +62,7 @@ where DS: KeyValueStore<PeerId, Peer>
     /// Constructs a new PeerStorage, with indexes populated from the given datastore
     pub fn new_indexed(database: DS) -> Result<PeerStorage<DS>, PeerManagerError> {
         // Restore peers and hashmap links from database
+        #[allow(clippy::mutable_key_type)]
         let mut public_key_index = HashMap::new();
         let mut node_id_index = HashMap::new();
         let mut total_entries = 0;

diff --git a/dan_layer/core/Cargo.toml b/dan_layer/core/Cargo.toml
@@ -11,7 +11,7 @@ tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_comms_rpc_macros = { path = "../../comms/rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.12.1" }
 tari_mmr = { path = "../../base_layer/mmr" }
 tari_p2p = { path = "../../base_layer/p2p" }
 tari_service_framework = { path = "../../base_layer/service_framework" }
@@ -20,7 +20,7 @@ tari_storage = { path = "../../infrastructure/storage" }
 tari_core = {path = "../../base_layer/core"}
 tari_dan_common_types = {path = "../common_types"}
 tari_common_types = {path = "../../base_layer/common_types"}
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 anyhow = "1.0.53"
 async-trait = "0.1.50"

diff --git a/dan_layer/storage_sqlite/Cargo.toml b/dan_layer/storage_sqlite/Cargo.toml
@@ -8,7 +8,7 @@ license = "BSD-3-Clause"
 tari_dan_core = {path="../core"}
 tari_common = { path = "../../common"}
 tari_common_types = {path = "../../base_layer/common_types"}
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }
 
 
 diesel = { version = "1.4.8", features = ["sqlite"] }
@@ -19,4 +19,4 @@ tokio = { version="1.10", features = ["macros", "time"]}
 tokio-stream = { version = "0.1.7", features = ["sync"] }
 log = { version = "0.4.8", features = ["std"] }
 patricia_tree = { version = "0.3.0", features = ["binary-format"] }
-bytecodec = { version = "0.4.14", features = ["bincode_codec"] }
+bytecodec = { version = "0.4.14", features = ["bincode_codec"] }
diff --git a/infrastructure/storage/Cargo.toml b/infrastructure/storage/Cargo.toml
@@ -19,4 +19,4 @@ serde_derive = "1.0.80"
 
 [dev-dependencies]
 rand = "0.8"
-tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", branch = "main" }
+tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.3.1" }