wip

Author: romac

relayer/cli/Cargo.toml

@@ -9,7 +9,7 @@ authors = [
 
 [dependencies]
 relayer = { path = "../relay" }
-tendermint = { git = "https://github.com/romac/tendermint-rs.git", branch = "rpc-client-new-sync" }
+tendermint = { git = "https://github.com/interchainio/tendermint-rs.git" }
 
 anomaly = "0.2.0"
 gumdrop = "0.7"

relayer/relay/src/chain.rs

@@ -1,9 +1,13 @@
+use anomaly::fail;
+
 use ::tendermint::lite::types as tmlite;
+use ::tendermint::lite::Height;
 use ::tendermint::rpc::Client as RpcClient;
 
 use relayer_modules::ics02_client::state::ConsensusState;
 
 use crate::config::ChainConfig;
+use crate::error;
 
 pub mod tendermint;
 
@@ -18,3 +22,36 @@ pub trait Chain {
     fn rpc_client(&self) -> &RpcClient;
     fn requester(&self) -> &Self::Requester;
 }
+
+pub async fn query_latest_height(chain: &impl Chain) -> Result<Height, error::Error> {
+    let status = chain
+        .rpc_client()
+        .status()
+        .await
+        .map_err(|e| error::Kind::Rpc.context(e))?;
+
+    if status.sync_info.catching_up {
+        fail!(
+            error::Kind::LightClient,
+            "node at {} running chain {} not caught up",
+            chain.config().rpc_addr,
+            chain.config().id,
+        );
+    }
+
+    Ok(status.sync_info.latest_block_height.into())
+}
+
+pub async fn query_header_at_height<C>(chain: &C, height: Height) -> Result<C::Header, error::Error>
+where
+    C: Chain,
+{
+    use tmlite::Requester;
+
+    let header = chain
+        .requester()
+        .signed_header(height)
+        .map_err(|e| error::Kind::Rpc.context(e))?;
+
+    Ok(header)
+}

relayer/relay/src/light_client.rs

@@ -1,9 +1,11 @@
 use std::marker::PhantomData;
 
+use anomaly::fail;
+
 use tendermint::lite::types::{Header, Requester};
 use tendermint::lite::{TrustThreshold, TrustedState};
 
-use crate::chain::Chain;
+use crate::chain::{query_latest_height, Chain};
 use crate::error;
 use crate::store::{Store, StoreHeight};
 
@@ -55,7 +57,7 @@ where
         }
     }
 
-    pub fn init_without_trust(
+    pub fn init_without_trusted_state(
         self,
     ) -> Result<LightClient<'a, C, S, state::InitUntrusted>, error::Error> {
         let req = &self.chain.requester();
@@ -96,7 +98,17 @@ where
         Ok(self.to())
     }
 
-    pub fn init_with_trust(
+    pub async fn init_with_node_trusted_state(
+        self,
+    ) -> Result<LightClient<'a, C, S, state::InitTrusted>, error::Error>
+    where
+        C: Chain,
+    {
+        let height = query_latest_height(self.chain).await?;
+        todo!()
+    }
+
+    pub fn init_with_trusted_state(
         self,
         _trust_options: TrustOptions<impl TrustThreshold>,
     ) -> Result<LightClient<'a, C, S, state::InitTrusted>, error::Error> {