Merge #676

676: Problem: complex feature-guarding of chain-core (CRO-628) r=tomtau a=tomtau

Solution: simplified feature guards to be just a switch on "mesalock_sgx"
instead of various combinations of required crates, as the feature guarding
is only needed for reduced dependencies in the enclave compilation

Co-authored-by: Tomas Tauber <2410580+tomtau@users.noreply.github.com>

Author: bors[bot]

chain-core/src/init/address.rs

@@ -11,45 +11,45 @@
 //!   These 20 bytes are the address.
 //!
 //! [Recommended Read](https://kobl.one/blog/create-full-ethereum-keypair-and-address/)
-#[cfg(feature = "bech32")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use bech32::{self, u5, FromBase32, ToBase32};
 use parity_scale_codec::{Decode, Encode};
 use std::ops;
 use std::prelude::v1::String;
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use std::str::FromStr;
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use hex;
 use secp256k1::key::PublicKey;
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use serde::de::Error;
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use std::fmt;
 use tiny_keccak::{Hasher, Keccak};
 
 use crate::common::{H256, HASH_SIZE_256};
-#[cfg(feature = "bech32")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use crate::init::network::{get_bech32_human_part_from_network, Network};
 
 #[derive(Debug, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub enum CroAddressError {
     // TODO: use directly bech32::Error or wrap it
     Bech32Error(String),
     InvalidNetwork,
     ConvertError,
 }
 
-#[cfg(feature = "bech32")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl ::std::error::Error for CroAddressError {}
 
 // CRO: mainnet transfer
 // TCRO: testnet transfer
 // DCRO: devnet/regnet transfer
