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

disable expiration of clients for cf-guest and cf-solana clients #413

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

disable expiration of clients for cf-guest and cf-solana clients #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 30 additions & 29 deletions common/cf-guest/src/client/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ impl<PK: PubKey> ibc::ClientStateCommon for ClientState<PK> {
}
}


impl From<proof::VerifyError> for ibc::ClientError {
fn from(err: proof::VerifyError) -> Self {
use ibc::CommitmentError::EncodingFailure;
Expand Down Expand Up @@ -371,39 +370,44 @@ where

fn status(
&self,
ctx: &V,
client_id: &ibc::ClientId,
_ctx: &V,
_client_id: &ibc::ClientId,
) -> Result<ibc::Status> {
if self.is_frozen {
return Ok(ibc::Status::Frozen);
}

let height = ibc::Height::new(1, self.latest_height.into())?;
let consensus = CommonContext::consensus_state(ctx, client_id, height)
.and_then(|state| state.try_into().map_err(error));
let consensus = match consensus {
Ok(consensus) => consensus,
Err(ibc::ClientError::ConsensusStateNotFound { .. }) => {
return Ok(ibc::Status::Expired)
}
// If the client state is not found, then a new client is going to be created and since its known from
// above that the client state is not frozen, we return the client state as active.
Err(ibc::ClientError::ClientStateNotFound { .. }) => {
return Ok(ibc::Status::Active)
}
Err(err) => return Err(err),
};

let (host_timestamp, _) = CommonContext::host_metadata(ctx)?;
Ok(if self.consensus_has_expired(&consensus, host_timestamp) {
ibc::Status::Expired
} else {
ibc::Status::Active
})
// let height = ibc::Height::new(1, self.latest_height.into())?;
// let consensus = CommonContext::consensus_state(ctx, client_id, height)
// .and_then(|state| state.try_into().map_err(error));
// let consensus = match consensus {
// Ok(consensus) => consensus,
// Err(ibc::ClientError::ConsensusStateNotFound { .. }) => {
// return Ok(ibc::Status::Expired)
// }
// // If the client state is not found, then a new client is going to be created and since its known from
// // above that the client state is not frozen, we return the client state as active.
// Err(ibc::ClientError::ClientStateNotFound { .. }) => {
// return Ok(ibc::Status::Active)
// }
// Err(err) => return Err(err),
// };

// let (host_timestamp, _) = CommonContext::host_metadata(ctx)?;
// Ok(if self.consensus_has_expired(&consensus, host_timestamp) {
// ibc::Status::Expired
// } else {
// ibc::Status::Active
// })

// TODO: Since there is no way of reviving client once expired in the current version of ibc-rs,
// we will always return active.
//
// Once the ibc-rs is updated, client update to revive a client will be supported which should be used.
Ok(ibc::Status::Active)
}
}


impl<PK: PubKey> ClientState<PK> {
pub fn do_update_state(
&self,
Expand Down Expand Up @@ -648,12 +652,10 @@ impl<PK: PubKey> ClientState<PK> {
}
}


fn error(msg: impl ToString) -> ibc::ClientError {
ibc::ClientError::Other { description: msg.to_string() }
}


/// Checks client id’s client type is what’s expected and then parses the id as
/// `ClientIdx`.
///
Expand All @@ -673,7 +675,6 @@ fn parse_client_id(client_id: &ibc::ClientId) -> Result<trie_ids::ClientIdx> {
Err(ibc::ClientError::ClientSpecific { description })
}


#[test]
fn test_verify_client_type() {
use core::str::FromStr;
Expand Down
54 changes: 30 additions & 24 deletions common/cf-solana/src/client/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,35 +279,41 @@ where

fn status(
&self,
ctx: &V,
client_id: &ibc::ClientId,
_ctx: &V,
_client_id: &ibc::ClientId,
) -> Result<ibc::Status> {
if self.is_frozen {
return Ok(ibc::Status::Frozen);
}

let height = self.latest_height();
let consensus = CommonContext::consensus_state(ctx, client_id, height)
.and_then(|state| state.try_into().map_err(error));
let consensus = match consensus {
Ok(consensus) => consensus,
Err(ibc::ClientError::ConsensusStateNotFound { .. }) => {
return Ok(ibc::Status::Expired)
}
// If the client state is not found, then a new client is going to be created and since its known from
// above that the client state is not frozen, we return the client state as active.
Err(ibc::ClientError::ClientStateNotFound { .. }) => {
return Ok(ibc::Status::Active)
}
Err(err) => return Err(err),
};

let (host_timestamp, _) = CommonContext::host_metadata(ctx)?;
Ok(if self.consensus_has_expired(&consensus, host_timestamp) {
ibc::Status::Expired
} else {
ibc::Status::Active
})
// let height = self.latest_height();
// let consensus = CommonContext::consensus_state(ctx, client_id, height)
// .and_then(|state| state.try_into().map_err(error));
// let consensus = match consensus {
// Ok(consensus) => consensus,
// Err(ibc::ClientError::ConsensusStateNotFound { .. }) => {
// return Ok(ibc::Status::Expired)
// }
// // If the client state is not found, then a new client is going to be created and since its known from
// // above that the client state is not frozen, we return the client state as active.
// Err(ibc::ClientError::ClientStateNotFound { .. }) => {
// return Ok(ibc::Status::Active)
// }
// Err(err) => return Err(err),
// };

// let (host_timestamp, _) = CommonContext::host_metadata(ctx)?;
// Ok(if self.consensus_has_expired(&consensus, host_timestamp) {
// ibc::Status::Expired
// } else {
// ibc::Status::Active
// })

// TODO: Since there is no way of reviving client once expired in the current version of ibc-rs,
// we will always return active.
//
// Once the ibc-rs is updated, client update to revive a client will be supported which should be used.
Ok(ibc::Status::Active)
}
}

Expand Down
Loading