Update tendermint-rs to v0.23.5 and use verification functions from `…

…tendermint-light-client-verifier` (#1748) * Use verification function from tendermint-light-client-verifier * Update to tendermint-rs v0.23.5 * Add changelog entry Co-authored-by: Romain Ruetschi <[email protected]>
informalsystems · Jan 14, 2022 · efcd884 · efcd884
1 parent de42b9e
commit efcd884
Show file tree

Hide file tree

Showing 16 changed files with 76 additions and 46 deletions.
diff --git a/.changelog/unreleased/breaking-changes/1767-tendermint-rs-0.23.5.md b/.changelog/unreleased/breaking-changes/1767-tendermint-rs-0.23.5.md
@@ -0,0 +1,2 @@
+- Update tendermint-rs dependencies to 0.23.5
+  ([#1767](https://github.com/informalsystems/ibc-rs/issues/1767))
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,4 +22,5 @@ exclude = [
 # tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
 # tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
 # tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
+# tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
 # tendermint-testgen      = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
diff --git a/modules/Cargo.toml b/modules/Cargo.toml
@@ -42,17 +42,17 @@ sha2 = { version = "0.10.1", default-features = false }
 flex-error = { version = "0.4.4", default-features = false }
 
 [dependencies.tendermint]
-version = "=0.23.4"
+version = "=0.23.5"
 
 [dependencies.tendermint-proto]
-version = "=0.23.4"
+version = "=0.23.5"
 
-[dependencies.tendermint-light-client]
-version = "=0.23.4"
+[dependencies.tendermint-light-client-verifier]
+version = "=0.23.5"
 default-features = false
 
 [dependencies.tendermint-testgen]
-version = "=0.23.4"
+version = "=0.23.5"
 optional = true
 
 [dev-dependencies]
@@ -61,8 +61,8 @@ tracing-subscriber = { version = "0.3.5", features = ["fmt", "env-filter", "json
 test-log = { version = "0.2.8", features = ["trace"] }
 modelator = "0.4.1"
 sha2 = { version = "0.10.1" }
-tendermint-rpc = { version = "=0.23.4", features = ["http-client", "websocket-client"] }
-tendermint-testgen = { version = "=0.23.4" } # Needed for generating (synthetic) light blocks.
+tendermint-rpc = { version = "=0.23.5", features = ["http-client", "websocket-client"] }
+tendermint-testgen = { version = "=0.23.5" } # Needed for generating (synthetic) light blocks.
 
 [[test]]
 name = "mbt"

diff --git a/modules/src/clients/ics07_tendermint/client_def.rs b/modules/src/clients/ics07_tendermint/client_def.rs
@@ -2,8 +2,8 @@ use core::convert::TryInto;
 
 use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
 use prost::Message;
-use tendermint_light_client::components::verifier::{ProdVerifier, Verdict, Verifier};
-use tendermint_light_client::types::{TrustedBlockState, UntrustedBlockState};
+use tendermint_light_client_verifier::types::{TrustedBlockState, UntrustedBlockState};
+use tendermint_light_client_verifier::{ProdVerifier, Verdict, Verifier};
 use tendermint_proto::Protobuf;
 use time::OffsetDateTime;
 

diff --git a/modules/src/clients/ics07_tendermint/client_state.rs b/modules/src/clients/ics07_tendermint/client_state.rs
@@ -4,7 +4,7 @@ use core::convert::{TryFrom, TryInto};
 use core::time::Duration;
 
 use serde::{Deserialize, Serialize};
-use tendermint_light_client::light_client::Options;
+use tendermint_light_client_verifier::options::Options;
 use tendermint_proto::Protobuf;
 
 use ibc_proto::ibc::lightclients::tendermint::v1::ClientState as RawClientState;

diff --git a/modules/src/clients/ics07_tendermint/error.rs b/modules/src/clients/ics07_tendermint/error.rs
@@ -6,10 +6,12 @@ use crate::core::ics23_commitment::error::Error as Ics23Error;
 use crate::core::ics24_host::error::ValidationError;
 use crate::core::ics24_host::identifier::ClientId;
 use crate::timestamp::{Timestamp, TimestampOverflowError};
+
 use crate::Height;
 use tendermint::account::Id;
 use tendermint::hash::Hash;
 use tendermint::Error as TendermintError;
+use tendermint_light_client_verifier::errors::VerificationErrorDetail as LightClientErrorDetail;
 
 define_error! {
     #[derive(Debug, PartialEq, Eq)]
@@ -216,7 +218,7 @@ define_error! {
             },
 
         VerificationError
-            { detail: tendermint_light_client::predicates::errors::VerificationErrorDetail }
+            { detail: LightClientErrorDetail }
             | e | {
                 format_args!("verification failed: {}", e.detail)
             },

diff --git a/modules/src/mock/host.rs b/modules/src/mock/host.rs
@@ -64,8 +64,8 @@ impl HostBlock {
         // same timestamp as two block can be generated per second.
         let ten_millis = core::time::Duration::from_millis(1000);
         std::thread::sleep(ten_millis);
+
         let time: Time = OffsetDateTime::now_utc().try_into().unwrap();
-        let time = time.duration_since(Time::unix_epoch()).unwrap().as_secs();
 
         TestgenLightBlock::new_default_with_time_and_chain_id(chain_id.to_string(), time, height)
             .generate()

diff --git a/proto/Cargo.toml b/proto/Cargo.toml
@@ -30,4 +30,4 @@ getrandom = { version = "0.2", features = ["js"] }
 serde = "1.0"
 
 [dependencies.tendermint-proto]
-version = "=0.23.4"
+version = "=0.23.5"
diff --git a/relayer-cli/Cargo.toml b/relayer-cli/Cargo.toml
@@ -56,20 +56,23 @@ flex-error = { version = "0.4.4", default-features = false, features = ["std", "
 signal-hook = "0.3.13"
 
 [dependencies.tendermint-proto]
-version = "=0.23.4"
+version = "=0.23.5"
 
 [dependencies.tendermint]
-version = "=0.23.4"
+version = "=0.23.5"
 features = ["secp256k1"]
 
 [dependencies.tendermint-rpc]
-version = "=0.23.4"
+version = "=0.23.5"
 features = ["http-client", "websocket-client"]
 
 [dependencies.tendermint-light-client]
-version = "=0.23.4"
+version = "=0.23.5"
 features = ["unstable"]
 
+[dependencies.tendermint-light-client-verifier]
+version = "=0.23.5"
+
 [dependencies.abscissa_core]
 version = "=0.6.0-beta.1"
 features = ["options"]

diff --git a/relayer-cli/src/config.rs b/relayer-cli/src/config.rs
@@ -10,7 +10,7 @@ use std::path::PathBuf;
 use flex_error::{define_error, TraceError};
 use ibc::core::ics24_host::identifier::ChainId;
 use ibc_relayer::config::{Config, ModeConfig};
-use tendermint_light_client::types::TrustThreshold;
+use tendermint_light_client_verifier::types::TrustThreshold;
 use tracing_subscriber::filter::ParseError;
 
 use crate::application::app_reader;

diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
@@ -70,20 +70,24 @@ version = "0.4.0"
 features = ["num-bigint", "serde"]
 
 [dependencies.tendermint]
-version = "=0.23.4"
+version = "=0.23.5"
 features = ["secp256k1"]
 
 [dependencies.tendermint-rpc]
-version = "=0.23.4"
+version = "=0.23.5"
 features = ["http-client", "websocket-client"]
 
 [dependencies.tendermint-light-client]
-version = "=0.23.4"
+version = "=0.23.5"
 default-features = false
 features = ["rpc-client", "secp256k1", "unstable"]
 
+[dependencies.tendermint-light-client-verifier]
+version = "=0.23.5"
+default-features = false
+
 [dependencies.tendermint-proto]
-version = "=0.23.4"
+version = "=0.23.5"
 
 [dev-dependencies]
 ibc = { version = "0.10.0", path = "../modules", features = ["mocks"] }
@@ -93,4 +97,4 @@ tracing-subscriber = { version = "0.3.5", features = ["fmt", "env-filter", "json
 test-log = { version = "0.2.8", features = ["trace"] }
 
 # Needed for generating (synthetic) light blocks.
-tendermint-testgen = { version = "=0.23.4" }
+tendermint-testgen = { version = "=0.23.5" }
diff --git a/relayer/src/chain/cosmos.rs b/relayer/src/chain/cosmos.rs
@@ -19,7 +19,7 @@ use tendermint::abci::{Code, Event, Path as TendermintABCIPath};
 use tendermint::account::Id as AccountId;
 use tendermint::block::Height;
 use tendermint::consensus::Params;
-use tendermint_light_client::types::LightBlock as TMLightBlock;
+use tendermint_light_client_verifier::types::LightBlock as TMLightBlock;
 use tendermint_proto::Protobuf;
 use tendermint_rpc::endpoint::tx::Response as ResultTx;
 use tendermint_rpc::query::{EventType, Query};
@@ -959,7 +959,7 @@ impl ChainEndpoint for CosmosSdkChain {
     }
 
     fn init_light_client(&self) -> Result<Self::LightClient, Error> {
-        use tendermint_light_client::types::PeerId;
+        use tendermint_light_client_verifier::types::PeerId;
 
         crate::time!("init_light_client");
 

diff --git a/relayer/src/config.rs b/relayer/src/config.rs
@@ -12,7 +12,7 @@ use std::sync::{Arc, RwLock};
 use std::{fs, fs::File, io::Write, path::Path};
 
 use serde_derive::{Deserialize, Serialize};
-use tendermint_light_client::types::TrustThreshold;
+use tendermint_light_client_verifier::types::TrustThreshold;
 
 use ibc::core::ics23_commitment::specs::ProofSpecs;
 use ibc::core::ics24_host::identifier::{ChainId, ChannelId, PortId};

diff --git a/relayer/src/light_client/tendermint.rs b/relayer/src/light_client/tendermint.rs
@@ -2,13 +2,14 @@ use itertools::Itertools;
 
 use tendermint_light_client::{
     components::{self, io::AtHeight},
-    light_client::{LightClient as TmLightClient, Options as TmOptions},
-    operations,
+    light_client::LightClient as TmLightClient,
     state::State as LightClientState,
     store::{memory::MemoryStore, LightStore},
-    types::Height as TMHeight,
-    types::{LightBlock, PeerId, Status},
 };
+use tendermint_light_client_verifier::operations;
+use tendermint_light_client_verifier::options::Options as TmOptions;
+use tendermint_light_client_verifier::types::{Height as TMHeight, LightBlock, PeerId, Status};
+use tendermint_light_client_verifier::ProdVerifier;
 use tendermint_rpc as rpc;
 
 use ibc::{
@@ -180,7 +181,7 @@ impl LightClient {
     fn prepare_client(&self, client_state: &AnyClientState) -> Result<TmLightClient, Error> {
         let clock = components::clock::SystemClock;
         let hasher = operations::hasher::ProdHasher;
-        let verifier = components::verifier::ProdVerifier::default();
+        let verifier = ProdVerifier::default();
         let scheduler = components::scheduler::basic_bisecting_schedule;
 
         let client_state =

diff --git a/tools/integration-test/Cargo.toml b/tools/integration-test/Cargo.toml
@@ -18,8 +18,8 @@ ibc             = { path = "../../modules" }
 ibc-relayer     = { path = "../../relayer" }
 ibc-relayer-cli = { path = "../../relayer-cli" }
 ibc-proto       = { path = "../../proto" }
-tendermint      = { version = "=0.23.4" }
-tendermint-rpc  = { version = "=0.23.4", features = ["http-client", "websocket-client"] }
+tendermint      = { version = "=0.23.5" }
+tendermint-rpc  = { version = "=0.23.5", features = ["http-client", "websocket-client"] }
 
 tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1.26"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Update tendermint-rs dependencies to 0.23.5
		([#1767](https://github.com/informalsystems/ibc-rs/issues/1767))