feat: upgrade utils (#6621)

Description --- upgrades tari utilties and tari crypto upgrades borsh removes blocking of `127.0.0.1` address by default Motivation and Context --- blocking of `127.0.0.1` blocks universe connections between the wallet and base node by default.
tari-project · Oct 11, 2024 · cf8f15c · cf8f15c
1 parent 8d04689
commit cf8f15c
Show file tree

Hide file tree

Showing 33 changed files with 116 additions and 116 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
@@ -11,14 +11,14 @@ edition = "2021"
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core" }
-tari_crypto = { version = "0.20.3" }
+tari_crypto = { version = "0.21.0" }
 tari_script = { path = "../../infrastructure/tari_script" }
 tari_max_size = { path = "../../infrastructure/max_size" }
-tari_utilities = { version = "0.7" }
+tari_utilities = { version = "0.8" }
 
 argon2 = { version = "0.4.1", features = ["std", "password-hash"] }
 base64 = "0.13.0"
-borsh = "1.2"
+borsh = "1.5"
 chrono = { version = "0.4.19", default-features = false }
 log = "0.4"
 prost = "0.13.3"

diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml
@@ -9,7 +9,7 @@ license = "BSD-3-Clause"
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
-tari_utilities = { version = "0.7" }
+tari_utilities = { version = "0.8" }
 minotari_app_grpc = { path = "../minotari_app_grpc", optional = true }
 
 clap = { version = "3.2", features = ["derive", "env"] }

diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -14,14 +14,14 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_contacts = { path = "../../base_layer/contacts" }
-tari_crypto = { version = "0.20.3" }
+tari_crypto = { version = "0.21.0" }
 tari_key_manager = { path = "../../base_layer/key_manager" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_max_size = { path = "../../infrastructure/max_size" }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_script = { path = "../../infrastructure/tari_script" }
 tari_shutdown = { path = "../../infrastructure/shutdown" }
-tari_utilities = { version = "0.7" }
+tari_utilities = { version = "0.8" }
 minotari_wallet = { path = "../../base_layer/wallet", features = [
     "bundled_sqlite",
 ] }

diff --git a/applications/minotari_console_wallet/src/automation/commands.rs b/applications/minotari_console_wallet/src/automation/commands.rs
@@ -109,7 +109,7 @@ use tari_key_manager::{
 use tari_p2p::{auto_update::AutoUpdateConfig, peer_seeds::SeedPeer, PeerSeedsConfig};
 use tari_script::{push_pubkey_script, CheckSigSchnorrSignature};
 use tari_shutdown::Shutdown;
-use tari_utilities::{encoding::Base58, hex::Hex, ByteArray, SafePassword};
+use tari_utilities::{encoding::MBase58, hex::Hex, ByteArray, SafePassword};
 use tokio::{
     sync::{broadcast, mpsc},
     time::{sleep, timeout},
@@ -2500,7 +2500,7 @@ pub async fn command_runner(
                                 .map_err(|e| CommandError::General(e.to_string()))?
                         },
                         (false, true) => {
-                            let bytes = Vec::<u8>::from_base58(args.cipher_seed.as_str())
+                            let bytes = Vec::<u8>::from_monero_base58(args.cipher_seed.as_str())
                                 .map_err(|e| CommandError::General(e.to_string()))?;
                             CipherSeed::from_enciphered_bytes(&bytes, passphrase)
                                 .map_err(|e| CommandError::General(e.to_string()))?

diff --git a/applications/minotari_console_wallet/src/automation/utils.rs b/applications/minotari_console_wallet/src/automation/utils.rs
@@ -31,7 +31,7 @@ use digest::crypto_common::rand_core::OsRng;
 use serde::{de::DeserializeOwned, Serialize};
 use tari_common_types::types::PrivateKey;
 use tari_crypto::keys::SecretKey;
-use tari_utilities::encoding::Base58;
+use tari_utilities::encoding::MBase58;
 
 use crate::automation::{
     commands::{FILE_EXTENSION, SPEND_SESSION_INFO},
@@ -133,7 +133,7 @@ fn append_to_json_file<P: AsRef<Path>, T: Serialize>(file: P, data: T) -> Result
 
 /// Create a unique session-based output directory
 pub(crate) fn create_pre_mine_output_dir(alias: Option<&str>) -> Result<(String, PathBuf), CommandError> {
-    let mut session_id = PrivateKey::random(&mut OsRng).to_base58();
+    let mut session_id = PrivateKey::random(&mut OsRng).to_monero_base58();
     session_id.truncate(if alias.is_some() { 8 } else { 16 });
     if let Some(alias) = alias {
         session_id.push('_');

diff --git a/applications/minotari_console_wallet/src/init/mod.rs b/applications/minotari_console_wallet/src/init/mod.rs
@@ -80,7 +80,7 @@ use tari_key_manager::{
 };
 use tari_p2p::{auto_update::AutoUpdateConfig, peer_seeds::SeedPeer, PeerSeedsConfig, TransportType};
 use tari_shutdown::ShutdownSignal;
-use tari_utilities::{encoding::Base58, hex::Hex, ByteArray, SafePassword};
+use tari_utilities::{encoding::MBase58, hex::Hex, ByteArray, SafePassword};
 use zxcvbn::zxcvbn;
 
 use crate::{
@@ -972,7 +972,7 @@ pub fn prompt_public_key(prompt: &str) -> Option<PublicKey> {
     let input = input.trim();
     match PublicKey::from_hex(input) {
         Ok(pk) => Some(pk),
-        Err(_) => match PublicKey::from_base58(input) {
+        Err(_) => match PublicKey::from_monero_base58(input) {
             Ok(pk) => Some(pk),
             Err(_) => None,
         },

diff --git a/applications/minotari_ledger_wallet/comms/Cargo.toml b/applications/minotari_ledger_wallet/comms/Cargo.toml
@@ -6,15 +6,15 @@ license = "BSD-3-Clause"
 edition = "2021"
 
 [dependencies]
-tari_crypto = { version = "0.20.2", default-features = false }
-tari_utilities = { version = "0.7" }
+tari_crypto = { version = "0.21.0", default-features = false }
+tari_utilities = { version = "0.8" }
 tari_common = { path = "../../../common" }
 tari_common_types = { path = "../../../base_layer/common_types" }
 tari_script = { path = "../../../infrastructure/tari_script" }
 
 minotari_ledger_wallet_common = { path = "../common" }
 semver = "1.0"
-borsh = "1.2"
+borsh = "1.5"
 dialoguer = { version = "0.11" }
 ledger-transport = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" }
 ledger-transport-hid = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" }

diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml
@@ -6,15 +6,15 @@ license = "BSD-3-Clause"
 edition = "2021"
 
 [dependencies]
-tari_crypto = { version = "0.20.3", default-features = false, features = [
+tari_crypto = { version = "0.21.0", default-features = false, features = [
     "borsh",
 ] }
 tari_hashing = { path = "../../../hashing", version = "1.6.0-pre.0" }
 
 minotari_ledger_wallet_common = { path = "../common" }
 
 blake2 = { version = "0.10", default-features = false }
-borsh = { version = "1.2", default-features = false }
+borsh = { version = "1.5", default-features = false }
 digest = { version = "0.10", default-features = false }
 include_gif = "1.0.1"
 ledger_device_sdk = "1.15"

diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml
@@ -27,11 +27,11 @@ tari_key_manager = { path = "../../base_layer/key_manager", features = [
     "key_manager_service",
 ] }
 tari_max_size = { path = "../../infrastructure/max_size" }
-tari_utilities = { version = "0.7" }
+tari_utilities = { version = "0.8" }
 
 anyhow = "1.0.53"
 bincode = "1.3.1"
-borsh = "1.2"
+borsh = "1.5"
 bytes = "1.1"
 chrono = { version = "0.4.19", default-features = false }
 clap = { version = "3.2", features = ["derive", "env"] }

diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml
@@ -17,11 +17,11 @@ minotari_app_utilities = { path = "../minotari_app_utilities", features = [
     "miner_input",
 ] }
 minotari_app_grpc = { path = "../minotari_app_grpc" }
-tari_crypto = { version = "0.20.3" }
-tari_utilities = { version = "0.7" }
+tari_crypto = { version = "0.21.0" }
+tari_utilities = { version = "0.8" }
 
 base64 = "0.13.0"
-borsh = "1.2"
+borsh = "1.5"
 bufstream = "0.1"
 chrono = { version = "0.4.19", default-features = false }
 clap = { version = "3.2", features = ["derive"] }