tari_max_size crate

applications/minotari_app_grpc/Cargo.toml

@@ -13,6 +13,7 @@ tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core" }
 tari_crypto = { version = "0.20.3" }
 tari_script = { path = "../../infrastructure/tari_script" }
+tari_max_size = { path = "../../infrastructure/max_size" }
 tari_utilities = { version = "0.7" }
 
 argon2 = { version = "0.4.1", features = ["std", "password-hash"] }

applications/minotari_app_grpc/src/conversions/sidechain_feature.rs

@@ -22,10 +22,7 @@
 
 use std::convert::{TryFrom, TryInto};
 
-use tari_common_types::{
-    types::{PublicKey, Signature},
-    MaxSizeString,
-};
+use tari_common_types::types::{PublicKey, Signature};
 use tari_core::transactions::transaction_components::{
     BuildInfo,
     CodeTemplateRegistration,
@@ -35,6 +32,7 @@ use tari_core::transactions::transaction_components::{
     ValidatorNodeRegistration,
     ValidatorNodeSignature,
 };
+use tari_max_size::MaxSizeString;
 use tari_utilities::ByteArray;
 
 use crate::tari_rpc as grpc;

applications/minotari_console_wallet/Cargo.toml

@@ -17,6 +17,7 @@ tari_contacts = { path = "../../base_layer/contacts" }
 tari_crypto = { version = "0.20.3" }
 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" }

applications/minotari_console_wallet/src/ui/state/tasks.rs

@@ -34,8 +34,6 @@ use rand::{random, rngs::OsRng};
 use tari_common_types::{
     tari_address::TariAddress,
     types::{PublicKey, Signature},
-    MaxSizeBytes,
-    MaxSizeString,
 };
 use tari_core::{
     consensus::DomainSeparatedConsensusHasher,
@@ -47,6 +45,7 @@ use tari_core::{
 use tari_crypto::{keys::PublicKey as PublicKeyTrait, ristretto::RistrettoPublicKey};
 use tari_hashing::TransactionHashDomain;
 use tari_key_manager::key_manager::KeyManager;
+use tari_max_size::{MaxSizeBytes, MaxSizeString};
 use tari_utilities::{hex::Hex, ByteArray};
 use tokio::sync::{broadcast, watch};
 

applications/minotari_merge_mining_proxy/Cargo.toml

@@ -20,6 +20,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
 tari_key_manager = {  path = "../../base_layer/key_manager", features = ["key_manager_service"] }
+tari_max_size = { path = "../../infrastructure/max_size" }
 tari_utilities = { version = "0.7" }
 
 anyhow = "1.0.53"

applications/minotari_merge_mining_proxy/src/block_template_protocol.rs

@@ -26,7 +26,7 @@ use std::{cmp, convert::TryFrom, sync::Arc};
 use log::*;
 use minotari_app_utilities::parse_miner_input::BaseNodeGrpcClient;
 use minotari_node_grpc_client::grpc;
-use tari_common_types::{tari_address::TariAddress, types::FixedHash, MaxSizeBytes};
+use tari_common_types::{tari_address::TariAddress, types::FixedHash};
 use tari_core::{
     consensus::ConsensusManager,
     proof_of_work::{monero_rx, monero_rx::FixedByteArray, Difficulty},
@@ -37,6 +37,7 @@ use tari_core::{
     },
     AuxChainHashes,
 };
+use tari_max_size::MaxSizeBytes;
 use tari_utilities::{hex::Hex, ByteArray};
 
 use crate::{

applications/minotari_merge_mining_proxy/src/error.rs

@@ -29,13 +29,13 @@ use hyper::header::InvalidHeaderValue;
 use minotari_app_utilities::parse_miner_input::ParseInputError;
 use minotari_wallet_grpc_client::BasicAuthError;
 use tari_common::{ConfigError, ConfigurationError};
-use tari_common_types::{MaxSizeBytesError, MaxSizeVecError};
 use tari_core::{
     consensus::ConsensusBuilderError,
     proof_of_work::{monero_rx::MergeMineError, DifficultyError},
     transactions::{key_manager::CoreKeyManagerError, CoinbaseBuildError},
 };
 use tari_key_manager::key_manager_service::KeyManagerServiceError;
+use tari_max_size::{MaxSizeBytesError, MaxSizeVecError};
 use thiserror::Error;
 use tonic::{codegen::http::uri::InvalidUri, transport};
 

applications/minotari_miner/Cargo.toml

@@ -12,6 +12,7 @@ tari_core = { path = "../../base_layer/core", default-features = false }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
+tari_max_size = { path = "../../infrastructure/max_size" }
 minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
 minotari_app_grpc = { path = "../minotari_app_grpc" }
 tari_crypto = { version = "0.20.3" }

applications/minotari_miner/src/errors.rs

@@ -21,7 +21,7 @@
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 use minotari_app_grpc::authentication::BasicAuthError;
 use minotari_app_utilities::parse_miner_input::ParseInputError;
-use tari_common_types::MaxSizeBytesError;
+use tari_max_size::MaxSizeBytesError;
 use thiserror::Error;
 use tonic::codegen::http::uri::InvalidUri;
 

applications/minotari_miner/src/stratum/error.rs

@@ -20,7 +20,7 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use tari_common_types::MaxSizeBytesError;
+use tari_max_size::MaxSizeBytesError;
 use thiserror::Error;
 
 #[allow(clippy::enum_variant_names)]

applications/minotari_miner/src/stratum/stratum_controller/controller.rs

@@ -25,7 +25,7 @@ use borsh::BorshDeserialize;
 use futures::stream::StreamExt;
 use log::*;
 use minotari_app_grpc::tari_rpc::BlockHeader;
-use tari_common_types::MaxSizeBytes;
+use tari_max_size::MaxSizeBytes;
 use tari_utilities::{hex::Hex, ByteArray};
 
 use crate::{

base_layer/common_types/src/lib.rs

@@ -31,18 +31,9 @@ pub mod encryption;
 pub mod epoch;
 pub mod grpc_authentication;
 pub mod key_branches;
-mod max_size;
 pub mod serializers;
 pub mod tari_address;
 pub mod transaction;
 mod tx_id;
 pub mod types;
 pub mod wallet_types;
-pub use max_size::{
-    MaxSizeBytes,
-    MaxSizeBytesError,
-    MaxSizeString,
-    MaxSizeStringLengthError,
-    MaxSizeVec,
-    MaxSizeVecError,
-};

base_layer/contacts/Cargo.toml

@@ -13,6 +13,7 @@ tari_common_types = { path = "../../base_layer/common_types", version = "1.2.0-p
 tari_comms = { path = "../../comms/core", version = "1.2.0-pre.0" }
 tari_comms_dht = { path = "../../comms/dht", version = "1.2.0-pre.0" }
 tari_crypto = { version = "0.20.3" }
+tari_max_size = { path = "../../infrastructure/max_size" }
 tari_p2p = {  path = "../p2p", features = ["auto-update"], version = "1.2.0-pre.0" }
 tari_service_framework = {  path = "../service_framework", version = "1.2.0-pre.0" }
 tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.2.0-pre.0" }

base_layer/contacts/src/chat_client/Cargo.toml

@@ -15,6 +15,7 @@ tari_common_types = { path = "../../../common_types" }
 tari_comms = { path = "../../../../comms/core" }
 tari_comms_dht = { path = "../../../../comms/dht" }
 tari_contacts = { path = "../../../contacts" }
+tari_max_size = { path = "../../../../infrastructure/max_size" }
 tari_p2p = { path = "../../../p2p" }
 tari_service_framework= { path = "../../../service_framework" }
 tari_shutdown = { path = "../../../../infrastructure/shutdown" }

base_layer/contacts/src/chat_client/src/error.rs

@@ -25,9 +25,9 @@ use std::io;
 use diesel::ConnectionError;
 use minotari_app_utilities::identity_management::IdentityError;
 use tari_common_sqlite::error::StorageError as SqliteStorageError;
-use tari_common_types::MaxSizeBytesError;
 use tari_comms::peer_manager::PeerManagerError;
 use tari_contacts::contacts_service::error::ContactsServiceError;
+use tari_max_size::MaxSizeBytesError;
 use tari_p2p::initialization::CommsInitializationError;
 use tari_storage::lmdb_store::LMDBError;
 

base_layer/contacts/src/contacts_service/error.rs

@@ -22,9 +22,9 @@
 
 use diesel::result::Error as DieselError;
 use tari_common_sqlite::error::SqliteStorageError;
-use tari_common_types::MaxSizeBytesError;
 use tari_comms::connectivity::ConnectivityError;
 use tari_comms_dht::outbound::DhtOutboundError;
+use tari_max_size::MaxSizeBytesError;
 use tari_p2p::services::liveness::error::LivenessError;
 use tari_service_framework::reply_channel::TransportChannelError;
 use thiserror::Error;

base_layer/contacts/src/contacts_service/types/confirmation.rs

@@ -22,7 +22,7 @@
 
 use std::{convert::TryFrom, fmt::Display};
 
-use tari_common_types::MaxSizeBytes;
+use tari_max_size::MaxSizeBytes;
 use tari_utilities::ByteArray;
 
 use crate::contacts_service::{error::ContactsServiceError, proto, types::MessageId};

base_layer/contacts/src/contacts_service/types/message.rs

@@ -25,8 +25,9 @@ use std::{convert::TryFrom, fmt::Display};
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 use serde::{Deserialize, Serialize};
-use tari_common_types::{tari_address::TariAddress, MaxSizeBytes};
+use tari_common_types::tari_address::TariAddress;
 use tari_comms_dht::domain_message::OutboundDomainMessage;
+use tari_max_size::MaxSizeBytes;
 use tari_p2p::tari_message::TariMessageType;
 use tari_utilities::ByteArray;
 

base_layer/core/Cargo.toml

@@ -36,6 +36,7 @@ tari_comms = { path = "../../comms/core", version = "1.2.0-pre.0" }
 tari_comms_dht = { path = "../../comms/dht", version = "1.2.0-pre.0" }
 tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.2.0-pre.0" }
 tari_crypto = { version = "0.20.3", features = ["borsh"] }
+tari_max_size = { path = "../../infrastructure/max_size" }
 tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.2.0-pre.0" }
 tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.2.0-pre.0" }
 tari_p2p = { path = "../../base_layer/p2p", version = "1.2.0-pre.0" }

base_layer/core/src/common/mod.rs

@@ -23,8 +23,8 @@
 use blake2::Blake2b;
 use digest::consts::U64;
 #[cfg(feature = "base_node")]
-use tari_common_types::MaxSizeVec;
 use tari_hashing::ConfidentialOutputHashDomain;
+use tari_max_size::MaxSizeVec;
 
 use crate::consensus::DomainSeparatedConsensusHasher;
 

base_layer/core/src/covenants/arguments.rs

@@ -27,10 +27,8 @@ use std::{
 
 use borsh::{BorshDeserialize, BorshSerialize};
 use integer_encoding::VarIntWriter;
-use tari_common_types::{
-    types::{Commitment, FixedHash, PublicKey},
-    MaxSizeBytes,
-};
+use tari_common_types::types::{Commitment, FixedHash, PublicKey};
+use tari_max_size::MaxSizeBytes;
 use tari_script::TariScript;
 use tari_utilities::{hex::Hex, ByteArray};
 

base_layer/core/src/covenants/covenant.rs

@@ -27,7 +27,7 @@ use std::{
 
 use borsh::{BorshDeserialize, BorshSerialize};
 use integer_encoding::{VarIntReader, VarIntWriter};
-use tari_common_types::MaxSizeVec;
+use tari_max_size::MaxSizeVec;
 
 use super::decoder::CovenantDecodeError;
 use crate::{

base_layer/core/src/covenants/error.rs

@@ -20,7 +20,7 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use tari_common_types::MaxSizeVecError;
+use tari_max_size::MaxSizeVecError;
 
 #[derive(Debug, thiserror::Error)]
 pub enum CovenantError {

base_layer/core/src/proof_of_work/proof_of_work.rs

@@ -25,7 +25,7 @@ use std::fmt::{Display, Error, Formatter};
 use borsh::{BorshDeserialize, BorshSerialize};
 use bytes::BufMut;
 use serde::{Deserialize, Serialize};
-use tari_common_types::MaxSizeBytes;
+use tari_max_size::MaxSizeBytes;
 use tari_utilities::hex::Hex;
 
 use crate::proof_of_work::PowAlgorithm;

base_layer/core/src/proto/sidechain_feature.rs

@@ -24,10 +24,8 @@
 
 use std::convert::{TryFrom, TryInto};
 
-use tari_common_types::{
-    types::{PublicKey, Signature},
-    MaxSizeString,
-};
+use tari_common_types::types::{PublicKey, Signature};
+use tari_max_size::MaxSizeString;
 use tari_utilities::ByteArray;
 
 use crate::{

base_layer/core/src/transactions/transaction_components/encrypted_data.rs

@@ -47,10 +47,10 @@ use serde::{Deserialize, Serialize};
 use tari_common_types::{
     tari_address::{TariAddress, TARI_ADDRESS_INTERNAL_DUAL_SIZE, TARI_ADDRESS_INTERNAL_SINGLE_SIZE},
     types::{Commitment, PrivateKey},
-    MaxSizeBytes,
 };
 use tari_crypto::{hashing::DomainSeparatedHasher, keys::SecretKey};
 use tari_hashing::TransactionSecureNonceKdfDomain;
+use tari_max_size::MaxSizeBytes;
 use tari_utilities::{
     hex::{from_hex, to_hex, Hex, HexError},
     safe_array::SafeArray,

base_layer/core/src/transactions/transaction_components/output_features.rs

@@ -28,11 +28,8 @@ use std::{
 
 use borsh::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
-use tari_common_types::{
-    types::{PublicKey, Signature},
-    MaxSizeBytes,
-    MaxSizeString,
-};
+use tari_common_types::types::{PublicKey, Signature};
+use tari_max_size::{MaxSizeBytes, MaxSizeString};
 
 use super::OutputFeaturesVersion;
 use crate::transactions::transaction_components::{