mirror/lighthouse-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/lighthouse-pulse.git synced 2025-01-04 02:04:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Swap over to v0.2.0 shuffling algo

Browse Source
This commit is contained in:
Paul Hauner 2019-02-15 16:55:52 +11:00
parent 2f8c4536a0
commit 054c1f9047
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth2/types/Cargo.toml
View File

@ -18,7 +18,7 @@ serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
slog = "^2.2.3" slog = "^2.2.3"
ssz = { path = "../utils/ssz" } ssz = { path = "../utils/ssz" }
fisher_yates_shuffle = { path = "../utils/fisher_yates_shuffle" } swap_or_not_shuffle = { path = "../utils/swap_or_not_shuffle" }
[dev-dependencies] [dev-dependencies]
env_logger = "0.6.0" env_logger = "0.6.0"

40
eth2/types/src/beacon_state.rs
View File

@ -5,15 +5,16 @@ use crate::{
PendingAttestation, PublicKey, Signature, Slot, Validator, PendingAttestation, PublicKey, Signature, Slot, Validator,
}; };
use bls::verify_proof_of_possession; use bls::verify_proof_of_possession;
use fisher_yates_shuffle::shuffle;
use honey_badger_split::SplitExt; use honey_badger_split::SplitExt;
use rand::RngCore; use rand::RngCore;
use serde_derive::Serialize; use serde_derive::Serialize;
use ssz::{hash, Decodable, DecodeError, Encodable, SszStream, TreeHash}; use ssz::{hash, Decodable, DecodeError, Encodable, SszStream, TreeHash};
use swap_or_not_shuffle::get_permutated_index;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum BeaconStateError { pub enum BeaconStateError {
EpochOutOfBounds, EpochOutOfBounds,
UnableToShuffle,
InsufficientRandaoMixes, InsufficientRandaoMixes,
InsufficientValidators, InsufficientValidators,
InsufficientBlockRoots, InsufficientBlockRoots,
@ -249,23 +250,36 @@ impl BeaconState {
/// committee is itself a list of validator indices. /// committee is itself a list of validator indices.
/// ///
/// Spec v0.1 /// Spec v0.1
pub fn get_shuffling(&self, seed: Hash256, epoch: Epoch, spec: &ChainSpec) -> Vec<Vec<usize>> { pub fn get_shuffling(
&self,
seed: Hash256,
epoch: Epoch,
spec: &ChainSpec,
) -> Option<Vec<Vec<usize>>> {
let active_validator_indices = let active_validator_indices =
get_active_validator_indices(&self.validator_registry, epoch); get_active_validator_indices(&self.validator_registry, epoch);
let committees_per_epoch = let committees_per_epoch =
self.get_epoch_committee_count(active_validator_indices.len(), spec); self.get_epoch_committee_count(active_validator_indices.len(), spec);
// TODO: check that Hash256::from(u64) matches 'int_to_bytes32'. let mut shuffled_active_validator_indices =
let seed = seed ^ Hash256::from(epoch.as_u64()); Vec::with_capacity(active_validator_indices.len());
// TODO: fix `expect` assert. for &i in &active_validator_indices {
let shuffled_active_validator_indices = let shuffled_i = get_permutated_index(
shuffle(&seed, active_validator_indices).expect("Max validator count exceed!"); i,
active_validator_indices.len(),
&seed[..],
spec.shuffle_round_count,
)?;
shuffled_active_validator_indices[i] = active_validator_indices[shuffled_i]
}
shuffled_active_validator_indices Some(
.honey_badger_split(committees_per_epoch as usize) shuffled_active_validator_indices
.map(|slice: &[usize]| slice.to_vec()) .honey_badger_split(committees_per_epoch as usize)
.collect() .map(|slice: &[usize]| slice.to_vec())
.collect(),
)
} }
/// Return the number of committees in the previous epoch. /// Return the number of committees in the previous epoch.
@ -401,7 +415,9 @@ impl BeaconState {
return Err(BeaconStateError::EpochOutOfBounds); return Err(BeaconStateError::EpochOutOfBounds);
}; };
let shuffling = self.get_shuffling(seed, shuffling_epoch, spec); let shuffling = self
.get_shuffling(seed, shuffling_epoch, spec)
.ok_or_else(|| BeaconStateError::UnableToShuffle)?;
let offset = slot.as_u64() % spec.epoch_length; let offset = slot.as_u64() % spec.epoch_length;
let committees_per_slot = committees_per_epoch / spec.epoch_length; let committees_per_slot = committees_per_epoch / spec.epoch_length;
let slot_start_shard = let slot_start_shard =

2
eth2/types/src/spec/mod.rs
View File

@ -17,7 +17,7 @@ pub struct ChainSpec {
pub beacon_chain_shard_number: u64, pub beacon_chain_shard_number: u64,
pub max_indices_per_slashable_vote: u64, pub max_indices_per_slashable_vote: u64,
pub max_withdrawals_per_epoch: u64, pub max_withdrawals_per_epoch: u64,
pub shuffle_round_count: u64, pub shuffle_round_count: u8,
/* /*
* Deposit contract * Deposit contract