diff --git a/Cargo.toml b/Cargo.toml index 35e23ba..b211912 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "ghost-eye" authors = ["str3tch "] description = "Application for interacting with Casper/Ghost nodes that are exposing RPC only to the localhost" -version = "0.3.40" +version = "0.3.41" edition = "2021" homepage = "https://git.ghostchain.io/ghostchain" repository = "https://git.ghostchain.io/ghostchain/ghost-eye" diff --git a/src/components/validator/withdrawals.rs b/src/components/validator/withdrawals.rs index 77a0650..95ef457 100644 --- a/src/components/validator/withdrawals.rs +++ b/src/components/validator/withdrawals.rs @@ -154,7 +154,7 @@ impl Component for Withdrawals { fn update(&mut self, action: Action) -> Result> { match action { Action::SetStashAccount(account_id) => self.stash_account = account_id, - Action::SetCurrentEra(current_era) => self.current_era = current_era, + Action::SetActiveEra(era_info) => self.current_era = era_info.index, Action::SetValidatorEraUnlocking(era_index, unlocking, account_id) if self.stash_account == account_id => self.add_new_unlocking(era_index, unlocking), _ => {} diff --git a/src/network/predefined_calls.rs b/src/network/predefined_calls.rs index ef1ad81..db36de6 100644 --- a/src/network/predefined_calls.rs +++ b/src/network/predefined_calls.rs @@ -281,12 +281,14 @@ pub async fn get_validator_staking_results( api: &OnlineClient, account_id: &[u8; 32], ) -> Result<()> { - let current_era = super::raw_calls::staking::current_era(api, None).await?.unwrap_or(0); + let current_era = super::raw_calls::staking::active_era(api, None) + .await? + .map(|era_info| era_info.index) + .unwrap_or(0); let era_depth = super::raw_calls::staking::history_depth(api).unwrap_or(0); let start = current_era.saturating_sub(era_depth); - let end = current_era.saturating_sub(1); - for era_index in (start..end).rev() { + for era_index in (start..current_era).rev() { if get_validator_staking_result(action_tx, api, account_id, era_index).await? { break; } @@ -546,7 +548,10 @@ pub async fn get_validator_latest_claim( api: &OnlineClient, account_id: &[u8; 32], ) -> Result<()> { - let current_era = super::raw_calls::staking::current_era(api, None).await?.unwrap_or(0); + let current_era = super::raw_calls::staking::active_era(api, None) + .await? + .map(|era_info| era_info.index) + .unwrap_or(0); let era_depth = super::raw_calls::staking::history_depth(api).unwrap_or(0); let last_era = current_era.saturating_sub(era_depth);