fix(lc/starknet): incorrect height during client and consensus state updates

.github/workflows/hermes.yaml

@@ -37,15 +37,17 @@ jobs:
             light-client -> light-client/target
 
       - name: Nix build
-        env:
-          RUST_BACKTRACE: 1
         run: |
           nix build \
             .#starknet-devnet \
             .#cairo \
             .#scarb \
             .#universal-sierra-compiler \
             .#rust \
+            .#rust-wasm \
+            .#rust-nightly \
+            .#taplo \
+            .#nixfmt \
             .#cargo-nextest \
             .#ibc-starknet-cw \
             .#wasm-simapp \

light-client/ibc-client-starknet/src/client_state/cw.rs

@@ -1,12 +1,14 @@
 use ibc_client_cw::api::CwClientStateExecution;
 use ibc_client_cw::context::client_ctx::CwClientExecution;
+use ibc_core::client::context::ExtClientValidationContext;
 
 use super::ClientState;
 use crate::ConsensusState;
 
 impl<'a, E> CwClientStateExecution<'a, E> for ClientState
 where
-    E: CwClientExecution<'a, ClientStateMut = ClientState, ConsensusStateRef = ConsensusState>,
+    E: CwClientExecution<'a, ClientStateMut = ClientState, ConsensusStateRef = ConsensusState>
+        + ExtClientValidationContext,
 {
     fn public_key(&self) -> Option<Vec<u8>> {
         Some(self.0.pub_key.clone())

light-client/ibc-client-starknet/src/client_state/execution.rs

@@ -8,8 +8,8 @@ use ibc_client_cw::context::client_ctx::CwClientExecution;
 use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader};
 use ibc_client_starknet_types::StarknetClientState as ClientStateType;
 use ibc_core::client::context::client_state::ClientStateExecution;
-use ibc_core::client::context::prelude::{ClientStateCommon, ConsensusState};
-use ibc_core::client::context::ClientExecutionContext;
+use ibc_core::client::context::prelude::ClientStateCommon;
+use ibc_core::client::context::ExtClientExecutionContext;
 use ibc_core::client::types::error::ClientError;
 use ibc_core::client::types::Height;
 use ibc_core::host::types::identifiers::ClientId;
@@ -24,22 +24,20 @@ use crate::ConsensusState as StarknetConsensusState;
 impl<'a, E> ClientStateExecution<E> for ClientState
 where
     E: CwClientExecution<
-        'a,
-        ClientStateMut = ClientState,
-        ConsensusStateRef = StarknetConsensusState,
-    >,
+            'a,
+            ClientStateMut = ClientState,
+            ConsensusStateRef = StarknetConsensusState,
+        > + ExtClientExecutionContext,
 {
     fn initialise(
         &self,
         ctx: &mut E,
         client_id: &ClientId,
         consensus_state: Any,
     ) -> Result<(), ClientError> {
-        let latest_height = Height::min(0);
-
         update_client_and_consensus_state(
             ctx,
-            latest_height,
+            self.latest_height(),
             client_id,
             self.clone(),
             consensus_state.try_into()?,
@@ -90,20 +88,22 @@ where
             StarknetHeader,
         >>::decode(&StarknetLightClientEncoding, &raw_header)?;
 
-        let latest_height = header.height;
+        let current_height = header.height;
+
+        let latest_height = core::cmp::max(self.latest_height(), current_height);
 
         let new_consensus_state = header.consensus_state;
 
         let new_client_state = ClientStateType {
-            latest_height: header.height,
+            latest_height,
             chain_id: self.0.chain_id.clone(),
             pub_key: self.0.pub_key.clone(),
         }
         .into();
 
         update_client_and_consensus_state(
             ctx,
-            latest_height,
+            current_height,
             client_id,
             new_client_state,
             new_consensus_state.into(),
@@ -128,13 +128,15 @@ where
         upgraded_client_state: Any,
         upgraded_consensus_state: Any,
     ) -> Result<Height, ClientError> {
-        let latest_height = ctx.client_state(client_id)?.latest_height().increment();
+        let client_state = E::ClientStateRef::try_from(upgraded_client_state)?;
+
+        let latest_height = client_state.latest_height();
 
         update_client_and_consensus_state(
             ctx,
             latest_height,
             client_id,
-            upgraded_client_state.try_into()?,
+            client_state,
             upgraded_consensus_state.try_into()?,
         )?;
 
@@ -148,31 +150,27 @@ where
         substitute_client_state: Any,
         substitute_consensus_state: Any,
     ) -> Result<(), ClientError> {
-        let latest_height = ctx
-            .client_state(subject_client_id)?
-            .latest_height()
-            .increment();
+        let client_state = E::ClientStateRef::try_from(substitute_client_state)?;
 
         update_client_and_consensus_state(
             ctx,
-            latest_height,
+            client_state.latest_height(),
             subject_client_id,
-            substitute_client_state.try_into()?,
+            client_state,
             substitute_consensus_state.try_into()?,
         )?;
 
         Ok(())
     }
 }
 
-fn update_client_and_consensus_state<E: ClientExecutionContext>(
+fn update_client_and_consensus_state<E: ExtClientExecutionContext>(
     ctx: &mut E,
     client_height: Height,
     client_id: &ClientId,
     client_state: E::ClientStateRef,
     consensus_state: E::ConsensusStateRef,
 ) -> Result<(), ClientError> {
-    let timestamp = consensus_state.timestamp()?;
     ctx.store_consensus_state(
         ClientConsensusStatePath::new(
             client_id.clone(),
@@ -182,7 +180,12 @@ fn update_client_and_consensus_state<E: ClientExecutionContext>(
         consensus_state,
     )?;
     ctx.store_client_state(ClientStatePath::new(client_id.clone()), client_state)?;
-    ctx.store_update_meta(client_id.clone(), client_height, timestamp, Height::min(0))?;
+    ctx.store_update_meta(
+        client_id.clone(),
+        client_height,
+        ctx.host_timestamp()?,
+        ctx.host_height()?,
+    )?;
 
     Ok(())
 }

relayer/crates/starknet-chain-components/src/impls/payload_builders/create_client.rs

@@ -52,7 +52,7 @@ where
         };
 
         Ok(StarknetCreateClientPayload {
-            latest_height: Height::new(0, 1).map_err(Chain::raise_error)?,
+            latest_height: Height::new(0, chain_status.height).map_err(Chain::raise_error)?,
             chain_id: chain.chain_id().clone(),
             client_state_wasm_code_hash: create_client_options.wasm_code_hash.into(),
             consensus_state,

relayer/crates/starknet-integration-tests/src/tests/light_client.rs

@@ -116,6 +116,10 @@ fn test_starknet_light_client() -> Result<(), Error> {
 
         let starknet_chain = &mut starknet_chain_driver.chain;
 
+        // just waiting for the chains to progress
+        // Starknet block height starts at zero
+        runtime.sleep(Duration::from_secs(2)).await;
+
         let cosmos_client_id = StarknetToCosmosRelay::create_client(
             DestinationTarget,
             cosmos_chain,