enable tendermint no_std and error handle by flex-error

light-client/src/components/verifier.rs

@@ -113,8 +113,8 @@ impl Verifier for ProdVerifier {
             &*self.voting_power_calculator,
             &*self.commit_validator,
             &*self.hasher,
-            &trusted,
-            &untrusted,
+            trusted,
+            untrusted,
             options,
             now,
         )

light-client/src/evidence.rs

@@ -70,7 +70,7 @@ mod prod {
         #[pre(self.peer_map.contains_key(&peer))]
         fn rpc_client_for(&self, peer: PeerId) -> Result<rpc::HttpClient, IoError> {
             let peer_addr = self.peer_map.get(&peer).unwrap().to_owned();
-            Ok(rpc::HttpClient::new(peer_addr).map_err(IoError::from)?)
+            rpc::HttpClient::new(peer_addr).map_err(IoError::from)
         }
     }
 }

light-client/src/light_client.rs

@@ -138,8 +138,8 @@ impl LightClient {
     ///   should be trusted based on a previously verified light block.
     /// - When doing _forward_ verification, the Scheduler component decides which height to try to
     ///   verify next, in case the current block pass verification but cannot be trusted yet.
-    /// - When doing _backward_ verification, the Hasher component is used to determine
-    ///   whether the `last_block_id` hash of a block matches the hash of the block right below it.
+    /// - When doing _backward_ verification, the Hasher component is used to determine whether the
+    ///   `last_block_id` hash of a block matches the hash of the block right below it.
     ///
     /// ## Implements
     /// - [LCV-DIST-SAFE.1]

light-client/src/peer_list.rs

@@ -115,7 +115,7 @@ impl<T> PeerList<T> {
     /// - The given peer id must not be the primary peer id.
     /// - The given peer must be in the witness list
     #[pre(faulty_witness != self.primary && self.witnesses.contains(&faulty_witness))]
-    #[post(Self::invariant(&self))]
+    #[post(Self::invariant(self))]
     pub fn replace_faulty_witness(&mut self, faulty_witness: PeerId) -> Option<PeerId> {
         let mut result = None;
 
@@ -137,7 +137,7 @@ impl<T> PeerList<T> {
     ///
     /// ## Errors
     /// - If there are no witness left, returns `ErrorKind::NoWitnessLeft`.
-    #[post(ret.is_ok() ==> Self::invariant(&self))]
+    #[post(ret.is_ok() ==> Self::invariant(self))]
     pub fn replace_faulty_primary(
         &mut self,
         primary_error: Option<Error>,

light-client/src/predicates.rs

@@ -240,10 +240,10 @@ pub fn verify(
     vp.is_header_from_past(&untrusted.signed_header.header, options.clock_drift, now)?;
 
     // Ensure the header validator hashes match the given validators
-    vp.validator_sets_match(&untrusted, &*hasher)?;
+    vp.validator_sets_match(untrusted, &*hasher)?;
 
     // Ensure the header next validator hashes match the given next validators
-    vp.next_validators_match(&untrusted, &*hasher)?;
+    vp.next_validators_match(untrusted, &*hasher)?;
 
     // Ensure the header matches the commit
     vp.header_matches_commit(&untrusted.signed_header, hasher)?;
@@ -266,7 +266,7 @@ pub fn verify(
     if untrusted.height() == trusted_next_height {
         // If the untrusted block is the very next block after the trusted block,
         // check that their (next) validator sets hashes match.
-        vp.valid_next_validator_set(&untrusted, trusted)?;
+        vp.valid_next_validator_set(untrusted, trusted)?;
     } else {
         // Otherwise, ensure that the untrusted block has a greater height than
         // the trusted block.

light-client/src/supervisor.rs

@@ -320,7 +320,7 @@ impl Supervisor {
             .collect();
 
         self.fork_detector
-            .detect_forks(verified_block, &trusted_block, witnesses)
+            .detect_forks(verified_block, trusted_block, witnesses)
     }
 
     /// Run the supervisor event loop in the same thread.

p2p/src/secret_connection/public_key.rs

@@ -24,7 +24,7 @@ impl PublicKey {
     pub fn from_raw_ed25519(bytes: &[u8]) -> Result<Self, Error> {
         ed25519::PublicKey::from_bytes(bytes)
             .map(Self::Ed25519)
-            .map_err(|_| error::Kind::Crypto.into())
+            .map_err(|_| error::crypto_error())
     }
 
     /// Get Ed25519 public key

rpc/src/endpoint/abci_info.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use std::convert::{TryFrom, TryInto};
 use tendermint::block;
-use tendermint::Error;
+use tendermint::error::Error;
 use tendermint_proto::abci::ResponseInfo;
 
 /// Request ABCI information from a node

rpc/src/lib.rs

@@ -8,14 +8,12 @@
 //!
 //! Several client-related features are provided at present:
 //!
-//! * `http-client` - Provides [`HttpClient`], which is a basic RPC client that
-//!   interacts with remote Tendermint nodes via **JSON-RPC over HTTP or
-//!   HTTPS**. This client does not provide [`event::Event`] subscription
-//!   functionality. See the [Tendermint RPC] for more details.
-//! * `websocket-client` - Provides [`WebSocketClient`], which provides full
-//!   client functionality, including general RPC functionality as well as
-//!   [`event::Event`] subscription functionality. Can be used over secure
-//!   (`wss://`) and unsecure (`ws://`) connections.
+//! * `http-client` - Provides [`HttpClient`], which is a basic RPC client that interacts with
+//!   remote Tendermint nodes via **JSON-RPC over HTTP or HTTPS**. This client does not provide
+//!   [`event::Event`] subscription functionality. See the [Tendermint RPC] for more details.
+//! * `websocket-client` - Provides [`WebSocketClient`], which provides full client functionality,
+//!   including general RPC functionality as well as [`event::Event`] subscription functionality.
+//!   Can be used over secure (`wss://`) and unsecure (`ws://`) connections.
 //!
 //! ### Mock Clients
 //!

tendermint/Cargo.toml

@@ -33,36 +33,66 @@ rustdoc-args = ["--cfg", "docsrs"]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-anomaly = "0.2"
+anyhow = {version = "1.0", default-features = false}
+flex-error = { version = "0.3.0", default-features = false, features = ["anyhow_tracer"] }
 async-trait = "0.1"
-bytes = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
-ed25519 = "1"
-ed25519-dalek = { version = "1", features = ["serde"] }
-futures = "0.3"
-num-traits = "0.2"
-once_cell = "1.3"
-prost = "0.7"
-prost-types = "0.7"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-serde_bytes = "0.11"
+bytes = { version = "1.0", default-features = false }
+chrono = { version = "0.4", default-features = false, features = ["serde", "clock"] }
+ed25519 = { version = "1", default-features = false }
+# use features (u64 backend)
+ed25519-dalek = { version = "1", default-features = false, features = ["serde", "u64_backend"] }
+# TODO(thane): Remove once https://github.com/myrrlyn/funty/issues/3 is fixed
+funty = { version = "=1.1.0", default-features = false }
+futures = { version = "0.3", default-features =  false }
+num-traits = { version = "0.2", default-features = false }
+once_cell = { version = "1.3", default-features = false }
+prost = { version = "0.7", default-features = false }
+prost-types = { version = "0.7", default-features = false }
+serde = { version = "1", default-features = false, features = ["derive"] }
+# use features (alloc)
+serde_json = { version = "1", default-features = false, features = ["alloc"] }
+serde_bytes = { version = "0.11", default-features = false }
 serde_repr = "0.1"
 sha2 = { version = "0.9", default-features = false }
-signature = "1.2"
-subtle = "2"
-subtle-encoding = { version = "0.5", features = ["bech32-preview"] }
-thiserror = "1"
+signature = { version = "1.2", default-features = false }
+subtle = { version = "2", default-features = false }
+subtle-encoding = { version = "0.5", default-features = false, features = ["bech32-preview"] }
 tendermint-proto = { version = "0.21.0", path = "../proto" }
 toml = { version = "0.5" }
 url = { version = "2.2" }
-zeroize = { version = "1.1", features = ["zeroize_derive"] }
+zeroize = { version = "1.1", default-features = false, features = ["zeroize_derive", "alloc"] }
+k256 = { version = "0.9", default-features = false, optional = true, features = ["ecdsa"] }
+ripemd160 = { version = "0.9", default-features = false, optional = true }
+sp-std = { version = "3.0.0", default-features = false}
+displaydoc = {version = "0.2", default-features = false }
 
-k256 = { version = "0.9", optional = true, features = ["ecdsa"] }
-ripemd160 = { version = "0.9", optional = true }
 
 [features]
 secp256k1 = ["k256", "ripemd160"]
+default = ["std"]
+std = [
+    'bytes/std',
+    'chrono/std',
+    'ed25519-dalek/std',
+    'funty/std',
+    'futures/std',
+    'num-traits/std',
+    'once_cell/std',
+    'prost/std',
+    'serde/std',
+    'serde_json/std',
+    'serde_bytes/std',
+    'sha2/std',
+    'signature/std',
+    'subtle/std',
+    'subtle-encoding/std',
+    'k256/std',
+    'ripemd160/std',
+    'sp-std/std',
+    'flex-error/std',
+    'anyhow/std',
+    'displaydoc/std',
+]
 
 [dev-dependencies]
 pretty_assertions = "0.7.2"

tendermint/src/abci/data.rs

@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use std::vec::Vec;
 
 /// ABCI transaction data.
 ///

tendermint/src/abci/gas.rs

@@ -5,12 +5,14 @@
 //!
 //! <https://tendermint.com/docs/spec/abci/apps.html#gas>
 
-use crate::{Error, Kind};
+use crate::error::{self, Error};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     fmt::{self, Display},
     str::FromStr,
 };
+use alloc::format;
+use alloc::string::{String, ToString};
 
 /// Gas: representation of transaction processing resource costs
 #[derive(Copy, Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord)]
@@ -44,8 +46,10 @@ impl Display for Gas {
 impl FromStr for Gas {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Self::from(s.parse::<u64>().map_err(|_| Kind::Parse)?))
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self::from(s.parse::<u64>().map_err(|e| {
+            error::parse_int_error("Gas decode error".into(), e)
+        })?))
     }
 }
 

tendermint/src/abci/info.rs

@@ -1,5 +1,6 @@
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display};
+use alloc::string::String;
 
 /// ABCI info
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]

tendermint/src/abci/log.rs

@@ -1,6 +1,9 @@
 use serde::{Deserialize, Serialize};
-use std::fmt;
-use std::fmt::Display;
+use std::{
+    borrow::ToOwned,
+    fmt::{self, Display},
+};
+use alloc::string::String;
 
 /// ABCI log data
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]

tendermint/src/abci/path.rs

@@ -3,9 +3,11 @@
 use crate::error::Error;
 use serde::{Deserialize, Serialize};
 use std::{
+    borrow::ToOwned,
     fmt::{self, Display},
     str::FromStr,
 };
+use alloc::string::String;
 
 /// Path to ABCI data
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
@@ -20,7 +22,7 @@ impl Display for Path {
 impl FromStr for Path {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Path(s.to_owned()))
     }
 }

tendermint/src/abci/responses.rs

@@ -3,7 +3,11 @@
 use super::{code::Code, data::Data, gas::Gas, info::Info, log::Log, tag::Tag};
 use crate::{consensus, serializers, validator};
 use serde::{Deserialize, Deserializer, Serialize};
-use std::fmt::{self, Display};
+use std::{
+    fmt::{self, Display},
+    vec::Vec,
+};
+use alloc::string::String;
 
 /// Responses for ABCI calls which occur during block processing.
 ///

tendermint/src/abci/tag.rs

@@ -3,6 +3,7 @@
 use crate::error::Error;
 use serde::{Deserialize, Serialize};
 use std::{fmt, str::FromStr};
+use alloc::string::String;
 use tendermint_proto::serializers::bytes::base64string;
 
 /// Tags
@@ -34,7 +35,7 @@ impl AsRef<str> for Key {
 impl FromStr for Key {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Key(s.into()))
     }
 }
@@ -64,7 +65,7 @@ impl AsRef<str> for Value {
 impl FromStr for Value {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Value(s.into()))
     }
 }