-#[cfg(feature = "bech32")]
+#[cfg(not(feature = "mesalock_sgx"))]
 pub trait CroAddress<T> {
     fn to_cro(&self, network: Network) -> Result<String, CroAddressError>;
     fn from_cro(encoded: &str, network: Network) -> Result<T, CroAddressError>;
@@ -85,7 +85,7 @@ where
 
 /// Core domain logic errors
 #[derive(Debug)]
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 pub enum ErrorAddress {
     /// An invalid length
     InvalidLength(usize),
@@ -103,21 +103,21 @@ pub enum ErrorAddress {
     InvalidCroAddress,
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl From<hex::FromHexError> for ErrorAddress {
     fn from(err: hex::FromHexError) -> Self {
         ErrorAddress::UnexpectedHexEncoding(err)
     }
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl From<secp256k1::Error> for ErrorAddress {
     fn from(err: secp256k1::Error) -> Self {
         ErrorAddress::EcdsaCrypto(err)
     }
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl fmt::Display for ErrorAddress {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
@@ -134,7 +134,7 @@ impl fmt::Display for ErrorAddress {
     }
 }
 
-#[cfg(feature = "bech32")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl fmt::Display for CroAddressError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -145,7 +145,7 @@ impl fmt::Display for CroAddressError {
     }
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl std::error::Error for ErrorAddress {
     fn description(&self) -> &str {
         "Core error"
@@ -167,10 +167,10 @@ pub type RedeemAddressRaw = [u8; REDEEM_ADDRESS_BYTES];
 
 /// Eth-style Account address (20 bytes)
 #[derive(Clone, Copy, Default, Hash, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)]
-#[cfg_attr(not(feature = "hex"), derive(Debug))]
+#[cfg_attr(feature = "mesalock_sgx", derive(Debug))]
 pub struct RedeemAddress(pub RedeemAddressRaw);
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl RedeemAddress {
     /// Try to convert a byte vector to `RedeemAddress`.
     ///
@@ -187,7 +187,7 @@ impl RedeemAddress {
     }
 }
 
-#[cfg(all(feature = "bech32", feature = "hex"))]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl CroAddress<RedeemAddress> for RedeemAddress {
     fn to_cro(&self, network: Network) -> Result<String, CroAddressError> {
         let checked_data: Vec<u5> = self.0.to_vec().to_base32();
@@ -231,7 +231,7 @@ impl From<[u8; REDEEM_ADDRESS_BYTES]> for RedeemAddress {
     }
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl FromStr for RedeemAddress {
     type Err = ErrorAddress;
 
@@ -250,21 +250,21 @@ impl FromStr for RedeemAddress {
     }
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl fmt::Display for RedeemAddress {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "0x{}", hex::encode(self.0))
     }
 }
 
-#[cfg(feature = "hex")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl fmt::Debug for RedeemAddress {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "(0x{}", hex::encode(self.0))
     }
 }
 
-#[cfg(all(feature = "serde", feature = "hex"))]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl Serialize for RedeemAddress {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -274,7 +274,7 @@ impl Serialize for RedeemAddress {
     }
 }
 
-#[cfg(all(feature = "serde", feature = "hex"))]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl<'de> Deserialize<'de> for RedeemAddress {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

chain-core/src/init/coin.rs

@@ -3,16 +3,16 @@
 //! Copyright (c) 2018, Input Output HK (licensed under the MIT License)
 //! Modifications Copyright (c) 2018 - 2019, Foris Limited (licensed under the Apache License, Version 2.0)
 
-#[cfg(feature = "base64")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use crate::init::config::SlashRatio;
 use crate::init::{MAX_COIN, MAX_COIN_DECIMALS, MAX_COIN_UNITS};
 use crate::state::tendermint::TendermintVotePower;
 use crate::state::tendermint::TENDERMINT_MAX_VOTE_POWER;
 use parity_scale_codec::{Decode, Encode, Error as ScaleError, Input};
 
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use serde::de::{Deserializer, Error, Visitor};
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use serde::{Deserialize, Serialize, Serializer};
 
 use static_assertions::const_assert;
@@ -39,7 +39,7 @@ pub enum CoinError {
     Overflow,
 }
 
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl Serialize for Coin {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -50,7 +50,7 @@ impl Serialize for Coin {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl<'de> Deserialize<'de> for Coin {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -239,7 +239,7 @@ impl ops::Rem<u64> for Coin {
     }
 }
 
-#[cfg(feature = "base64")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl ops::Mul<SlashRatio> for Coin {
     type Output = Self;
 

chain-core/src/init/config.rs

@@ -9,7 +9,7 @@ use crate::state::account::{
 };
 use crate::state::tendermint::{TendermintValidatorPubKey, TendermintVotePower};
 use crate::state::RewardsPoolState;
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashSet};
 use std::fmt;
@@ -73,7 +73,7 @@ impl fmt::Display for DistributionError {
 /// Initial configuration ("app_state" in genesis.json of Tendermint config)
 /// TODO: reward/treasury config, extra validator config...
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub struct InitConfig {
     // Redeem mapping of ERC20 snapshot: Eth address => (StakedStateDestination,CRO tokens)
     // (doesn't include the rewards pool amount)

chain-core/src/init/mod.rs

@@ -6,11 +6,11 @@ pub mod address;
 /// Fixed supply coin/amounts
 pub mod coin;
 /// Configuration in JSON passed to InitChain
-#[cfg(feature = "base64")]
+#[cfg(not(feature = "mesalock_sgx"))]
 pub mod config;
 
 /// Network static configuration
-#[cfg(all(feature = "bech32", feature = "hex"))]
+#[cfg(not(feature = "mesalock_sgx"))]
 pub mod network;
 
 /// Network parameters

chain-core/src/init/params.rs

@@ -5,7 +5,7 @@ use crate::tx::fee::{Fee, FeeAlgorithm};
 use crate::tx::fee::{LinearFee, Milli, MilliError};
 use blake2::Blake2s;
 use parity_scale_codec::{Decode, Encode};
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::TryFrom;
 use std::fmt;
@@ -15,7 +15,7 @@ use std::str::FromStr;
 const MAX_SLASH_RATIO: Milli = Milli::new(1, 0); // 1.0
 
 #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub struct InitNetworkParameters {
     /// Initial fee setting
     /// -- TODO: perhaps change to be against T: FeeAlgorithm
@@ -36,7 +36,7 @@ pub struct InitNetworkParameters {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub enum NetworkParameters {
     /// parameters specified at genesis time
     Genesis(InitNetworkParameters),
@@ -147,7 +147,7 @@ impl NetworkParameters {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Encode, Decode)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub struct JailingParameters {
     /// Minimum jailing time for punished accounts (in seconds)
     pub jail_duration: u32,
@@ -159,7 +159,7 @@ pub struct JailingParameters {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Encode, Decode)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub struct SlashingParameters {
     /// Percentage of funds (bonded + unbonded) slashed when validator is not live (liveness is calculated by jailing
     /// parameters)
@@ -171,7 +171,7 @@ pub struct SlashingParameters {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Encode, Decode)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(not(feature = "mesalock_sgx"), derive(Serialize, Deserialize))]
 pub struct RewardsParameters {
     /// Maximum monetary expansion for rewards.
     pub monetary_expansion_cap: Coin,
@@ -249,7 +249,7 @@ impl fmt::Display for SlashRatio {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl Serialize for SlashRatio {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -259,7 +259,7 @@ impl Serialize for SlashRatio {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(not(feature = "mesalock_sgx"))]
 impl<'de> Deserialize<'de> for SlashRatio {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where