Check header and update state

Cargo.toml

@@ -12,9 +12,9 @@ exclude = [
     "proto-compiler"
 ]
 
-# [patch.crates-io]
-# tendermint              = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-testgen      = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
+[patch.crates-io]
+  tendermint              = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
+  tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
+  tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
+  tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
+  tendermint-testgen      = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }

modules/src/application/ics20_fungible_token_transfer/msgs/transfer.rs

@@ -101,14 +101,17 @@ impl From<MsgTransfer> for RawMsgTransfer {
 
 #[cfg(test)]
 pub mod test_util {
+    use std::ops::Add;
+    use std::time::Duration;
+
     use crate::{
         ics24_host::identifier::{ChannelId, PortId},
         test_utils::get_dummy_account_id,
+        timestamp::Timestamp,
         Height,
     };
 
     use super::MsgTransfer;
-    use crate::timestamp::Timestamp;
 
     // Returns a dummy `RawMsgTransfer`, for testing only!
     pub fn get_dummy_msg_transfer(height: u64) -> MsgTransfer {
@@ -120,7 +123,7 @@ pub mod test_util {
             token: None,
             sender: id.clone(),
             receiver: id,
-            timeout_timestamp: Timestamp::from_nanoseconds(1).unwrap(),
+            timeout_timestamp: Timestamp::now().add(Duration::from_secs(10)).unwrap(),
             timeout_height: Height {
                 revision_number: 0,
                 revision_height: height,

modules/src/ics02_client/client_def.rs

@@ -4,6 +4,7 @@ use crate::downcast;
 use crate::ics02_client::client_consensus::{AnyConsensusState, ConsensusState};
 use crate::ics02_client::client_state::{AnyClientState, ClientState};
 use crate::ics02_client::client_type::ClientType;
+use crate::ics02_client::context::ClientReader;
 use crate::ics02_client::error::Kind;
 use crate::ics02_client::header::{AnyHeader, Header};
 use crate::ics03_connection::connection::ConnectionEnd;
@@ -25,6 +26,8 @@ pub trait ClientDef: Clone {
     /// TODO
     fn check_header_and_update_state(
         &self,
+        ctx: &dyn ClientReader,
+        client_id: ClientId,
         client_state: Self::ClientState,
         header: Self::Header,
     ) -> Result<(Self::ClientState, Self::ConsensusState), Box<dyn std::error::Error>>;
@@ -172,6 +175,8 @@ impl ClientDef for AnyClient {
     /// Validates an incoming `header` against the latest consensus state of this client.
     fn check_header_and_update_state(
         &self,
+        ctx: &dyn ClientReader,
+        client_id: ClientId,
         client_state: AnyClientState,
         header: AnyHeader,
     ) -> Result<(AnyClientState, AnyConsensusState), Box<dyn std::error::Error>> {
@@ -184,7 +189,7 @@ impl ClientDef for AnyClient {
                 .ok_or_else(|| Kind::ClientArgsTypeMismatch(ClientType::Tendermint))?;
 
                 let (new_state, new_consensus) =
-                    client.check_header_and_update_state(client_state, header)?;
+                    client.check_header_and_update_state(ctx, client_id, client_state, header)?;
 
                 Ok((
                     AnyClientState::Tendermint(new_state),
@@ -201,7 +206,7 @@ impl ClientDef for AnyClient {
                 .ok_or_else(|| Kind::ClientArgsTypeMismatch(ClientType::Mock))?;
 
                 let (new_state, new_consensus) =
-                    client.check_header_and_update_state(client_state, header)?;
+                    client.check_header_and_update_state(ctx, client_id, client_state, header)?;
 
                 Ok((
                     AnyClientState::Mock(new_state),

modules/src/ics02_client/error.rs

@@ -1,12 +1,14 @@
 use std::num::ParseIntError;
 
 use anomaly::{BoxError, Context};
+use tendermint::hash::Hash;
 use thiserror::Error;
 
 use crate::ics02_client::client_type::ClientType;
 use crate::ics23_commitment::error::Error as Ics23Error;
 use crate::ics24_host::error::ValidationKind;
 use crate::ics24_host::identifier::ClientId;
+use crate::timestamp::Timestamp;
 use crate::Height;
 
 pub type Error = anomaly::Error<Kind>;
@@ -111,6 +113,30 @@ pub enum Kind {
 
     #[error("upgraded client height {0} must be at greater than current client height {1}")]
     LowUpgradeHeight(Height, Height),
+
+    /// Insufficient voting power in the commit
+    #[error("insufficient overlap {0}")]
+    InsufficientVotingPower(String),
+
+    #[error("Timestamp none or {0} and now {1}")]
+    InvalidConsensusStateTimestamp(Timestamp, Timestamp),
+
+    /// Not enough trust because insufficient validators overlap
+    #[error("not enough trust because insufficient validators overlap: {0}")]
+    NotEnoughTrustedValsSigned(String),
+
+    /// Hash mismatch for the validator set
+    #[error("invalid validator set: header_validators_hash={0} validators_hash={1}")]
+    InvalidValidatorSet(Hash, Hash),
+
+    #[error("not withing trusting period: expires_at={0} now={1}")]
+    ClientStateNotWithinTrustPeriod(Timestamp, Timestamp),
+
+    #[error("header not withing trusting period: expires_at={0} now={1}")]
+    HeaderNotWithinTrustPeriod(Timestamp, Timestamp),
+
+    #[error("Header revision {0} and client state revision {1} should coincide")]
+    MismatchedRevisions(u64, u64),
 }
 
 impl Kind {

modules/src/ics02_client/handler/create_client.rs

@@ -224,10 +224,7 @@ mod tests {
 
         let tm_client_state = AnyClientState::Tendermint(ClientState {
             chain_id: tm_header.chain_id.clone().into(),
-            trust_level: TrustThreshold {
-                numerator: 1,
-                denominator: 3,
-            },
+            trust_level: TrustThreshold::ONE_THIRD,
             trusting_period: Duration::from_secs(64000),
             unbonding_period: Duration::from_secs(128000),
             max_clock_drift: Duration::from_millis(3000),