tendermint/src/abci/transaction.rs

@@ -4,10 +4,11 @@ mod hash;
 
 pub use self::hash::Hash;
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
-use std::{fmt, slice};
+use std::{fmt, prelude::*, slice};
 use subtle_encoding::base64;
 use tendermint_proto::types::Data as RawData;
-
+use alloc::format;
+use alloc::string::String;
 /// Transactions are arbitrary byte arrays whose contents are validated by the
 /// underlying Tendermint application.
 #[derive(Clone, Debug, Eq, PartialEq)] // Custom serde serialization used by RPC /broadcast_tx_async endpoint

tendermint/src/abci/transaction/hash.rs

@@ -1,11 +1,13 @@
 //! Transaction hashes
 
-use crate::error::{Error, Kind};
+use crate::error::{self, Error};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     fmt::{self, Debug, Display},
     str::FromStr,
 };
+use alloc::format;
+use alloc::string::{String, ToString};
 use subtle::{self, ConstantTimeEq};
 use subtle_encoding::hex;
 
@@ -64,10 +66,10 @@ impl FromStr for Hash {
         // Accept either upper or lower case hex
         let bytes = hex::decode_upper(s)
             .or_else(|_| hex::decode(s))
-            .map_err(|_| Kind::Parse.context("hash decode"))?;
+            .map_err(|_| error::parse_error("hash decode error".into()))?;
 
         if bytes.len() != LENGTH {
-            return Err(Kind::Parse.context("hash length").into());
+            return Err(error::parse_error("hash length error".into()));
         }
 
         let mut result_bytes = [0u8; LENGTH];