Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ibc-client-tendermint-types): drop frozen height check in TryFrom of TmClientState #1062

Merged
merged 6 commits into from
Jan 26, 2024
Merged

fix(ibc-client-tendermint-types): drop frozen height check in TryFrom of TmClientState #1062

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
806a668
Fix issues related to frozen height of tendermint client.
riversyang Jan 17, 2024
d715869
fix: ease frozen height check within TryFrom for TmClientState
Farhad-Shabani Jan 25, 2024
c1e78b1
nit: set correct vallue for the frozen height in test
Farhad-Shabani Jan 25, 2024
3510799
nit
Farhad-Shabani Jan 25, 2024
3bd6494
use rstest cases
rnbguy Jan 26, 2024
dbcecb1
add check for is_frozen
rnbguy Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix issues related to frozen height of tendermint client.
  • Loading branch information
@riversyang @Farhad-Shabani
riversyang authored and Farhad-Shabani committed Jan 25, 2024
commit 806a66892bfa3016d38376257fd3d318a3c4d677
35 changes: 19 additions & 16 deletions ibc-clients/ics07-tendermint/types/src/client_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use ibc_core_host_types::identifiers::ChainId;
use ibc_primitives::prelude::*;
use ibc_primitives::ZERO_DURATION;
use ibc_proto::google::protobuf::Any;
use ibc_proto::ibc::core::client::v1::Height as RawHeight;
use ibc_proto::ibc::lightclients::tendermint::v1::ClientState as RawTmClientState;
use ibc_proto::Protobuf;
use tendermint::chain::id::MAX_LENGTH as MaxChainIdLen;
Expand Down Expand Up @@ -283,13 +282,16 @@ impl TryFrom<RawTmClientState> for ClientState {
// In `RawClientState`, a `frozen_height` of `0` means "not frozen".
// See:
// https://github.com/cosmos/ibc-go/blob/8422d0c4c35ef970539466c5bdec1cd27369bab3/modules/light-clients/07-tendermint/types/client_state.go#L74
if raw
.frozen_height
.and_then(|h| Height::try_from(h).ok())
.is_some()
{
return Err(Error::FrozenHeightNotAllowed);
}
//
// Comment out this check for now to allow fixing the client state.
//
// if raw
// .frozen_height
// .and_then(|h| Height::try_from(h).ok())
// .is_some()
// {
// return Err(Error::FrozenHeightNotAllowed);
// }

// We use set this deprecated field just so that we can properly convert
// it back in its raw form
Expand All @@ -299,8 +301,8 @@ impl TryFrom<RawTmClientState> for ClientState {
after_misbehaviour: raw.allow_update_after_misbehaviour,
};

let client_state = Self::new_without_validation(
chain_id,
let mut client_state = Self::new_without_validation(
chain_id.clone(),
trust_level,
trusting_period,
unbonding_period,
Expand All @@ -311,6 +313,12 @@ impl TryFrom<RawTmClientState> for ClientState {
allow_update,
);

// Restore the frozen height if it was set, allow fixing the client state.
if let Some(frozen_height) = raw.frozen_height {
client_state = client_state.with_frozen_height(
Height::try_from(frozen_height).unwrap_or(Height::min(chain_id.revision_number())),
);
};
Ok(client_state)
}
}
Expand All @@ -324,12 +332,7 @@ impl From<ClientState> for RawTmClientState {
trusting_period: Some(value.trusting_period.into()),
unbonding_period: Some(value.unbonding_period.into()),
max_clock_drift: Some(value.max_clock_drift.into()),
frozen_height: Some(value.frozen_height.map(|height| height.into()).unwrap_or(
RawHeight {
revision_number: 0,
revision_height: 0,
},
)),
frozen_height: value.frozen_height.map(|height| height.into()),
latest_height: Some(value.latest_height.into()),
proof_specs: value.proof_specs.into(),
upgrade_path: value.upgrade_path,
Expand Down