forked from near/nearcore
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: remove approval verification functions from epoch manager (n…
…ear#12417) The approval verification functions are not needed in the epoch manager and each one is only used once. The MR moves them to a separate file and exposes the `get_heuristic_block_approvers_ordered` function needed by the validation functions.
- Loading branch information
Showing
7 changed files
with
106 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| use near_chain_primitives::error::Error; | ||
| use near_crypto::Signature; | ||
| use near_primitives::{ | ||
| block_header::{Approval, ApprovalInner}, | ||
| epoch_info::EpochInfo, | ||
| errors::EpochError, | ||
| hash::CryptoHash, | ||
| types::{AccountId, ApprovalStake, Balance, BlockHeight}, | ||
| }; | ||
| use std::{collections::HashSet, sync::Arc}; | ||
|
|
||
| pub fn verify_approval_with_approvers_info( | ||
| prev_block_hash: &CryptoHash, | ||
| prev_block_height: BlockHeight, | ||
| block_height: BlockHeight, | ||
| approvals: &[Option<Box<near_crypto::Signature>>], | ||
| info: Vec<(ApprovalStake, bool)>, | ||
| ) -> Result<bool, Error> { | ||
| if approvals.len() > info.len() { | ||
| return Ok(false); | ||
| } | ||
|
|
||
| let message_to_sign = Approval::get_data_for_sig( | ||
| &if prev_block_height + 1 == block_height { | ||
| ApprovalInner::Endorsement(*prev_block_hash) | ||
| } else { | ||
| ApprovalInner::Skip(prev_block_height) | ||
| }, | ||
| block_height, | ||
| ); | ||
|
|
||
| for ((validator, is_slashed), may_be_signature) in info.into_iter().zip(approvals.iter()) { | ||
| if let Some(signature) = may_be_signature { | ||
| if is_slashed || !signature.verify(message_to_sign.as_ref(), &validator.public_key) { | ||
| return Ok(false); | ||
| } | ||
| } | ||
| } | ||
| Ok(true) | ||
| } | ||
|
|
||
| /// Verify approvals and check threshold, but ignore next epoch approvals and slashing | ||
| pub fn verify_approvals_and_threshold_orphan( | ||
| can_approved_block_be_produced: &dyn Fn( | ||
| &[Option<Box<Signature>>], | ||
| &[(Balance, Balance, bool)], | ||
| ) -> bool, | ||
| prev_block_hash: &CryptoHash, | ||
| prev_block_height: BlockHeight, | ||
| block_height: BlockHeight, | ||
| approvals: &[Option<Box<Signature>>], | ||
| epoch_info: Arc<EpochInfo>, | ||
| ) -> Result<(), Error> { | ||
| let block_approvers = get_heuristic_block_approvers_ordered(&epoch_info)?; | ||
| let message_to_sign = Approval::get_data_for_sig( | ||
| &if prev_block_height + 1 == block_height { | ||
| ApprovalInner::Endorsement(*prev_block_hash) | ||
| } else { | ||
| ApprovalInner::Skip(prev_block_height) | ||
| }, | ||
| block_height, | ||
| ); | ||
|
|
||
| for (validator, may_be_signature) in block_approvers.iter().zip(approvals.iter()) { | ||
| if let Some(signature) = may_be_signature { | ||
| if !signature.verify(message_to_sign.as_ref(), &validator.public_key) { | ||
| return Err(Error::InvalidApprovals); | ||
| } | ||
| } | ||
| } | ||
| let stakes = block_approvers | ||
| .iter() | ||
| .map(|stake| (stake.stake_this_epoch, stake.stake_next_epoch, false)) | ||
| .collect::<Vec<_>>(); | ||
| if !can_approved_block_be_produced(approvals, &stakes) { | ||
| Err(Error::NotEnoughApprovals) | ||
| } else { | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| fn get_heuristic_block_approvers_ordered( | ||
| epoch_info: &EpochInfo, | ||
| ) -> Result<Vec<ApprovalStake>, EpochError> { | ||
| let mut result = vec![]; | ||
| let mut validators: HashSet<AccountId> = HashSet::new(); | ||
| for validator_id in epoch_info.block_producers_settlement().into_iter() { | ||
| let validator_stake = epoch_info.get_validator(*validator_id); | ||
| let account_id = validator_stake.account_id(); | ||
| if validators.insert(account_id.clone()) { | ||
| result.push(validator_stake.get_approval_stake(false)); | ||
| } | ||
| } | ||
|
|
||
| Ok(result) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.