Merge branch 'feat/dpnsImprovements' of github.com:dashpay/platform into feat/dpnsImprovements

Author: quantum

packages/rs-dpp/Cargo.toml

@@ -270,8 +270,9 @@ core-types = ["bls-signatures"]
 core-types-serialization = ["core-types"]
 core-types-serde-conversion = ["core-types"]
 state-transitions = []
+system_contracts = ["data-contracts", "factories"]
 # All system data contracts
-all-system_contracts = ["data-contracts", "data-contracts/all-contracts", "dpns-contract", "dashpay-contract", "withdrawals-contract", "masternode-rewards-contract", "wallet-utils-contract", "token-history-contract", "keywords-contract"]
+all-system_contracts = ["system_contracts", "data-contracts/all-contracts", "dpns-contract", "dashpay-contract", "withdrawals-contract", "masternode-rewards-contract", "wallet-utils-contract", "token-history-contract", "keywords-contract"]
 
 # Individual data contract features
 dpns-contract = ["data-contracts", "data-contracts/dpns"]

packages/rs-dpp/src/lib.rs

@@ -48,7 +48,7 @@ pub mod serialization;
     feature = "message-signature-verification"
 ))]
 pub mod signing;
-#[cfg(feature = "data-contracts")]
+#[cfg(feature = "system_contracts")]
 pub mod system_data_contracts;
 
 pub mod tokens;

packages/rs-drive/src/util/object_size_info/contract_info.rs

@@ -46,7 +46,7 @@ pub enum DataContractInfo<'a> {
     OwnedDataContract(DataContract),
 }
 
-impl<'a> DataContractInfo<'a> {
+impl DataContractInfo<'_> {
     #[cfg(feature = "server")]
     /// Resolve the data contract info into an object that contains the data contract
     pub(crate) fn resolve(