From 4a57aec4723f7ddf9a8f8afad6fcaf70b4c31318 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 4 Mar 2019 14:24:29 +1100 Subject: [PATCH 01/31] Unfinished progress --- eth2/types/src/lib.rs | 2 ++ eth2/types/src/proposal.rs | 46 +++++++++++++++++++++++++++++ eth2/types/src/proposer_slashing.rs | 12 ++++---- 3 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 eth2/types/src/proposal.rs diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs index 4f196b9e9..ff73a6ea6 100644 --- a/eth2/types/src/lib.rs +++ b/eth2/types/src/lib.rs @@ -19,6 +19,7 @@ pub mod exit; pub mod fork; pub mod free_attestation; pub mod pending_attestation; +pub mod proposal; pub mod proposal_signed_data; pub mod proposer_slashing; pub mod readers; @@ -57,6 +58,7 @@ pub use crate::exit::Exit; pub use crate::fork::Fork; pub use crate::free_attestation::FreeAttestation; pub use crate::pending_attestation::PendingAttestation; +pub use crate::proposal::Proposal; pub use crate::proposal_signed_data::ProposalSignedData; pub use crate::proposer_slashing::ProposerSlashing; pub use crate::slashable_attestation::SlashableAttestation; diff --git a/eth2/types/src/proposal.rs b/eth2/types/src/proposal.rs new file mode 100644 index 000000000..ac92dbce8 --- /dev/null +++ b/eth2/types/src/proposal.rs @@ -0,0 +1,46 @@ +use crate::test_utils::TestRandom; +use crate::{Hash256, Slot}; +use bls::Signature; +use rand::RngCore; +use serde_derive::Serialize; +use ssz_derive::{Decode, Encode, TreeHash}; +use test_random_derive::TestRandom; + +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] +pub struct Proposal { + pub slot: Slot, + /// Shard number (spec.beacon_chain_shard_number for beacon chain) + pub shard: u64, + pub block_root: Hash256, + pub signature: Signature, +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; + use ssz::{ssz_encode, Decodable, TreeHash}; + + #[test] + pub fn test_ssz_round_trip() { + let mut rng = XorShiftRng::from_seed([42; 16]); + let original = Proposal::random_for_test(&mut rng); + + let bytes = ssz_encode(&original); + let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); + + assert_eq!(original, decoded); + } + + #[test] + pub fn test_hash_tree_root_internal() { + let mut rng = XorShiftRng::from_seed([42; 16]); + let original = Proposal::random_for_test(&mut rng); + + let result = original.hash_tree_root_internal(); + + assert_eq!(result.len(), 32); + // TODO: Add further tests + // https://github.com/sigp/lighthouse/issues/170 + } +} diff --git a/eth2/types/src/proposer_slashing.rs b/eth2/types/src/proposer_slashing.rs index ea30d46ec..3b6f57c40 100644 --- a/eth2/types/src/proposer_slashing.rs +++ b/eth2/types/src/proposer_slashing.rs @@ -1,6 +1,5 @@ -use super::ProposalSignedData; +use super::Proposal; use crate::test_utils::TestRandom; -use bls::Signature; use rand::RngCore; use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; @@ -10,13 +9,14 @@ mod builder; pub use builder::ProposerSlashingBuilder; +/// Two conflicting proposals from the same proposer (validator). +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct ProposerSlashing { pub proposer_index: u64, - pub proposal_data_1: ProposalSignedData, - pub proposal_signature_1: Signature, - pub proposal_data_2: ProposalSignedData, - pub proposal_signature_2: Signature, + pub proposer_1: Proposal, + pub proposer_2: Proposal, } #[cfg(test)] From 94122a73345fe7f5bca23fdec981910ef72c7415 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 4 Mar 2019 15:47:48 +1100 Subject: [PATCH 02/31] Add SignedRoot methods --- eth2/types/src/proposal.rs | 35 +++++++++++++-- eth2/utils/ssz/src/lib.rs | 2 + eth2/utils/ssz/src/signed_root.rs | 5 +++ eth2/utils/ssz_derive/src/lib.rs | 75 +++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 eth2/utils/ssz/src/signed_root.rs diff --git a/eth2/types/src/proposal.rs b/eth2/types/src/proposal.rs index ac92dbce8..af69731cb 100644 --- a/eth2/types/src/proposal.rs +++ b/eth2/types/src/proposal.rs @@ -3,10 +3,11 @@ use crate::{Hash256, Slot}; use bls::Signature; use rand::RngCore; use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz::TreeHash; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] pub struct Proposal { pub slot: Slot, /// Shard number (spec.beacon_chain_shard_number for beacon chain) @@ -19,7 +20,7 @@ pub struct Proposal { mod tests { use super::*; use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use ssz::{ssz_encode, Decodable, TreeHash}; + use ssz::{ssz_encode, Decodable, SignedRoot, TreeHash}; #[test] pub fn test_ssz_round_trip() { @@ -43,4 +44,32 @@ mod tests { // TODO: Add further tests // https://github.com/sigp/lighthouse/issues/170 } + + #[derive(TreeHash)] + struct SignedProposal { + pub slot: Slot, + pub shard: u64, + pub block_root: Hash256, + } + + impl Into for Proposal { + fn into(self) -> SignedProposal { + SignedProposal { + slot: self.slot, + shard: self.shard, + block_root: self.block_root, + } + } + } + + #[test] + pub fn test_signed_root() { + let mut rng = XorShiftRng::from_seed([42; 16]); + let original = Proposal::random_for_test(&mut rng); + + let other: SignedProposal = original.clone().into(); + + assert_eq!(original.signed_root(), other.hash_tree_root()); + } + } diff --git a/eth2/utils/ssz/src/lib.rs b/eth2/utils/ssz/src/lib.rs index a6baa35a7..7c29667af 100644 --- a/eth2/utils/ssz/src/lib.rs +++ b/eth2/utils/ssz/src/lib.rs @@ -12,6 +12,7 @@ extern crate ethereum_types; pub mod decode; pub mod encode; +mod signed_root; pub mod tree_hash; mod impl_decode; @@ -20,6 +21,7 @@ mod impl_tree_hash; pub use crate::decode::{decode_ssz, decode_ssz_list, Decodable, DecodeError}; pub use crate::encode::{Encodable, SszStream}; +pub use crate::signed_root::SignedRoot; pub use crate::tree_hash::{merkle_hash, TreeHash}; pub use hashing::hash; diff --git a/eth2/utils/ssz/src/signed_root.rs b/eth2/utils/ssz/src/signed_root.rs new file mode 100644 index 000000000..f7aeca4af --- /dev/null +++ b/eth2/utils/ssz/src/signed_root.rs @@ -0,0 +1,5 @@ +use crate::TreeHash; + +pub trait SignedRoot: TreeHash { + fn signed_root(&self) -> Vec; +} diff --git a/eth2/utils/ssz_derive/src/lib.rs b/eth2/utils/ssz_derive/src/lib.rs index f71bff709..4c6b9dc11 100644 --- a/eth2/utils/ssz_derive/src/lib.rs +++ b/eth2/utils/ssz_derive/src/lib.rs @@ -158,3 +158,78 @@ pub fn ssz_tree_hash_derive(input: TokenStream) -> TokenStream { }; output.into() } + +/// Returns `true` if some `Ident` should be considered to be a signature type. +fn type_ident_is_signature(ident: &syn::Ident) -> bool { + match ident.to_string().as_ref() { + "Signature" => true, + "AggregateSignature" => true, + _ => false, + } +} + +/// Takes a `Field` where the type (`ty`) portion is a path (e.g., `types::Signature`) and returns +/// the final `Ident` in that path. +/// +/// E.g., for `types::Signature` returns `Signature`. +fn final_type_ident<'a>(field: &'a syn::Field) -> &'a syn::Ident { + match &field.ty { + syn::Type::Path(path) => &path.path.segments.last().unwrap().value().ident, + _ => panic!("ssz_derive only supports Path types."), + } +} + +/// Implements `ssz::TreeHash` for some `struct`, whilst excluding any fields following and +/// including a field that is of type "Signature" or "AggregateSignature". +/// +/// See: +/// https://github.com/ethereum/eth2.0-specs/blob/master/specs/simple-serialize.md#signed-roots +/// +/// This is a rather horrendous macro, it will read the type of the object as a string and decide +/// if it's a signature by matching that string against "Signature" or "AggregateSignature". So, +/// it's important that you use those exact words as your type -- don't alias it to something else. +/// +/// If you can think of a better way to do this, please make an issue! +/// +/// Fields are processed in the order they are defined. +#[proc_macro_derive(SignedRoot)] +pub fn ssz_signed_root_derive(input: TokenStream) -> TokenStream { + let item = parse_macro_input!(input as DeriveInput); + + let name = &item.ident; + + let struct_data = match &item.data { + syn::Data::Struct(s) => s, + _ => panic!("ssz_derive only supports structs."), + }; + + let mut field_idents: Vec<&syn::Ident> = vec![]; + + for field in struct_data.fields.iter() { + let final_type_ident = final_type_ident(&field); + + if type_ident_is_signature(final_type_ident) { + break; + } else { + let ident = field + .ident + .as_ref() + .expect("ssz_derive only supports named_struct fields."); + field_idents.push(ident); + } + } + + let output = quote! { + impl ssz::SignedRoot for #name { + fn signed_root(&self) -> Vec { + let mut list: Vec> = Vec::new(); + #( + list.push(self.#field_idents.hash_tree_root_internal()); + )* + + ssz::merkle_hash(&mut list) + } + } + }; + output.into() +} From 9769ca46656d9b8d6c8c2b625a4b4a22b59129ac Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 4 Mar 2019 17:13:50 +1100 Subject: [PATCH 03/31] Update all struct definitions Does not compile --- eth2/types/src/attestation.rs | 32 +--- eth2/types/src/attestation_data.rs | 46 ++--- .../src/attestation_data_and_custody_bit.rs | 3 + eth2/types/src/attester_slashing.rs | 3 + eth2/types/src/beacon_block.rs | 28 +-- eth2/types/src/beacon_block_body.rs | 8 +- eth2/types/src/beacon_state.rs | 169 ++++++++++-------- eth2/types/src/crosslink.rs | 13 +- eth2/types/src/deposit.rs | 3 + eth2/types/src/deposit_data.rs | 3 + eth2/types/src/deposit_input.rs | 3 + eth2/types/src/eth1_data.rs | 4 +- eth2/types/src/eth1_data_vote.rs | 4 +- eth2/types/src/fork.rs | 3 + eth2/types/src/lib.rs | 8 +- eth2/types/src/pending_attestation.rs | 3 + eth2/types/src/proposal.rs | 3 + eth2/types/src/proposer_slashing.rs | 4 +- eth2/types/src/proposer_slashing/builder.rs | 22 +-- eth2/types/src/slashable_attestation.rs | 17 +- eth2/types/src/transfer.rs | 51 ++++++ eth2/types/src/validator.rs | 132 ++------------ eth2/types/src/{exit.rs => voluntary_exit.rs} | 14 +- 23 files changed, 261 insertions(+), 315 deletions(-) create mode 100644 eth2/types/src/transfer.rs rename eth2/types/src/{exit.rs => voluntary_exit.rs} (74%) diff --git a/eth2/types/src/attestation.rs b/eth2/types/src/attestation.rs index a0c8505b8..03ef8ce48 100644 --- a/eth2/types/src/attestation.rs +++ b/eth2/types/src/attestation.rs @@ -1,12 +1,15 @@ -use super::{AggregatePublicKey, AggregateSignature, AttestationData, Bitfield, Hash256}; +use super::{AggregateSignature, AttestationData, Bitfield}; use crate::test_utils::TestRandom; use rand::RngCore; use serde_derive::Serialize; use ssz::TreeHash; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; -#[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TreeHash, TestRandom)] +/// Details an attestation that can be slashable. +/// +/// Spec v0.4.0 +#[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] pub struct Attestation { pub aggregation_bitfield: Bitfield, pub data: AttestationData, @@ -14,29 +17,6 @@ pub struct Attestation { pub aggregate_signature: AggregateSignature, } -impl Attestation { - pub fn canonical_root(&self) -> Hash256 { - Hash256::from(&self.hash_tree_root()[..]) - } - - pub fn signable_message(&self, custody_bit: bool) -> Vec { - self.data.signable_message(custody_bit) - } - - pub fn verify_signature( - &self, - group_public_key: &AggregatePublicKey, - custody_bit: bool, - domain: u64, - ) -> bool { - self.aggregate_signature.verify( - &self.signable_message(custody_bit), - domain, - group_public_key, - ) - } -} - #[cfg(test)] mod tests { use super::*; diff --git a/eth2/types/src/attestation_data.rs b/eth2/types/src/attestation_data.rs index e23cdab46..1dfadfb1d 100644 --- a/eth2/types/src/attestation_data.rs +++ b/eth2/types/src/attestation_data.rs @@ -1,31 +1,33 @@ use crate::test_utils::TestRandom; -use crate::{AttestationDataAndCustodyBit, Crosslink, Epoch, Hash256, Slot}; +use crate::{Crosslink, Epoch, Hash256, Slot}; use rand::RngCore; use serde_derive::Serialize; use ssz::TreeHash; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; -pub const SSZ_ATTESTION_DATA_LENGTH: usize = { - 8 + // slot - 8 + // shard - 32 + // beacon_block_hash - 32 + // epoch_boundary_root - 32 + // shard_block_hash - 32 + // latest_crosslink_hash - 8 + // justified_epoch - 32 // justified_block_root -}; - +/// The data upon which an attestation is based. +/// +/// Spec v0.4.0 #[derive( - Debug, Clone, PartialEq, Default, Serialize, Hash, Encode, Decode, TreeHash, TestRandom, + Debug, + Clone, + PartialEq, + Default, + Serialize, + Hash, + Encode, + Decode, + TreeHash, + TestRandom, + SignedRoot, )] pub struct AttestationData { pub slot: Slot, pub shard: u64, pub beacon_block_root: Hash256, pub epoch_boundary_root: Hash256, - pub shard_block_root: Hash256, + pub crosslink_data_root: Hash256, pub latest_crosslink: Crosslink, pub justified_epoch: Epoch, pub justified_block_root: Hash256, @@ -33,20 +35,6 @@ pub struct AttestationData { impl Eq for AttestationData {} -impl AttestationData { - pub fn canonical_root(&self) -> Hash256 { - Hash256::from(&self.hash_tree_root()[..]) - } - - pub fn signable_message(&self, custody_bit: bool) -> Vec { - let attestation_data_and_custody_bit = AttestationDataAndCustodyBit { - data: self.clone(), - custody_bit, - }; - attestation_data_and_custody_bit.hash_tree_root() - } -} - #[cfg(test)] mod tests { use super::*; diff --git a/eth2/types/src/attestation_data_and_custody_bit.rs b/eth2/types/src/attestation_data_and_custody_bit.rs index 9175863ae..2f652609e 100644 --- a/eth2/types/src/attestation_data_and_custody_bit.rs +++ b/eth2/types/src/attestation_data_and_custody_bit.rs @@ -4,6 +4,9 @@ use rand::RngCore; use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; +/// Used for pairing an attestation with a proof-of-custody. +/// +/// Spec v0.4.0 #[derive(Debug, Clone, PartialEq, Default, Serialize, Encode, Decode, TreeHash)] pub struct AttestationDataAndCustodyBit { pub data: AttestationData, diff --git a/eth2/types/src/attester_slashing.rs b/eth2/types/src/attester_slashing.rs index ac75a2562..1cb671960 100644 --- a/eth2/types/src/attester_slashing.rs +++ b/eth2/types/src/attester_slashing.rs @@ -8,6 +8,9 @@ mod builder; pub use builder::AttesterSlashingBuilder; +/// Two conflicting attestations. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct AttesterSlashing { pub slashable_attestation_1: SlashableAttestation, diff --git a/eth2/types/src/beacon_block.rs b/eth2/types/src/beacon_block.rs index cb4e6668b..53b0dac80 100644 --- a/eth2/types/src/beacon_block.rs +++ b/eth2/types/src/beacon_block.rs @@ -4,18 +4,21 @@ use bls::Signature; use rand::RngCore; use serde_derive::Serialize; use ssz::TreeHash; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] +/// A block of the `BeaconChain`. +/// +/// Spec v0.4.0 +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] pub struct BeaconBlock { pub slot: Slot, pub parent_root: Hash256, pub state_root: Hash256, pub randao_reveal: Signature, pub eth1_data: Eth1Data, - pub signature: Signature, pub body: BeaconBlockBody, + pub signature: Signature, } impl BeaconBlock { @@ -40,25 +43,6 @@ impl BeaconBlock { }, } } - - pub fn canonical_root(&self) -> Hash256 { - Hash256::from(&self.hash_tree_root()[..]) - } - - pub fn proposal_root(&self, spec: &ChainSpec) -> Hash256 { - let block_without_signature_root = { - let mut block_without_signature = self.clone(); - block_without_signature.signature = spec.empty_signature.clone(); - block_without_signature.canonical_root() - }; - - let proposal = ProposalSignedData { - slot: self.slot, - shard: spec.beacon_chain_shard_number, - block_root: block_without_signature_root, - }; - Hash256::from(&proposal.hash_tree_root()[..]) - } } #[cfg(test)] diff --git a/eth2/types/src/beacon_block_body.rs b/eth2/types/src/beacon_block_body.rs index 2b343b970..13c82e42f 100644 --- a/eth2/types/src/beacon_block_body.rs +++ b/eth2/types/src/beacon_block_body.rs @@ -1,17 +1,21 @@ -use super::{Attestation, AttesterSlashing, Deposit, Exit, ProposerSlashing}; +use super::{Attestation, AttesterSlashing, Deposit, ProposerSlashing, Transfer, VolutaryExit}; use crate::test_utils::TestRandom; use rand::RngCore; use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// The body of a `BeaconChain` block, containing operations. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Default, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct BeaconBlockBody { pub proposer_slashings: Vec, pub attester_slashings: Vec, pub attestations: Vec, pub deposits: Vec, - pub exits: Vec, + pub voluntary_exits: Vec, + pub transfers: Vec, } #[cfg(test)] diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index a9e2f2673..c96beff52 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -1,6 +1,6 @@ use self::epoch_cache::EpochCache; use crate::test_utils::TestRandom; -use crate::{validator::StatusFlags, validator_registry::get_active_validator_indices, *}; +use crate::{validator_registry::get_active_validator_indices, *}; use bls::verify_proof_of_possession; use honey_badger_split::SplitExt; use log::{debug, error, trace}; @@ -82,12 +82,12 @@ pub struct BeaconState { // Randomness and committees pub latest_randao_mixes: Vec, - pub previous_epoch_start_shard: u64, - pub current_epoch_start_shard: u64, - pub previous_calculation_epoch: Epoch, - pub current_calculation_epoch: Epoch, - pub previous_epoch_seed: Hash256, - pub current_epoch_seed: Hash256, + pub previous_shuffling_start_shard: u64, + pub current_shuffling_start_shard: u64, + pub previous_shuffling_epoch: Epoch, + pub current_shuffling_epoch: Epoch, + pub previous_shuffling_seed: Hash256, + pub current_shuffling_seed: Hash256, // Finality pub previous_justified_epoch: Epoch, @@ -98,8 +98,8 @@ pub struct BeaconState { // Recent state pub latest_crosslinks: Vec, pub latest_block_roots: Vec, - pub latest_index_roots: Vec, - pub latest_penalized_balances: Vec, + pub latest_active_index_roots: Vec, + pub latest_slashed_balances: Vec, pub latest_attestations: Vec, pub batched_block_roots: Vec, @@ -107,7 +107,7 @@ pub struct BeaconState { pub latest_eth1_data: Eth1Data, pub eth1_data_votes: Vec, - // Caching + // Caching (not in the spec) pub cache_index_offset: usize, pub caches: Vec, } @@ -148,12 +148,12 @@ impl BeaconState { * Randomness and committees */ latest_randao_mixes: vec![spec.zero_hash; spec.latest_randao_mixes_length as usize], - previous_epoch_start_shard: spec.genesis_start_shard, - current_epoch_start_shard: spec.genesis_start_shard, - previous_calculation_epoch: spec.genesis_epoch, - current_calculation_epoch: spec.genesis_epoch, - previous_epoch_seed: spec.zero_hash, - current_epoch_seed: spec.zero_hash, + previous_shuffling_start_shard: spec.genesis_start_shard, + current_shuffling_start_shard: spec.genesis_start_shard, + previous_shuffling_epoch: spec.genesis_epoch, + current_shuffling_epoch: spec.genesis_epoch, + previous_shuffling_seed: spec.zero_hash, + current_shuffling_seed: spec.zero_hash, /* * Finality @@ -168,8 +168,11 @@ impl BeaconState { */ latest_crosslinks: vec![initial_crosslink; spec.shard_count as usize], latest_block_roots: vec![spec.zero_hash; spec.latest_block_roots_length as usize], - latest_index_roots: vec![spec.zero_hash; spec.latest_index_roots_length as usize], - latest_penalized_balances: vec![0; spec.latest_penalized_exit_length as usize], + latest_active_index_roots: vec![ + spec.zero_hash; + spec.latest_active_index_roots_length as usize + ], + latest_slashed_balances: vec![0; spec.latest_penalized_exit_length as usize], latest_attestations: vec![], batched_block_roots: vec![], @@ -218,9 +221,10 @@ impl BeaconState { &genesis_state.validator_registry, spec.genesis_epoch, )); - genesis_state.latest_index_roots = - vec![genesis_active_index_root; spec.latest_index_roots_length]; - genesis_state.current_epoch_seed = genesis_state.generate_seed(spec.genesis_epoch, spec)?; + genesis_state.latest_active_index_roots = + vec![genesis_active_index_root; spec.latest_active_index_roots_length]; + genesis_state.current_shuffling_seed = + genesis_state.generate_seed(spec.genesis_epoch, spec)?; Ok(genesis_state) } @@ -440,7 +444,7 @@ impl BeaconState { /// Spec v0.2.0 fn get_previous_epoch_committee_count(&self, spec: &ChainSpec) -> u64 { let previous_active_validators = - get_active_validator_indices(&self.validator_registry, self.previous_calculation_epoch); + get_active_validator_indices(&self.validator_registry, self.previous_shuffling_epoch); self.get_epoch_committee_count(previous_active_validators.len(), spec) } @@ -449,7 +453,7 @@ impl BeaconState { /// Spec v0.2.0 pub fn get_current_epoch_committee_count(&self, spec: &ChainSpec) -> u64 { let current_active_validators = - get_active_validator_indices(&self.validator_registry, self.current_calculation_epoch); + get_active_validator_indices(&self.validator_registry, self.current_shuffling_epoch); self.get_epoch_committee_count(current_active_validators.len(), spec) } @@ -468,13 +472,17 @@ impl BeaconState { pub fn get_active_index_root(&self, epoch: Epoch, spec: &ChainSpec) -> Option { let current_epoch = self.current_epoch(spec); - let earliest_index_root = current_epoch - Epoch::from(spec.latest_index_roots_length) + let earliest_index_root = current_epoch + - Epoch::from(spec.latest_active_index_roots_length) + Epoch::from(spec.entry_exit_delay) + 1; let latest_index_root = current_epoch + spec.entry_exit_delay; if (epoch >= earliest_index_root) & (epoch <= latest_index_root) { - Some(self.latest_index_roots[epoch.as_usize() % spec.latest_index_roots_length]) + Some( + self.latest_active_index_roots + [epoch.as_usize() % spec.latest_active_index_roots_length], + ) } else { None } @@ -566,17 +574,17 @@ impl BeaconState { trace!("get_committee_params_at_slot: current_epoch"); Ok(( self.get_current_epoch_committee_count(spec), - self.current_epoch_seed, - self.current_calculation_epoch, - self.current_epoch_start_shard, + self.current_shuffling_seed, + self.current_shuffling_epoch, + self.current_shuffling_start_shard, )) } else if epoch == previous_epoch { trace!("get_committee_params_at_slot: previous_epoch"); Ok(( self.get_previous_epoch_committee_count(spec), - self.previous_epoch_seed, - self.previous_calculation_epoch, - self.previous_epoch_start_shard, + self.previous_shuffling_seed, + self.previous_shuffling_epoch, + self.previous_shuffling_start_shard, )) } else if epoch == next_epoch { trace!("get_committee_params_at_slot: next_epoch"); @@ -587,16 +595,19 @@ impl BeaconState { let next_seed = self.generate_seed(next_epoch, spec)?; ( next_seed, - (self.current_epoch_start_shard + current_committees_per_epoch) + (self.current_shuffling_start_shard + current_committees_per_epoch) % spec.shard_count, ) } else if (epochs_since_last_registry_update > 1) & epochs_since_last_registry_update.is_power_of_two() { let next_seed = self.generate_seed(next_epoch, spec)?; - (next_seed, self.current_epoch_start_shard) + (next_seed, self.current_shuffling_start_shard) } else { - (self.current_epoch_seed, self.current_epoch_start_shard) + ( + self.current_shuffling_seed, + self.current_shuffling_start_shard, + ) }; Ok(( self.get_next_epoch_committee_count(spec), @@ -715,9 +726,9 @@ impl BeaconState { let epoch_index: usize = current_epoch.as_usize() % spec.latest_penalized_exit_length; - let total_at_start = self.latest_penalized_balances + let total_at_start = self.latest_slashed_balances [(epoch_index + 1) % spec.latest_penalized_exit_length]; - let total_at_end = self.latest_penalized_balances[epoch_index]; + let total_at_end = self.latest_slashed_balances[epoch_index]; let total_penalities = total_at_end.saturating_sub(total_at_start); let penalty = self.get_effective_balance(index, spec) * std::cmp::min(total_penalities * 3, total_balance) @@ -983,7 +994,7 @@ impl BeaconState { self.exit_validator(validator_index, spec); let current_epoch = self.current_epoch(spec); - self.latest_penalized_balances + self.latest_slashed_balances [current_epoch.as_usize() % spec.latest_penalized_exit_length] += self.get_effective_balance(validator_index, spec); @@ -1329,20 +1340,20 @@ impl Encodable for BeaconState { s.append(&self.validator_balances); s.append(&self.validator_registry_update_epoch); s.append(&self.latest_randao_mixes); - s.append(&self.previous_epoch_start_shard); - s.append(&self.current_epoch_start_shard); - s.append(&self.previous_calculation_epoch); - s.append(&self.current_calculation_epoch); - s.append(&self.previous_epoch_seed); - s.append(&self.current_epoch_seed); + s.append(&self.previous_shuffling_start_shard); + s.append(&self.current_shuffling_start_shard); + s.append(&self.previous_shuffling_epoch); + s.append(&self.current_shuffling_epoch); + s.append(&self.previous_shuffling_seed); + s.append(&self.current_shuffling_seed); s.append(&self.previous_justified_epoch); s.append(&self.justified_epoch); s.append(&self.justification_bitfield); s.append(&self.finalized_epoch); s.append(&self.latest_crosslinks); s.append(&self.latest_block_roots); - s.append(&self.latest_index_roots); - s.append(&self.latest_penalized_balances); + s.append(&self.latest_active_index_roots); + s.append(&self.latest_slashed_balances); s.append(&self.latest_attestations); s.append(&self.batched_block_roots); s.append(&self.latest_eth1_data); @@ -1359,20 +1370,20 @@ impl Decodable for BeaconState { let (validator_balances, i) = <_>::ssz_decode(bytes, i)?; let (validator_registry_update_epoch, i) = <_>::ssz_decode(bytes, i)?; let (latest_randao_mixes, i) = <_>::ssz_decode(bytes, i)?; - let (previous_epoch_start_shard, i) = <_>::ssz_decode(bytes, i)?; - let (current_epoch_start_shard, i) = <_>::ssz_decode(bytes, i)?; - let (previous_calculation_epoch, i) = <_>::ssz_decode(bytes, i)?; - let (current_calculation_epoch, i) = <_>::ssz_decode(bytes, i)?; - let (previous_epoch_seed, i) = <_>::ssz_decode(bytes, i)?; - let (current_epoch_seed, i) = <_>::ssz_decode(bytes, i)?; + let (previous_shuffling_start_shard, i) = <_>::ssz_decode(bytes, i)?; + let (current_shuffling_start_shard, i) = <_>::ssz_decode(bytes, i)?; + let (previous_shuffling_epoch, i) = <_>::ssz_decode(bytes, i)?; + let (current_shuffling_epoch, i) = <_>::ssz_decode(bytes, i)?; + let (previous_shuffling_seed, i) = <_>::ssz_decode(bytes, i)?; + let (current_shuffling_seed, i) = <_>::ssz_decode(bytes, i)?; let (previous_justified_epoch, i) = <_>::ssz_decode(bytes, i)?; let (justified_epoch, i) = <_>::ssz_decode(bytes, i)?; let (justification_bitfield, i) = <_>::ssz_decode(bytes, i)?; let (finalized_epoch, i) = <_>::ssz_decode(bytes, i)?; let (latest_crosslinks, i) = <_>::ssz_decode(bytes, i)?; let (latest_block_roots, i) = <_>::ssz_decode(bytes, i)?; - let (latest_index_roots, i) = <_>::ssz_decode(bytes, i)?; - let (latest_penalized_balances, i) = <_>::ssz_decode(bytes, i)?; + let (latest_active_index_roots, i) = <_>::ssz_decode(bytes, i)?; + let (latest_slashed_balances, i) = <_>::ssz_decode(bytes, i)?; let (latest_attestations, i) = <_>::ssz_decode(bytes, i)?; let (batched_block_roots, i) = <_>::ssz_decode(bytes, i)?; let (latest_eth1_data, i) = <_>::ssz_decode(bytes, i)?; @@ -1387,20 +1398,20 @@ impl Decodable for BeaconState { validator_balances, validator_registry_update_epoch, latest_randao_mixes, - previous_epoch_start_shard, - current_epoch_start_shard, - previous_calculation_epoch, - current_calculation_epoch, - previous_epoch_seed, - current_epoch_seed, + previous_shuffling_start_shard, + current_shuffling_start_shard, + previous_shuffling_epoch, + current_shuffling_epoch, + previous_shuffling_seed, + current_shuffling_seed, previous_justified_epoch, justified_epoch, justification_bitfield, finalized_epoch, latest_crosslinks, latest_block_roots, - latest_index_roots, - latest_penalized_balances, + latest_active_index_roots, + latest_slashed_balances, latest_attestations, batched_block_roots, latest_eth1_data, @@ -1427,20 +1438,24 @@ impl TreeHash for BeaconState { .hash_tree_root_internal(), ); result.append(&mut self.latest_randao_mixes.hash_tree_root_internal()); - result.append(&mut self.previous_epoch_start_shard.hash_tree_root_internal()); - result.append(&mut self.current_epoch_start_shard.hash_tree_root_internal()); - result.append(&mut self.previous_calculation_epoch.hash_tree_root_internal()); - result.append(&mut self.current_calculation_epoch.hash_tree_root_internal()); - result.append(&mut self.previous_epoch_seed.hash_tree_root_internal()); - result.append(&mut self.current_epoch_seed.hash_tree_root_internal()); + result.append( + &mut self + .previous_shuffling_start_shard + .hash_tree_root_internal(), + ); + result.append(&mut self.current_shuffling_start_shard.hash_tree_root_internal()); + result.append(&mut self.previous_shuffling_epoch.hash_tree_root_internal()); + result.append(&mut self.current_shuffling_epoch.hash_tree_root_internal()); + result.append(&mut self.previous_shuffling_seed.hash_tree_root_internal()); + result.append(&mut self.current_shuffling_seed.hash_tree_root_internal()); result.append(&mut self.previous_justified_epoch.hash_tree_root_internal()); result.append(&mut self.justified_epoch.hash_tree_root_internal()); result.append(&mut self.justification_bitfield.hash_tree_root_internal()); result.append(&mut self.finalized_epoch.hash_tree_root_internal()); result.append(&mut self.latest_crosslinks.hash_tree_root_internal()); result.append(&mut self.latest_block_roots.hash_tree_root_internal()); - result.append(&mut self.latest_index_roots.hash_tree_root_internal()); - result.append(&mut self.latest_penalized_balances.hash_tree_root_internal()); + result.append(&mut self.latest_active_index_roots.hash_tree_root_internal()); + result.append(&mut self.latest_slashed_balances.hash_tree_root_internal()); result.append(&mut self.latest_attestations.hash_tree_root_internal()); result.append(&mut self.batched_block_roots.hash_tree_root_internal()); result.append(&mut self.latest_eth1_data.hash_tree_root_internal()); @@ -1459,20 +1474,20 @@ impl TestRandom for BeaconState { validator_balances: <_>::random_for_test(rng), validator_registry_update_epoch: <_>::random_for_test(rng), latest_randao_mixes: <_>::random_for_test(rng), - previous_epoch_start_shard: <_>::random_for_test(rng), - current_epoch_start_shard: <_>::random_for_test(rng), - previous_calculation_epoch: <_>::random_for_test(rng), - current_calculation_epoch: <_>::random_for_test(rng), - previous_epoch_seed: <_>::random_for_test(rng), - current_epoch_seed: <_>::random_for_test(rng), + previous_shuffling_start_shard: <_>::random_for_test(rng), + current_shuffling_start_shard: <_>::random_for_test(rng), + previous_shuffling_epoch: <_>::random_for_test(rng), + current_shuffling_epoch: <_>::random_for_test(rng), + previous_shuffling_seed: <_>::random_for_test(rng), + current_shuffling_seed: <_>::random_for_test(rng), previous_justified_epoch: <_>::random_for_test(rng), justified_epoch: <_>::random_for_test(rng), justification_bitfield: <_>::random_for_test(rng), finalized_epoch: <_>::random_for_test(rng), latest_crosslinks: <_>::random_for_test(rng), latest_block_roots: <_>::random_for_test(rng), - latest_index_roots: <_>::random_for_test(rng), - latest_penalized_balances: <_>::random_for_test(rng), + latest_active_index_roots: <_>::random_for_test(rng), + latest_slashed_balances: <_>::random_for_test(rng), latest_attestations: <_>::random_for_test(rng), batched_block_roots: <_>::random_for_test(rng), latest_eth1_data: <_>::random_for_test(rng), diff --git a/eth2/types/src/crosslink.rs b/eth2/types/src/crosslink.rs index 11fb3386d..142d0f894 100644 --- a/eth2/types/src/crosslink.rs +++ b/eth2/types/src/crosslink.rs @@ -5,6 +5,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// Specifies the block hash for a shard at an epoch. +/// +/// Spec v0.4.0 #[derive( Debug, Clone, PartialEq, Default, Serialize, Hash, Encode, Decode, TreeHash, TestRandom, )] @@ -13,16 +16,6 @@ pub struct Crosslink { pub shard_block_root: Hash256, } -impl Crosslink { - /// Generates a new instance where `dynasty` and `hash` are both zero. - pub fn zero() -> Self { - Self { - epoch: Epoch::new(0), - shard_block_root: Hash256::zero(), - } - } -} - #[cfg(test)] mod tests { use super::*; diff --git a/eth2/types/src/deposit.rs b/eth2/types/src/deposit.rs index 02da32cfe..2e69ea599 100644 --- a/eth2/types/src/deposit.rs +++ b/eth2/types/src/deposit.rs @@ -5,6 +5,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// A deposit to potentially become a beacon chain validator. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct Deposit { pub branch: Vec, diff --git a/eth2/types/src/deposit_data.rs b/eth2/types/src/deposit_data.rs index 349207791..1eb2722a9 100644 --- a/eth2/types/src/deposit_data.rs +++ b/eth2/types/src/deposit_data.rs @@ -5,6 +5,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// Data generated by the deposit contract. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct DepositData { pub amount: u64, diff --git a/eth2/types/src/deposit_input.rs b/eth2/types/src/deposit_input.rs index 1f3b22779..c4c79c3d1 100644 --- a/eth2/types/src/deposit_input.rs +++ b/eth2/types/src/deposit_input.rs @@ -6,6 +6,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// The data supplied by the user to the deposit contract. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct DepositInput { pub pubkey: PublicKey, diff --git a/eth2/types/src/eth1_data.rs b/eth2/types/src/eth1_data.rs index 8eabbabc7..2c817ca38 100644 --- a/eth2/types/src/eth1_data.rs +++ b/eth2/types/src/eth1_data.rs @@ -5,7 +5,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; -// Note: this is refer to as DepositRootVote in specs +/// Contains data obtained from the Eth1 chain. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Default, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct Eth1Data { pub deposit_root: Hash256, diff --git a/eth2/types/src/eth1_data_vote.rs b/eth2/types/src/eth1_data_vote.rs index fa30b9052..898145575 100644 --- a/eth2/types/src/eth1_data_vote.rs +++ b/eth2/types/src/eth1_data_vote.rs @@ -5,7 +5,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; -// Note: this is refer to as DepositRootVote in specs +/// A summation of votes for some `Eth1Data`. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Default, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct Eth1DataVote { pub eth1_data: Eth1Data, diff --git a/eth2/types/src/fork.rs b/eth2/types/src/fork.rs index 5b13a2388..783a65302 100644 --- a/eth2/types/src/fork.rs +++ b/eth2/types/src/fork.rs @@ -4,6 +4,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// Specifies a fork of the `BeaconChain`, to prevent replay attacks. +/// +/// Spec v0.4.0 #[derive(Debug, Clone, PartialEq, Default, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct Fork { pub previous_version: u64, diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs index ff73a6ea6..b4b124294 100644 --- a/eth2/types/src/lib.rs +++ b/eth2/types/src/lib.rs @@ -15,7 +15,6 @@ pub mod deposit_data; pub mod deposit_input; pub mod eth1_data; pub mod eth1_data_vote; -pub mod exit; pub mod fork; pub mod free_attestation; pub mod pending_attestation; @@ -26,6 +25,8 @@ pub mod readers; pub mod shard_reassignment_record; pub mod slashable_attestation; pub mod slashable_vote_data; +pub mod transfer; +pub mod voluntary_exit; #[macro_use] pub mod slot_epoch_macros; pub mod slot_epoch; @@ -54,7 +55,6 @@ pub use crate::deposit_data::DepositData; pub use crate::deposit_input::DepositInput; pub use crate::eth1_data::Eth1Data; pub use crate::eth1_data_vote::Eth1DataVote; -pub use crate::exit::Exit; pub use crate::fork::Fork; pub use crate::free_attestation::FreeAttestation; pub use crate::pending_attestation::PendingAttestation; @@ -65,8 +65,10 @@ pub use crate::slashable_attestation::SlashableAttestation; pub use crate::slashable_vote_data::SlashableVoteData; pub use crate::slot_epoch::{Epoch, Slot}; pub use crate::slot_height::SlotHeight; -pub use crate::validator::{StatusFlags as ValidatorStatusFlags, Validator}; +pub use crate::transfer::Transfer; +pub use crate::validator::Validator; pub use crate::validator_registry_delta_block::ValidatorRegistryDeltaBlock; +pub use crate::voluntary_exit::VolutaryExit; pub type Hash256 = H256; pub type Address = H160; diff --git a/eth2/types/src/pending_attestation.rs b/eth2/types/src/pending_attestation.rs index 84eb59207..0430d18ba 100644 --- a/eth2/types/src/pending_attestation.rs +++ b/eth2/types/src/pending_attestation.rs @@ -5,6 +5,9 @@ use serde_derive::Serialize; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; +/// An attestation that has been included in the state but not yet fully processed. +/// +/// Spec v0.4.0 #[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct PendingAttestation { pub aggregation_bitfield: Bitfield, diff --git a/eth2/types/src/proposal.rs b/eth2/types/src/proposal.rs index af69731cb..b1fd737a0 100644 --- a/eth2/types/src/proposal.rs +++ b/eth2/types/src/proposal.rs @@ -7,6 +7,9 @@ use ssz::TreeHash; use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; +/// A proposal for some shard or beacon block. +/// +/// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] pub struct Proposal { pub slot: Slot, diff --git a/eth2/types/src/proposer_slashing.rs b/eth2/types/src/proposer_slashing.rs index 3b6f57c40..f86e7f3a8 100644 --- a/eth2/types/src/proposer_slashing.rs +++ b/eth2/types/src/proposer_slashing.rs @@ -15,8 +15,8 @@ pub use builder::ProposerSlashingBuilder; #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] pub struct ProposerSlashing { pub proposer_index: u64, - pub proposer_1: Proposal, - pub proposer_2: Proposal, + pub proposal_1: Proposal, + pub proposal_2: Proposal, } #[cfg(test)] diff --git a/eth2/types/src/proposer_slashing/builder.rs b/eth2/types/src/proposer_slashing/builder.rs index 7923ff74d..66f74a2e2 100644 --- a/eth2/types/src/proposer_slashing/builder.rs +++ b/eth2/types/src/proposer_slashing/builder.rs @@ -1,5 +1,5 @@ use crate::*; -use ssz::TreeHash; +use ssz::SignedRoot; /// Builds a `ProposerSlashing`. pub struct ProposerSlashingBuilder(); @@ -22,27 +22,29 @@ impl ProposerSlashingBuilder { let slot = Slot::new(0); let shard = 0; - let proposal_data_1 = ProposalSignedData { + let mut proposal_1 = Proposal { slot, shard, block_root: Hash256::from(&[1][..]), + signature: Signature::empty_signature(), }; - let proposal_data_2 = ProposalSignedData { + let mut proposal_2 = Proposal { slot, shard, block_root: Hash256::from(&[2][..]), + signature: Signature::empty_signature(), }; - let proposal_signature_1 = { - let message = proposal_data_1.hash_tree_root(); + proposal_1.signature = { + let message = proposal_1.signed_root(); let epoch = slot.epoch(spec.epoch_length); let domain = spec.domain_proposal; signer(proposer_index, &message[..], epoch, domain) }; - let proposal_signature_2 = { - let message = proposal_data_2.hash_tree_root(); + proposal_2.signature = { + let message = proposal_2.signed_root(); let epoch = slot.epoch(spec.epoch_length); let domain = spec.domain_proposal; signer(proposer_index, &message[..], epoch, domain) @@ -50,10 +52,8 @@ impl ProposerSlashingBuilder { ProposerSlashing { proposer_index, - proposal_data_1, - proposal_signature_1, - proposal_data_2, - proposal_signature_2, + proposal_1, + proposal_2, } } } diff --git a/eth2/types/src/slashable_attestation.rs b/eth2/types/src/slashable_attestation.rs index 8ad582ce6..9f2ccab60 100644 --- a/eth2/types/src/slashable_attestation.rs +++ b/eth2/types/src/slashable_attestation.rs @@ -1,11 +1,18 @@ use crate::{test_utils::TestRandom, AggregateSignature, AttestationData, Bitfield, ChainSpec}; use rand::RngCore; use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz::TreeHash; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] +/// Details an attestation that can be slashable. +/// +/// To be included in an `AttesterSlashing`. +/// +/// Spec v0.4.0 +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] pub struct SlashableAttestation { + /// Lists validator registry indices, not committee indices. pub validator_indices: Vec, pub data: AttestationData, pub custody_bitfield: Bitfield, @@ -15,21 +22,21 @@ pub struct SlashableAttestation { impl SlashableAttestation { /// Check if ``attestation_data_1`` and ``attestation_data_2`` have the same target. /// - /// Spec v0.3.0 + /// Spec v0.4.0 pub fn is_double_vote(&self, other: &SlashableAttestation, spec: &ChainSpec) -> bool { self.data.slot.epoch(spec.epoch_length) == other.data.slot.epoch(spec.epoch_length) } /// Check if ``attestation_data_1`` surrounds ``attestation_data_2``. /// - /// Spec v0.3.0 + /// Spec v0.4.0 pub fn is_surround_vote(&self, other: &SlashableAttestation, spec: &ChainSpec) -> bool { let source_epoch_1 = self.data.justified_epoch; let source_epoch_2 = other.data.justified_epoch; let target_epoch_1 = self.data.slot.epoch(spec.epoch_length); let target_epoch_2 = other.data.slot.epoch(spec.epoch_length); - (source_epoch_1 < source_epoch_2) && (target_epoch_2 < target_epoch_1) + (source_epoch_1 < source_epoch_2) & (target_epoch_2 < target_epoch_1) } } diff --git a/eth2/types/src/transfer.rs b/eth2/types/src/transfer.rs new file mode 100644 index 000000000..f23d3845e --- /dev/null +++ b/eth2/types/src/transfer.rs @@ -0,0 +1,51 @@ +use super::Slot; +use crate::test_utils::TestRandom; +use bls::{PublicKey, Signature}; +use rand::RngCore; +use serde_derive::Serialize; +use ssz_derive::{Decode, Encode, TreeHash}; +use test_random_derive::TestRandom; + +/// The data submitted to the deposit contract. +/// +/// Spec v0.4.0 +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] +pub struct Transfer { + pub from: u64, + pub to: u64, + pub amount: u64, + pub fee: u64, + pub slot: Slot, + pub pubkey: PublicKey, + pub signature: Signature, +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; + use ssz::{ssz_encode, Decodable, TreeHash}; + + #[test] + pub fn test_ssz_round_trip() { + let mut rng = XorShiftRng::from_seed([42; 16]); + let original = Transfer::random_for_test(&mut rng); + + let bytes = ssz_encode(&original); + let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); + + assert_eq!(original, decoded); + } + + #[test] + pub fn test_hash_tree_root_internal() { + let mut rng = XorShiftRng::from_seed([42; 16]); + let original = Transfer::random_for_test(&mut rng); + + let result = original.hash_tree_root_internal(); + + assert_eq!(result.len(), 32); + // TODO: Add further tests + // https://github.com/sigp/lighthouse/issues/170 + } +} diff --git a/eth2/types/src/validator.rs b/eth2/types/src/validator.rs index 587a48a1f..5b5dab6bf 100644 --- a/eth2/types/src/validator.rs +++ b/eth2/types/src/validator.rs @@ -2,55 +2,21 @@ use crate::{test_utils::TestRandom, Epoch, Hash256, PublicKey}; use rand::RngCore; use serde_derive::Serialize; use ssz::{hash, Decodable, DecodeError, Encodable, SszStream, TreeHash}; +use ssz_derive::{Decode, Encode, TreeHash}; +use test_random_derive::TestRandom; -const STATUS_FLAG_INITIATED_EXIT: u8 = 1; -const STATUS_FLAG_WITHDRAWABLE: u8 = 2; - -#[derive(Debug, PartialEq, Clone, Copy, Serialize)] -pub enum StatusFlags { - InitiatedExit, - Withdrawable, -} - -struct StatusFlagsDecodeError; - -impl From for DecodeError { - fn from(_: StatusFlagsDecodeError) -> DecodeError { - DecodeError::Invalid - } -} - -/// Handles the serialization logic for the `status_flags` field of the `Validator`. -fn status_flag_to_byte(flag: Option) -> u8 { - if let Some(flag) = flag { - match flag { - StatusFlags::InitiatedExit => STATUS_FLAG_INITIATED_EXIT, - StatusFlags::Withdrawable => STATUS_FLAG_WITHDRAWABLE, - } - } else { - 0 - } -} - -/// Handles the deserialization logic for the `status_flags` field of the `Validator`. -fn status_flag_from_byte(flag: u8) -> Result, StatusFlagsDecodeError> { - match flag { - 0 => Ok(None), - 1 => Ok(Some(StatusFlags::InitiatedExit)), - 2 => Ok(Some(StatusFlags::Withdrawable)), - _ => Err(StatusFlagsDecodeError), - } -} - -#[derive(Debug, Clone, PartialEq, Serialize)] +/// Information about a `BeaconChain` validator. +/// +/// Spec v0.4.0 +#[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TestRandom)] pub struct Validator { pub pubkey: PublicKey, pub withdrawal_credentials: Hash256, pub activation_epoch: Epoch, pub exit_epoch: Epoch, pub withdrawal_epoch: Epoch, - pub penalized_epoch: Epoch, - pub status_flags: Option, + pub initiated_exit: bool, + pub slashed: bool, } impl Validator { @@ -64,9 +30,9 @@ impl Validator { self.exit_epoch <= epoch } - /// Returns `true` if the validator is considered penalized at some epoch. - pub fn is_penalized_at(&self, epoch: Epoch) -> bool { - self.penalized_epoch <= epoch + /// Returns `true` if the validator is able to withdraw at some epoch. + pub fn is_withdrawable_at(&self, epoch: Epoch) -> bool { + self.withdrawal_epoch <= epoch } } @@ -85,82 +51,6 @@ impl Default for Validator { } } -impl TestRandom for StatusFlags { - fn random_for_test(rng: &mut T) -> Self { - let options = vec![StatusFlags::InitiatedExit, StatusFlags::Withdrawable]; - options[(rng.next_u32() as usize) % options.len()] - } -} - -impl Encodable for Validator { - fn ssz_append(&self, s: &mut SszStream) { - s.append(&self.pubkey); - s.append(&self.withdrawal_credentials); - s.append(&self.activation_epoch); - s.append(&self.exit_epoch); - s.append(&self.withdrawal_epoch); - s.append(&self.penalized_epoch); - s.append(&status_flag_to_byte(self.status_flags)); - } -} - -impl Decodable for Validator { - fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { - let (pubkey, i) = <_>::ssz_decode(bytes, i)?; - let (withdrawal_credentials, i) = <_>::ssz_decode(bytes, i)?; - let (activation_epoch, i) = <_>::ssz_decode(bytes, i)?; - let (exit_epoch, i) = <_>::ssz_decode(bytes, i)?; - let (withdrawal_epoch, i) = <_>::ssz_decode(bytes, i)?; - let (penalized_epoch, i) = <_>::ssz_decode(bytes, i)?; - let (status_flags_byte, i): (u8, usize) = <_>::ssz_decode(bytes, i)?; - - let status_flags = status_flag_from_byte(status_flags_byte)?; - - Ok(( - Self { - pubkey, - withdrawal_credentials, - activation_epoch, - exit_epoch, - withdrawal_epoch, - penalized_epoch, - status_flags, - }, - i, - )) - } -} - -impl TreeHash for Validator { - fn hash_tree_root_internal(&self) -> Vec { - let mut result: Vec = vec![]; - result.append(&mut self.pubkey.hash_tree_root_internal()); - result.append(&mut self.withdrawal_credentials.hash_tree_root_internal()); - result.append(&mut self.activation_epoch.hash_tree_root_internal()); - result.append(&mut self.exit_epoch.hash_tree_root_internal()); - result.append(&mut self.withdrawal_epoch.hash_tree_root_internal()); - result.append(&mut self.penalized_epoch.hash_tree_root_internal()); - result.append( - &mut u64::from(status_flag_to_byte(self.status_flags)).hash_tree_root_internal(), - ); - hash(&result) - } -} - -impl TestRandom for Validator { - fn random_for_test(rng: &mut T) -> Self { - Self { - pubkey: <_>::random_for_test(rng), - withdrawal_credentials: <_>::random_for_test(rng), - activation_epoch: <_>::random_for_test(rng), - exit_epoch: <_>::random_for_test(rng), - withdrawal_epoch: <_>::random_for_test(rng), - penalized_epoch: <_>::random_for_test(rng), - status_flags: Some(<_>::random_for_test(rng)), - } - } -} - #[cfg(test)] mod tests { use super::*; diff --git a/eth2/types/src/exit.rs b/eth2/types/src/voluntary_exit.rs similarity index 74% rename from eth2/types/src/exit.rs rename to eth2/types/src/voluntary_exit.rs index 5b41fcc7a..3cb0a85b7 100644 --- a/eth2/types/src/exit.rs +++ b/eth2/types/src/voluntary_exit.rs @@ -2,11 +2,15 @@ use crate::{test_utils::TestRandom, Epoch}; use bls::Signature; use rand::RngCore; use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz::TreeHash; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] -pub struct Exit { +/// An exit voluntarily submitted a validator who wishes to withdraw. +/// +/// Spec v0.4.0 +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] +pub struct VolutaryExit { pub epoch: Epoch, pub validator_index: u64, pub signature: Signature, @@ -21,7 +25,7 @@ mod tests { #[test] pub fn test_ssz_round_trip() { let mut rng = XorShiftRng::from_seed([42; 16]); - let original = Exit::random_for_test(&mut rng); + let original = VolutaryExit::random_for_test(&mut rng); let bytes = ssz_encode(&original); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); @@ -32,7 +36,7 @@ mod tests { #[test] pub fn test_hash_tree_root_internal() { let mut rng = XorShiftRng::from_seed([42; 16]); - let original = Exit::random_for_test(&mut rng); + let original = VolutaryExit::random_for_test(&mut rng); let result = original.hash_tree_root_internal(); From 7f10d41121f5daf38cd1be16a4fe1746365bc00c Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 4 Mar 2019 17:17:07 +1100 Subject: [PATCH 04/31] Remove old spec types They have been made obsolete --- eth2/types/src/casper_slashing.rs | 42 ----- eth2/types/src/lib.rs | 8 - eth2/types/src/proposal_signed_data.rs | 43 ----- eth2/types/src/slashable_vote_data.rs | 154 ------------------ .../src/validator_registry_delta_block.rs | 59 ------- 5 files changed, 306 deletions(-) delete mode 100644 eth2/types/src/casper_slashing.rs delete mode 100644 eth2/types/src/proposal_signed_data.rs delete mode 100644 eth2/types/src/slashable_vote_data.rs delete mode 100644 eth2/types/src/validator_registry_delta_block.rs diff --git a/eth2/types/src/casper_slashing.rs b/eth2/types/src/casper_slashing.rs deleted file mode 100644 index cb1e46ee5..000000000 --- a/eth2/types/src/casper_slashing.rs +++ /dev/null @@ -1,42 +0,0 @@ -use super::SlashableVoteData; -use crate::test_utils::TestRandom; -use rand::RngCore; -use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; -use test_random_derive::TestRandom; - -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] -pub struct CasperSlashing { - pub slashable_vote_data_1: SlashableVoteData, - pub slashable_vote_data_2: SlashableVoteData, -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use ssz::{ssz_encode, Decodable, TreeHash}; - - #[test] - pub fn test_ssz_round_trip() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = CasperSlashing::random_for_test(&mut rng); - - let bytes = ssz_encode(&original); - let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); - - assert_eq!(original, decoded); - } - - #[test] - pub fn test_hash_tree_root_internal() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = CasperSlashing::random_for_test(&mut rng); - - let result = original.hash_tree_root_internal(); - - assert_eq!(result.len(), 32); - // TODO: Add further tests - // https://github.com/sigp/lighthouse/issues/170 - } -} diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs index b4b124294..f54a24b01 100644 --- a/eth2/types/src/lib.rs +++ b/eth2/types/src/lib.rs @@ -7,7 +7,6 @@ pub mod attester_slashing; pub mod beacon_block; pub mod beacon_block_body; pub mod beacon_state; -pub mod casper_slashing; pub mod chain_spec; pub mod crosslink; pub mod deposit; @@ -19,12 +18,10 @@ pub mod fork; pub mod free_attestation; pub mod pending_attestation; pub mod proposal; -pub mod proposal_signed_data; pub mod proposer_slashing; pub mod readers; pub mod shard_reassignment_record; pub mod slashable_attestation; -pub mod slashable_vote_data; pub mod transfer; pub mod voluntary_exit; #[macro_use] @@ -33,7 +30,6 @@ pub mod slot_epoch; pub mod slot_height; pub mod validator; pub mod validator_registry; -pub mod validator_registry_delta_block; use ethereum_types::{H160, H256, U256}; use std::collections::HashMap; @@ -47,7 +43,6 @@ pub use crate::beacon_block_body::BeaconBlockBody; pub use crate::beacon_state::{ BeaconState, Error as BeaconStateError, InclusionError, RelativeEpoch, }; -pub use crate::casper_slashing::CasperSlashing; pub use crate::chain_spec::ChainSpec; pub use crate::crosslink::Crosslink; pub use crate::deposit::Deposit; @@ -59,15 +54,12 @@ pub use crate::fork::Fork; pub use crate::free_attestation::FreeAttestation; pub use crate::pending_attestation::PendingAttestation; pub use crate::proposal::Proposal; -pub use crate::proposal_signed_data::ProposalSignedData; pub use crate::proposer_slashing::ProposerSlashing; pub use crate::slashable_attestation::SlashableAttestation; -pub use crate::slashable_vote_data::SlashableVoteData; pub use crate::slot_epoch::{Epoch, Slot}; pub use crate::slot_height::SlotHeight; pub use crate::transfer::Transfer; pub use crate::validator::Validator; -pub use crate::validator_registry_delta_block::ValidatorRegistryDeltaBlock; pub use crate::voluntary_exit::VolutaryExit; pub type Hash256 = H256; diff --git a/eth2/types/src/proposal_signed_data.rs b/eth2/types/src/proposal_signed_data.rs deleted file mode 100644 index 6f6048ffc..000000000 --- a/eth2/types/src/proposal_signed_data.rs +++ /dev/null @@ -1,43 +0,0 @@ -use crate::test_utils::TestRandom; -use crate::{Hash256, Slot}; -use rand::RngCore; -use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; -use test_random_derive::TestRandom; - -#[derive(Debug, PartialEq, Clone, Default, Serialize, Encode, Decode, TreeHash, TestRandom)] -pub struct ProposalSignedData { - pub slot: Slot, - pub shard: u64, - pub block_root: Hash256, -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use ssz::{ssz_encode, Decodable, TreeHash}; - - #[test] - pub fn test_ssz_round_trip() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = ProposalSignedData::random_for_test(&mut rng); - - let bytes = ssz_encode(&original); - let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); - - assert_eq!(original, decoded); - } - - #[test] - pub fn test_hash_tree_root_internal() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = ProposalSignedData::random_for_test(&mut rng); - - let result = original.hash_tree_root_internal(); - - assert_eq!(result.len(), 32); - // TODO: Add further tests - // https://github.com/sigp/lighthouse/issues/170 - } -} diff --git a/eth2/types/src/slashable_vote_data.rs b/eth2/types/src/slashable_vote_data.rs deleted file mode 100644 index 31dd9e0a8..000000000 --- a/eth2/types/src/slashable_vote_data.rs +++ /dev/null @@ -1,154 +0,0 @@ -use super::AttestationData; -use crate::chain_spec::ChainSpec; -use crate::test_utils::TestRandom; -use bls::AggregateSignature; -use rand::RngCore; -use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; -use test_random_derive::TestRandom; - -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] -pub struct SlashableVoteData { - pub custody_bit_0_indices: Vec, - pub custody_bit_1_indices: Vec, - pub data: AttestationData, - pub aggregate_signature: AggregateSignature, -} - -impl SlashableVoteData { - /// Check if ``attestation_data_1`` and ``attestation_data_2`` have the same target. - /// - /// Spec v0.3.0 - pub fn is_double_vote(&self, other: &SlashableVoteData, spec: &ChainSpec) -> bool { - self.data.slot.epoch(spec.epoch_length) == other.data.slot.epoch(spec.epoch_length) - } - - /// Check if ``attestation_data_1`` surrounds ``attestation_data_2``. - /// - /// Spec v0.3.0 - pub fn is_surround_vote(&self, other: &SlashableVoteData, spec: &ChainSpec) -> bool { - let source_epoch_1 = self.data.justified_epoch; - let source_epoch_2 = other.data.justified_epoch; - let target_epoch_1 = self.data.slot.epoch(spec.epoch_length); - let target_epoch_2 = other.data.slot.epoch(spec.epoch_length); - - (source_epoch_1 < source_epoch_2) && (target_epoch_2 < target_epoch_1) - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::chain_spec::ChainSpec; - use crate::slot_epoch::{Epoch, Slot}; - use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use ssz::{ssz_encode, Decodable, TreeHash}; - - #[test] - pub fn test_is_double_vote_true() { - let spec = ChainSpec::foundation(); - let slashable_vote_first = create_slashable_vote_data(1, 1, &spec); - let slashable_vote_second = create_slashable_vote_data(1, 1, &spec); - - assert_eq!( - slashable_vote_first.is_double_vote(&slashable_vote_second, &spec), - true - ) - } - - #[test] - pub fn test_is_double_vote_false() { - let spec = ChainSpec::foundation(); - let slashable_vote_first = create_slashable_vote_data(1, 1, &spec); - let slashable_vote_second = create_slashable_vote_data(2, 1, &spec); - - assert_eq!( - slashable_vote_first.is_double_vote(&slashable_vote_second, &spec), - false - ); - } - - #[test] - pub fn test_is_surround_vote_true() { - let spec = ChainSpec::foundation(); - let slashable_vote_first = create_slashable_vote_data(2, 1, &spec); - let slashable_vote_second = create_slashable_vote_data(1, 2, &spec); - - assert_eq!( - slashable_vote_first.is_surround_vote(&slashable_vote_second, &spec), - true - ); - } - - #[test] - pub fn test_is_surround_vote_true_realistic() { - let spec = ChainSpec::foundation(); - let slashable_vote_first = create_slashable_vote_data(4, 1, &spec); - let slashable_vote_second = create_slashable_vote_data(3, 2, &spec); - - assert_eq!( - slashable_vote_first.is_surround_vote(&slashable_vote_second, &spec), - true - ); - } - - #[test] - pub fn test_is_surround_vote_false_source_epoch_fails() { - let spec = ChainSpec::foundation(); - let slashable_vote_first = create_slashable_vote_data(2, 2, &spec); - let slashable_vote_second = create_slashable_vote_data(1, 1, &spec); - - assert_eq!( - slashable_vote_first.is_surround_vote(&slashable_vote_second, &spec), - false - ); - } - - #[test] - pub fn test_is_surround_vote_false_target_epoch_fails() { - let spec = ChainSpec::foundation(); - let slashable_vote_first = create_slashable_vote_data(1, 1, &spec); - let slashable_vote_second = create_slashable_vote_data(2, 2, &spec); - - assert_eq!( - slashable_vote_first.is_surround_vote(&slashable_vote_second, &spec), - false - ); - } - - #[test] - pub fn test_ssz_round_trip() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = SlashableVoteData::random_for_test(&mut rng); - - let bytes = ssz_encode(&original); - let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); - - assert_eq!(original, decoded); - } - - #[test] - pub fn test_hash_tree_root_internal() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = SlashableVoteData::random_for_test(&mut rng); - - let result = original.hash_tree_root_internal(); - - assert_eq!(result.len(), 32); - // TODO: Add further tests - // https://github.com/sigp/lighthouse/issues/170 - } - - fn create_slashable_vote_data( - slot_factor: u64, - justified_epoch: u64, - spec: &ChainSpec, - ) -> SlashableVoteData { - let mut rng = XorShiftRng::from_seed([42; 16]); - let mut slashable_vote = SlashableVoteData::random_for_test(&mut rng); - - slashable_vote.data.slot = Slot::new(slot_factor * spec.epoch_length); - slashable_vote.data.justified_epoch = Epoch::new(justified_epoch); - slashable_vote - } -} diff --git a/eth2/types/src/validator_registry_delta_block.rs b/eth2/types/src/validator_registry_delta_block.rs deleted file mode 100644 index 0746875f0..000000000 --- a/eth2/types/src/validator_registry_delta_block.rs +++ /dev/null @@ -1,59 +0,0 @@ -use crate::{test_utils::TestRandom, Hash256, Slot}; -use bls::PublicKey; -use rand::RngCore; -use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; -use test_random_derive::TestRandom; - -// The information gathered from the PoW chain validator registration function. -#[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TreeHash, TestRandom)] -pub struct ValidatorRegistryDeltaBlock { - pub latest_registry_delta_root: Hash256, - pub validator_index: u32, - pub pubkey: PublicKey, - pub slot: Slot, - pub flag: u64, -} - -impl Default for ValidatorRegistryDeltaBlock { - /// Yields a "default" `Validator`. Primarily used for testing. - fn default() -> Self { - Self { - latest_registry_delta_root: Hash256::zero(), - validator_index: std::u32::MAX, - pubkey: PublicKey::default(), - slot: Slot::from(std::u64::MAX), - flag: std::u64::MAX, - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use ssz::{ssz_encode, Decodable, TreeHash}; - - #[test] - pub fn test_ssz_round_trip() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = ValidatorRegistryDeltaBlock::random_for_test(&mut rng); - - let bytes = ssz_encode(&original); - let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); - - assert_eq!(original, decoded); - } - - #[test] - pub fn test_hash_tree_root_internal() { - let mut rng = XorShiftRng::from_seed([42; 16]); - let original = ValidatorRegistryDeltaBlock::random_for_test(&mut rng); - - let result = original.hash_tree_root_internal(); - - assert_eq!(result.len(), 32); - // TODO: Add further tests - // https://github.com/sigp/lighthouse/issues/170 - } -} From a1af65ce1a75c03c6c9fead20be88bd729cb74e1 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 4 Mar 2019 17:48:19 +1100 Subject: [PATCH 05/31] Update ChainSpec to v0.4.0 --- .../src/attestation_data_and_custody_bit.rs | 3 +- eth2/types/src/beacon_block.rs | 2 +- eth2/types/src/beacon_state.rs | 20 +++-- eth2/types/src/chain_spec.rs | 73 ++++++++++--------- eth2/types/src/test_utils/mod.rs | 6 ++ eth2/types/src/validator.rs | 15 ++-- 6 files changed, 62 insertions(+), 57 deletions(-) diff --git a/eth2/types/src/attestation_data_and_custody_bit.rs b/eth2/types/src/attestation_data_and_custody_bit.rs index 2f652609e..83018c194 100644 --- a/eth2/types/src/attestation_data_and_custody_bit.rs +++ b/eth2/types/src/attestation_data_and_custody_bit.rs @@ -17,8 +17,7 @@ impl TestRandom for AttestationDataAndCustodyBit { fn random_for_test(rng: &mut T) -> Self { Self { data: <_>::random_for_test(rng), - // TODO: deal with bools - custody_bit: false, + custody_bit: <_>::random_for_test(rng), } } } diff --git a/eth2/types/src/beacon_block.rs b/eth2/types/src/beacon_block.rs index 53b0dac80..d8e50d9ca 100644 --- a/eth2/types/src/beacon_block.rs +++ b/eth2/types/src/beacon_block.rs @@ -1,5 +1,5 @@ use crate::test_utils::TestRandom; -use crate::{BeaconBlockBody, ChainSpec, Eth1Data, Hash256, ProposalSignedData, Slot}; +use crate::{BeaconBlockBody, ChainSpec, Eth1Data, Hash256, Slot}; use bls::Signature; use rand::RngCore; use serde_derive::Serialize; diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index c96beff52..b420f51d5 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -772,7 +772,7 @@ impl BeaconState { /// Update validator registry, activating/exiting validators if possible. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn update_validator_registry(&mut self, spec: &ChainSpec) { let current_epoch = self.current_epoch(spec); let active_validator_indices = @@ -788,8 +788,8 @@ impl BeaconState { for index in 0..self.validator_registry.len() { let validator = &self.validator_registry[index]; - if (validator.activation_epoch > self.get_entry_exit_effect_epoch(current_epoch, spec)) - && self.validator_balances[index] >= spec.max_deposit_amount + if (validator.activation_epoch == spec.far_future_epoch) + & (self.validator_balances[index] == spec.max_deposit_amount) { balance_churn += self.get_effective_balance(index, spec); if balance_churn > max_balance_churn { @@ -803,9 +803,7 @@ impl BeaconState { for index in 0..self.validator_registry.len() { let validator = &self.validator_registry[index]; - if (validator.exit_epoch > self.get_entry_exit_effect_epoch(current_epoch, spec)) - && validator.status_flags == Some(StatusFlags::InitiatedExit) - { + if (validator.exit_epoch == spec.far_future_epoch) & (validator.initiated_exit) { balance_churn += self.get_effective_balance(index, spec); if balance_churn > max_balance_churn { break; @@ -958,10 +956,9 @@ impl BeaconState { /// Initiate an exit for the validator of the given `index`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn initiate_validator_exit(&mut self, validator_index: usize) { - // TODO: the spec does an `|=` here, ensure this isn't buggy. - self.validator_registry[validator_index].status_flags = Some(StatusFlags::InitiatedExit); + self.validator_registry[validator_index].initiated_exit = true; } /// Exit the validator of the given `index`. @@ -1019,9 +1016,10 @@ impl BeaconState { /// Initiate an exit for the validator of the given `index`. /// /// Spec v0.2.0 - pub fn prepare_validator_for_withdrawal(&mut self, validator_index: usize) { + pub fn prepare_validator_for_withdrawal(&mut self, validator_index: usize, spec: &ChainSpec) { //TODO: we're not ANDing here, we're setting. Potentially wrong. - self.validator_registry[validator_index].status_flags = Some(StatusFlags::Withdrawable); + self.validator_registry[validator_index].withdrawable_epoch = + self.current_epoch(spec) + spec.min_validator_withdrawability_delay; } /// Iterate through the validator registry and eject active validators with balance below diff --git a/eth2/types/src/chain_spec.rs b/eth2/types/src/chain_spec.rs index 706ad417a..ac5d0a815 100644 --- a/eth2/types/src/chain_spec.rs +++ b/eth2/types/src/chain_spec.rs @@ -5,7 +5,7 @@ const GWEI: u64 = 1_000_000_000; /// Holds all the "constants" for a BeaconChain. /// -/// Spec v0.2.0 +/// Spec v0.4.0 #[derive(PartialEq, Debug, Clone)] pub struct ChainSpec { /* @@ -16,7 +16,7 @@ pub struct ChainSpec { pub max_balance_churn_quotient: u64, pub beacon_chain_shard_number: u64, pub max_indices_per_slashable_vote: u64, - pub max_withdrawals_per_epoch: u64, + pub max_exit_dequeues_per_epoch: u64, pub shuffle_round_count: u8, /* @@ -48,13 +48,13 @@ pub struct ChainSpec { /* * Time parameters */ - pub slot_duration: u64, + pub seconds_per_slot: u64, pub min_attestation_inclusion_delay: u64, - pub epoch_length: u64, - pub seed_lookahead: Epoch, - pub entry_exit_delay: u64, - pub eth1_data_voting_period: u64, - pub min_validator_withdrawal_epochs: Epoch, + pub slots_per_epoch: u64, + pub min_seed_lookahead: Epoch, + pub activation_exit_delay: u64, + pub epochs_per_eth1_voting_period: u64, + pub min_validator_withdrawability_delay: Epoch, /* * State list lengths @@ -62,15 +62,16 @@ pub struct ChainSpec { pub latest_block_roots_length: usize, pub latest_randao_mixes_length: usize, pub latest_index_roots_length: usize, - pub latest_penalized_exit_length: usize, + pub latest_slashed_exit_length: usize, /* * Reward and penalty quotients */ pub base_reward_quotient: u64, pub whistleblower_reward_quotient: u64, - pub includer_reward_quotient: u64, + pub attestation_inclusion_reward_quotient: u64, pub inactivity_penalty_quotient: u64, + pub min_penalty_quotient: u64, /* * Max operations per block @@ -79,7 +80,8 @@ pub struct ChainSpec { pub max_attester_slashings: u64, pub max_attestations: u64, pub max_deposits: u64, - pub max_exits: u64, + pub max_voluntary_exits: u64, + pub max_transfers: u64, /* * Signature domains @@ -89,19 +91,17 @@ pub struct ChainSpec { pub domain_proposal: u64, pub domain_exit: u64, pub domain_randao: u64, + pub domain_transfer: u64, } impl ChainSpec { - /// Returns a `ChainSpec` compatible with the specification from Ethereum Foundation. + /// Returns a `ChainSpec` compatible with the Ethereum Foundation specification. /// - /// Of course, the actual foundation specs are unknown at this point so these are just a rough - /// estimate. - /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn foundation() -> Self { - let genesis_slot = Slot::new(2_u64.pow(19)); - let epoch_length = 64; - let genesis_epoch = genesis_slot.epoch(epoch_length); + let genesis_slot = Slot::new(2_u64.pow(32)); + let slots_per_epoch = 64; + let genesis_epoch = genesis_slot.epoch(slots_per_epoch); Self { /* @@ -112,7 +112,7 @@ impl ChainSpec { max_balance_churn_quotient: 32, beacon_chain_shard_number: u64::max_value(), max_indices_per_slashable_vote: 4_096, - max_withdrawals_per_epoch: 4, + max_exit_dequeues_per_epoch: 4, shuffle_round_count: 90, /* @@ -133,7 +133,7 @@ impl ChainSpec { * Initial Values */ genesis_fork_version: 0, - genesis_slot: Slot::new(2_u64.pow(19)), + genesis_slot, genesis_epoch, genesis_start_shard: 0, far_future_epoch: Epoch::new(u64::max_value()), @@ -144,13 +144,13 @@ impl ChainSpec { /* * Time parameters */ - slot_duration: 6, + seconds_per_slot: 6, min_attestation_inclusion_delay: 4, - epoch_length, - seed_lookahead: Epoch::new(1), - entry_exit_delay: 4, - eth1_data_voting_period: 16, - min_validator_withdrawal_epochs: Epoch::new(256), + slots_per_epoch, + min_seed_lookahead: Epoch::new(1), + activation_exit_delay: 4, + epochs_per_eth1_voting_period: 16, + min_validator_withdrawability_delay: Epoch::new(256), /* * State list lengths @@ -158,15 +158,16 @@ impl ChainSpec { latest_block_roots_length: 8_192, latest_randao_mixes_length: 8_192, latest_index_roots_length: 8_192, - latest_penalized_exit_length: 8_192, + latest_slashed_exit_length: 8_192, /* * Reward and penalty quotients */ base_reward_quotient: 32, whistleblower_reward_quotient: 512, - includer_reward_quotient: 8, + attestation_inclusion_reward_quotient: 8, inactivity_penalty_quotient: 16_777_216, + min_penalty_quotient: 32, /* * Max operations per block @@ -175,7 +176,8 @@ impl ChainSpec { max_attester_slashings: 1, max_attestations: 128, max_deposits: 16, - max_exits: 16, + max_voluntary_exits: 16, + max_transfers: 16, /* * Signature domains @@ -185,6 +187,7 @@ impl ChainSpec { domain_proposal: 2, domain_exit: 3, domain_randao: 4, + domain_transfer: 5, } } } @@ -192,18 +195,18 @@ impl ChainSpec { impl ChainSpec { /// Returns a `ChainSpec` compatible with the specification suitable for 8 validators. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn few_validators() -> Self { - let genesis_slot = Slot::new(2_u64.pow(19)); - let epoch_length = 8; - let genesis_epoch = genesis_slot.epoch(epoch_length); + let genesis_slot = Slot::new(2_u64.pow(32)); + let slots_per_epoch = 8; + let genesis_epoch = genesis_slot.epoch(slots_per_epoch); Self { shard_count: 8, target_committee_size: 1, genesis_slot, genesis_epoch, - epoch_length, + slots_per_epoch, ..ChainSpec::foundation() } } diff --git a/eth2/types/src/test_utils/mod.rs b/eth2/types/src/test_utils/mod.rs index eb54f2a53..82e060fca 100644 --- a/eth2/types/src/test_utils/mod.rs +++ b/eth2/types/src/test_utils/mod.rs @@ -17,6 +17,12 @@ where fn random_for_test(rng: &mut T) -> Self; } +impl TestRandom for bool { + fn random_for_test(rng: &mut T) -> Self { + (rng.next_u32() % 2) == 1 + } +} + impl TestRandom for u64 { fn random_for_test(rng: &mut T) -> Self { rng.next_u64() diff --git a/eth2/types/src/validator.rs b/eth2/types/src/validator.rs index 5b5dab6bf..43701ca05 100644 --- a/eth2/types/src/validator.rs +++ b/eth2/types/src/validator.rs @@ -1,20 +1,19 @@ use crate::{test_utils::TestRandom, Epoch, Hash256, PublicKey}; use rand::RngCore; use serde_derive::Serialize; -use ssz::{hash, Decodable, DecodeError, Encodable, SszStream, TreeHash}; use ssz_derive::{Decode, Encode, TreeHash}; use test_random_derive::TestRandom; /// Information about a `BeaconChain` validator. /// /// Spec v0.4.0 -#[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TestRandom)] +#[derive(Debug, Clone, PartialEq, Serialize, Encode, Decode, TestRandom, TreeHash)] pub struct Validator { pub pubkey: PublicKey, pub withdrawal_credentials: Hash256, pub activation_epoch: Epoch, pub exit_epoch: Epoch, - pub withdrawal_epoch: Epoch, + pub withdrawable_epoch: Epoch, pub initiated_exit: bool, pub slashed: bool, } @@ -32,7 +31,7 @@ impl Validator { /// Returns `true` if the validator is able to withdraw at some epoch. pub fn is_withdrawable_at(&self, epoch: Epoch) -> bool { - self.withdrawal_epoch <= epoch + self.withdrawable_epoch <= epoch } } @@ -44,9 +43,9 @@ impl Default for Validator { withdrawal_credentials: Hash256::default(), activation_epoch: Epoch::from(std::u64::MAX), exit_epoch: Epoch::from(std::u64::MAX), - withdrawal_epoch: Epoch::from(std::u64::MAX), - penalized_epoch: Epoch::from(std::u64::MAX), - status_flags: None, + withdrawable_epoch: Epoch::from(std::u64::MAX), + initiated_exit: false, + slashed: false, } } } @@ -55,7 +54,7 @@ impl Default for Validator { mod tests { use super::*; use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use ssz::ssz_encode; + use ssz::{ssz_encode, Decodable, TreeHash}; #[test] pub fn test_ssz_round_trip() { From 663d39739f735a03a497832d4ea890f153e47416 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 4 Mar 2019 17:51:54 +1100 Subject: [PATCH 06/31] Do project-wide s/epoch_length/slots_per_epoch/g --- beacon_node/beacon_chain/src/beacon_chain.rs | 4 +-- .../beacon_chain/test_harness/README.md | 2 +- .../test_harness/benches/state_transition.rs | 8 ++--- .../specs/validator_registry.yaml | 2 +- .../test_harness/src/beacon_chain_harness.rs | 8 ++--- .../test_harness/src/test_case/config.rs | 4 +-- .../test_harness/src/test_case/mod.rs | 8 ++--- .../test_harness/src/test_case/state_check.rs | 4 +-- .../beacon_chain/test_harness/tests/chain.rs | 2 +- eth2/attester/src/lib.rs | 6 ++-- eth2/attester/src/test_utils/epoch_map.rs | 10 +++---- eth2/block_proposer/src/lib.rs | 8 ++--- .../src/test_utils/epoch_map.rs | 8 ++--- eth2/fork_choice/src/bitwise_lmd_ghost.rs | 2 +- eth2/fork_choice/src/slow_lmd_ghost.rs | 2 +- .../state_processing/src/block_processable.rs | 14 ++++----- .../state_processing/src/epoch_processable.rs | 16 +++++----- eth2/state_processing/src/slot_processable.rs | 2 +- eth2/types/src/beacon_state.rs | 26 ++++++++-------- eth2/types/src/beacon_state/builder.rs | 19 ++++++------ eth2/types/src/beacon_state/epoch_cache.rs | 6 ++-- eth2/types/src/beacon_state/tests.rs | 4 +-- eth2/types/src/proposer_slashing/builder.rs | 4 +-- eth2/types/src/slashable_attestation.rs | 8 ++--- eth2/types/src/slot_epoch.rs | 30 +++++++++---------- eth2/types/src/slot_height.rs | 4 +-- validator_client/src/duties/epoch_duties.rs | 8 ++--- validator_client/src/duties/mod.rs | 4 +-- validator_client/src/main.rs | 2 +- 29 files changed, 113 insertions(+), 112 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index e6fd2a134..e33912f7a 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -312,7 +312,7 @@ where .state .read() .get_block_root( - justified_epoch.start_slot(self.spec.epoch_length), + justified_epoch.start_slot(self.spec.slots_per_epoch), &self.spec, ) .ok_or_else(|| Error::BadRecentBlockRoots)?; @@ -333,7 +333,7 @@ where epoch_boundary_root, shard_block_root: Hash256::zero(), latest_crosslink: Crosslink { - epoch: self.state.read().slot.epoch(self.spec.epoch_length), + epoch: self.state.read().slot.epoch(self.spec.slots_per_epoch), shard_block_root: Hash256::zero(), }, justified_epoch, diff --git a/beacon_node/beacon_chain/test_harness/README.md b/beacon_node/beacon_chain/test_harness/README.md index 12cbbe062..9dfd90d60 100644 --- a/beacon_node/beacon_chain/test_harness/README.md +++ b/beacon_node/beacon_chain/test_harness/README.md @@ -27,7 +27,7 @@ fork: tchaikovsky version: 1.0 test_cases: - config: - epoch_length: 64 + slots_per_epoch: 64 deposits_for_chain_start: 1000 num_slots: 64 skip_slots: [2, 3] diff --git a/beacon_node/beacon_chain/test_harness/benches/state_transition.rs b/beacon_node/beacon_chain/test_harness/benches/state_transition.rs index aa2a858fa..7d1c44653 100644 --- a/beacon_node/beacon_chain/test_harness/benches/state_transition.rs +++ b/beacon_node/beacon_chain/test_harness/benches/state_transition.rs @@ -11,7 +11,7 @@ fn mid_epoch_state_transition(c: &mut Criterion) { let validator_count = 1000; let mut rig = BeaconChainHarness::new(ChainSpec::foundation(), validator_count); - let epoch_depth = (rig.spec.epoch_length * 2) + (rig.spec.epoch_length / 2); + let epoch_depth = (rig.spec.slots_per_epoch * 2) + (rig.spec.slots_per_epoch / 2); for _ in 0..epoch_depth { rig.advance_chain_with_block(); @@ -19,7 +19,7 @@ fn mid_epoch_state_transition(c: &mut Criterion) { let state = rig.beacon_chain.state.read().clone(); - assert!((state.slot + 1) % rig.spec.epoch_length != 0); + assert!((state.slot + 1) % rig.spec.slots_per_epoch != 0); c.bench_function("mid-epoch state transition 10k validators", move |b| { let state = state.clone(); @@ -36,7 +36,7 @@ fn epoch_boundary_state_transition(c: &mut Criterion) { let validator_count = 10000; let mut rig = BeaconChainHarness::new(ChainSpec::foundation(), validator_count); - let epoch_depth = rig.spec.epoch_length * 2; + let epoch_depth = rig.spec.slots_per_epoch * 2; for _ in 0..(epoch_depth - 1) { rig.advance_chain_with_block(); @@ -44,7 +44,7 @@ fn epoch_boundary_state_transition(c: &mut Criterion) { let state = rig.beacon_chain.state.read().clone(); - assert_eq!((state.slot + 1) % rig.spec.epoch_length, 0); + assert_eq!((state.slot + 1) % rig.spec.slots_per_epoch, 0); c.bench( "routines", diff --git a/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml b/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml index b7fdda9bf..56dd66558 100644 --- a/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml +++ b/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml @@ -5,7 +5,7 @@ fork: tchaikovsky version: 1.0 test_cases: - config: - epoch_length: 64 + slots_per_epoch: 64 deposits_for_chain_start: 1000 num_slots: 64 skip_slots: [2, 3] diff --git a/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs b/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs index 2f375f7fa..ed5fddabf 100644 --- a/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs +++ b/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs @@ -125,13 +125,13 @@ impl BeaconChainHarness { let nth_slot = slot - slot - .epoch(self.spec.epoch_length) - .start_slot(self.spec.epoch_length); - let nth_epoch = slot.epoch(self.spec.epoch_length) - self.spec.genesis_epoch; + .epoch(self.spec.slots_per_epoch) + .start_slot(self.spec.slots_per_epoch); + let nth_epoch = slot.epoch(self.spec.slots_per_epoch) - self.spec.genesis_epoch; debug!( "Advancing BeaconChain to slot {}, epoch {} (epoch height: {}, slot {} in epoch.).", slot, - slot.epoch(self.spec.epoch_length), + slot.epoch(self.spec.slots_per_epoch), nth_epoch, nth_slot ); diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/config.rs b/beacon_node/beacon_chain/test_harness/src/test_case/config.rs index 8c88ee5d1..440c76cd2 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/config.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/config.rs @@ -13,7 +13,7 @@ pub struct Config { /// Initial validators. pub deposits_for_chain_start: usize, /// Number of slots in an epoch. - pub epoch_length: Option, + pub slots_per_epoch: Option, /// Number of slots to build before ending execution. pub num_slots: u64, /// Number of slots that should be skipped due to inactive validator. @@ -34,7 +34,7 @@ impl Config { Self { deposits_for_chain_start: as_usize(&yaml, "deposits_for_chain_start") .expect("Must specify validator count"), - epoch_length: as_u64(&yaml, "epoch_length"), + slots_per_epoch: as_u64(&yaml, "slots_per_epoch"), num_slots: as_u64(&yaml, "num_slots").expect("Must specify `config.num_slots`"), skip_slots: as_vec_u64(yaml, "skip_slots"), deposits: parse_deposits(&yaml), diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/mod.rs b/beacon_node/beacon_chain/test_harness/src/test_case/mod.rs index f6d8d42e8..ae438a5d5 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/mod.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/mod.rs @@ -54,12 +54,12 @@ impl TestCase { /// Return a `ChainSpec::foundation()`. /// - /// If specified in `config`, returns it with a modified `epoch_length`. + /// If specified in `config`, returns it with a modified `slots_per_epoch`. fn spec(&self) -> ChainSpec { let mut spec = ChainSpec::foundation(); - if let Some(n) = self.config.epoch_length { - spec.epoch_length = n; + if let Some(n) = self.config.slots_per_epoch { + spec.slots_per_epoch = n; } spec @@ -174,7 +174,7 @@ impl TestCase { for state_check in state_checks { let adjusted_state_slot = - state.slot - spec.genesis_epoch.start_slot(spec.epoch_length); + state.slot - spec.genesis_epoch.start_slot(spec.slots_per_epoch); if state_check.slot == adjusted_state_slot { state_check.assert_valid(state, spec); diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs b/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs index 90c622894..3126dcfea 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs @@ -36,13 +36,13 @@ impl StateCheck { /// /// Panics with an error message if any test fails. pub fn assert_valid(&self, state: &BeaconState, spec: &ChainSpec) { - let state_epoch = state.slot.epoch(spec.epoch_length); + let state_epoch = state.slot.epoch(spec.slots_per_epoch); info!("Running state check for slot height {}.", self.slot); assert_eq!( self.slot, - state.slot - spec.genesis_epoch.start_slot(spec.epoch_length), + state.slot - spec.genesis_epoch.start_slot(spec.slots_per_epoch), "State slot is invalid." ); diff --git a/beacon_node/beacon_chain/test_harness/tests/chain.rs b/beacon_node/beacon_chain/test_harness/tests/chain.rs index 238e567ad..e72c3a5aa 100644 --- a/beacon_node/beacon_chain/test_harness/tests/chain.rs +++ b/beacon_node/beacon_chain/test_harness/tests/chain.rs @@ -29,7 +29,7 @@ fn it_can_produce_past_first_epoch_boundary() { debug!("Harness built, tests starting.."); - let blocks = harness.spec.epoch_length * 2 + 1; + let blocks = harness.spec.slots_per_epoch * 2 + 1; for i in 0..blocks { harness.advance_chain_with_block(); diff --git a/eth2/attester/src/lib.rs b/eth2/attester/src/lib.rs index 13a1d72bb..5bffd0c50 100644 --- a/eth2/attester/src/lib.rs +++ b/eth2/attester/src/lib.rs @@ -195,9 +195,9 @@ mod tests { let beacon_node = Arc::new(SimulatedBeaconNode::default()); let signer = Arc::new(LocalSigner::new(Keypair::random())); - let mut duties = EpochMap::new(spec.epoch_length); + let mut duties = EpochMap::new(spec.slots_per_epoch); let attest_slot = Slot::new(100); - let attest_epoch = attest_slot / spec.epoch_length; + let attest_epoch = attest_slot / spec.slots_per_epoch; let attest_shard = 12; duties.insert_attestation_shard(attest_slot, attest_shard); duties.set_validator_index(Some(2)); @@ -243,7 +243,7 @@ mod tests { ); // In an epoch without known duties... - let slot = (attest_epoch + 1) * spec.epoch_length; + let slot = (attest_epoch + 1) * spec.slots_per_epoch; slot_clock.set_slot(slot.into()); assert_eq!( attester.poll(), diff --git a/eth2/attester/src/test_utils/epoch_map.rs b/eth2/attester/src/test_utils/epoch_map.rs index f0dc4312e..0b5827d64 100644 --- a/eth2/attester/src/test_utils/epoch_map.rs +++ b/eth2/attester/src/test_utils/epoch_map.rs @@ -3,22 +3,22 @@ use std::collections::HashMap; use types::{Epoch, Slot}; pub struct EpochMap { - epoch_length: u64, + slots_per_epoch: u64, validator_index: Option, map: HashMap, } impl EpochMap { - pub fn new(epoch_length: u64) -> Self { + pub fn new(slots_per_epoch: u64) -> Self { Self { - epoch_length, + slots_per_epoch, validator_index: None, map: HashMap::new(), } } pub fn insert_attestation_shard(&mut self, slot: Slot, shard: u64) { - let epoch = slot.epoch(self.epoch_length); + let epoch = slot.epoch(self.slots_per_epoch); self.map.insert(epoch, (slot, shard)); } @@ -29,7 +29,7 @@ impl EpochMap { impl DutiesReader for EpochMap { fn attestation_shard(&self, slot: Slot) -> Result, DutiesReaderError> { - let epoch = slot.epoch(self.epoch_length); + let epoch = slot.epoch(self.slots_per_epoch); match self.map.get(&epoch) { Some((attest_slot, attest_shard)) if *attest_slot == slot => Ok(Some(*attest_shard)), diff --git a/eth2/block_proposer/src/lib.rs b/eth2/block_proposer/src/lib.rs index 0e66bdc70..cea855627 100644 --- a/eth2/block_proposer/src/lib.rs +++ b/eth2/block_proposer/src/lib.rs @@ -132,7 +132,7 @@ impl BlockProducer Result { let randao_reveal = { // TODO: add domain, etc to this message. Also ensure result matches `into_to_bytes32`. - let message = int_to_bytes32(slot.epoch(self.spec.epoch_length).as_u64()); + let message = int_to_bytes32(slot.epoch(self.spec.slots_per_epoch).as_u64()); match self .signer @@ -233,9 +233,9 @@ mod tests { let beacon_node = Arc::new(SimulatedBeaconNode::default()); let signer = Arc::new(LocalSigner::new(Keypair::random())); - let mut epoch_map = EpochMap::new(spec.epoch_length); + let mut epoch_map = EpochMap::new(spec.slots_per_epoch); let produce_slot = Slot::new(100); - let produce_epoch = produce_slot.epoch(spec.epoch_length); + let produce_epoch = produce_slot.epoch(spec.slots_per_epoch); epoch_map.map.insert(produce_epoch, produce_slot); let epoch_map = Arc::new(epoch_map); @@ -280,7 +280,7 @@ mod tests { ); // In an epoch without known duties... - let slot = (produce_epoch.as_u64() + 1) * spec.epoch_length; + let slot = (produce_epoch.as_u64() + 1) * spec.slots_per_epoch; slot_clock.set_slot(slot); assert_eq!( block_proposer.poll(), diff --git a/eth2/block_proposer/src/test_utils/epoch_map.rs b/eth2/block_proposer/src/test_utils/epoch_map.rs index e9ed9b68a..f7d8dcdcb 100644 --- a/eth2/block_proposer/src/test_utils/epoch_map.rs +++ b/eth2/block_proposer/src/test_utils/epoch_map.rs @@ -3,14 +3,14 @@ use std::collections::HashMap; use types::{Epoch, Slot}; pub struct EpochMap { - epoch_length: u64, + slots_per_epoch: u64, pub map: HashMap, } impl EpochMap { - pub fn new(epoch_length: u64) -> Self { + pub fn new(slots_per_epoch: u64) -> Self { Self { - epoch_length, + slots_per_epoch, map: HashMap::new(), } } @@ -18,7 +18,7 @@ impl EpochMap { impl DutiesReader for EpochMap { fn is_block_production_slot(&self, slot: Slot) -> Result { - let epoch = slot.epoch(self.epoch_length); + let epoch = slot.epoch(self.slots_per_epoch); match self.map.get(&epoch) { Some(s) if *s == slot => Ok(true), Some(s) if *s != slot => Ok(false), diff --git a/eth2/fork_choice/src/bitwise_lmd_ghost.rs b/eth2/fork_choice/src/bitwise_lmd_ghost.rs index 60aa38fe7..c13aacbf4 100644 --- a/eth2/fork_choice/src/bitwise_lmd_ghost.rs +++ b/eth2/fork_choice/src/bitwise_lmd_ghost.rs @@ -95,7 +95,7 @@ where let active_validator_indices = get_active_validator_indices( ¤t_state.validator_registry[..], - block_slot.epoch(spec.epoch_length), + block_slot.epoch(spec.slots_per_epoch), ); for index in active_validator_indices { diff --git a/eth2/fork_choice/src/slow_lmd_ghost.rs b/eth2/fork_choice/src/slow_lmd_ghost.rs index 3aafb3924..ab4cd2ada 100644 --- a/eth2/fork_choice/src/slow_lmd_ghost.rs +++ b/eth2/fork_choice/src/slow_lmd_ghost.rs @@ -64,7 +64,7 @@ where let active_validator_indices = get_active_validator_indices( ¤t_state.validator_registry[..], - block_slot.epoch(spec.epoch_length), + block_slot.epoch(spec.slots_per_epoch), ); for index in active_validator_indices { diff --git a/eth2/state_processing/src/block_processable.rs b/eth2/state_processing/src/block_processable.rs index 32327aad3..ee8bc7c33 100644 --- a/eth2/state_processing/src/block_processable.rs +++ b/eth2/state_processing/src/block_processable.rs @@ -185,7 +185,7 @@ fn per_block_processing_signature_optional( proposer_slashing .proposal_data_1 .slot - .epoch(spec.epoch_length), + .epoch(spec.slots_per_epoch), spec.domain_proposal ) ), @@ -201,7 +201,7 @@ fn per_block_processing_signature_optional( proposer_slashing .proposal_data_2 .slot - .epoch(spec.epoch_length), + .epoch(spec.slots_per_epoch), spec.domain_proposal ) ), @@ -341,14 +341,14 @@ fn validate_attestation_signature_optional( ) -> Result<(), AttestationValidationError> { trace!( "validate_attestation_signature_optional: attestation epoch: {}", - attestation.data.slot.epoch(spec.epoch_length) + attestation.data.slot.epoch(spec.slots_per_epoch) ); ensure!( attestation.data.slot + spec.min_attestation_inclusion_delay <= state.slot, AttestationValidationError::IncludedTooEarly ); ensure!( - attestation.data.slot + spec.epoch_length >= state.slot, + attestation.data.slot + spec.slots_per_epoch >= state.slot, AttestationValidationError::IncludedTooLate ); if attestation.data.slot >= state.current_epoch_start_slot(spec) { @@ -369,7 +369,7 @@ fn validate_attestation_signature_optional( attestation .data .justified_epoch - .start_slot(spec.epoch_length), + .start_slot(spec.slots_per_epoch), &spec ) .ok_or(AttestationValidationError::NoBlockRoot)?, @@ -377,7 +377,7 @@ fn validate_attestation_signature_optional( ); let potential_crosslink = Crosslink { shard_block_root: attestation.data.shard_block_root, - epoch: attestation.data.slot.epoch(spec.epoch_length), + epoch: attestation.data.slot.epoch(spec.slots_per_epoch), }; ensure!( (attestation.data.latest_crosslink @@ -407,7 +407,7 @@ fn validate_attestation_signature_optional( PHASE_0_CUSTODY_BIT, get_domain( &state.fork, - attestation.data.slot.epoch(spec.epoch_length), + attestation.data.slot.epoch(spec.slots_per_epoch), spec.domain_attestation, ) ), diff --git a/eth2/state_processing/src/epoch_processable.rs b/eth2/state_processing/src/epoch_processable.rs index 0ecd1bbd1..47336d3f8 100644 --- a/eth2/state_processing/src/epoch_processable.rs +++ b/eth2/state_processing/src/epoch_processable.rs @@ -76,7 +76,7 @@ impl EpochProcessable for BeaconState { */ let active_validator_indices = get_active_validator_indices( &self.validator_registry, - self.slot.epoch(spec.epoch_length), + self.slot.epoch(spec.slots_per_epoch), ); let current_total_balance = self.get_total_balance(&active_validator_indices[..], spec); @@ -90,7 +90,7 @@ impl EpochProcessable for BeaconState { .latest_attestations .par_iter() .filter(|a| { - (a.data.slot / spec.epoch_length).epoch(spec.epoch_length) + (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) == self.current_epoch(spec) }) .collect(); @@ -137,7 +137,7 @@ impl EpochProcessable for BeaconState { .par_iter() .filter(|a| { //TODO: ensure these saturating subs are correct. - (a.data.slot / spec.epoch_length).epoch(spec.epoch_length) + (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) == self.previous_epoch(spec) }) .collect(); @@ -320,12 +320,12 @@ impl EpochProcessable for BeaconState { let mut winning_root_for_shards: HashMap> = HashMap::new(); - // for slot in self.slot.saturating_sub(2 * spec.epoch_length)..self.slot { - for slot in self.previous_epoch(spec).slot_iter(spec.epoch_length) { + // for slot in self.slot.saturating_sub(2 * spec.slots_per_epoch)..self.slot { + for slot in self.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { trace!( "Finding winning root for slot: {} (epoch: {})", slot, - slot.epoch(spec.epoch_length) + slot.epoch(spec.slots_per_epoch) ); // Clone is used to remove the borrow. It becomes an issue later when trying to mutate @@ -506,7 +506,7 @@ impl EpochProcessable for BeaconState { /* * Crosslinks */ - for slot in self.previous_epoch(spec).slot_iter(spec.epoch_length) { + for slot in self.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { // Clone is used to remove the borrow. It becomes an issue later when trying to mutate // `self.balances`. let crosslink_committees_at_slot = @@ -615,7 +615,7 @@ impl EpochProcessable for BeaconState { self.latest_attestations = self .latest_attestations .iter() - .filter(|a| a.data.slot.epoch(spec.epoch_length) >= current_epoch) + .filter(|a| a.data.slot.epoch(spec.slots_per_epoch) >= current_epoch) .cloned() .collect(); diff --git a/eth2/state_processing/src/slot_processable.rs b/eth2/state_processing/src/slot_processable.rs index 6017f4c0a..8d6506c36 100644 --- a/eth2/state_processing/src/slot_processable.rs +++ b/eth2/state_processing/src/slot_processable.rs @@ -24,7 +24,7 @@ where previous_block_root: Hash256, spec: &ChainSpec, ) -> Result<(), Error> { - if (self.slot + 1) % spec.epoch_length == 0 { + if (self.slot + 1) % spec.slots_per_epoch == 0 { self.per_epoch_processing(spec)?; self.advance_caches(); } diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index b420f51d5..75beb79ca 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -337,7 +337,7 @@ impl BeaconState { /// /// Spec v0.2.0 pub fn current_epoch(&self, spec: &ChainSpec) -> Epoch { - self.slot.epoch(spec.epoch_length) + self.slot.epoch(spec.slots_per_epoch) } /// The epoch prior to `self.current_epoch()`. @@ -363,14 +363,14 @@ impl BeaconState { /// /// Spec v0.2.0 pub fn current_epoch_start_slot(&self, spec: &ChainSpec) -> Slot { - self.current_epoch(spec).start_slot(spec.epoch_length) + self.current_epoch(spec).start_slot(spec.slots_per_epoch) } /// The first slot of the epoch preceeding the one corresponding to `self.slot`. /// /// Spec v0.2.0 pub fn previous_epoch_start_slot(&self, spec: &ChainSpec) -> Slot { - self.previous_epoch(spec).start_slot(spec.epoch_length) + self.previous_epoch(spec).start_slot(spec.slots_per_epoch) } /// Return the number of committees in one epoch. @@ -386,10 +386,10 @@ impl BeaconState { std::cmp::max( 1, std::cmp::min( - spec.shard_count / spec.epoch_length, - active_validator_count as u64 / spec.epoch_length / spec.target_committee_size, + spec.shard_count / spec.slots_per_epoch, + active_validator_count as u64 / spec.slots_per_epoch / spec.target_committee_size, ), - ) * spec.epoch_length + ) * spec.slots_per_epoch } /// Shuffle ``validators`` into crosslink committees seeded by ``seed`` and ``epoch``. @@ -520,11 +520,11 @@ impl BeaconState { slot: Slot, spec: &ChainSpec, ) -> Result<&CrosslinkCommittees, Error> { - let epoch = slot.epoch(spec.epoch_length); + let epoch = slot.epoch(spec.slots_per_epoch); let relative_epoch = self.relative_epoch(epoch, spec)?; let cache = self.cache(relative_epoch)?; - let slot_offset = slot - epoch.start_slot(spec.epoch_length); + let slot_offset = slot - epoch.start_slot(spec.slots_per_epoch); Ok(&cache.committees[slot_offset.as_usize()]) } @@ -565,7 +565,7 @@ impl BeaconState { registry_change: bool, spec: &ChainSpec, ) -> Result<(u64, Hash256, Epoch, u64), Error> { - let epoch = slot.epoch(spec.epoch_length); + let epoch = slot.epoch(spec.slots_per_epoch); let current_epoch = self.current_epoch(spec); let previous_epoch = self.previous_epoch(spec); let next_epoch = self.next_epoch(spec); @@ -639,8 +639,8 @@ impl BeaconState { let (committees_per_epoch, _seed, _shuffling_epoch, shuffling_start_shard) = self.get_committee_params_at_slot(slot, registry_change, spec)?; - let offset = slot.as_u64() % spec.epoch_length; - let committees_per_slot = committees_per_epoch / spec.epoch_length; + let offset = slot.as_u64() % spec.slots_per_epoch; + let committees_per_slot = committees_per_epoch / spec.slots_per_epoch; let slot_start_shard = (shuffling_start_shard + committees_per_slot * offset) % spec.shard_count; @@ -835,7 +835,7 @@ impl BeaconState { proof_of_possession.verify( &proof_of_possession_data.hash_tree_root(), self.fork - .get_domain(self.slot.epoch(spec.epoch_length), spec.domain_deposit), + .get_domain(self.slot.epoch(spec.slots_per_epoch), spec.domain_deposit), &pubkey, ) } @@ -1296,7 +1296,7 @@ impl BeaconState { bitfield: &Bitfield, spec: &ChainSpec, ) -> Result, Error> { - let epoch = attestation_data.slot.epoch(spec.epoch_length); + let epoch = attestation_data.slot.epoch(spec.slots_per_epoch); let relative_epoch = self.relative_epoch(epoch, spec)?; let cache = self.cache(relative_epoch)?; diff --git a/eth2/types/src/beacon_state/builder.rs b/eth2/types/src/beacon_state/builder.rs index 02886a86e..4acd172f5 100644 --- a/eth2/types/src/beacon_state/builder.rs +++ b/eth2/types/src/beacon_state/builder.rs @@ -137,7 +137,7 @@ impl BeaconStateBuilder { pub fn teleport_to_end_of_epoch(&mut self, epoch: Epoch) { let state = self.state.as_mut().expect("Genesis required"); - let slot = epoch.end_slot(self.spec.epoch_length); + let slot = epoch.end_slot(self.spec.slots_per_epoch); state.slot = slot; state.validator_registry_update_epoch = epoch - 1; @@ -171,11 +171,11 @@ impl BeaconStateBuilder { let current_epoch = state.current_epoch(&self.spec); let previous_epoch = state.previous_epoch(&self.spec); let current_epoch_depth = - (state.slot - current_epoch.end_slot(self.spec.epoch_length)).as_usize(); + (state.slot - current_epoch.end_slot(self.spec.slots_per_epoch)).as_usize(); - let previous_epoch_slots = previous_epoch.slot_iter(self.spec.epoch_length); + let previous_epoch_slots = previous_epoch.slot_iter(self.spec.slots_per_epoch); let current_epoch_slots = current_epoch - .slot_iter(self.spec.epoch_length) + .slot_iter(self.spec.slots_per_epoch) .take(current_epoch_depth); for slot in previous_epoch_slots.chain(current_epoch_slots) { @@ -219,7 +219,8 @@ fn committee_to_pending_attestation( custody_bitfield.set(i, true); } - let is_previous_epoch = state.slot.epoch(spec.epoch_length) != slot.epoch(spec.epoch_length); + let is_previous_epoch = + state.slot.epoch(spec.slots_per_epoch) != slot.epoch(spec.slots_per_epoch); let justified_epoch = if is_previous_epoch { state.previous_justified_epoch @@ -229,16 +230,16 @@ fn committee_to_pending_attestation( let epoch_boundary_root = if is_previous_epoch { *state - .get_block_root(previous_epoch.start_slot(spec.epoch_length), spec) + .get_block_root(previous_epoch.start_slot(spec.slots_per_epoch), spec) .unwrap() } else { *state - .get_block_root(current_epoch.start_slot(spec.epoch_length), spec) + .get_block_root(current_epoch.start_slot(spec.slots_per_epoch), spec) .unwrap() }; let justified_block_root = *state - .get_block_root(justified_epoch.start_slot(spec.epoch_length), &spec) + .get_block_root(justified_epoch.start_slot(spec.slots_per_epoch), &spec) .unwrap(); PendingAttestation { @@ -250,7 +251,7 @@ fn committee_to_pending_attestation( epoch_boundary_root, shard_block_root: Hash256::zero(), latest_crosslink: Crosslink { - epoch: slot.epoch(spec.epoch_length), + epoch: slot.epoch(spec.slots_per_epoch), shard_block_root: Hash256::zero(), }, justified_epoch, diff --git a/eth2/types/src/beacon_state/epoch_cache.rs b/eth2/types/src/beacon_state/epoch_cache.rs index ee3a67813..bbc991646 100644 --- a/eth2/types/src/beacon_state/epoch_cache.rs +++ b/eth2/types/src/beacon_state/epoch_cache.rs @@ -32,14 +32,14 @@ impl EpochCache { spec: &ChainSpec, ) -> Result { let mut epoch_committees: Vec = - Vec::with_capacity(spec.epoch_length as usize); + Vec::with_capacity(spec.slots_per_epoch as usize); let mut attestation_duty_map: AttestationDutyMap = HashMap::new(); let mut shard_committee_index_map: ShardCommitteeIndexMap = HashMap::new(); let shuffling = - state.get_shuffling_for_slot(epoch.start_slot(spec.epoch_length), false, spec)?; + state.get_shuffling_for_slot(epoch.start_slot(spec.slots_per_epoch), false, spec)?; - for (epoch_committeess_index, slot) in epoch.slot_iter(spec.epoch_length).enumerate() { + for (epoch_committeess_index, slot) in epoch.slot_iter(spec.slots_per_epoch).enumerate() { let slot_committees = state.calculate_crosslink_committees_at_slot( slot, false, diff --git a/eth2/types/src/beacon_state/tests.rs b/eth2/types/src/beacon_state/tests.rs index bb8561511..40bfd146c 100644 --- a/eth2/types/src/beacon_state/tests.rs +++ b/eth2/types/src/beacon_state/tests.rs @@ -35,8 +35,8 @@ pub fn get_attestation_participants_consistency() { for slot in state .slot - .epoch(spec.epoch_length) - .slot_iter(spec.epoch_length) + .epoch(spec.slots_per_epoch) + .slot_iter(spec.slots_per_epoch) { let committees = state.get_crosslink_committees_at_slot(slot, &spec).unwrap(); diff --git a/eth2/types/src/proposer_slashing/builder.rs b/eth2/types/src/proposer_slashing/builder.rs index 66f74a2e2..8dc1abfbe 100644 --- a/eth2/types/src/proposer_slashing/builder.rs +++ b/eth2/types/src/proposer_slashing/builder.rs @@ -38,14 +38,14 @@ impl ProposerSlashingBuilder { proposal_1.signature = { let message = proposal_1.signed_root(); - let epoch = slot.epoch(spec.epoch_length); + let epoch = slot.epoch(spec.slots_per_epoch); let domain = spec.domain_proposal; signer(proposer_index, &message[..], epoch, domain) }; proposal_2.signature = { let message = proposal_2.signed_root(); - let epoch = slot.epoch(spec.epoch_length); + let epoch = slot.epoch(spec.slots_per_epoch); let domain = spec.domain_proposal; signer(proposer_index, &message[..], epoch, domain) }; diff --git a/eth2/types/src/slashable_attestation.rs b/eth2/types/src/slashable_attestation.rs index 9f2ccab60..20ba76cdb 100644 --- a/eth2/types/src/slashable_attestation.rs +++ b/eth2/types/src/slashable_attestation.rs @@ -24,7 +24,7 @@ impl SlashableAttestation { /// /// Spec v0.4.0 pub fn is_double_vote(&self, other: &SlashableAttestation, spec: &ChainSpec) -> bool { - self.data.slot.epoch(spec.epoch_length) == other.data.slot.epoch(spec.epoch_length) + self.data.slot.epoch(spec.slots_per_epoch) == other.data.slot.epoch(spec.slots_per_epoch) } /// Check if ``attestation_data_1`` surrounds ``attestation_data_2``. @@ -33,8 +33,8 @@ impl SlashableAttestation { pub fn is_surround_vote(&self, other: &SlashableAttestation, spec: &ChainSpec) -> bool { let source_epoch_1 = self.data.justified_epoch; let source_epoch_2 = other.data.justified_epoch; - let target_epoch_1 = self.data.slot.epoch(spec.epoch_length); - let target_epoch_2 = other.data.slot.epoch(spec.epoch_length); + let target_epoch_1 = self.data.slot.epoch(spec.slots_per_epoch); + let target_epoch_2 = other.data.slot.epoch(spec.slots_per_epoch); (source_epoch_1 < source_epoch_2) & (target_epoch_2 < target_epoch_1) } @@ -151,7 +151,7 @@ mod tests { let mut rng = XorShiftRng::from_seed([42; 16]); let mut slashable_vote = SlashableAttestation::random_for_test(&mut rng); - slashable_vote.data.slot = Slot::new(slot_factor * spec.epoch_length); + slashable_vote.data.slot = Slot::new(slot_factor * spec.slots_per_epoch); slashable_vote.data.justified_epoch = Epoch::new(justified_epoch); slashable_vote } diff --git a/eth2/types/src/slot_epoch.rs b/eth2/types/src/slot_epoch.rs index ff4fd5b9b..7753027a6 100644 --- a/eth2/types/src/slot_epoch.rs +++ b/eth2/types/src/slot_epoch.rs @@ -35,8 +35,8 @@ impl Slot { Slot(slot) } - pub fn epoch(self, epoch_length: u64) -> Epoch { - Epoch::from(self.0 / epoch_length) + pub fn epoch(self, slots_per_epoch: u64) -> Epoch { + Epoch::from(self.0 / slots_per_epoch) } pub fn height(self, genesis_slot: Slot) -> SlotHeight { @@ -57,24 +57,24 @@ impl Epoch { Epoch(u64::max_value()) } - pub fn start_slot(self, epoch_length: u64) -> Slot { - Slot::from(self.0.saturating_mul(epoch_length)) + pub fn start_slot(self, slots_per_epoch: u64) -> Slot { + Slot::from(self.0.saturating_mul(slots_per_epoch)) } - pub fn end_slot(self, epoch_length: u64) -> Slot { + pub fn end_slot(self, slots_per_epoch: u64) -> Slot { Slot::from( self.0 .saturating_add(1) - .saturating_mul(epoch_length) + .saturating_mul(slots_per_epoch) .saturating_sub(1), ) } - pub fn slot_iter(&self, epoch_length: u64) -> SlotIter { + pub fn slot_iter(&self, slots_per_epoch: u64) -> SlotIter { SlotIter { current_iteration: 0, epoch: self, - epoch_length, + slots_per_epoch, } } } @@ -82,17 +82,17 @@ impl Epoch { pub struct SlotIter<'a> { current_iteration: u64, epoch: &'a Epoch, - epoch_length: u64, + slots_per_epoch: u64, } impl<'a> Iterator for SlotIter<'a> { type Item = Slot; fn next(&mut self) -> Option { - if self.current_iteration >= self.epoch_length { + if self.current_iteration >= self.slots_per_epoch { None } else { - let start_slot = self.epoch.start_slot(self.epoch_length); + let start_slot = self.epoch.start_slot(self.slots_per_epoch); let previous = self.current_iteration; self.current_iteration += 1; Some(start_slot + previous) @@ -119,18 +119,18 @@ mod epoch_tests { #[test] fn slot_iter() { - let epoch_length = 8; + let slots_per_epoch = 8; let epoch = Epoch::new(0); let mut slots = vec![]; - for slot in epoch.slot_iter(epoch_length) { + for slot in epoch.slot_iter(slots_per_epoch) { slots.push(slot); } - assert_eq!(slots.len(), epoch_length as usize); + assert_eq!(slots.len(), slots_per_epoch as usize); - for i in 0..epoch_length { + for i in 0..slots_per_epoch { assert_eq!(Slot::from(i), slots[i as usize]) } } diff --git a/eth2/types/src/slot_height.rs b/eth2/types/src/slot_height.rs index f9370f485..1739227a4 100644 --- a/eth2/types/src/slot_height.rs +++ b/eth2/types/src/slot_height.rs @@ -23,8 +23,8 @@ impl SlotHeight { Slot::from(self.0.saturating_add(genesis_slot.as_u64())) } - pub fn epoch(self, genesis_slot: u64, epoch_length: u64) -> Epoch { - Epoch::from(self.0.saturating_add(genesis_slot) / epoch_length) + pub fn epoch(self, genesis_slot: u64, slots_per_epoch: u64) -> Epoch { + Epoch::from(self.0.saturating_add(genesis_slot) / slots_per_epoch) } pub fn max_value() -> SlotHeight { diff --git a/validator_client/src/duties/epoch_duties.rs b/validator_client/src/duties/epoch_duties.rs index 54a882f8d..d1bbfa156 100644 --- a/validator_client/src/duties/epoch_duties.rs +++ b/validator_client/src/duties/epoch_duties.rs @@ -32,14 +32,14 @@ pub enum EpochDutiesMapError { /// Maps an `epoch` to some `EpochDuties` for a single validator. pub struct EpochDutiesMap { - pub epoch_length: u64, + pub slots_per_epoch: u64, pub map: RwLock>, } impl EpochDutiesMap { - pub fn new(epoch_length: u64) -> Self { + pub fn new(slots_per_epoch: u64) -> Self { Self { - epoch_length, + slots_per_epoch, map: RwLock::new(HashMap::new()), } } @@ -67,7 +67,7 @@ impl EpochDutiesMap { impl DutiesReader for EpochDutiesMap { fn is_block_production_slot(&self, slot: Slot) -> Result { - let epoch = slot.epoch(self.epoch_length); + let epoch = slot.epoch(self.slots_per_epoch); let map = self.map.read().map_err(|_| DutiesReaderError::Poisoned)?; let duties = map diff --git a/validator_client/src/duties/mod.rs b/validator_client/src/duties/mod.rs index febab4755..29bd81d0a 100644 --- a/validator_client/src/duties/mod.rs +++ b/validator_client/src/duties/mod.rs @@ -61,7 +61,7 @@ impl DutiesManager { .map_err(|_| Error::SlotClockError)? .ok_or(Error::SlotUnknowable)?; - let epoch = slot.epoch(self.spec.epoch_length); + let epoch = slot.epoch(self.spec.slots_per_epoch); if let Some(duties) = self.beacon_node.request_shuffling(epoch, &self.pubkey)? { // If these duties were known, check to see if they're updates or identical. @@ -112,7 +112,7 @@ mod tests { #[test] pub fn polling() { let spec = Arc::new(ChainSpec::foundation()); - let duties_map = Arc::new(EpochDutiesMap::new(spec.epoch_length)); + let duties_map = Arc::new(EpochDutiesMap::new(spec.slots_per_epoch)); let keypair = Keypair::random(); let slot_clock = Arc::new(TestingSlotClock::new(0)); let beacon_node = Arc::new(TestBeaconNode::default()); diff --git a/validator_client/src/main.rs b/validator_client/src/main.rs index c835300b5..b4d8ae5db 100644 --- a/validator_client/src/main.rs +++ b/validator_client/src/main.rs @@ -111,7 +111,7 @@ fn main() { for keypair in keypairs { info!(log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id()); - let duties_map = Arc::new(EpochDutiesMap::new(spec.epoch_length)); + let duties_map = Arc::new(EpochDutiesMap::new(spec.slots_per_epoch)); // Spawn a new thread to maintain the validator's `EpochDuties`. let duties_manager_thread = { From 262e9cf0bcc772e54f312b3d6055448dd9058145 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 5 Mar 2019 09:51:29 +1100 Subject: [PATCH 07/31] Additional spec updates --- .../state_processing/src/epoch_processable.rs | 18 ++--- eth2/types/src/beacon_state.rs | 77 ++++++++++++------- eth2/types/src/beacon_state/builder.rs | 8 +- eth2/types/src/chain_spec.rs | 4 +- 4 files changed, 63 insertions(+), 44 deletions(-) diff --git a/eth2/state_processing/src/epoch_processable.rs b/eth2/state_processing/src/epoch_processable.rs index 47336d3f8..0d6ca8038 100644 --- a/eth2/state_processing/src/epoch_processable.rs +++ b/eth2/state_processing/src/epoch_processable.rs @@ -555,15 +555,15 @@ impl EpochProcessable for BeaconState { /* * Validator Registry */ - self.previous_calculation_epoch = self.current_calculation_epoch; + self.previous_shuffling_epoch = self.current_shuffling_epoch; self.previous_epoch_start_shard = self.current_epoch_start_shard; debug!( - "setting previous_epoch_seed to : {}", - self.current_epoch_seed + "setting previous_shuffling_seed to : {}", + self.current_shuffling_seed ); - self.previous_epoch_seed = self.current_epoch_seed; + self.previous_shuffling_seed = self.current_shuffling_seed; let should_update_validator_registy = if self.finalized_epoch > self.validator_registry_update_epoch @@ -580,11 +580,11 @@ impl EpochProcessable for BeaconState { trace!("updating validator registry."); self.update_validator_registry(spec); - self.current_calculation_epoch = next_epoch; + self.current_shuffling_epoch = next_epoch; self.current_epoch_start_shard = (self.current_epoch_start_shard + self.get_current_epoch_committee_count(spec) as u64) % spec.shard_count; - self.current_epoch_seed = self.generate_seed(self.current_calculation_epoch, spec)? + self.current_shuffling_seed = self.generate_seed(self.current_shuffling_epoch, spec)? } else { trace!("not updating validator registry."); let epochs_since_last_registry_update = @@ -592,9 +592,9 @@ impl EpochProcessable for BeaconState { if (epochs_since_last_registry_update > 1) & epochs_since_last_registry_update.is_power_of_two() { - self.current_calculation_epoch = next_epoch; - self.current_epoch_seed = - self.generate_seed(self.current_calculation_epoch, spec)? + self.current_shuffling_epoch = next_epoch; + self.current_shuffling_seed = + self.generate_seed(self.current_shuffling_epoch, spec)? } } diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index 75beb79ca..43fd72232 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -39,8 +39,10 @@ pub enum Error { EpochOutOfBounds, /// The supplied shard is unknown. It may be larger than the maximum shard count, or not in a /// committee for the given slot. + SlotOutOfBounds, ShardOutOfBounds, UnableToShuffle, + UnknownValidator, InsufficientRandaoMixes, InsufficientValidators, InsufficientBlockRoots, @@ -172,7 +174,7 @@ impl BeaconState { spec.zero_hash; spec.latest_active_index_roots_length as usize ], - latest_slashed_balances: vec![0; spec.latest_penalized_exit_length as usize], + latest_slashed_balances: vec![0; spec.latest_slashed_exit_length as usize], latest_attestations: vec![], batched_block_roots: vec![], @@ -711,7 +713,7 @@ impl BeaconState { /// Process the penalties and prepare the validators who are eligible to withdrawal. /// /// Spec v0.2.0 - pub fn process_penalties_and_exits(&mut self, spec: &ChainSpec) { + pub fn process_slashings(&mut self, spec: &ChainSpec) { let current_epoch = self.current_epoch(spec); let active_validator_indices = get_active_validator_indices(&self.validator_registry, current_epoch); @@ -721,13 +723,12 @@ impl BeaconState { let validator = &self.validator_registry[index]; if current_epoch - == validator.penalized_epoch + Epoch::from(spec.latest_penalized_exit_length / 2) + == validator.penalized_epoch + Epoch::from(spec.latest_slashed_exit_length / 2) { - let epoch_index: usize = - current_epoch.as_usize() % spec.latest_penalized_exit_length; + let epoch_index: usize = current_epoch.as_usize() % spec.latest_slashed_exit_length; let total_at_start = self.latest_slashed_balances - [(epoch_index + 1) % spec.latest_penalized_exit_length]; + [(epoch_index + 1) % spec.latest_slashed_exit_length]; let total_at_end = self.latest_slashed_balances[epoch_index]; let total_penalities = total_at_end.saturating_sub(total_at_start); let penalty = self.get_effective_balance(index, spec) @@ -736,12 +737,22 @@ impl BeaconState { safe_sub_assign!(self.validator_balances[index], penalty); } } + } + + /// Process the penalties and prepare the validators who are eligible to withdrawal. + /// + /// Spec v0.2.0 + pub fn process_exit_queue(&mut self, spec: &ChainSpec) { + let current_epoch = self.current_epoch(spec); + let active_validator_indices = + get_active_validator_indices(&self.validator_registry, current_epoch); + let total_balance = self.get_total_balance(&active_validator_indices[..], spec); let eligible = |index: usize| { let validator = &self.validator_registry[index]; if validator.penalized_epoch <= current_epoch { - let penalized_withdrawal_epochs = spec.latest_penalized_exit_length / 2; + let penalized_withdrawal_epochs = spec.latest_slashed_exit_length / 2; current_epoch >= validator.penalized_epoch + penalized_withdrawal_epochs as u64 } else { current_epoch >= validator.exit_epoch + spec.min_validator_withdrawal_epochs @@ -881,7 +892,7 @@ impl BeaconState { /// this hashmap, each call to `process_deposits` requires an iteration though /// `self.validator_registry`. This becomes highly inefficient at scale. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn process_deposit( &mut self, pubkey: PublicKey, @@ -893,15 +904,9 @@ impl BeaconState { ) -> Result { // TODO: update proof of possession to function written above ( // requires bls::create_proof_of_possession to be updated + // // https://github.com/sigp/lighthouse/issues/239 - if !verify_proof_of_possession(&proof_of_possession, &pubkey) - //if !self.validate_proof_of_possession( - // pubkey.clone(), - // proof_of_possession, - // withdrawal_credentials, - // &spec, - // ) - { + if !verify_proof_of_possession(&proof_of_possession, &pubkey) { return Err(()); } @@ -926,9 +931,9 @@ impl BeaconState { withdrawal_credentials, activation_epoch: spec.far_future_epoch, exit_epoch: spec.far_future_epoch, - withdrawal_epoch: spec.far_future_epoch, - penalized_epoch: spec.far_future_epoch, - status_flags: None, + withdrawable_epoch: spec.far_future_epoch, + initiated_exit: false, + slashed: false, }; self.validator_registry.push(validator); self.validator_balances.push(amount); @@ -977,22 +982,32 @@ impl BeaconState { self.get_entry_exit_effect_epoch(current_epoch, spec); } - /// Penalize the validator of the given ``index``. + /// Slash the validator with index ``index``. /// - /// Exits the validator and assigns its effective balance to the block producer for this - /// state. - /// - /// Spec v0.2.0 - pub fn penalize_validator( + /// Spec v0.4.0 + pub fn slash_validator( &mut self, validator_index: usize, spec: &ChainSpec, ) -> Result<(), Error> { - self.exit_validator(validator_index, spec); let current_epoch = self.current_epoch(spec); - self.latest_slashed_balances - [current_epoch.as_usize() % spec.latest_penalized_exit_length] += + let validator = &self + .validator_registry + .get(validator_index) + .ok_or_else(|| Error::UnknownValidator)?; + + if self.slot + >= validator + .withdrawable_epoch + .start_slot(spec.slots_per_epoch) + { + return Err(Error::SlotOutOfBounds); + } + + self.exit_validator(validator_index, spec); + + self.latest_slashed_balances[current_epoch.as_usize() % spec.latest_slashed_exit_length] += self.get_effective_balance(validator_index, spec); let whistleblower_index = self.get_beacon_proposer_index(self.slot, spec)?; @@ -1005,11 +1020,15 @@ impl BeaconState { self.validator_balances[validator_index], whistleblower_reward ); - self.validator_registry[validator_index].penalized_epoch = current_epoch; + self.validator_registry[validator_index].slashed = true; + self.validator_registry[validator_index].withdrawable_epoch = + current_epoch + Epoch::from(spec.latest_slashed_exit_length); + debug!( "Whistleblower {} penalized validator {}.", whistleblower_index, validator_index ); + Ok(()) } diff --git a/eth2/types/src/beacon_state/builder.rs b/eth2/types/src/beacon_state/builder.rs index 4acd172f5..94cc28a6b 100644 --- a/eth2/types/src/beacon_state/builder.rs +++ b/eth2/types/src/beacon_state/builder.rs @@ -142,11 +142,11 @@ impl BeaconStateBuilder { state.slot = slot; state.validator_registry_update_epoch = epoch - 1; - state.previous_calculation_epoch = epoch - 1; - state.current_calculation_epoch = epoch; + state.previous_shuffling_epoch = epoch - 1; + state.current_shuffling_epoch = epoch; - state.previous_epoch_seed = Hash256::from(&b"previous_seed"[..]); - state.current_epoch_seed = Hash256::from(&b"current_seed"[..]); + state.previous_shuffling_seed = Hash256::from(&b"previous_seed"[..]); + state.current_shuffling_seed = Hash256::from(&b"current_seed"[..]); state.previous_justified_epoch = epoch - 2; state.justified_epoch = epoch - 1; diff --git a/eth2/types/src/chain_spec.rs b/eth2/types/src/chain_spec.rs index ac5d0a815..8aef79466 100644 --- a/eth2/types/src/chain_spec.rs +++ b/eth2/types/src/chain_spec.rs @@ -61,7 +61,7 @@ pub struct ChainSpec { */ pub latest_block_roots_length: usize, pub latest_randao_mixes_length: usize, - pub latest_index_roots_length: usize, + pub latest_active_index_roots_length: usize, pub latest_slashed_exit_length: usize, /* @@ -157,7 +157,7 @@ impl ChainSpec { */ latest_block_roots_length: 8_192, latest_randao_mixes_length: 8_192, - latest_index_roots_length: 8_192, + latest_active_index_roots_length: 8_192, latest_slashed_exit_length: 8_192, /* From 0f7d2c168ca6770d9ecabcf34a2274faee61152b Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 5 Mar 2019 17:19:36 +1100 Subject: [PATCH 08/31] Fix compile errors in beacon_state.rs --- eth2/types/src/beacon_state.rs | 77 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index 43fd72232..bf989b858 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -470,17 +470,15 @@ impl BeaconState { /// Return the index root at a recent `epoch`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn get_active_index_root(&self, epoch: Epoch, spec: &ChainSpec) -> Option { let current_epoch = self.current_epoch(spec); - let earliest_index_root = current_epoch - - Epoch::from(spec.latest_active_index_roots_length) - + Epoch::from(spec.entry_exit_delay) - + 1; - let latest_index_root = current_epoch + spec.entry_exit_delay; - - if (epoch >= earliest_index_root) & (epoch <= latest_index_root) { + if (current_epoch - spec.latest_active_index_roots_length as u64 + + spec.activation_exit_delay + < epoch) + & (epoch <= current_epoch + spec.activation_exit_delay) + { Some( self.latest_active_index_roots [epoch.as_usize() % spec.latest_active_index_roots_length], @@ -678,12 +676,11 @@ impl BeaconState { .and_then(|tuple| Some(*tuple))) } - /// An entry or exit triggered in the ``epoch`` given by the input takes effect at - /// the epoch given by the output. + /// Return the epoch at which an activation or exit triggered in ``epoch`` takes effect. /// - /// Spec v0.2.0 - pub fn get_entry_exit_effect_epoch(&self, epoch: Epoch, spec: &ChainSpec) -> Epoch { - epoch + 1 + spec.entry_exit_delay + /// Spec v0.4.0 + pub fn get_delayed_activation_exit_epoch(&self, epoch: Epoch, spec: &ChainSpec) -> Epoch { + epoch + 1 + spec.activation_exit_delay } /// Returns the beacon proposer index for the `slot`. @@ -710,20 +707,20 @@ impl BeaconState { }) } - /// Process the penalties and prepare the validators who are eligible to withdrawal. + /// Process the slashings. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn process_slashings(&mut self, spec: &ChainSpec) { let current_epoch = self.current_epoch(spec); let active_validator_indices = get_active_validator_indices(&self.validator_registry, current_epoch); let total_balance = self.get_total_balance(&active_validator_indices[..], spec); - for index in 0..self.validator_balances.len() { - let validator = &self.validator_registry[index]; - - if current_epoch - == validator.penalized_epoch + Epoch::from(spec.latest_slashed_exit_length / 2) + for (index, validator) in self.validator_registry.iter().enumerate() { + if validator.slashed + && (current_epoch + == validator.withdrawable_epoch + - Epoch::from(spec.latest_slashed_exit_length / 2)) { let epoch_index: usize = current_epoch.as_usize() % spec.latest_slashed_exit_length; @@ -731,17 +728,21 @@ impl BeaconState { [(epoch_index + 1) % spec.latest_slashed_exit_length]; let total_at_end = self.latest_slashed_balances[epoch_index]; let total_penalities = total_at_end.saturating_sub(total_at_start); - let penalty = self.get_effective_balance(index, spec) - * std::cmp::min(total_penalities * 3, total_balance) - / total_balance; + let penalty = std::cmp::max( + self.get_effective_balance(index, spec) + * std::cmp::min(total_penalities * 3, total_balance) + / total_balance, + self.get_effective_balance(index, spec) / spec.min_penalty_quotient, + ); + safe_sub_assign!(self.validator_balances[index], penalty); } } } - /// Process the penalties and prepare the validators who are eligible to withdrawal. + /// Process the exit queue. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn process_exit_queue(&mut self, spec: &ChainSpec) { let current_epoch = self.current_epoch(spec); let active_validator_indices = @@ -751,11 +752,10 @@ impl BeaconState { let eligible = |index: usize| { let validator = &self.validator_registry[index]; - if validator.penalized_epoch <= current_epoch { - let penalized_withdrawal_epochs = spec.latest_slashed_exit_length / 2; - current_epoch >= validator.penalized_epoch + penalized_withdrawal_epochs as u64 + if validator.withdrawable_epoch != spec.far_future_epoch { + false } else { - current_epoch >= validator.exit_epoch + spec.min_validator_withdrawal_epochs + current_epoch >= validator.exit_epoch + spec.min_validator_withdrawability_delay } }; @@ -763,11 +763,12 @@ impl BeaconState { .filter(|i| eligible(*i)) .collect(); eligable_indices.sort_by_key(|i| self.validator_registry[*i].exit_epoch); + for (withdrawn_so_far, index) in eligable_indices.iter().enumerate() { - self.prepare_validator_for_withdrawal(*index); - if withdrawn_so_far as u64 >= spec.max_withdrawals_per_epoch { + if withdrawn_so_far as u64 >= spec.max_exit_dequeues_per_epoch { break; } + self.prepare_validator_for_withdrawal(*index, spec); } } @@ -943,7 +944,7 @@ impl BeaconState { /// Activate the validator of the given ``index``. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn activate_validator( &mut self, validator_index: usize, @@ -955,7 +956,7 @@ impl BeaconState { self.validator_registry[validator_index].activation_epoch = if is_genesis { spec.genesis_epoch } else { - self.get_entry_exit_effect_epoch(current_epoch, spec) + self.get_delayed_activation_exit_epoch(current_epoch, spec) } } @@ -968,18 +969,16 @@ impl BeaconState { /// Exit the validator of the given `index`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 fn exit_validator(&mut self, validator_index: usize, spec: &ChainSpec) { let current_epoch = self.current_epoch(spec); + let delayed_epoch = self.get_delayed_activation_exit_epoch(current_epoch, spec); - if self.validator_registry[validator_index].exit_epoch - <= self.get_entry_exit_effect_epoch(current_epoch, spec) - { + if self.validator_registry[validator_index].exit_epoch <= delayed_epoch { return; } - self.validator_registry[validator_index].exit_epoch = - self.get_entry_exit_effect_epoch(current_epoch, spec); + self.validator_registry[validator_index].exit_epoch = delayed_epoch; } /// Slash the validator with index ``index``. From e0ccde1ce3f71fe4b5bcfba03676a8bd285d3c23 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 5 Mar 2019 17:37:09 +1100 Subject: [PATCH 09/31] Remove unused function from @agemanning --- eth2/types/src/slot_epoch_macros.rs | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/eth2/types/src/slot_epoch_macros.rs b/eth2/types/src/slot_epoch_macros.rs index b0550f2f8..2148b6cc2 100644 --- a/eth2/types/src/slot_epoch_macros.rs +++ b/eth2/types/src/slot_epoch_macros.rs @@ -20,25 +20,6 @@ macro_rules! impl_from_into_u64 { }; } -// need to truncate for some fork-choice algorithms -macro_rules! impl_into_u32 { - ($main: ident) => { - impl Into for $main { - fn into(self) -> u32 { - assert!(self.0 < u64::from(std::u32::MAX), "Lossy conversion to u32"); - self.0 as u32 - } - } - - impl $main { - pub fn as_u32(&self) -> u32 { - assert!(self.0 < u64::from(std::u32::MAX), "Lossy conversion to u32"); - self.0 as u32 - } - } - }; -} - macro_rules! impl_from_into_usize { ($main: ident) => { impl From for $main { From 38a1b94f61ad22aeedee22aa91ae5f413dc1aff4 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 5 Mar 2019 17:38:17 +1100 Subject: [PATCH 10/31] Fix compile issues in `types` crate --- eth2/types/src/attester_slashing/builder.rs | 4 ++-- eth2/types/src/beacon_block.rs | 3 ++- eth2/types/src/beacon_state.rs | 3 --- eth2/types/src/beacon_state/builder.rs | 2 +- eth2/types/src/readers/block_reader.rs | 5 ----- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/eth2/types/src/attester_slashing/builder.rs b/eth2/types/src/attester_slashing/builder.rs index ed203d6e1..54dfae959 100644 --- a/eth2/types/src/attester_slashing/builder.rs +++ b/eth2/types/src/attester_slashing/builder.rs @@ -37,7 +37,7 @@ impl AttesterSlashingBuilder { shard, beacon_block_root: hash_1, epoch_boundary_root: hash_1, - shard_block_root: hash_1, + crosslink_data_root: hash_1, latest_crosslink: Crosslink { epoch, shard_block_root: hash_1, @@ -56,7 +56,7 @@ impl AttesterSlashingBuilder { shard, beacon_block_root: hash_2, epoch_boundary_root: hash_2, - shard_block_root: hash_2, + crosslink_data_root: hash_2, latest_crosslink: Crosslink { epoch, shard_block_root: hash_2, diff --git a/eth2/types/src/beacon_block.rs b/eth2/types/src/beacon_block.rs index d8e50d9ca..111ca1b4b 100644 --- a/eth2/types/src/beacon_block.rs +++ b/eth2/types/src/beacon_block.rs @@ -39,7 +39,8 @@ impl BeaconBlock { attester_slashings: vec![], attestations: vec![], deposits: vec![], - exits: vec![], + voluntary_exits: vec![], + transfers: vec![], }, } } diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index bf989b858..d62e29127 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -745,9 +745,6 @@ impl BeaconState { /// Spec v0.4.0 pub fn process_exit_queue(&mut self, spec: &ChainSpec) { let current_epoch = self.current_epoch(spec); - let active_validator_indices = - get_active_validator_indices(&self.validator_registry, current_epoch); - let total_balance = self.get_total_balance(&active_validator_indices[..], spec); let eligible = |index: usize| { let validator = &self.validator_registry[index]; diff --git a/eth2/types/src/beacon_state/builder.rs b/eth2/types/src/beacon_state/builder.rs index 94cc28a6b..36b6468fc 100644 --- a/eth2/types/src/beacon_state/builder.rs +++ b/eth2/types/src/beacon_state/builder.rs @@ -249,7 +249,7 @@ fn committee_to_pending_attestation( shard, beacon_block_root: *state.get_block_root(slot, spec).unwrap(), epoch_boundary_root, - shard_block_root: Hash256::zero(), + crosslink_data_root: Hash256::zero(), latest_crosslink: Crosslink { epoch: slot.epoch(spec.slots_per_epoch), shard_block_root: Hash256::zero(), diff --git a/eth2/types/src/readers/block_reader.rs b/eth2/types/src/readers/block_reader.rs index bcb2d0e63..93157a1a3 100644 --- a/eth2/types/src/readers/block_reader.rs +++ b/eth2/types/src/readers/block_reader.rs @@ -13,7 +13,6 @@ pub trait BeaconBlockReader: Debug + PartialEq { fn slot(&self) -> Slot; fn parent_root(&self) -> Hash256; fn state_root(&self) -> Hash256; - fn canonical_root(&self) -> Hash256; fn into_beacon_block(self) -> Option; } @@ -30,10 +29,6 @@ impl BeaconBlockReader for BeaconBlock { self.state_root } - fn canonical_root(&self) -> Hash256 { - self.canonical_root() - } - fn into_beacon_block(self) -> Option { Some(self) } From 96ec53c6a83f01c6e2f4826269fa85846f35b604 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 5 Mar 2019 18:22:37 +1100 Subject: [PATCH 11/31] Update beacon_state.rs to spec v0.4.0 --- eth2/types/Cargo.toml | 1 + eth2/types/src/beacon_state.rs | 1131 ++++++++++++------------ eth2/types/src/beacon_state/helpers.rs | 0 eth2/types/src/chain_spec.rs | 16 +- eth2/types/src/fork.rs | 4 + eth2/types/src/readers/state_reader.rs | 7 +- eth2/types/src/validator_registry.rs | 2 + 7 files changed, 575 insertions(+), 586 deletions(-) create mode 100644 eth2/types/src/beacon_state/helpers.rs diff --git a/eth2/types/Cargo.toml b/eth2/types/Cargo.toml index f70e8b490..f611aa3c1 100644 --- a/eth2/types/Cargo.toml +++ b/eth2/types/Cargo.toml @@ -10,6 +10,7 @@ boolean-bitfield = { path = "../utils/boolean-bitfield" } ethereum-types = "0.4.0" hashing = { path = "../utils/hashing" } honey-badger-split = { path = "../utils/honey-badger-split" } +int_to_bytes = { path = "../utils/int_to_bytes" } log = "0.4" rayon = "1.0" rand = "0.5.5" diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index d62e29127..d876adc62 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -3,6 +3,7 @@ use crate::test_utils::TestRandom; use crate::{validator_registry::get_active_validator_indices, *}; use bls::verify_proof_of_possession; use honey_badger_split::SplitExt; +use int_to_bytes::int_to_bytes32; use log::{debug, error, trace}; use rand::RngCore; use rayon::prelude::*; @@ -191,6 +192,7 @@ impl BeaconState { caches: vec![EpochCache::empty(); CACHED_EPOCHS], }) } + /// Produce the first state of the Beacon Chain. pub fn genesis( genesis_time: u64, @@ -328,144 +330,116 @@ impl BeaconState { } } - /// Return the tree hash root for this `BeaconState`. - /// - /// Spec v0.2.0 - pub fn canonical_root(&self) -> Hash256 { - Hash256::from(&self.hash_tree_root()[..]) - } - /// The epoch corresponding to `self.slot`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn current_epoch(&self, spec: &ChainSpec) -> Epoch { self.slot.epoch(spec.slots_per_epoch) } /// The epoch prior to `self.current_epoch()`. /// - /// Spec v0.2.0 + /// If the current epoch is the genesis epoch, the genesis_epoch is returned. + /// + /// Spec v0.4.0 pub fn previous_epoch(&self, spec: &ChainSpec) -> Epoch { let current_epoch = self.current_epoch(&spec); - if current_epoch == spec.genesis_epoch { - current_epoch - } else { - current_epoch - 1 - } + std::cmp::max(current_epoch - 1, spec.genesis_epoch) } /// The epoch following `self.current_epoch()`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn next_epoch(&self, spec: &ChainSpec) -> Epoch { self.current_epoch(spec).saturating_add(1_u64) } /// The first slot of the epoch corresponding to `self.slot`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn current_epoch_start_slot(&self, spec: &ChainSpec) -> Slot { self.current_epoch(spec).start_slot(spec.slots_per_epoch) } - /// The first slot of the epoch preceeding the one corresponding to `self.slot`. + /// The first slot of the epoch preceding the one corresponding to `self.slot`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn previous_epoch_start_slot(&self, spec: &ChainSpec) -> Slot { self.previous_epoch(spec).start_slot(spec.slots_per_epoch) } - /// Return the number of committees in one epoch. - /// - /// TODO: this should probably be a method on `ChainSpec`. - /// - /// Spec v0.2.0 - pub fn get_epoch_committee_count( - &self, - active_validator_count: usize, - spec: &ChainSpec, - ) -> u64 { - std::cmp::max( - 1, - std::cmp::min( - spec.shard_count / spec.slots_per_epoch, - active_validator_count as u64 / spec.slots_per_epoch / spec.target_committee_size, - ), - ) * spec.slots_per_epoch - } - - /// Shuffle ``validators`` into crosslink committees seeded by ``seed`` and ``epoch``. - /// - /// Return a list of ``committees_per_epoch`` committees where each - /// committee is itself a list of validator indices. - /// - /// Spec v0.2.0 - pub(crate) fn get_shuffling( - &self, - seed: Hash256, - epoch: Epoch, - spec: &ChainSpec, - ) -> Result>, Error> { - let active_validator_indices = - get_active_validator_indices(&self.validator_registry, epoch); - - if active_validator_indices.is_empty() { - error!("get_shuffling: no validators."); - return Err(Error::InsufficientValidators); - } - - debug!("Shuffling {} validators...", active_validator_indices.len()); - - let committees_per_epoch = - self.get_epoch_committee_count(active_validator_indices.len(), spec); - - trace!( - "get_shuffling: active_validator_indices.len() == {}, committees_per_epoch: {}", - active_validator_indices.len(), - committees_per_epoch - ); - - let active_validator_indices: Vec = active_validator_indices.to_vec(); - - let shuffled_active_validator_indices = shuffle_list( - active_validator_indices, - spec.shuffle_round_count, - &seed[..], - true, - ) - .ok_or_else(|| Error::UnableToShuffle)?; - - Ok(shuffled_active_validator_indices - .honey_badger_split(committees_per_epoch as usize) - .map(|slice: &[usize]| slice.to_vec()) - .collect()) - } - /// Return the number of committees in the previous epoch. /// - /// Spec v0.2.0 + /// Spec v0.4.0 fn get_previous_epoch_committee_count(&self, spec: &ChainSpec) -> u64 { let previous_active_validators = get_active_validator_indices(&self.validator_registry, self.previous_shuffling_epoch); - self.get_epoch_committee_count(previous_active_validators.len(), spec) + spec.get_epoch_committee_count(previous_active_validators.len()) } /// Return the number of committees in the current epoch. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn get_current_epoch_committee_count(&self, spec: &ChainSpec) -> u64 { let current_active_validators = get_active_validator_indices(&self.validator_registry, self.current_shuffling_epoch); - self.get_epoch_committee_count(current_active_validators.len(), spec) + spec.get_epoch_committee_count(current_active_validators.len()) } /// Return the number of committees in the next epoch. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn get_next_epoch_committee_count(&self, spec: &ChainSpec) -> u64 { - let current_active_validators = + let next_active_validators = get_active_validator_indices(&self.validator_registry, self.next_epoch(spec)); - self.get_epoch_committee_count(current_active_validators.len(), spec) + spec.get_epoch_committee_count(next_active_validators.len()) + } + + /// Returns the crosslink committees for some slot. + /// + /// Note: Utilizes the cache and will fail if the appropriate cache is not initialized. + /// + /// Spec v0.4.0 + pub fn get_crosslink_committees_at_slot( + &self, + slot: Slot, + spec: &ChainSpec, + ) -> Result<&CrosslinkCommittees, Error> { + let epoch = slot.epoch(spec.slots_per_epoch); + let relative_epoch = self.relative_epoch(epoch, spec)?; + let cache = self.cache(relative_epoch)?; + + let slot_offset = slot - epoch.start_slot(spec.slots_per_epoch); + + Ok(&cache.committees[slot_offset.as_usize()]) + } + + /// Return the block root at a recent `slot`. + /// + /// Spec v0.4.0 + pub fn get_block_root(&self, slot: Slot, spec: &ChainSpec) -> Option<&Hash256> { + if (self.slot <= slot + spec.latest_block_roots_length as u64) && (slot < self.slot) { + self.latest_block_roots + .get(slot.as_usize() % spec.latest_block_roots_length) + } else { + None + } + } + + /// Return the randao mix at a recent ``epoch``. + /// + /// Spec v0.4.0 + pub fn get_randao_mix(&self, epoch: Epoch, spec: &ChainSpec) -> Option<&Hash256> { + let current_epoch = self.current_epoch(spec); + + if (current_epoch - (spec.latest_randao_mixes_length as u64) < epoch) + & (epoch <= current_epoch) + { + self.latest_randao_mixes + .get(epoch.as_usize() % spec.latest_randao_mixes_length) + } else { + None + } } /// Return the index root at a recent `epoch`. @@ -490,10 +464,10 @@ impl BeaconState { /// Generate a seed for the given `epoch`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn generate_seed(&self, epoch: Epoch, spec: &ChainSpec) -> Result { let mut input = self - .get_randao_mix(epoch, spec) + .get_randao_mix(epoch - spec.min_seed_lookahead, spec) .ok_or_else(|| Error::InsufficientRandaoMixes)? .to_vec(); @@ -504,190 +478,16 @@ impl BeaconState { .to_vec(), ); - // TODO: ensure `Hash256::from(u64)` == `int_to_bytes32`. - input.append(&mut Hash256::from(epoch.as_u64()).to_vec()); + input.append(&mut int_to_bytes32(epoch.as_u64())); Ok(Hash256::from(&hash(&input[..])[..])) } - /// Returns the crosslink committees for some slot. - /// - /// Note: Utilizes the cache and will fail if the appropriate cache is not initialized. - /// - /// Spec v0.2.0 - pub fn get_crosslink_committees_at_slot( - &self, - slot: Slot, - spec: &ChainSpec, - ) -> Result<&CrosslinkCommittees, Error> { - let epoch = slot.epoch(spec.slots_per_epoch); - let relative_epoch = self.relative_epoch(epoch, spec)?; - let cache = self.cache(relative_epoch)?; - - let slot_offset = slot - epoch.start_slot(spec.slots_per_epoch); - - Ok(&cache.committees[slot_offset.as_usize()]) - } - - /// Returns the crosslink committees for some slot. - /// - /// Utilizes the cache and will fail if the appropriate cache is not initialized. - /// - /// Spec v0.2.0 - pub(crate) fn get_shuffling_for_slot( - &self, - slot: Slot, - registry_change: bool, - - spec: &ChainSpec, - ) -> Result>, Error> { - let (_committees_per_epoch, seed, shuffling_epoch, _shuffling_start_shard) = - self.get_committee_params_at_slot(slot, registry_change, spec)?; - - self.get_shuffling(seed, shuffling_epoch, spec) - } - - /// Returns the following params for the given slot: - /// - /// - epoch committee count - /// - epoch seed - /// - calculation epoch - /// - start shard - /// - /// In the spec, this functionality is included in the `get_crosslink_committees_at_slot(..)` - /// function. It is separated here to allow the division of shuffling and committee building, - /// as is required for efficient operations. - /// - /// Spec v0.2.0 - pub(crate) fn get_committee_params_at_slot( - &self, - slot: Slot, - registry_change: bool, - spec: &ChainSpec, - ) -> Result<(u64, Hash256, Epoch, u64), Error> { - let epoch = slot.epoch(spec.slots_per_epoch); - let current_epoch = self.current_epoch(spec); - let previous_epoch = self.previous_epoch(spec); - let next_epoch = self.next_epoch(spec); - - if epoch == current_epoch { - trace!("get_committee_params_at_slot: current_epoch"); - Ok(( - self.get_current_epoch_committee_count(spec), - self.current_shuffling_seed, - self.current_shuffling_epoch, - self.current_shuffling_start_shard, - )) - } else if epoch == previous_epoch { - trace!("get_committee_params_at_slot: previous_epoch"); - Ok(( - self.get_previous_epoch_committee_count(spec), - self.previous_shuffling_seed, - self.previous_shuffling_epoch, - self.previous_shuffling_start_shard, - )) - } else if epoch == next_epoch { - trace!("get_committee_params_at_slot: next_epoch"); - let current_committees_per_epoch = self.get_current_epoch_committee_count(spec); - let epochs_since_last_registry_update = - current_epoch - self.validator_registry_update_epoch; - let (seed, shuffling_start_shard) = if registry_change { - let next_seed = self.generate_seed(next_epoch, spec)?; - ( - next_seed, - (self.current_shuffling_start_shard + current_committees_per_epoch) - % spec.shard_count, - ) - } else if (epochs_since_last_registry_update > 1) - & epochs_since_last_registry_update.is_power_of_two() - { - let next_seed = self.generate_seed(next_epoch, spec)?; - (next_seed, self.current_shuffling_start_shard) - } else { - ( - self.current_shuffling_seed, - self.current_shuffling_start_shard, - ) - }; - Ok(( - self.get_next_epoch_committee_count(spec), - seed, - next_epoch, - shuffling_start_shard, - )) - } else { - Err(Error::EpochOutOfBounds) - } - } - - /// Return the list of ``(committee, shard)`` tuples for the ``slot``. - /// - /// Note: There are two possible shufflings for crosslink committees for a - /// `slot` in the next epoch: with and without a `registry_change` - /// - /// Note: does not utilize the cache, `get_crosslink_committees_at_slot` is an equivalent - /// function which uses the cache. - /// - /// Spec v0.2.0 - pub(crate) fn calculate_crosslink_committees_at_slot( - &self, - slot: Slot, - registry_change: bool, - shuffling: Vec>, - spec: &ChainSpec, - ) -> Result, u64)>, Error> { - let (committees_per_epoch, _seed, _shuffling_epoch, shuffling_start_shard) = - self.get_committee_params_at_slot(slot, registry_change, spec)?; - - let offset = slot.as_u64() % spec.slots_per_epoch; - let committees_per_slot = committees_per_epoch / spec.slots_per_epoch; - let slot_start_shard = - (shuffling_start_shard + committees_per_slot * offset) % spec.shard_count; - - let mut crosslinks_at_slot = vec![]; - for i in 0..committees_per_slot { - let tuple = ( - shuffling[(committees_per_slot * offset + i) as usize].clone(), - (slot_start_shard + i) % spec.shard_count, - ); - crosslinks_at_slot.push(tuple) - } - Ok(crosslinks_at_slot) - } - - /// Returns the `slot`, `shard` and `committee_index` for which a validator must produce an - /// attestation. - /// - /// Only reads the current epoch. - /// - /// Note: Utilizes the cache and will fail if the appropriate cache is not initialized. - /// - /// Spec v0.2.0 - pub fn attestation_slot_and_shard_for_validator( - &self, - validator_index: usize, - _spec: &ChainSpec, - ) -> Result, Error> { - let cache = self.cache(RelativeEpoch::Current)?; - - Ok(cache - .attestation_duty_map - .get(&(validator_index as u64)) - .and_then(|tuple| Some(*tuple))) - } - - /// Return the epoch at which an activation or exit triggered in ``epoch`` takes effect. - /// - /// Spec v0.4.0 - pub fn get_delayed_activation_exit_epoch(&self, epoch: Epoch, spec: &ChainSpec) -> Epoch { - epoch + 1 + spec.activation_exit_delay - } - /// Returns the beacon proposer index for the `slot`. /// /// If the state does not contain an index for a beacon proposer at the requested `slot`, then `None` is returned. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn get_beacon_proposer_index(&self, slot: Slot, spec: &ChainSpec) -> Result { let committees = self.get_crosslink_committees_at_slot(slot, spec)?; trace!( @@ -707,155 +507,175 @@ impl BeaconState { }) } - /// Process the slashings. + /// Returns the list of validator indices which participiated in the attestation. + /// + /// Note: Utilizes the cache and will fail if the appropriate cache is not initialized. /// /// Spec v0.4.0 - pub fn process_slashings(&mut self, spec: &ChainSpec) { - let current_epoch = self.current_epoch(spec); - let active_validator_indices = - get_active_validator_indices(&self.validator_registry, current_epoch); - let total_balance = self.get_total_balance(&active_validator_indices[..], spec); - - for (index, validator) in self.validator_registry.iter().enumerate() { - if validator.slashed - && (current_epoch - == validator.withdrawable_epoch - - Epoch::from(spec.latest_slashed_exit_length / 2)) - { - let epoch_index: usize = current_epoch.as_usize() % spec.latest_slashed_exit_length; - - let total_at_start = self.latest_slashed_balances - [(epoch_index + 1) % spec.latest_slashed_exit_length]; - let total_at_end = self.latest_slashed_balances[epoch_index]; - let total_penalities = total_at_end.saturating_sub(total_at_start); - let penalty = std::cmp::max( - self.get_effective_balance(index, spec) - * std::cmp::min(total_penalities * 3, total_balance) - / total_balance, - self.get_effective_balance(index, spec) / spec.min_penalty_quotient, - ); - - safe_sub_assign!(self.validator_balances[index], penalty); - } - } - } - - /// Process the exit queue. - /// - /// Spec v0.4.0 - pub fn process_exit_queue(&mut self, spec: &ChainSpec) { - let current_epoch = self.current_epoch(spec); - - let eligible = |index: usize| { - let validator = &self.validator_registry[index]; - - if validator.withdrawable_epoch != spec.far_future_epoch { - false - } else { - current_epoch >= validator.exit_epoch + spec.min_validator_withdrawability_delay - } - }; - - let mut eligable_indices: Vec = (0..self.validator_registry.len()) - .filter(|i| eligible(*i)) - .collect(); - eligable_indices.sort_by_key(|i| self.validator_registry[*i].exit_epoch); - - for (withdrawn_so_far, index) in eligable_indices.iter().enumerate() { - if withdrawn_so_far as u64 >= spec.max_exit_dequeues_per_epoch { - break; - } - self.prepare_validator_for_withdrawal(*index, spec); - } - } - - /// Return the randao mix at a recent ``epoch``. - /// - /// Returns `None` if the epoch is out-of-bounds of `self.latest_randao_mixes`. - /// - /// Spec v0.2.0 - pub fn get_randao_mix(&self, epoch: Epoch, spec: &ChainSpec) -> Option<&Hash256> { - self.latest_randao_mixes - .get(epoch.as_usize() % spec.latest_randao_mixes_length) - } - - /// Update validator registry, activating/exiting validators if possible. - /// - /// Spec v0.4.0 - pub fn update_validator_registry(&mut self, spec: &ChainSpec) { - let current_epoch = self.current_epoch(spec); - let active_validator_indices = - get_active_validator_indices(&self.validator_registry, current_epoch); - let total_balance = self.get_total_balance(&active_validator_indices[..], spec); - - let max_balance_churn = std::cmp::max( - spec.max_deposit_amount, - total_balance / (2 * spec.max_balance_churn_quotient), - ); - - let mut balance_churn = 0; - for index in 0..self.validator_registry.len() { - let validator = &self.validator_registry[index]; - - if (validator.activation_epoch == spec.far_future_epoch) - & (self.validator_balances[index] == spec.max_deposit_amount) - { - balance_churn += self.get_effective_balance(index, spec); - if balance_churn > max_balance_churn { - break; - } - self.activate_validator(index, false, spec); - } - } - - let mut balance_churn = 0; - for index in 0..self.validator_registry.len() { - let validator = &self.validator_registry[index]; - - if (validator.exit_epoch == spec.far_future_epoch) & (validator.initiated_exit) { - balance_churn += self.get_effective_balance(index, spec); - if balance_churn > max_balance_churn { - break; - } - - self.exit_validator(index, spec); - } - } - - self.validator_registry_update_epoch = current_epoch; - } - - /// Confirm validator owns PublicKey - /// - /// Spec v0.2.0 - pub fn validate_proof_of_possession( + pub fn get_attestation_participants( &self, - pubkey: PublicKey, - proof_of_possession: Signature, - withdrawal_credentials: Hash256, + attestation_data: &AttestationData, + bitfield: &Bitfield, + spec: &ChainSpec, + ) -> Result, Error> { + let epoch = attestation_data.slot.epoch(spec.slots_per_epoch); + let relative_epoch = self.relative_epoch(epoch, spec)?; + let cache = self.cache(relative_epoch)?; + + let (committee_slot_index, committee_index) = cache + .shard_committee_index_map + .get(&attestation_data.shard) + .ok_or_else(|| Error::ShardOutOfBounds)?; + let (committee, shard) = &cache.committees[*committee_slot_index][*committee_index]; + + assert_eq!(*shard, attestation_data.shard, "Bad epoch cache build."); + + let mut participants = vec![]; + for (i, validator_index) in committee.iter().enumerate() { + if bitfield.get(i).unwrap() { + participants.push(*validator_index); + } + } + + Ok(participants) + } + + /// Return the effective balance (also known as "balance at stake") for a validator with the given ``index``. + /// + /// Spec v0.4.0 + pub fn get_effective_balance(&self, validator_index: usize, spec: &ChainSpec) -> u64 { + std::cmp::min( + self.validator_balances[validator_index], + spec.max_deposit_amount, + ) + } + + /// Return the combined effective balance of an array of validators. + /// + /// Spec v0.4.0 + pub fn get_total_balance(&self, validator_indices: &[usize], spec: &ChainSpec) -> u64 { + validator_indices + .iter() + .fold(0, |acc, i| acc + self.get_effective_balance(*i, spec)) + } + + /// Verify ``bitfield`` against the ``committee_size``. + /// + /// Spec v0.4.0 + pub fn verify_bitfield(&self, bitfield: &Bitfield, committee_size: usize) -> bool { + if bitfield.num_bytes() != ((committee_size + 7) / 8) { + return false; + } + + for i in committee_size..(bitfield.num_bytes() * 8) { + if bitfield.get(i).expect("Impossible due to previous check.") { + return false; + } + } + + true + } + + /// Verify validity of ``slashable_attestation`` fields. + /// + /// Spec v0.4.0 + pub fn verify_slashable_attestation( + &self, + slashable_attestation: &SlashableAttestation, spec: &ChainSpec, ) -> bool { - let proof_of_possession_data = DepositInput { - pubkey: pubkey.clone(), - withdrawal_credentials, - proof_of_possession: Signature::empty_signature(), - }; + if slashable_attestation.custody_bitfield.num_set_bits() > 0 { + return false; + } - proof_of_possession.verify( - &proof_of_possession_data.hash_tree_root(), - self.fork - .get_domain(self.slot.epoch(spec.slots_per_epoch), spec.domain_deposit), - &pubkey, + if slashable_attestation.validator_indices.is_empty() { + return false; + } + + for i in 0..(slashable_attestation.validator_indices.len() - 1) { + if slashable_attestation.validator_indices[i] + >= slashable_attestation.validator_indices[i + 1] + { + return false; + } + } + + if !self.verify_bitfield( + &slashable_attestation.custody_bitfield, + slashable_attestation.validator_indices.len(), + ) { + return false; + } + + if slashable_attestation.validator_indices.len() + > spec.max_indices_per_slashable_vote as usize + { + return false; + } + + let mut aggregate_pubs = vec![AggregatePublicKey::new(); 2]; + let mut message_exists = vec![false; 2]; + + for (i, v) in slashable_attestation.validator_indices.iter().enumerate() { + let custody_bit = match slashable_attestation.custody_bitfield.get(i) { + Ok(bit) => bit, + Err(_) => unreachable!(), + }; + + message_exists[custody_bit as usize] = true; + + match self.validator_registry.get(*v as usize) { + Some(validator) => { + aggregate_pubs[custody_bit as usize].add(&validator.pubkey); + } + None => return false, + }; + } + + let message_0 = AttestationDataAndCustodyBit { + data: slashable_attestation.data.clone(), + custody_bit: false, + } + .hash_tree_root(); + let message_1 = AttestationDataAndCustodyBit { + data: slashable_attestation.data.clone(), + custody_bit: true, + } + .hash_tree_root(); + + let mut messages = vec![]; + let mut keys = vec![]; + + if message_exists[0] { + messages.push(&message_0[..]); + keys.push(&aggregate_pubs[0]); + } + if message_exists[1] { + messages.push(&message_1[..]); + keys.push(&aggregate_pubs[1]); + } + + slashable_attestation.aggregate_signature.verify_multiple( + &messages[..], + spec.domain_attestation, + &keys[..], ) } + /// Return the epoch at which an activation or exit triggered in ``epoch`` takes effect. + /// + /// Spec v0.4.0 + pub fn get_delayed_activation_exit_epoch(&self, epoch: Epoch, spec: &ChainSpec) -> Epoch { + epoch + 1 + spec.activation_exit_delay + } + /// Process multiple deposits in sequence. /// /// Builds a hashmap of validator pubkeys to validator index and passes it to each successive /// call to `process_deposit(..)`. This requires much less computation than successive calls to /// `process_deposits(..)` without the hashmap. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn process_deposits( &mut self, deposits: Vec<&DepositData>, @@ -1030,17 +850,339 @@ impl BeaconState { /// Initiate an exit for the validator of the given `index`. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn prepare_validator_for_withdrawal(&mut self, validator_index: usize, spec: &ChainSpec) { //TODO: we're not ANDing here, we're setting. Potentially wrong. self.validator_registry[validator_index].withdrawable_epoch = self.current_epoch(spec) + spec.min_validator_withdrawability_delay; } + /// Returns the crosslink committees for some slot. + /// + /// Utilizes the cache and will fail if the appropriate cache is not initialized. + /// + /// Spec v0.4.0 + pub(crate) fn get_shuffling_for_slot( + &self, + slot: Slot, + registry_change: bool, + + spec: &ChainSpec, + ) -> Result>, Error> { + let (_committees_per_epoch, seed, shuffling_epoch, _shuffling_start_shard) = + self.get_committee_params_at_slot(slot, registry_change, spec)?; + + self.get_shuffling(seed, shuffling_epoch, spec) + } + + /// Shuffle ``validators`` into crosslink committees seeded by ``seed`` and ``epoch``. + /// + /// Return a list of ``committees_per_epoch`` committees where each + /// committee is itself a list of validator indices. + /// + /// Spec v0.4.0 + pub(crate) fn get_shuffling( + &self, + seed: Hash256, + epoch: Epoch, + spec: &ChainSpec, + ) -> Result>, Error> { + let active_validator_indices = + get_active_validator_indices(&self.validator_registry, epoch); + + if active_validator_indices.is_empty() { + error!("get_shuffling: no validators."); + return Err(Error::InsufficientValidators); + } + + debug!("Shuffling {} validators...", active_validator_indices.len()); + + let committees_per_epoch = spec.get_epoch_committee_count(active_validator_indices.len()); + + trace!( + "get_shuffling: active_validator_indices.len() == {}, committees_per_epoch: {}", + active_validator_indices.len(), + committees_per_epoch + ); + + let active_validator_indices: Vec = active_validator_indices.to_vec(); + + let shuffled_active_validator_indices = shuffle_list( + active_validator_indices, + spec.shuffle_round_count, + &seed[..], + true, + ) + .ok_or_else(|| Error::UnableToShuffle)?; + + Ok(shuffled_active_validator_indices + .honey_badger_split(committees_per_epoch as usize) + .map(|slice: &[usize]| slice.to_vec()) + .collect()) + } + + /// Returns the following params for the given slot: + /// + /// - epoch committee count + /// - epoch seed + /// - calculation epoch + /// - start shard + /// + /// In the spec, this functionality is included in the `get_crosslink_committees_at_slot(..)` + /// function. It is separated here to allow the division of shuffling and committee building, + /// as is required for efficient operations. + /// + /// Spec v0.4.0 + pub(crate) fn get_committee_params_at_slot( + &self, + slot: Slot, + registry_change: bool, + spec: &ChainSpec, + ) -> Result<(u64, Hash256, Epoch, u64), Error> { + let epoch = slot.epoch(spec.slots_per_epoch); + let current_epoch = self.current_epoch(spec); + let previous_epoch = self.previous_epoch(spec); + let next_epoch = self.next_epoch(spec); + + if epoch == current_epoch { + Ok(( + self.get_current_epoch_committee_count(spec), + self.current_shuffling_seed, + self.current_shuffling_epoch, + self.current_shuffling_start_shard, + )) + } else if epoch == previous_epoch { + Ok(( + self.get_previous_epoch_committee_count(spec), + self.previous_shuffling_seed, + self.previous_shuffling_epoch, + self.previous_shuffling_start_shard, + )) + } else if epoch == next_epoch { + let current_committees_per_epoch = self.get_current_epoch_committee_count(spec); + let epochs_since_last_registry_update = + current_epoch - self.validator_registry_update_epoch; + let (seed, shuffling_start_shard) = if registry_change { + let next_seed = self.generate_seed(next_epoch, spec)?; + ( + next_seed, + (self.current_shuffling_start_shard + current_committees_per_epoch) + % spec.shard_count, + ) + } else if (epochs_since_last_registry_update > 1) + & epochs_since_last_registry_update.is_power_of_two() + { + let next_seed = self.generate_seed(next_epoch, spec)?; + (next_seed, self.current_shuffling_start_shard) + } else { + ( + self.current_shuffling_seed, + self.current_shuffling_start_shard, + ) + }; + Ok(( + self.get_next_epoch_committee_count(spec), + seed, + next_epoch, + shuffling_start_shard, + )) + } else { + Err(Error::EpochOutOfBounds) + } + } + + /// Return the list of ``(committee, shard)`` tuples for the ``slot``. + /// + /// Note: There are two possible shufflings for crosslink committees for a + /// `slot` in the next epoch: with and without a `registry_change` + /// + /// Note: does not utilize the cache, `get_crosslink_committees_at_slot` is an equivalent + /// function which uses the cache. + /// + /// Spec v0.4.0 + pub(crate) fn calculate_crosslink_committees_at_slot( + &self, + slot: Slot, + registry_change: bool, + shuffling: Vec>, + spec: &ChainSpec, + ) -> Result, u64)>, Error> { + let (committees_per_epoch, _seed, _shuffling_epoch, shuffling_start_shard) = + self.get_committee_params_at_slot(slot, registry_change, spec)?; + + let offset = slot.as_u64() % spec.slots_per_epoch; + let committees_per_slot = committees_per_epoch / spec.slots_per_epoch; + let slot_start_shard = + (shuffling_start_shard + committees_per_slot * offset) % spec.shard_count; + + let mut crosslinks_at_slot = vec![]; + for i in 0..committees_per_slot { + let tuple = ( + shuffling[(committees_per_slot * offset + i) as usize].clone(), + (slot_start_shard + i) % spec.shard_count, + ); + crosslinks_at_slot.push(tuple) + } + Ok(crosslinks_at_slot) + } + + /// Returns the `slot`, `shard` and `committee_index` for which a validator must produce an + /// attestation. + /// + /// Only reads the current epoch. + /// + /// Note: Utilizes the cache and will fail if the appropriate cache is not initialized. + /// + /// Spec v0.4.0 + pub fn attestation_slot_and_shard_for_validator( + &self, + validator_index: usize, + _spec: &ChainSpec, + ) -> Result, Error> { + let cache = self.cache(RelativeEpoch::Current)?; + + Ok(cache + .attestation_duty_map + .get(&(validator_index as u64)) + .and_then(|tuple| Some(*tuple))) + } + + /// Process the slashings. + /// + /// Spec v0.4.0 + pub fn process_slashings(&mut self, spec: &ChainSpec) { + let current_epoch = self.current_epoch(spec); + let active_validator_indices = + get_active_validator_indices(&self.validator_registry, current_epoch); + let total_balance = self.get_total_balance(&active_validator_indices[..], spec); + + for (index, validator) in self.validator_registry.iter().enumerate() { + if validator.slashed + && (current_epoch + == validator.withdrawable_epoch + - Epoch::from(spec.latest_slashed_exit_length / 2)) + { + let epoch_index: usize = current_epoch.as_usize() % spec.latest_slashed_exit_length; + + let total_at_start = self.latest_slashed_balances + [(epoch_index + 1) % spec.latest_slashed_exit_length]; + let total_at_end = self.latest_slashed_balances[epoch_index]; + let total_penalities = total_at_end.saturating_sub(total_at_start); + let penalty = std::cmp::max( + self.get_effective_balance(index, spec) + * std::cmp::min(total_penalities * 3, total_balance) + / total_balance, + self.get_effective_balance(index, spec) / spec.min_penalty_quotient, + ); + + safe_sub_assign!(self.validator_balances[index], penalty); + } + } + } + + /// Process the exit queue. + /// + /// Spec v0.4.0 + pub fn process_exit_queue(&mut self, spec: &ChainSpec) { + let current_epoch = self.current_epoch(spec); + + let eligible = |index: usize| { + let validator = &self.validator_registry[index]; + + if validator.withdrawable_epoch != spec.far_future_epoch { + false + } else { + current_epoch >= validator.exit_epoch + spec.min_validator_withdrawability_delay + } + }; + + let mut eligable_indices: Vec = (0..self.validator_registry.len()) + .filter(|i| eligible(*i)) + .collect(); + eligable_indices.sort_by_key(|i| self.validator_registry[*i].exit_epoch); + + for (withdrawn_so_far, index) in eligable_indices.iter().enumerate() { + if withdrawn_so_far as u64 >= spec.max_exit_dequeues_per_epoch { + break; + } + self.prepare_validator_for_withdrawal(*index, spec); + } + } + + /// Update validator registry, activating/exiting validators if possible. + /// + /// Spec v0.4.0 + pub fn update_validator_registry(&mut self, spec: &ChainSpec) { + let current_epoch = self.current_epoch(spec); + let active_validator_indices = + get_active_validator_indices(&self.validator_registry, current_epoch); + let total_balance = self.get_total_balance(&active_validator_indices[..], spec); + + let max_balance_churn = std::cmp::max( + spec.max_deposit_amount, + total_balance / (2 * spec.max_balance_churn_quotient), + ); + + let mut balance_churn = 0; + for index in 0..self.validator_registry.len() { + let validator = &self.validator_registry[index]; + + if (validator.activation_epoch == spec.far_future_epoch) + & (self.validator_balances[index] == spec.max_deposit_amount) + { + balance_churn += self.get_effective_balance(index, spec); + if balance_churn > max_balance_churn { + break; + } + self.activate_validator(index, false, spec); + } + } + + let mut balance_churn = 0; + for index in 0..self.validator_registry.len() { + let validator = &self.validator_registry[index]; + + if (validator.exit_epoch == spec.far_future_epoch) & (validator.initiated_exit) { + balance_churn += self.get_effective_balance(index, spec); + if balance_churn > max_balance_churn { + break; + } + + self.exit_validator(index, spec); + } + } + + self.validator_registry_update_epoch = current_epoch; + } + + /// Confirm validator owns PublicKey + /// + /// Spec v0.4.0 + pub fn validate_proof_of_possession( + &self, + pubkey: PublicKey, + proof_of_possession: Signature, + withdrawal_credentials: Hash256, + spec: &ChainSpec, + ) -> bool { + let proof_of_possession_data = DepositInput { + pubkey: pubkey.clone(), + withdrawal_credentials, + proof_of_possession: Signature::empty_signature(), + }; + + proof_of_possession.verify( + &proof_of_possession_data.hash_tree_root(), + self.fork + .get_domain(self.slot.epoch(spec.slots_per_epoch), spec.domain_deposit), + &pubkey, + ) + } + /// Iterate through the validator registry and eject active validators with balance below /// ``EJECTION_BALANCE``. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn process_ejections(&mut self, spec: &ChainSpec) { for validator_index in get_active_validator_indices(&self.validator_registry, self.current_epoch(spec)) @@ -1055,7 +1197,7 @@ impl BeaconState { /// /// Note: this is defined "inline" in the spec, not as a helper function. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn inactivity_penalty( &self, validator_index: usize, @@ -1075,7 +1217,7 @@ impl BeaconState { /// /// Note: In the spec this is defined "inline", not as a helper function. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn inclusion_distance( &self, attestations: &[&PendingAttestation], @@ -1091,7 +1233,7 @@ impl BeaconState { /// /// Note: In the spec this is defined "inline", not as a helper function. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn inclusion_slot( &self, attestations: &[&PendingAttestation], @@ -1107,7 +1249,7 @@ impl BeaconState { /// /// Note: In the spec this is defined "inline", not as a helper function. /// - /// Spec v0.2.0 + /// Spec v0.4.0 fn earliest_included_attestation( &self, attestations: &[&PendingAttestation], @@ -1135,7 +1277,7 @@ impl BeaconState { /// /// Note: In the spec this is defined "inline", not as a helper function. /// - /// Spec v0.2.0 + /// Spec v0.4.0 pub fn base_reward( &self, validator_index: usize, @@ -1145,141 +1287,9 @@ impl BeaconState { self.get_effective_balance(validator_index, spec) / base_reward_quotient / 5 } - /// Return the combined effective balance of an array of validators. + /// Returns the union of all participants in the provided attestations /// - /// Spec v0.2.0 - pub fn get_total_balance(&self, validator_indices: &[usize], spec: &ChainSpec) -> u64 { - validator_indices - .iter() - .fold(0, |acc, i| acc + self.get_effective_balance(*i, spec)) - } - - /// Return the effective balance (also known as "balance at stake") for a validator with the given ``index``. - /// - /// Spec v0.2.0 - pub fn get_effective_balance(&self, validator_index: usize, spec: &ChainSpec) -> u64 { - std::cmp::min( - self.validator_balances[validator_index], - spec.max_deposit_amount, - ) - } - - /// Verify ``bitfield`` against the ``committee_size``. - /// - /// Spec v0.2.0 - pub fn verify_bitfield(&self, bitfield: &Bitfield, committee_size: usize) -> bool { - if bitfield.num_bytes() != ((committee_size + 7) / 8) { - return false; - } - - for i in committee_size..(bitfield.num_bytes() * 8) { - match bitfield.get(i) { - Ok(bit) => { - if bit { - return false; - } - } - Err(_) => unreachable!(), - } - } - - true - } - - /// Verify validity of ``slashable_attestation`` fields. - /// - /// Spec v0.2.0 - pub fn verify_slashable_attestation( - &self, - slashable_attestation: &SlashableAttestation, - spec: &ChainSpec, - ) -> bool { - if slashable_attestation.custody_bitfield.num_set_bits() > 0 { - return false; - } - - if slashable_attestation.validator_indices.is_empty() { - return false; - } - - for i in 0..(slashable_attestation.validator_indices.len() - 1) { - if slashable_attestation.validator_indices[i] - >= slashable_attestation.validator_indices[i + 1] - { - return false; - } - } - - if !self.verify_bitfield( - &slashable_attestation.custody_bitfield, - slashable_attestation.validator_indices.len(), - ) { - return false; - } - - if slashable_attestation.validator_indices.len() - > spec.max_indices_per_slashable_vote as usize - { - return false; - } - - let mut aggregate_pubs = vec![AggregatePublicKey::new(); 2]; - let mut message_exists = vec![false; 2]; - - for (i, v) in slashable_attestation.validator_indices.iter().enumerate() { - let custody_bit = match slashable_attestation.custody_bitfield.get(i) { - Ok(bit) => bit, - Err(_) => unreachable!(), - }; - - message_exists[custody_bit as usize] = true; - - match self.validator_registry.get(*v as usize) { - Some(validator) => { - aggregate_pubs[custody_bit as usize].add(&validator.pubkey); - } - None => return false, - }; - } - - let message_0 = AttestationDataAndCustodyBit { - data: slashable_attestation.data.clone(), - custody_bit: false, - } - .hash_tree_root(); - let message_1 = AttestationDataAndCustodyBit { - data: slashable_attestation.data.clone(), - custody_bit: true, - } - .hash_tree_root(); - - let mut messages = vec![]; - let mut keys = vec![]; - - if message_exists[0] { - messages.push(&message_0[..]); - keys.push(&aggregate_pubs[0]); - } - if message_exists[1] { - messages.push(&message_1[..]); - keys.push(&aggregate_pubs[1]); - } - - slashable_attestation.aggregate_signature.verify_multiple( - &messages[..], - spec.domain_attestation, - &keys[..], - ) - } - - /// Return the block root at a recent `slot`. - /// - /// Spec v0.2.0 - pub fn get_block_root(&self, slot: Slot, spec: &ChainSpec) -> Option<&Hash256> { - self.latest_block_roots - .get(slot.as_usize() % spec.latest_block_roots_length) - } - + /// Spec v0.4.0 pub fn get_attestation_participants_union( &self, attestations: &[&PendingAttestation], @@ -1299,39 +1309,6 @@ impl BeaconState { all_participants.dedup(); Ok(all_participants) } - - /// Returns the list of validator indices which participiated in the attestation. - /// - /// Note: Utilizes the cache and will fail if the appropriate cache is not initialized. - /// - /// Spec v0.2.0 - pub fn get_attestation_participants( - &self, - attestation_data: &AttestationData, - bitfield: &Bitfield, - spec: &ChainSpec, - ) -> Result, Error> { - let epoch = attestation_data.slot.epoch(spec.slots_per_epoch); - let relative_epoch = self.relative_epoch(epoch, spec)?; - let cache = self.cache(relative_epoch)?; - - let (committee_slot_index, committee_index) = cache - .shard_committee_index_map - .get(&attestation_data.shard) - .ok_or_else(|| Error::ShardOutOfBounds)?; - let (committee, shard) = &cache.committees[*committee_slot_index][*committee_index]; - - assert_eq!(*shard, attestation_data.shard, "Bad epoch cache build."); - - let mut participants = vec![]; - for (i, validator_index) in committee.iter().enumerate() { - if bitfield.get(i).unwrap() { - participants.push(*validator_index); - } - } - - Ok(participants) - } } fn hash_tree_root(input: Vec) -> Hash256 { diff --git a/eth2/types/src/beacon_state/helpers.rs b/eth2/types/src/beacon_state/helpers.rs new file mode 100644 index 000000000..e69de29bb diff --git a/eth2/types/src/chain_spec.rs b/eth2/types/src/chain_spec.rs index 8aef79466..dea079755 100644 --- a/eth2/types/src/chain_spec.rs +++ b/eth2/types/src/chain_spec.rs @@ -93,8 +93,20 @@ pub struct ChainSpec { pub domain_randao: u64, pub domain_transfer: u64, } - impl ChainSpec { + /// Return the number of committees in one epoch. + /// + /// Spec v0.4.0 + pub fn get_epoch_committee_count(&self, active_validator_count: usize) -> u64 { + std::cmp::max( + 1, + std::cmp::min( + self.shard_count / self.slots_per_epoch, + active_validator_count as u64 / self.slots_per_epoch / self.target_committee_size, + ), + ) * self.slots_per_epoch + } + /// Returns a `ChainSpec` compatible with the Ethereum Foundation specification. /// /// Spec v0.4.0 @@ -190,9 +202,7 @@ impl ChainSpec { domain_transfer: 5, } } -} -impl ChainSpec { /// Returns a `ChainSpec` compatible with the specification suitable for 8 validators. /// /// Spec v0.4.0 diff --git a/eth2/types/src/fork.rs b/eth2/types/src/fork.rs index 783a65302..6c524a2d9 100644 --- a/eth2/types/src/fork.rs +++ b/eth2/types/src/fork.rs @@ -16,6 +16,8 @@ pub struct Fork { impl Fork { /// Return the fork version of the given ``epoch``. + /// + /// Spec v0.4.0 pub fn get_fork_version(&self, epoch: Epoch) -> u64 { if epoch < self.epoch { return self.previous_version; @@ -24,6 +26,8 @@ impl Fork { } /// Get the domain number that represents the fork meta and signature domain. + /// + /// Spec v0.4.0 pub fn get_domain(&self, epoch: Epoch, domain_type: u64) -> u64 { let fork_version = self.get_fork_version(epoch); fork_version * u64::pow(2, 32) + domain_type diff --git a/eth2/types/src/readers/state_reader.rs b/eth2/types/src/readers/state_reader.rs index 92a870855..e469bee57 100644 --- a/eth2/types/src/readers/state_reader.rs +++ b/eth2/types/src/readers/state_reader.rs @@ -1,4 +1,4 @@ -use crate::{BeaconState, Hash256, Slot}; +use crate::{BeaconState, Slot}; use std::fmt::Debug; /// The `BeaconStateReader` provides interfaces for reading a subset of fields of a `BeaconState`. @@ -11,7 +11,6 @@ use std::fmt::Debug; /// "future proofing". pub trait BeaconStateReader: Debug + PartialEq { fn slot(&self) -> Slot; - fn canonical_root(&self) -> Hash256; fn into_beacon_state(self) -> Option; } @@ -20,10 +19,6 @@ impl BeaconStateReader for BeaconState { self.slot } - fn canonical_root(&self) -> Hash256 { - self.canonical_root() - } - fn into_beacon_state(self) -> Option { Some(self) } diff --git a/eth2/types/src/validator_registry.rs b/eth2/types/src/validator_registry.rs index 20863dd72..7b55e78cb 100644 --- a/eth2/types/src/validator_registry.rs +++ b/eth2/types/src/validator_registry.rs @@ -4,6 +4,8 @@ use super::validator::*; use crate::Epoch; /// Given an indexed sequence of `validators`, return the indices corresponding to validators that are active at `epoch`. +/// +/// Spec v0.4.0 pub fn get_active_validator_indices(validators: &[Validator], epoch: Epoch) -> Vec { validators .iter() From 0be8e57fd3bf916ca8dee426fc5a5a4fdae8336c Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 10:21:55 +1100 Subject: [PATCH 12/31] Further v0.4.0 updates to `types` crate --- eth2/types/src/attester_slashing/builder.rs | 4 +-- eth2/types/src/beacon_block_body.rs | 4 +-- eth2/types/src/beacon_state.rs | 28 +++++++-------------- eth2/types/src/beacon_state/builder.rs | 2 +- eth2/types/src/beacon_state/helpers.rs | 20 +++++++++++++++ eth2/types/src/crosslink.rs | 2 +- eth2/types/src/lib.rs | 2 +- eth2/types/src/voluntary_exit.rs | 6 ++--- 8 files changed, 39 insertions(+), 29 deletions(-) diff --git a/eth2/types/src/attester_slashing/builder.rs b/eth2/types/src/attester_slashing/builder.rs index 54dfae959..6638eb2a5 100644 --- a/eth2/types/src/attester_slashing/builder.rs +++ b/eth2/types/src/attester_slashing/builder.rs @@ -40,7 +40,7 @@ impl AttesterSlashingBuilder { crosslink_data_root: hash_1, latest_crosslink: Crosslink { epoch, - shard_block_root: hash_1, + crosslink_data_root: hash_1, }, justified_epoch, justified_block_root: hash_1, @@ -59,7 +59,7 @@ impl AttesterSlashingBuilder { crosslink_data_root: hash_2, latest_crosslink: Crosslink { epoch, - shard_block_root: hash_2, + crosslink_data_root: hash_2, }, justified_epoch, justified_block_root: hash_2, diff --git a/eth2/types/src/beacon_block_body.rs b/eth2/types/src/beacon_block_body.rs index 13c82e42f..e7dec2e4b 100644 --- a/eth2/types/src/beacon_block_body.rs +++ b/eth2/types/src/beacon_block_body.rs @@ -1,4 +1,4 @@ -use super::{Attestation, AttesterSlashing, Deposit, ProposerSlashing, Transfer, VolutaryExit}; +use super::{Attestation, AttesterSlashing, Deposit, ProposerSlashing, Transfer, VoluntaryExit}; use crate::test_utils::TestRandom; use rand::RngCore; use serde_derive::Serialize; @@ -14,7 +14,7 @@ pub struct BeaconBlockBody { pub attester_slashings: Vec, pub attestations: Vec, pub deposits: Vec, - pub voluntary_exits: Vec, + pub voluntary_exits: Vec, pub transfers: Vec, } diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index d876adc62..2394c2c0d 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -2,6 +2,7 @@ use self::epoch_cache::EpochCache; use crate::test_utils::TestRandom; use crate::{validator_registry::get_active_validator_indices, *}; use bls::verify_proof_of_possession; +use helpers::*; use honey_badger_split::SplitExt; use int_to_bytes::int_to_bytes32; use log::{debug, error, trace}; @@ -16,6 +17,7 @@ pub use builder::BeaconStateBuilder; mod builder; mod epoch_cache; +pub mod helpers; mod tests; pub type Committee = Vec; @@ -44,6 +46,7 @@ pub enum Error { ShardOutOfBounds, UnableToShuffle, UnknownValidator, + InvalidBitfield, InsufficientRandaoMixes, InsufficientValidators, InsufficientBlockRoots, @@ -125,7 +128,7 @@ impl BeaconState { debug!("Creating genesis state (without validator processing)."); let initial_crosslink = Crosslink { epoch: spec.genesis_epoch, - shard_block_root: spec.zero_hash, + crosslink_data_root: spec.zero_hash, }; Ok(BeaconState { @@ -530,6 +533,10 @@ impl BeaconState { assert_eq!(*shard, attestation_data.shard, "Bad epoch cache build."); + if !verify_bitfield_length(&bitfield, committee.len()) { + return Err(Error::InvalidBitfield); + } + let mut participants = vec![]; for (i, validator_index) in committee.iter().enumerate() { if bitfield.get(i).unwrap() { @@ -559,23 +566,6 @@ impl BeaconState { .fold(0, |acc, i| acc + self.get_effective_balance(*i, spec)) } - /// Verify ``bitfield`` against the ``committee_size``. - /// - /// Spec v0.4.0 - pub fn verify_bitfield(&self, bitfield: &Bitfield, committee_size: usize) -> bool { - if bitfield.num_bytes() != ((committee_size + 7) / 8) { - return false; - } - - for i in committee_size..(bitfield.num_bytes() * 8) { - if bitfield.get(i).expect("Impossible due to previous check.") { - return false; - } - } - - true - } - /// Verify validity of ``slashable_attestation`` fields. /// /// Spec v0.4.0 @@ -600,7 +590,7 @@ impl BeaconState { } } - if !self.verify_bitfield( + if !verify_bitfield_length( &slashable_attestation.custody_bitfield, slashable_attestation.validator_indices.len(), ) { diff --git a/eth2/types/src/beacon_state/builder.rs b/eth2/types/src/beacon_state/builder.rs index 36b6468fc..dadce9cac 100644 --- a/eth2/types/src/beacon_state/builder.rs +++ b/eth2/types/src/beacon_state/builder.rs @@ -252,7 +252,7 @@ fn committee_to_pending_attestation( crosslink_data_root: Hash256::zero(), latest_crosslink: Crosslink { epoch: slot.epoch(spec.slots_per_epoch), - shard_block_root: Hash256::zero(), + crosslink_data_root: Hash256::zero(), }, justified_epoch, justified_block_root, diff --git a/eth2/types/src/beacon_state/helpers.rs b/eth2/types/src/beacon_state/helpers.rs index e69de29bb..c93b16f76 100644 --- a/eth2/types/src/beacon_state/helpers.rs +++ b/eth2/types/src/beacon_state/helpers.rs @@ -0,0 +1,20 @@ +use crate::*; + +/// Verify ``bitfield`` against the ``committee_size``. +/// +/// Is title `verify_bitfield` in spec. +/// +/// Spec v0.4.0 +pub fn verify_bitfield_length(bitfield: &Bitfield, committee_size: usize) -> bool { + if bitfield.num_bytes() != ((committee_size + 7) / 8) { + return false; + } + + for i in committee_size..(bitfield.num_bytes() * 8) { + if bitfield.get(i).expect("Impossible due to previous check.") { + return false; + } + } + + true +} diff --git a/eth2/types/src/crosslink.rs b/eth2/types/src/crosslink.rs index 142d0f894..f49195a75 100644 --- a/eth2/types/src/crosslink.rs +++ b/eth2/types/src/crosslink.rs @@ -13,7 +13,7 @@ use test_random_derive::TestRandom; )] pub struct Crosslink { pub epoch: Epoch, - pub shard_block_root: Hash256, + pub crosslink_data_root: Hash256, } #[cfg(test)] diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs index f54a24b01..f88cc6a17 100644 --- a/eth2/types/src/lib.rs +++ b/eth2/types/src/lib.rs @@ -60,7 +60,7 @@ pub use crate::slot_epoch::{Epoch, Slot}; pub use crate::slot_height::SlotHeight; pub use crate::transfer::Transfer; pub use crate::validator::Validator; -pub use crate::voluntary_exit::VolutaryExit; +pub use crate::voluntary_exit::VoluntaryExit; pub type Hash256 = H256; pub type Address = H160; diff --git a/eth2/types/src/voluntary_exit.rs b/eth2/types/src/voluntary_exit.rs index 3cb0a85b7..58c3ae4c2 100644 --- a/eth2/types/src/voluntary_exit.rs +++ b/eth2/types/src/voluntary_exit.rs @@ -10,7 +10,7 @@ use test_random_derive::TestRandom; /// /// Spec v0.4.0 #[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] -pub struct VolutaryExit { +pub struct VoluntaryExit { pub epoch: Epoch, pub validator_index: u64, pub signature: Signature, @@ -25,7 +25,7 @@ mod tests { #[test] pub fn test_ssz_round_trip() { let mut rng = XorShiftRng::from_seed([42; 16]); - let original = VolutaryExit::random_for_test(&mut rng); + let original = VoluntaryExit::random_for_test(&mut rng); let bytes = ssz_encode(&original); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); @@ -36,7 +36,7 @@ mod tests { #[test] pub fn test_hash_tree_root_internal() { let mut rng = XorShiftRng::from_seed([42; 16]); - let original = VolutaryExit::random_for_test(&mut rng); + let original = VoluntaryExit::random_for_test(&mut rng); let result = original.hash_tree_root_internal(); From a15ed0acd3663fbae42e91edb22a89ad53b8323d Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 10:22:19 +1100 Subject: [PATCH 13/31] Start new Error structure in `state_processing` --- .../state_processing/src/block_processable.rs | 124 +-------- .../block_processable/validate_attestation.rs | 238 ++++++++++++++++++ eth2/state_processing/src/errors.rs | 30 +++ eth2/state_processing/src/lib.rs | 11 +- eth2/state_processing/src/macros.rs | 8 + 5 files changed, 290 insertions(+), 121 deletions(-) create mode 100644 eth2/state_processing/src/block_processable/validate_attestation.rs create mode 100644 eth2/state_processing/src/errors.rs create mode 100644 eth2/state_processing/src/macros.rs diff --git a/eth2/state_processing/src/block_processable.rs b/eth2/state_processing/src/block_processable.rs index ee8bc7c33..6f4d7268e 100644 --- a/eth2/state_processing/src/block_processable.rs +++ b/eth2/state_processing/src/block_processable.rs @@ -5,7 +5,11 @@ use int_to_bytes::int_to_bytes32; use log::{debug, trace}; use ssz::{ssz_encode, TreeHash}; use types::*; +use validate_attestation::validate_attestations; +pub use validate_attestation::{validate_attestation, validate_attestation_without_signature}; + +mod validate_attestation; mod verify_slashable_attestation; const PHASE_0_CUSTODY_BIT: bool = false; @@ -41,7 +45,6 @@ pub enum Error { BeaconStateError(BeaconStateError), SlotProcessingError(SlotProcessingError), } - #[derive(Debug, PartialEq)] pub enum AttestationValidationError { IncludedTooEarly, @@ -221,19 +224,10 @@ fn per_block_processing_signature_optional( verify_slashable_attestation(&mut state, &attester_slashing, spec)?; } - /* - * Attestations - */ - ensure!( - block.body.attestations.len() as u64 <= spec.max_attestations, - Error::MaxAttestationsExceeded - ); - - debug!("Verifying {} attestations.", block.body.attestations.len()); + validate_attestations(&mut state, &block, spec); + // Convert each attestation into a `PendingAttestation` and insert into the state. for attestation in &block.body.attestations { - validate_attestation(&state, attestation, spec)?; - let pending_attestation = PendingAttestation { data: attestation.data.clone(), aggregation_bitfield: attestation.aggregation_bitfield.clone(), @@ -293,7 +287,7 @@ fn per_block_processing_signature_optional( ); ensure!(state.current_epoch(spec) >= exit.epoch, Error::BadExit); let exit_message = { - let exit_struct = Exit { + let exit_struct = VoluntaryExit { epoch: exit.epoch, validator_index: exit.validator_index, signature: spec.empty_signature.clone(), @@ -317,110 +311,6 @@ fn per_block_processing_signature_optional( Ok(()) } -pub fn validate_attestation( - state: &BeaconState, - attestation: &Attestation, - spec: &ChainSpec, -) -> Result<(), AttestationValidationError> { - validate_attestation_signature_optional(state, attestation, spec, true) -} - -pub fn validate_attestation_without_signature( - state: &BeaconState, - attestation: &Attestation, - spec: &ChainSpec, -) -> Result<(), AttestationValidationError> { - validate_attestation_signature_optional(state, attestation, spec, false) -} - -fn validate_attestation_signature_optional( - state: &BeaconState, - attestation: &Attestation, - spec: &ChainSpec, - verify_signature: bool, -) -> Result<(), AttestationValidationError> { - trace!( - "validate_attestation_signature_optional: attestation epoch: {}", - attestation.data.slot.epoch(spec.slots_per_epoch) - ); - ensure!( - attestation.data.slot + spec.min_attestation_inclusion_delay <= state.slot, - AttestationValidationError::IncludedTooEarly - ); - ensure!( - attestation.data.slot + spec.slots_per_epoch >= state.slot, - AttestationValidationError::IncludedTooLate - ); - if attestation.data.slot >= state.current_epoch_start_slot(spec) { - ensure!( - attestation.data.justified_epoch == state.justified_epoch, - AttestationValidationError::WrongJustifiedSlot - ); - } else { - ensure!( - attestation.data.justified_epoch == state.previous_justified_epoch, - AttestationValidationError::WrongJustifiedSlot - ); - } - ensure!( - attestation.data.justified_block_root - == *state - .get_block_root( - attestation - .data - .justified_epoch - .start_slot(spec.slots_per_epoch), - &spec - ) - .ok_or(AttestationValidationError::NoBlockRoot)?, - AttestationValidationError::WrongJustifiedRoot - ); - let potential_crosslink = Crosslink { - shard_block_root: attestation.data.shard_block_root, - epoch: attestation.data.slot.epoch(spec.slots_per_epoch), - }; - ensure!( - (attestation.data.latest_crosslink - == state.latest_crosslinks[attestation.data.shard as usize]) - | (attestation.data.latest_crosslink == potential_crosslink), - AttestationValidationError::BadLatestCrosslinkRoot - ); - if verify_signature { - let participants = state.get_attestation_participants( - &attestation.data, - &attestation.aggregation_bitfield, - spec, - )?; - trace!( - "slot: {}, shard: {}, participants: {:?}", - attestation.data.slot, - attestation.data.shard, - participants - ); - let mut group_public_key = AggregatePublicKey::new(); - for participant in participants { - group_public_key.add(&state.validator_registry[participant as usize].pubkey) - } - ensure!( - attestation.verify_signature( - &group_public_key, - PHASE_0_CUSTODY_BIT, - get_domain( - &state.fork, - attestation.data.slot.epoch(spec.slots_per_epoch), - spec.domain_attestation, - ) - ), - AttestationValidationError::BadSignature - ); - } - ensure!( - attestation.data.shard_block_root == spec.zero_hash, - AttestationValidationError::ShardBlockRootNotZero - ); - Ok(()) -} - fn get_domain(fork: &Fork, epoch: Epoch, domain_type: u64) -> u64 { fork.get_domain(epoch, domain_type) } diff --git a/eth2/state_processing/src/block_processable/validate_attestation.rs b/eth2/state_processing/src/block_processable/validate_attestation.rs new file mode 100644 index 000000000..1b422711c --- /dev/null +++ b/eth2/state_processing/src/block_processable/validate_attestation.rs @@ -0,0 +1,238 @@ +use crate::errors::{AttestationInvalid as Invalid, AttestationValidationError as Error}; +use ssz::TreeHash; +use types::beacon_state::helpers::*; +use types::*; + +/// Validate the attestations in some block, converting each into a `PendingAttestation` which is +/// then added to `state.latest_attestations`. +/// +/// Spec v0.4.0 +pub fn validate_attestations( + state: &BeaconState, + block: &BeaconBlock, + spec: &ChainSpec, +) -> Result<(), Error> { + ensure!( + block.body.attestations.len() as u64 <= spec.max_attestations, + MaxAttestationsExceeded + ); + + for attestation in &block.body.attestations { + validate_attestation(&state, attestation, spec)?; + } + + Ok(()) +} + +/// Validate an attestation, checking the aggregate signature. +/// +/// Spec v0.4.0 +pub fn validate_attestation( + state: &BeaconState, + attestation: &Attestation, + spec: &ChainSpec, +) -> Result<(), Error> { + validate_attestation_signature_optional(state, attestation, spec, true) +} + +/// Validate an attestation, without checking the aggregate signature. +/// +/// Spec v0.4.0 +pub fn validate_attestation_without_signature( + state: &BeaconState, + attestation: &Attestation, + spec: &ChainSpec, +) -> Result<(), Error> { + validate_attestation_signature_optional(state, attestation, spec, false) +} + +/// Validate an attestation, optionally checking the aggregate signature. +/// +/// Spec v0.2.0 +fn validate_attestation_signature_optional( + state: &BeaconState, + attestation: &Attestation, + spec: &ChainSpec, + verify_signature: bool, +) -> Result<(), Error> { + // Verify that `attestation.data.slot >= GENESIS_SLOT`. + ensure!(attestation.data.slot >= spec.genesis_slot, PreGenesis); + + // Verify that `attestation.data.slot + MIN_ATTESTATION_INCLUSION_DELAY <= state.slot`. + ensure!( + attestation.data.slot + spec.min_attestation_inclusion_delay <= state.slot, + IncludedTooEarly + ); + + // Verify that `state.slot < attestation.data.slot + SLOTS_PER_EPOCH`. + ensure!( + state.slot < attestation.data.slot + spec.slots_per_epoch, + IncludedTooLate + ); + + // Verify that `attestation.data.justified_epoch` is equal to `state.justified_epoch` if + // `slot_to_epoch(attestation.data.slot + 1) >= get_current_epoch(state) else + // state.previous_justified_epoch`. + if (attestation.data.slot + 1).epoch(spec.slots_per_epoch) >= state.current_epoch(spec) { + ensure!( + attestation.data.justified_epoch == state.justified_epoch, + WrongJustifiedSlot + ); + } else { + ensure!( + attestation.data.justified_epoch == state.previous_justified_epoch, + WrongJustifiedSlot + ); + } + + // Verify that `attestation.data.justified_block_root` is equal to `get_block_root(state, + // get_epoch_start_slot(attestation.data.justified_epoch))`. + ensure!( + attestation.data.justified_block_root + == *state + .get_block_root( + attestation + .data + .justified_epoch + .start_slot(spec.slots_per_epoch), + &spec + ) + .ok_or(BeaconStateError::InsufficientBlockRoots)?, + WrongJustifiedRoot + ); + + // Verify that either: + // + // (i)`state.latest_crosslinks[attestation.data.shard] == attestation.data.latest_crosslink`, + // + // (ii) `state.latest_crosslinks[attestation.data.shard] == + // Crosslink(crosslink_data_root=attestation.data.crosslink_data_root, + // epoch=slot_to_epoch(attestation.data.slot))`. + let potential_crosslink = Crosslink { + crosslink_data_root: attestation.data.crosslink_data_root, + epoch: attestation.data.slot.epoch(spec.slots_per_epoch), + }; + ensure!( + (attestation.data.latest_crosslink + == state.latest_crosslinks[attestation.data.shard as usize]) + | (state.latest_crosslinks[attestation.data.shard as usize] == potential_crosslink), + BadLatestCrosslinkRoot + ); + + // Get the committee for this attestation + let (committee, _shard) = state + .get_crosslink_committees_at_slot(attestation.data.slot, spec)? + .iter() + .find(|(committee, shard)| *shard == attestation.data.shard) + .ok_or_else(|| Error::Invalid(Invalid::NoCommitteeForShard))?; + + // Custody bitfield is all zeros (phase 0 requirement). + ensure!( + attestation.custody_bitfield.num_set_bits() == 0, + CustodyBitfieldHasSetBits + ); + // Custody bitfield length is correct. + ensure!( + verify_bitfield_length(&attestation.aggregation_bitfield, committee.len()), + BadCustodyBitfieldLength + ); + // Aggregation bitfield isn't empty. + ensure!( + attestation.aggregation_bitfield.num_set_bits() != 0, + AggregationBitfieldIsEmpty + ); + // Aggregation bitfield length is correct. + ensure!( + verify_bitfield_length(&attestation.aggregation_bitfield, committee.len()), + BadAggregationBitfieldLength + ); + + if verify_signature { + ensure!( + verify_attestation_signature( + state, + committee, + &attestation.custody_bitfield, + &attestation.data, + &attestation.aggregate_signature, + spec + ), + BadSignature + ); + } + + // [TO BE REMOVED IN PHASE 1] Verify that `attestation.data.crosslink_data_root == ZERO_HASH`. + ensure!( + attestation.data.crosslink_data_root == spec.zero_hash, + ShardBlockRootNotZero + ); + + Ok(()) +} + +/// Verifies an aggregate signature for some given `AttestationData`, returning `true` if the +/// `aggregate_signature` is valid. +/// +/// Returns `false` if: +/// - `aggregate_signature` was not signed correctly. +/// - `custody_bitfield` does not have a bit for each index of `committee`. +/// - A `validator_index` in `committee` is not in `state.validator_registry`. +fn verify_attestation_signature( + state: &BeaconState, + committee: &[usize], + custody_bitfield: &Bitfield, + attestation_data: &AttestationData, + aggregate_signature: &AggregateSignature, + spec: &ChainSpec, +) -> bool { + let mut aggregate_pubs = vec![AggregatePublicKey::new(); 2]; + let mut message_exists = vec![false; 2]; + + for (i, v) in committee.iter().enumerate() { + let custody_bit = match custody_bitfield.get(i) { + Ok(bit) => bit, + // Invalidate signature if custody_bitfield.len() < committee + Err(_) => return false, + }; + + message_exists[custody_bit as usize] = true; + + match state.validator_registry.get(*v as usize) { + Some(validator) => { + aggregate_pubs[custody_bit as usize].add(&validator.pubkey); + } + // Invalidate signature if validator index is unknown. + None => return false, + }; + } + + // Message when custody bitfield is `false` + let message_0 = AttestationDataAndCustodyBit { + data: attestation_data.clone(), + custody_bit: false, + } + .hash_tree_root(); + + // Message when custody bitfield is `true` + let message_1 = AttestationDataAndCustodyBit { + data: attestation_data.clone(), + custody_bit: true, + } + .hash_tree_root(); + + let mut messages = vec![]; + let mut keys = vec![]; + + // If any validator signed a message with a `false` custody bit. + if message_exists[0] { + messages.push(&message_0[..]); + keys.push(&aggregate_pubs[0]); + } + // If any validator signed a message with a `true` custody bit. + if message_exists[1] { + messages.push(&message_1[..]); + keys.push(&aggregate_pubs[1]); + } + + aggregate_signature.verify_multiple(&messages[..], spec.domain_attestation, &keys[..]) +} diff --git a/eth2/state_processing/src/errors.rs b/eth2/state_processing/src/errors.rs new file mode 100644 index 000000000..5eceb0be0 --- /dev/null +++ b/eth2/state_processing/src/errors.rs @@ -0,0 +1,30 @@ +use types::BeaconStateError; + +#[derive(Debug, PartialEq)] +pub enum AttestationValidationError { + Invalid(AttestationInvalid), + ProcessingError(BeaconStateError), +} + +#[derive(Debug, PartialEq)] +pub enum AttestationInvalid { + PreGenesis, + IncludedTooEarly, + IncludedTooLate, + WrongJustifiedSlot, + WrongJustifiedRoot, + BadLatestCrosslinkRoot, + CustodyBitfieldHasSetBits, + AggregationBitfieldIsEmpty, + BadAggregationBitfieldLength, + BadCustodyBitfieldLength, + NoCommitteeForShard, + BadSignature, + ShardBlockRootNotZero, +} + +impl From for AttestationValidationError { + fn from(e: BeaconStateError) -> AttestationValidationError { + AttestationValidationError::ProcessingError(e) + } +} diff --git a/eth2/state_processing/src/lib.rs b/eth2/state_processing/src/lib.rs index 18d1f7554..0a4343e00 100644 --- a/eth2/state_processing/src/lib.rs +++ b/eth2/state_processing/src/lib.rs @@ -1,10 +1,13 @@ +#[macro_use] +mod macros; mod block_processable; -mod epoch_processable; -mod slot_processable; +// mod epoch_processable; +mod errors; +// mod slot_processable; pub use block_processable::{ validate_attestation, validate_attestation_without_signature, BlockProcessable, Error as BlockProcessingError, }; -pub use epoch_processable::{EpochProcessable, Error as EpochProcessingError}; -pub use slot_processable::{Error as SlotProcessingError, SlotProcessable}; +// pub use epoch_processable::{EpochProcessable, Error as EpochProcessingError}; +// pub use slot_processable::{Error as SlotProcessingError, SlotProcessable}; diff --git a/eth2/state_processing/src/macros.rs b/eth2/state_processing/src/macros.rs new file mode 100644 index 000000000..6ccc54ba9 --- /dev/null +++ b/eth2/state_processing/src/macros.rs @@ -0,0 +1,8 @@ +#[macro_use] +macro_rules! ensure { + ($condition: expr, $result: ident) => { + if !$condition { + return Err(Error::Invalid(Invalid::$result)); + } + }; +} From 40f74c9b2622fb1e23af7325e67d6218dae22f0c Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 15:22:45 +1100 Subject: [PATCH 14/31] First compiling version of per-block-proc refactor --- eth2/state_processing/Cargo.toml | 1 - .../state_processing/src/block_processable.rs | 344 ------------------ .../verify_slashable_attestation.rs | 61 ---- eth2/state_processing/src/errors.rs | 221 ++++++++++- eth2/state_processing/src/lib.rs | 10 +- eth2/state_processing/src/macros.rs | 13 +- .../src/per_block_processing.rs | 268 ++++++++++++++ .../validate_attestation.rs | 87 ++--- .../verify_attester_slashing.rs | 49 +++ .../per_block_processing/verify_deposit.rs | 24 ++ .../src/per_block_processing/verify_exit.rs | 41 +++ .../verify_proposer_slashing.rs | 71 ++++ .../verify_slashable_attestation.rs | 105 ++++++ .../per_block_processing/verify_transfer.rs | 19 + eth2/types/src/attester_slashing/builder.rs | 11 +- eth2/types/src/beacon_state.rs | 102 +----- eth2/types/src/chain_spec.rs | 46 ++- eth2/types/src/fork.rs | 8 - eth2/types/src/lib.rs | 2 +- eth2/types/src/proposer_slashing/builder.rs | 10 +- 20 files changed, 907 insertions(+), 586 deletions(-) delete mode 100644 eth2/state_processing/src/block_processable.rs delete mode 100644 eth2/state_processing/src/block_processable/verify_slashable_attestation.rs create mode 100644 eth2/state_processing/src/per_block_processing.rs rename eth2/state_processing/src/{block_processable => per_block_processing}/validate_attestation.rs (83%) create mode 100644 eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs create mode 100644 eth2/state_processing/src/per_block_processing/verify_deposit.rs create mode 100644 eth2/state_processing/src/per_block_processing/verify_exit.rs create mode 100644 eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs create mode 100644 eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs create mode 100644 eth2/state_processing/src/per_block_processing/verify_transfer.rs diff --git a/eth2/state_processing/Cargo.toml b/eth2/state_processing/Cargo.toml index 85ac8b42a..bdc14c1d7 100644 --- a/eth2/state_processing/Cargo.toml +++ b/eth2/state_processing/Cargo.toml @@ -10,7 +10,6 @@ harness = false [dev-dependencies] criterion = "0.2" -test_harness = { path = "../../beacon_node/beacon_chain/test_harness" } env_logger = "0.6.0" [dependencies] diff --git a/eth2/state_processing/src/block_processable.rs b/eth2/state_processing/src/block_processable.rs deleted file mode 100644 index 6f4d7268e..000000000 --- a/eth2/state_processing/src/block_processable.rs +++ /dev/null @@ -1,344 +0,0 @@ -use self::verify_slashable_attestation::verify_slashable_attestation; -use crate::SlotProcessingError; -use hashing::hash; -use int_to_bytes::int_to_bytes32; -use log::{debug, trace}; -use ssz::{ssz_encode, TreeHash}; -use types::*; -use validate_attestation::validate_attestations; - -pub use validate_attestation::{validate_attestation, validate_attestation_without_signature}; - -mod validate_attestation; -mod verify_slashable_attestation; - -const PHASE_0_CUSTODY_BIT: bool = false; - -#[derive(Debug, PartialEq)] -pub enum Error { - DBError(String), - StateAlreadyTransitioned, - PresentSlotIsNone, - UnableToDecodeBlock, - MissingParentState(Hash256), - InvalidParentState(Hash256), - MissingBeaconBlock(Hash256), - InvalidBeaconBlock(Hash256), - MissingParentBlock(Hash256), - StateSlotMismatch, - BadBlockSignature, - BadRandaoSignature, - MaxProposerSlashingsExceeded, - BadProposerSlashing, - MaxAttesterSlashingsExceed, - MaxAttestationsExceeded, - BadAttesterSlashing, - InvalidAttestation(AttestationValidationError), - NoBlockRoot, - MaxDepositsExceeded, - BadDeposit, - MaxExitsExceeded, - BadExit, - BadCustodyReseeds, - BadCustodyChallenges, - BadCustodyResponses, - BeaconStateError(BeaconStateError), - SlotProcessingError(SlotProcessingError), -} -#[derive(Debug, PartialEq)] -pub enum AttestationValidationError { - IncludedTooEarly, - IncludedTooLate, - WrongJustifiedSlot, - WrongJustifiedRoot, - BadLatestCrosslinkRoot, - BadSignature, - ShardBlockRootNotZero, - NoBlockRoot, - BeaconStateError(BeaconStateError), -} - -macro_rules! ensure { - ($condition: expr, $result: expr) => { - if !$condition { - return Err($result); - } - }; -} - -pub trait BlockProcessable { - fn per_block_processing(&mut self, block: &BeaconBlock, spec: &ChainSpec) -> Result<(), Error>; - fn per_block_processing_without_verifying_block_signature( - &mut self, - block: &BeaconBlock, - spec: &ChainSpec, - ) -> Result<(), Error>; -} - -impl BlockProcessable for BeaconState { - fn per_block_processing(&mut self, block: &BeaconBlock, spec: &ChainSpec) -> Result<(), Error> { - per_block_processing_signature_optional(self, block, true, spec) - } - - fn per_block_processing_without_verifying_block_signature( - &mut self, - block: &BeaconBlock, - spec: &ChainSpec, - ) -> Result<(), Error> { - per_block_processing_signature_optional(self, block, false, spec) - } -} - -fn per_block_processing_signature_optional( - mut state: &mut BeaconState, - block: &BeaconBlock, - verify_block_signature: bool, - spec: &ChainSpec, -) -> Result<(), Error> { - ensure!(block.slot == state.slot, Error::StateSlotMismatch); - - // Building the previous epoch could be delayed until an attestation from a previous epoch is - // included. This is left for future optimisation. - state.build_epoch_cache(RelativeEpoch::Previous, spec)?; - state.build_epoch_cache(RelativeEpoch::Current, spec)?; - - /* - * Proposer Signature - */ - let block_proposer_index = state.get_beacon_proposer_index(block.slot, spec)?; - let block_proposer = &state.validator_registry[block_proposer_index]; - - if verify_block_signature { - ensure!( - bls_verify( - &block_proposer.pubkey, - &block.proposal_root(spec)[..], - &block.signature, - get_domain(&state.fork, state.current_epoch(spec), spec.domain_proposal) - ), - Error::BadBlockSignature - ); - } - - /* - * RANDAO - */ - ensure!( - bls_verify( - &block_proposer.pubkey, - &int_to_bytes32(state.current_epoch(spec).as_u64()), - &block.randao_reveal, - get_domain(&state.fork, state.current_epoch(spec), spec.domain_randao) - ), - Error::BadRandaoSignature - ); - - // TODO: check this is correct. - let new_mix = { - let mut mix = state.latest_randao_mixes - [state.slot.as_usize() % spec.latest_randao_mixes_length] - .to_vec(); - mix.append(&mut ssz_encode(&block.randao_reveal)); - Hash256::from(&hash(&mix)[..]) - }; - - state.latest_randao_mixes[state.slot.as_usize() % spec.latest_randao_mixes_length] = new_mix; - - /* - * Eth1 data - */ - // TODO: Eth1 data processing. - - /* - * Proposer slashings - */ - ensure!( - block.body.proposer_slashings.len() as u64 <= spec.max_proposer_slashings, - Error::MaxProposerSlashingsExceeded - ); - for proposer_slashing in &block.body.proposer_slashings { - let proposer = state - .validator_registry - .get(proposer_slashing.proposer_index as usize) - .ok_or(Error::BadProposerSlashing)?; - ensure!( - proposer_slashing.proposal_data_1.slot == proposer_slashing.proposal_data_2.slot, - Error::BadProposerSlashing - ); - ensure!( - proposer_slashing.proposal_data_1.shard == proposer_slashing.proposal_data_2.shard, - Error::BadProposerSlashing - ); - ensure!( - proposer_slashing.proposal_data_1.block_root - != proposer_slashing.proposal_data_2.block_root, - Error::BadProposerSlashing - ); - ensure!( - proposer.penalized_epoch > state.current_epoch(spec), - Error::BadProposerSlashing - ); - ensure!( - bls_verify( - &proposer.pubkey, - &proposer_slashing.proposal_data_1.hash_tree_root(), - &proposer_slashing.proposal_signature_1, - get_domain( - &state.fork, - proposer_slashing - .proposal_data_1 - .slot - .epoch(spec.slots_per_epoch), - spec.domain_proposal - ) - ), - Error::BadProposerSlashing - ); - ensure!( - bls_verify( - &proposer.pubkey, - &proposer_slashing.proposal_data_2.hash_tree_root(), - &proposer_slashing.proposal_signature_2, - get_domain( - &state.fork, - proposer_slashing - .proposal_data_2 - .slot - .epoch(spec.slots_per_epoch), - spec.domain_proposal - ) - ), - Error::BadProposerSlashing - ); - state.penalize_validator(proposer_slashing.proposer_index as usize, spec)?; - } - - /* - * Attester slashings - */ - ensure!( - block.body.attester_slashings.len() as u64 <= spec.max_attester_slashings, - Error::MaxAttesterSlashingsExceed - ); - for attester_slashing in &block.body.attester_slashings { - verify_slashable_attestation(&mut state, &attester_slashing, spec)?; - } - - validate_attestations(&mut state, &block, spec); - - // Convert each attestation into a `PendingAttestation` and insert into the state. - for attestation in &block.body.attestations { - let pending_attestation = PendingAttestation { - data: attestation.data.clone(), - aggregation_bitfield: attestation.aggregation_bitfield.clone(), - custody_bitfield: attestation.custody_bitfield.clone(), - inclusion_slot: state.slot, - }; - state.latest_attestations.push(pending_attestation); - } - - /* - * Deposits - */ - ensure!( - block.body.deposits.len() as u64 <= spec.max_deposits, - Error::MaxDepositsExceeded - ); - - // TODO: verify deposit merkle branches. - for deposit in &block.body.deposits { - debug!( - "Processing deposit for pubkey {:?}", - deposit.deposit_data.deposit_input.pubkey - ); - state - .process_deposit( - deposit.deposit_data.deposit_input.pubkey.clone(), - deposit.deposit_data.amount, - deposit - .deposit_data - .deposit_input - .proof_of_possession - .clone(), - deposit.deposit_data.deposit_input.withdrawal_credentials, - None, - spec, - ) - .map_err(|_| Error::BadDeposit)?; - } - - /* - * Exits - */ - ensure!( - block.body.exits.len() as u64 <= spec.max_exits, - Error::MaxExitsExceeded - ); - - for exit in &block.body.exits { - let validator = state - .validator_registry - .get(exit.validator_index as usize) - .ok_or(Error::BadExit)?; - ensure!( - validator.exit_epoch - > state.get_entry_exit_effect_epoch(state.current_epoch(spec), spec), - Error::BadExit - ); - ensure!(state.current_epoch(spec) >= exit.epoch, Error::BadExit); - let exit_message = { - let exit_struct = VoluntaryExit { - epoch: exit.epoch, - validator_index: exit.validator_index, - signature: spec.empty_signature.clone(), - }; - exit_struct.hash_tree_root() - }; - ensure!( - bls_verify( - &validator.pubkey, - &exit_message, - &exit.signature, - get_domain(&state.fork, exit.epoch, spec.domain_exit) - ), - Error::BadProposerSlashing - ); - state.initiate_validator_exit(exit.validator_index as usize); - } - - debug!("State transition complete."); - - Ok(()) -} - -fn get_domain(fork: &Fork, epoch: Epoch, domain_type: u64) -> u64 { - fork.get_domain(epoch, domain_type) -} - -fn bls_verify(pubkey: &PublicKey, message: &[u8], signature: &Signature, domain: u64) -> bool { - signature.verify(message, domain, pubkey) -} - -impl From for Error { - fn from(e: AttestationValidationError) -> Error { - Error::InvalidAttestation(e) - } -} - -impl From for Error { - fn from(e: BeaconStateError) -> Error { - Error::BeaconStateError(e) - } -} - -impl From for Error { - fn from(e: SlotProcessingError) -> Error { - Error::SlotProcessingError(e) - } -} - -impl From for AttestationValidationError { - fn from(e: BeaconStateError) -> AttestationValidationError { - AttestationValidationError::BeaconStateError(e) - } -} diff --git a/eth2/state_processing/src/block_processable/verify_slashable_attestation.rs b/eth2/state_processing/src/block_processable/verify_slashable_attestation.rs deleted file mode 100644 index a406af24e..000000000 --- a/eth2/state_processing/src/block_processable/verify_slashable_attestation.rs +++ /dev/null @@ -1,61 +0,0 @@ -use super::Error; -use types::*; - -macro_rules! ensure { - ($condition: expr, $result: expr) => { - if !$condition { - return Err($result); - } - }; -} - -/// Returns `Ok(())` if some `AttesterSlashing` is valid to be included in some `BeaconState`, -/// otherwise returns an `Err`. -pub fn verify_slashable_attestation( - state: &mut BeaconState, - attester_slashing: &AttesterSlashing, - spec: &ChainSpec, -) -> Result<(), Error> { - let slashable_attestation_1 = &attester_slashing.slashable_attestation_1; - let slashable_attestation_2 = &attester_slashing.slashable_attestation_2; - - ensure!( - slashable_attestation_1.data != slashable_attestation_2.data, - Error::BadAttesterSlashing - ); - ensure!( - slashable_attestation_1.is_double_vote(slashable_attestation_2, spec) - | slashable_attestation_1.is_surround_vote(slashable_attestation_2, spec), - Error::BadAttesterSlashing - ); - ensure!( - state.verify_slashable_attestation(&slashable_attestation_1, spec), - Error::BadAttesterSlashing - ); - ensure!( - state.verify_slashable_attestation(&slashable_attestation_2, spec), - Error::BadAttesterSlashing - ); - - let mut slashable_indices = vec![]; - for i in &slashable_attestation_1.validator_indices { - let validator = state - .validator_registry - .get(*i as usize) - .ok_or_else(|| Error::BadAttesterSlashing)?; - - if slashable_attestation_1.validator_indices.contains(&i) - & !validator.is_penalized_at(state.current_epoch(spec)) - { - slashable_indices.push(i); - } - } - - ensure!(!slashable_indices.is_empty(), Error::BadAttesterSlashing); - - for i in slashable_indices { - state.penalize_validator(*i as usize, spec)?; - } - - Ok(()) -} diff --git a/eth2/state_processing/src/errors.rs b/eth2/state_processing/src/errors.rs index 5eceb0be0..89cd82b24 100644 --- a/eth2/state_processing/src/errors.rs +++ b/eth2/state_processing/src/errors.rs @@ -1,9 +1,98 @@ use types::BeaconStateError; +macro_rules! impl_from_beacon_state_error { + ($type: ident) => { + impl From for $type { + fn from(e: BeaconStateError) -> $type { + $type::BeaconStateError(e) + } + } + }; +} + +macro_rules! impl_into_with_index_with_beacon_error { + ($error_type: ident, $invalid_type: ident) => { + impl IntoWithIndex for $error_type { + fn into_with_index(self, i: usize) -> BlockProcessingError { + match self { + $error_type::Invalid(e) => { + BlockProcessingError::Invalid(BlockInvalid::$invalid_type(i, e)) + } + $error_type::BeaconStateError(e) => BlockProcessingError::BeaconStateError(e), + } + } + } + }; +} + +macro_rules! impl_into_with_index_without_beacon_error { + ($error_type: ident, $invalid_type: ident) => { + impl IntoWithIndex for $error_type { + fn into_with_index(self, i: usize) -> BlockProcessingError { + match self { + $error_type::Invalid(e) => { + BlockProcessingError::Invalid(BlockInvalid::$invalid_type(i, e)) + } + } + } + } + }; +} + +pub trait IntoWithIndex: Sized { + fn into_with_index(self, i: usize) -> T; +} + +/* + * Block Validation + */ + +#[derive(Debug, PartialEq)] +pub enum BlockProcessingError { + /// The `BeaconBlock` is invalid. + Invalid(BlockInvalid), + BeaconStateError(BeaconStateError), +} + +impl_from_beacon_state_error!(BlockProcessingError); + +#[derive(Debug, PartialEq)] +pub enum BlockInvalid { + StateSlotMismatch, + BadSignature, + BadRandaoSignature, + MaxAttestationsExceeded, + MaxAttesterSlashingsExceed, + MaxProposerSlashingsExceeded, + MaxDepositsExceeded, + MaxExitsExceeded, + MaxTransfersExceed, + AttestationInvalid(usize, AttestationInvalid), + AttesterSlashingInvalid(usize, AttesterSlashingInvalid), + ProposerSlashingInvalid(usize, ProposerSlashingInvalid), + DepositInvalid(usize, DepositInvalid), + // TODO: merge this into the `DepositInvalid` error. + DepositProcessingFailed(usize), + ExitInvalid(usize, ExitInvalid), + TransferInvalid(usize, TransferInvalid), +} + +impl Into for BlockInvalid { + fn into(self) -> BlockProcessingError { + BlockProcessingError::Invalid(self) + } +} + +/* + * Attestation Validation + */ + #[derive(Debug, PartialEq)] pub enum AttestationValidationError { + /// The `Attestation` is invalid. Invalid(AttestationInvalid), - ProcessingError(BeaconStateError), + /// Encountered a `BeaconStateError` whilst attempting to determine validity. + BeaconStateError(BeaconStateError), } #[derive(Debug, PartialEq)] @@ -23,8 +112,132 @@ pub enum AttestationInvalid { ShardBlockRootNotZero, } -impl From for AttestationValidationError { - fn from(e: BeaconStateError) -> AttestationValidationError { - AttestationValidationError::ProcessingError(e) +impl_from_beacon_state_error!(AttestationValidationError); +impl_into_with_index_with_beacon_error!(AttestationValidationError, AttestationInvalid); + +/* + * `AttesterSlashing` Validation + */ + +#[derive(Debug, PartialEq)] +pub enum AttesterSlashingValidationError { + /// The `SlashableAttestation` is invalid. + Invalid(AttesterSlashingInvalid), + /// Encountered a `BeaconStateError` whilst attempting to determine validity. + BeaconStateError(BeaconStateError), +} + +#[derive(Debug, PartialEq)] +pub enum AttesterSlashingInvalid { + AttestationDataIdentical, + NotSlashable, + SlashableAttestation1Invalid(SlashableAttestationInvalid), + SlashableAttestation2Invalid(SlashableAttestationInvalid), + UnknownValidator, + NoSlashableIndices, +} + +impl_from_beacon_state_error!(AttesterSlashingValidationError); +impl_into_with_index_with_beacon_error!(AttesterSlashingValidationError, AttesterSlashingInvalid); + +/* + * `SlashableAttestation` Validation + */ + +#[derive(Debug, PartialEq)] +pub enum SlashableAttestationValidationError { + Invalid(SlashableAttestationInvalid), +} + +#[derive(Debug, PartialEq)] +pub enum SlashableAttestationInvalid { + CustodyBitfieldHasSetBits, + NoValidatorIndices, + BadValidatorIndicesOrdering, + BadCustodyBitfieldLength, + MaxIndicesExceed, + UnknownValidator, + BadSignature, +} + +impl Into for SlashableAttestationValidationError { + fn into(self) -> SlashableAttestationInvalid { + match self { + SlashableAttestationValidationError::Invalid(e) => e, + } } } + +/* + * `ProposerSlashing` Validation + */ + +#[derive(Debug, PartialEq)] +pub enum ProposerSlashingValidationError { + Invalid(ProposerSlashingInvalid), +} + +#[derive(Debug, PartialEq)] +pub enum ProposerSlashingInvalid { + ProposerUnknown, + ProposalSlotMismatch, + ProposalShardMismatch, + ProposalBlockRootMismatch, + ProposerAlreadySlashed, + BadProposal1Signature, + BadProposal2Signature, +} + +impl_into_with_index_without_beacon_error!( + ProposerSlashingValidationError, + ProposerSlashingInvalid +); + +/* + * `Deposit` Validation + */ + +#[derive(Debug, PartialEq)] +pub enum DepositValidationError { + Invalid(DepositInvalid), +} + +#[derive(Debug, PartialEq)] +pub enum DepositInvalid { + BadIndex, +} + +impl_into_with_index_without_beacon_error!(DepositValidationError, DepositInvalid); + +/* + * `Exit` Validation + */ + +#[derive(Debug, PartialEq)] +pub enum ExitValidationError { + Invalid(ExitInvalid), +} + +#[derive(Debug, PartialEq)] +pub enum ExitInvalid { + ValidatorUnknown, + AlreadyExited, + FutureEpoch, + BadSignature, +} + +impl_into_with_index_without_beacon_error!(ExitValidationError, ExitInvalid); + +/* + * `Transfer` Validation + */ + +#[derive(Debug, PartialEq)] +pub enum TransferValidationError { + Invalid(TransferInvalid), +} + +#[derive(Debug, PartialEq)] +pub enum TransferInvalid {} + +impl_into_with_index_without_beacon_error!(TransferValidationError, TransferInvalid); diff --git a/eth2/state_processing/src/lib.rs b/eth2/state_processing/src/lib.rs index 0a4343e00..ec883ddca 100644 --- a/eth2/state_processing/src/lib.rs +++ b/eth2/state_processing/src/lib.rs @@ -1,13 +1,13 @@ #[macro_use] mod macros; -mod block_processable; +pub mod per_block_processing; // mod epoch_processable; -mod errors; +pub mod errors; // mod slot_processable; -pub use block_processable::{ - validate_attestation, validate_attestation_without_signature, BlockProcessable, - Error as BlockProcessingError, +pub use errors::{BlockInvalid, BlockProcessingError}; +pub use per_block_processing::{ + per_block_processing, per_block_processing_without_verifying_block_signature, }; // pub use epoch_processable::{EpochProcessable, Error as EpochProcessingError}; // pub use slot_processable::{Error as SlotProcessingError, SlotProcessable}; diff --git a/eth2/state_processing/src/macros.rs b/eth2/state_processing/src/macros.rs index 6ccc54ba9..5a0d0dc11 100644 --- a/eth2/state_processing/src/macros.rs +++ b/eth2/state_processing/src/macros.rs @@ -1,8 +1,13 @@ -#[macro_use] -macro_rules! ensure { - ($condition: expr, $result: ident) => { +macro_rules! verify { + ($condition: expr, $result: expr) => { if !$condition { - return Err(Error::Invalid(Invalid::$result)); + return Err(Error::Invalid($result)); } }; } + +macro_rules! invalid { + ($result: expr) => { + return Err(Error::Invalid($result)); + }; +} diff --git a/eth2/state_processing/src/per_block_processing.rs b/eth2/state_processing/src/per_block_processing.rs new file mode 100644 index 000000000..06fe3b556 --- /dev/null +++ b/eth2/state_processing/src/per_block_processing.rs @@ -0,0 +1,268 @@ +use self::verify_proposer_slashing::verify_proposer_slashing; +use crate::errors::{BlockInvalid as Invalid, BlockProcessingError as Error, IntoWithIndex}; +use hashing::hash; +use log::debug; +use ssz::{ssz_encode, SignedRoot, TreeHash}; +use types::*; + +pub use self::verify_attester_slashing::verify_attester_slashing; +pub use validate_attestation::{validate_attestation, validate_attestation_without_signature}; +pub use verify_deposit::verify_deposit; +pub use verify_exit::verify_exit; +pub use verify_transfer::verify_transfer; + +mod validate_attestation; +mod verify_attester_slashing; +mod verify_deposit; +mod verify_exit; +mod verify_proposer_slashing; +mod verify_slashable_attestation; +mod verify_transfer; + +pub fn per_block_processing( + state: &mut BeaconState, + block: &BeaconBlock, + spec: &ChainSpec, +) -> Result<(), Error> { + per_block_processing_signature_optional(state, block, true, spec) +} + +pub fn per_block_processing_without_verifying_block_signature( + state: &mut BeaconState, + block: &BeaconBlock, + spec: &ChainSpec, +) -> Result<(), Error> { + per_block_processing_signature_optional(state, block, false, spec) +} + +fn per_block_processing_signature_optional( + mut state: &mut BeaconState, + block: &BeaconBlock, + should_verify_block_signature: bool, + spec: &ChainSpec, +) -> Result<(), Error> { + // Verify that `block.slot == state.slot`. + verify!(block.slot == state.slot, Invalid::StateSlotMismatch); + + // Get the epoch for future ergonomics. + let epoch = block.slot.epoch(spec.slots_per_epoch); + + // Ensure the current epoch cache is built. + state.build_epoch_cache(RelativeEpoch::Current, spec)?; + + // Let `proposer = state.validator_registry[get_beacon_proposer_index(state, state.slot)]`. + let block_proposer = + &state.validator_registry[state.get_beacon_proposer_index(block.slot, spec)?]; + + // Block signature + if should_verify_block_signature { + verify!( + verify_block_signature(&block, &block_proposer, &state.fork, spec,), + Invalid::BadSignature + ); + } + + // Randao + + // Verify that `bls_verify(pubkey=proposer.pubkey, + // message_hash=hash_tree_root(get_current_epoch(state)), signature=block.randao_reveal, + // domain=get_domain(state.fork, get_current_epoch(state), DOMAIN_RANDAO))`. + verify!( + block.randao_reveal.verify( + &state.current_epoch(spec).hash_tree_root()[..], + spec.get_domain(epoch, Domain::Randao, &state.fork), + &block_proposer.pubkey + ), + Invalid::BadRandaoSignature + ); + + // Update the state's RANDAO mix with the one revealed in the block. + update_randao(&mut state, &block.randao_reveal, spec)?; + + // Eth1 Data + + // Either increment the eth1_data vote count, or add a new eth1_data. + let matching_eth1_vote_index = state + .eth1_data_votes + .iter() + .position(|vote| vote.eth1_data == block.eth1_data); + if let Some(index) = matching_eth1_vote_index { + state.eth1_data_votes[index].vote_count += 1; + } else { + state.eth1_data_votes.push(Eth1DataVote { + eth1_data: block.eth1_data.clone(), + vote_count: 1, + }); + } + + //Proposer slashings + + verify!( + block.body.proposer_slashings.len() as u64 <= spec.max_proposer_slashings, + Invalid::MaxProposerSlashingsExceeded + ); + for (i, proposer_slashing) in block.body.proposer_slashings.iter().enumerate() { + verify_proposer_slashing(proposer_slashing, &state, spec) + .map_err(|e| e.into_with_index(i))?; + state.slash_validator(proposer_slashing.proposer_index as usize, spec)?; + } + + // Attester Slashings + + verify!( + block.body.attester_slashings.len() as u64 <= spec.max_attester_slashings, + Invalid::MaxAttesterSlashingsExceed + ); + for (i, attester_slashing) in block.body.attester_slashings.iter().enumerate() { + let slashable_indices = verify_attester_slashing(&state, &attester_slashing, spec) + .map_err(|e| e.into_with_index(i))?; + for i in slashable_indices { + state.slash_validator(i as usize, spec)?; + } + } + + // Attestations + + verify!( + block.body.attestations.len() as u64 <= spec.max_attestations, + Invalid::MaxAttestationsExceeded + ); + for (i, attestation) in block.body.attestations.iter().enumerate() { + // Build the previous epoch cache only if required by an attestation. + if attestation.data.slot.epoch(spec.slots_per_epoch) == state.previous_epoch(spec) { + state.build_epoch_cache(RelativeEpoch::Previous, spec)?; + } + + validate_attestation(&mut state, attestation, spec).map_err(|e| e.into_with_index(i))?; + + let pending_attestation = PendingAttestation { + data: attestation.data.clone(), + aggregation_bitfield: attestation.aggregation_bitfield.clone(), + custody_bitfield: attestation.custody_bitfield.clone(), + inclusion_slot: state.slot, + }; + state.latest_attestations.push(pending_attestation); + } + + // Deposits + + verify!( + block.body.deposits.len() as u64 <= spec.max_deposits, + Invalid::MaxDepositsExceeded + ); + for (i, deposit) in block.body.deposits.iter().enumerate() { + verify_deposit(&mut state, deposit, spec).map_err(|e| e.into_with_index(i))?; + + state + .process_deposit( + deposit.deposit_data.deposit_input.pubkey.clone(), + deposit.deposit_data.amount, + deposit + .deposit_data + .deposit_input + .proof_of_possession + .clone(), + deposit.deposit_data.deposit_input.withdrawal_credentials, + None, + spec, + ) + .map_err(|_| Error::Invalid(Invalid::DepositProcessingFailed(i)))?; + + state.deposit_index += 1; + } + + // Exits + + verify!( + block.body.voluntary_exits.len() as u64 <= spec.max_voluntary_exits, + Invalid::MaxExitsExceeded + ); + for (i, exit) in block.body.voluntary_exits.iter().enumerate() { + verify_exit(&state, exit, spec).map_err(|e| e.into_with_index(i))?; + + state.initiate_validator_exit(exit.validator_index as usize); + } + + // Transfers + verify!( + block.body.transfers.len() as u64 <= spec.max_transfers, + Invalid::MaxTransfersExceed + ); + for (i, transfer) in block.body.transfers.iter().enumerate() { + verify_transfer(&state, transfer, spec).map_err(|e| e.into_with_index(i))?; + + let block_proposer = state.get_beacon_proposer_index(state.slot, spec)?; + + state.validator_balances[transfer.from as usize] -= transfer.amount + transfer.fee; + state.validator_balances[transfer.to as usize] += transfer.amount + transfer.fee; + state.validator_balances[block_proposer as usize] += transfer.fee; + } + + debug!("State transition complete."); + + Ok(()) +} + +/// Verifies the signature of a block. +/// +/// Spec v0.4.0 +pub fn verify_block_signature( + block: &BeaconBlock, + block_proposer: &Validator, + fork: &Fork, + spec: &ChainSpec, +) -> bool { + // Let proposal = `Proposal(block.slot, BEACON_CHAIN_SHARD_NUMBER, signed_root(block, + // "signature"), block.signature)`. + let proposal = Proposal { + slot: block.slot, + shard: spec.beacon_chain_shard_number, + block_root: Hash256::from(&block.signed_root()[..]), + signature: block.signature.clone(), + }; + let domain = spec.get_domain( + block.slot.epoch(spec.slots_per_epoch), + Domain::Proposal, + fork, + ); + // Verify that `bls_verify(pubkey=proposer.pubkey, message_hash=signed_root(proposal, + // "signature"), signature=proposal.signature, domain=get_domain(state.fork, + // get_current_epoch(state), DOMAIN_PROPOSAL))`. + proposal + .signature + .verify(&proposal.signed_root()[..], domain, &block_proposer.pubkey) +} + +/// Updates the present randao mix. +/// +/// Set `state.latest_randao_mixes[get_current_epoch(state) % LATEST_RANDAO_MIXES_LENGTH] = +/// xor(get_randao_mix(state, get_current_epoch(state)), hash(block.randao_reveal))`. +/// +/// Spec v0.4.0 +pub fn update_randao( + state: &mut BeaconState, + reveal: &Signature, + spec: &ChainSpec, +) -> Result<(), BeaconStateError> { + let hashed_reveal = { + let encoded_signature = ssz_encode(reveal); + Hash256::from(&hash(&encoded_signature[..])[..]) + }; + + let current_epoch = state.slot.epoch(spec.slots_per_epoch); + + let current_mix = state + .get_randao_mix(current_epoch, spec) + .ok_or_else(|| BeaconStateError::InsufficientRandaoMixes)?; + + let new_mix = *current_mix ^ hashed_reveal; + + let index = current_epoch.as_usize() % spec.latest_randao_mixes_length; + + if index < state.latest_randao_mixes.len() { + state.latest_randao_mixes[index] = new_mix; + Ok(()) + } else { + Err(BeaconStateError::InsufficientRandaoMixes) + } +} diff --git a/eth2/state_processing/src/block_processable/validate_attestation.rs b/eth2/state_processing/src/per_block_processing/validate_attestation.rs similarity index 83% rename from eth2/state_processing/src/block_processable/validate_attestation.rs rename to eth2/state_processing/src/per_block_processing/validate_attestation.rs index 1b422711c..8214e8d9a 100644 --- a/eth2/state_processing/src/block_processable/validate_attestation.rs +++ b/eth2/state_processing/src/per_block_processing/validate_attestation.rs @@ -3,27 +3,6 @@ use ssz::TreeHash; use types::beacon_state::helpers::*; use types::*; -/// Validate the attestations in some block, converting each into a `PendingAttestation` which is -/// then added to `state.latest_attestations`. -/// -/// Spec v0.4.0 -pub fn validate_attestations( - state: &BeaconState, - block: &BeaconBlock, - spec: &ChainSpec, -) -> Result<(), Error> { - ensure!( - block.body.attestations.len() as u64 <= spec.max_attestations, - MaxAttestationsExceeded - ); - - for attestation in &block.body.attestations { - validate_attestation(&state, attestation, spec)?; - } - - Ok(()) -} - /// Validate an attestation, checking the aggregate signature. /// /// Spec v0.4.0 @@ -48,7 +27,7 @@ pub fn validate_attestation_without_signature( /// Validate an attestation, optionally checking the aggregate signature. /// -/// Spec v0.2.0 +/// Spec v0.4.0 fn validate_attestation_signature_optional( state: &BeaconState, attestation: &Attestation, @@ -56,38 +35,41 @@ fn validate_attestation_signature_optional( verify_signature: bool, ) -> Result<(), Error> { // Verify that `attestation.data.slot >= GENESIS_SLOT`. - ensure!(attestation.data.slot >= spec.genesis_slot, PreGenesis); + verify!( + attestation.data.slot >= spec.genesis_slot, + Invalid::PreGenesis + ); // Verify that `attestation.data.slot + MIN_ATTESTATION_INCLUSION_DELAY <= state.slot`. - ensure!( + verify!( attestation.data.slot + spec.min_attestation_inclusion_delay <= state.slot, - IncludedTooEarly + Invalid::IncludedTooEarly ); // Verify that `state.slot < attestation.data.slot + SLOTS_PER_EPOCH`. - ensure!( + verify!( state.slot < attestation.data.slot + spec.slots_per_epoch, - IncludedTooLate + Invalid::IncludedTooLate ); // Verify that `attestation.data.justified_epoch` is equal to `state.justified_epoch` if // `slot_to_epoch(attestation.data.slot + 1) >= get_current_epoch(state) else // state.previous_justified_epoch`. if (attestation.data.slot + 1).epoch(spec.slots_per_epoch) >= state.current_epoch(spec) { - ensure!( + verify!( attestation.data.justified_epoch == state.justified_epoch, - WrongJustifiedSlot + Invalid::WrongJustifiedSlot ); } else { - ensure!( + verify!( attestation.data.justified_epoch == state.previous_justified_epoch, - WrongJustifiedSlot + Invalid::WrongJustifiedSlot ); } // Verify that `attestation.data.justified_block_root` is equal to `get_block_root(state, // get_epoch_start_slot(attestation.data.justified_epoch))`. - ensure!( + verify!( attestation.data.justified_block_root == *state .get_block_root( @@ -98,7 +80,7 @@ fn validate_attestation_signature_optional( &spec ) .ok_or(BeaconStateError::InsufficientBlockRoots)?, - WrongJustifiedRoot + Invalid::WrongJustifiedRoot ); // Verify that either: @@ -112,59 +94,61 @@ fn validate_attestation_signature_optional( crosslink_data_root: attestation.data.crosslink_data_root, epoch: attestation.data.slot.epoch(spec.slots_per_epoch), }; - ensure!( + verify!( (attestation.data.latest_crosslink == state.latest_crosslinks[attestation.data.shard as usize]) | (state.latest_crosslinks[attestation.data.shard as usize] == potential_crosslink), - BadLatestCrosslinkRoot + Invalid::BadLatestCrosslinkRoot ); // Get the committee for this attestation let (committee, _shard) = state .get_crosslink_committees_at_slot(attestation.data.slot, spec)? .iter() - .find(|(committee, shard)| *shard == attestation.data.shard) + .find(|(_committee, shard)| *shard == attestation.data.shard) .ok_or_else(|| Error::Invalid(Invalid::NoCommitteeForShard))?; // Custody bitfield is all zeros (phase 0 requirement). - ensure!( + verify!( attestation.custody_bitfield.num_set_bits() == 0, - CustodyBitfieldHasSetBits + Invalid::CustodyBitfieldHasSetBits ); // Custody bitfield length is correct. - ensure!( + verify!( verify_bitfield_length(&attestation.aggregation_bitfield, committee.len()), - BadCustodyBitfieldLength + Invalid::BadCustodyBitfieldLength ); // Aggregation bitfield isn't empty. - ensure!( + verify!( attestation.aggregation_bitfield.num_set_bits() != 0, - AggregationBitfieldIsEmpty + Invalid::AggregationBitfieldIsEmpty ); // Aggregation bitfield length is correct. - ensure!( + verify!( verify_bitfield_length(&attestation.aggregation_bitfield, committee.len()), - BadAggregationBitfieldLength + Invalid::BadAggregationBitfieldLength ); if verify_signature { - ensure!( + let attestation_epoch = attestation.data.slot.epoch(spec.slots_per_epoch); + verify!( verify_attestation_signature( state, committee, + attestation_epoch, &attestation.custody_bitfield, &attestation.data, &attestation.aggregate_signature, spec ), - BadSignature + Invalid::BadSignature ); } // [TO BE REMOVED IN PHASE 1] Verify that `attestation.data.crosslink_data_root == ZERO_HASH`. - ensure!( + verify!( attestation.data.crosslink_data_root == spec.zero_hash, - ShardBlockRootNotZero + Invalid::ShardBlockRootNotZero ); Ok(()) @@ -177,9 +161,12 @@ fn validate_attestation_signature_optional( /// - `aggregate_signature` was not signed correctly. /// - `custody_bitfield` does not have a bit for each index of `committee`. /// - A `validator_index` in `committee` is not in `state.validator_registry`. +/// +/// Spec v0.4.0 fn verify_attestation_signature( state: &BeaconState, committee: &[usize], + attestation_epoch: Epoch, custody_bitfield: &Bitfield, attestation_data: &AttestationData, aggregate_signature: &AggregateSignature, @@ -234,5 +221,7 @@ fn verify_attestation_signature( keys.push(&aggregate_pubs[1]); } - aggregate_signature.verify_multiple(&messages[..], spec.domain_attestation, &keys[..]) + let domain = spec.get_domain(attestation_epoch, Domain::Attestation, &state.fork); + + aggregate_signature.verify_multiple(&messages[..], domain, &keys[..]) } diff --git a/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs new file mode 100644 index 000000000..b12ffa5ae --- /dev/null +++ b/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs @@ -0,0 +1,49 @@ +use super::verify_slashable_attestation::verify_slashable_attestation; +use crate::errors::{AttesterSlashingInvalid as Invalid, AttesterSlashingValidationError as Error}; +use types::*; + +/// Returns `Ok(())` if some `AttesterSlashing` is valid to be included in some `BeaconState`, +/// otherwise returns an `Err`. +/// +/// Returns the slashable indices from the `AttesterSlashing`. +/// +/// Spec v0.4.0 +pub fn verify_attester_slashing( + state: &BeaconState, + attester_slashing: &AttesterSlashing, + spec: &ChainSpec, +) -> Result, Error> { + let slashable_attestation_1 = &attester_slashing.slashable_attestation_1; + let slashable_attestation_2 = &attester_slashing.slashable_attestation_2; + + verify!( + slashable_attestation_1.data != slashable_attestation_2.data, + Invalid::AttestationDataIdentical + ); + verify!( + slashable_attestation_1.is_double_vote(slashable_attestation_2, spec) + | slashable_attestation_1.is_surround_vote(slashable_attestation_2, spec), + Invalid::NotSlashable + ); + + verify_slashable_attestation(state, &slashable_attestation_1, spec) + .map_err(|e| Error::Invalid(Invalid::SlashableAttestation1Invalid(e.into())))?; + verify_slashable_attestation(state, &slashable_attestation_2, spec) + .map_err(|e| Error::Invalid(Invalid::SlashableAttestation2Invalid(e.into())))?; + + let mut slashable_indices = vec![]; + for i in &slashable_attestation_1.validator_indices { + let validator = state + .validator_registry + .get(*i as usize) + .ok_or_else(|| Error::Invalid(Invalid::UnknownValidator))?; + + if slashable_attestation_1.validator_indices.contains(&i) & !validator.slashed { + slashable_indices.push(*i); + } + } + + verify!(!slashable_indices.is_empty(), Invalid::NoSlashableIndices); + + Ok(slashable_indices) +} diff --git a/eth2/state_processing/src/per_block_processing/verify_deposit.rs b/eth2/state_processing/src/per_block_processing/verify_deposit.rs new file mode 100644 index 000000000..20ed2f0b2 --- /dev/null +++ b/eth2/state_processing/src/per_block_processing/verify_deposit.rs @@ -0,0 +1,24 @@ +use crate::errors::{DepositInvalid as Invalid, DepositValidationError as Error}; +use ssz::TreeHash; +use types::beacon_state::helpers::verify_bitfield_length; +use types::*; + +/// Verify validity of ``slashable_attestation`` fields. +/// +/// Returns `Ok(())` if all fields are valid. +/// +/// Spec v0.4.0 +pub fn verify_deposit( + state: &BeaconState, + deposit: &Deposit, + spec: &ChainSpec, +) -> Result<(), Error> { + // TODO: verify serialized deposit data. + + // TODO: verify deposit index. + verify!(deposit.index == state.deposit_index, Invalid::BadIndex); + + // TODO: verify merkle branch. + + Ok(()) +} diff --git a/eth2/state_processing/src/per_block_processing/verify_exit.rs b/eth2/state_processing/src/per_block_processing/verify_exit.rs new file mode 100644 index 000000000..d4c2f7baa --- /dev/null +++ b/eth2/state_processing/src/per_block_processing/verify_exit.rs @@ -0,0 +1,41 @@ +use crate::errors::{ExitInvalid as Invalid, ExitValidationError as Error}; +use ssz::SignedRoot; +use types::*; + +/// Verify validity of ``slashable_attestation`` fields. +/// +/// Returns `Ok(())` if all fields are valid. +/// +/// Spec v0.4.0 +pub fn verify_exit( + state: &BeaconState, + exit: &VoluntaryExit, + spec: &ChainSpec, +) -> Result<(), Error> { + let validator = state + .validator_registry + .get(exit.validator_index as usize) + .ok_or(Error::Invalid(Invalid::ValidatorUnknown))?; + + verify!( + validator.exit_epoch + > state.get_delayed_activation_exit_epoch(state.current_epoch(spec), spec), + Invalid::AlreadyExited + ); + + verify!( + state.current_epoch(spec) >= exit.epoch, + Invalid::FutureEpoch + ); + + let message = exit.signed_root(); + let domain = spec.get_domain(exit.epoch, Domain::Exit, &state.fork); + + verify!( + exit.signature + .verify(&message[..], domain, &validator.pubkey), + Invalid::BadSignature + ); + + Ok(()) +} diff --git a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs new file mode 100644 index 000000000..a7b344b2c --- /dev/null +++ b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs @@ -0,0 +1,71 @@ +use crate::errors::{ProposerSlashingInvalid as Invalid, ProposerSlashingValidationError as Error}; +use ssz::SignedRoot; +use types::*; + +/// Returns `Ok(())` if some `ProposerSlashing` is valid to be included in some `BeaconState`, +/// otherwise returns an `Err`. +/// +/// Spec v0.4.0 +pub fn verify_proposer_slashing( + proposer_slashing: &ProposerSlashing, + state: &BeaconState, + spec: &ChainSpec, +) -> Result<(), Error> { + let proposer = state + .validator_registry + .get(proposer_slashing.proposer_index as usize) + .ok_or(Error::Invalid(Invalid::ProposerUnknown))?; + + verify!( + proposer_slashing.proposal_1.slot == proposer_slashing.proposal_2.slot, + Invalid::ProposalSlotMismatch + ); + + verify!( + proposer_slashing.proposal_1.shard == proposer_slashing.proposal_2.shard, + Invalid::ProposalShardMismatch + ); + + verify!( + proposer_slashing.proposal_1.block_root != proposer_slashing.proposal_2.block_root, + Invalid::ProposalBlockRootMismatch + ); + + verify!(!proposer.slashed, Invalid::ProposerAlreadySlashed); + + verify!( + verify_proposal_signature( + &proposer_slashing.proposal_1, + &proposer.pubkey, + &state.fork, + spec + ), + Invalid::BadProposal1Signature + ); + verify!( + verify_proposal_signature( + &proposer_slashing.proposal_2, + &proposer.pubkey, + &state.fork, + spec + ), + Invalid::BadProposal2Signature + ); + + Ok(()) +} + +fn verify_proposal_signature( + proposal: &Proposal, + pubkey: &PublicKey, + fork: &Fork, + spec: &ChainSpec, +) -> bool { + let message = proposal.signed_root(); + let domain = spec.get_domain( + proposal.slot.epoch(spec.slots_per_epoch), + Domain::Proposal, + fork, + ); + proposal.signature.verify(&message[..], domain, pubkey) +} diff --git a/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs b/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs new file mode 100644 index 000000000..cd0f9a201 --- /dev/null +++ b/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs @@ -0,0 +1,105 @@ +use crate::errors::{ + SlashableAttestationInvalid as Invalid, SlashableAttestationValidationError as Error, +}; +use ssz::TreeHash; +use types::beacon_state::helpers::verify_bitfield_length; +use types::*; + +/// Verify validity of ``slashable_attestation`` fields. +/// +/// Returns `Ok(())` if all fields are valid. +/// +/// Spec v0.4.0 +pub fn verify_slashable_attestation( + state: &BeaconState, + slashable_attestation: &SlashableAttestation, + spec: &ChainSpec, +) -> Result<(), Error> { + if slashable_attestation.custody_bitfield.num_set_bits() > 0 { + invalid!(Invalid::CustodyBitfieldHasSetBits); + } + + if slashable_attestation.validator_indices.is_empty() { + invalid!(Invalid::NoValidatorIndices); + } + + for i in 0..(slashable_attestation.validator_indices.len() - 1) { + if slashable_attestation.validator_indices[i] + >= slashable_attestation.validator_indices[i + 1] + { + invalid!(Invalid::BadValidatorIndicesOrdering); + } + } + + if !verify_bitfield_length( + &slashable_attestation.custody_bitfield, + slashable_attestation.validator_indices.len(), + ) { + invalid!(Invalid::BadCustodyBitfieldLength); + } + + if slashable_attestation.validator_indices.len() > spec.max_indices_per_slashable_vote as usize + { + invalid!(Invalid::MaxIndicesExceed); + } + + // TODO: this signature verification could likely be replaced with: + // + // super::validate_attestation::validate_attestation_signature(..) + + let mut aggregate_pubs = vec![AggregatePublicKey::new(); 2]; + let mut message_exists = vec![false; 2]; + + for (i, v) in slashable_attestation.validator_indices.iter().enumerate() { + let custody_bit = match slashable_attestation.custody_bitfield.get(i) { + Ok(bit) => bit, + Err(_) => unreachable!(), + }; + + message_exists[custody_bit as usize] = true; + + match state.validator_registry.get(*v as usize) { + Some(validator) => { + aggregate_pubs[custody_bit as usize].add(&validator.pubkey); + } + None => invalid!(Invalid::UnknownValidator), + }; + } + + let message_0 = AttestationDataAndCustodyBit { + data: slashable_attestation.data.clone(), + custody_bit: false, + } + .hash_tree_root(); + let message_1 = AttestationDataAndCustodyBit { + data: slashable_attestation.data.clone(), + custody_bit: true, + } + .hash_tree_root(); + + let mut messages = vec![]; + let mut keys = vec![]; + + if message_exists[0] { + messages.push(&message_0[..]); + keys.push(&aggregate_pubs[0]); + } + if message_exists[1] { + messages.push(&message_1[..]); + keys.push(&aggregate_pubs[1]); + } + + let domain = { + let epoch = slashable_attestation.data.slot.epoch(spec.slots_per_epoch); + spec.get_domain(epoch, Domain::Attestation, &state.fork) + }; + + verify!( + slashable_attestation + .aggregate_signature + .verify_multiple(&messages[..], domain, &keys[..]), + Invalid::BadSignature + ); + + Ok(()) +} diff --git a/eth2/state_processing/src/per_block_processing/verify_transfer.rs b/eth2/state_processing/src/per_block_processing/verify_transfer.rs new file mode 100644 index 000000000..0dee9a7d2 --- /dev/null +++ b/eth2/state_processing/src/per_block_processing/verify_transfer.rs @@ -0,0 +1,19 @@ +use crate::errors::{TransferInvalid as Invalid, TransferValidationError as Error}; +use ssz::TreeHash; +use types::beacon_state::helpers::verify_bitfield_length; +use types::*; + +/// Verify validity of ``slashable_attestation`` fields. +/// +/// Returns `Ok(())` if all fields are valid. +/// +/// Spec v0.4.0 +pub fn verify_transfer( + state: &BeaconState, + transfer: &Transfer, + spec: &ChainSpec, +) -> Result<(), Error> { + // TODO: verify transfer. + + Ok(()) +} diff --git a/eth2/types/src/attester_slashing/builder.rs b/eth2/types/src/attester_slashing/builder.rs index 6638eb2a5..bdb46b154 100644 --- a/eth2/types/src/attester_slashing/builder.rs +++ b/eth2/types/src/attester_slashing/builder.rs @@ -12,7 +12,7 @@ impl AttesterSlashingBuilder { /// - `validator_index: u64` /// - `message: &[u8]` /// - `epoch: Epoch` - /// - `domain: u64` + /// - `domain: Domain` /// /// Where domain is a domain "constant" (e.g., `spec.domain_attestation`). pub fn double_vote( @@ -21,7 +21,7 @@ impl AttesterSlashingBuilder { spec: &ChainSpec, ) -> AttesterSlashing where - F: Fn(u64, &[u8], Epoch, u64) -> Signature, + F: Fn(u64, &[u8], Epoch, Domain) -> Signature, { let double_voted_slot = Slot::new(0); let shard = 0; @@ -75,12 +75,7 @@ impl AttesterSlashingBuilder { custody_bit: attestation.custody_bitfield.get(i).unwrap(), }; let message = attestation_data_and_custody_bit.hash_tree_root(); - let signature = signer( - *validator_index, - &message[..], - epoch, - spec.domain_attestation, - ); + let signature = signer(*validator_index, &message[..], epoch, Domain::Attestation); attestation.aggregate_signature.add(&signature); } }; diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index 2394c2c0d..76b97b21d 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -112,6 +112,7 @@ pub struct BeaconState { // Ethereum 1.0 chain data pub latest_eth1_data: Eth1Data, pub eth1_data_votes: Vec, + pub deposit_index: u64, // Caching (not in the spec) pub cache_index_offset: usize, @@ -187,6 +188,7 @@ impl BeaconState { */ latest_eth1_data, eth1_data_votes: vec![], + deposit_index: 0, /* * Caching (not in spec) @@ -224,6 +226,8 @@ impl BeaconState { } } + genesis_state.deposit_index = initial_validator_deposits.len() as u64; + let genesis_active_index_root = hash_tree_root(get_active_validator_indices( &genesis_state.validator_registry, spec.genesis_epoch, @@ -566,92 +570,6 @@ impl BeaconState { .fold(0, |acc, i| acc + self.get_effective_balance(*i, spec)) } - /// Verify validity of ``slashable_attestation`` fields. - /// - /// Spec v0.4.0 - pub fn verify_slashable_attestation( - &self, - slashable_attestation: &SlashableAttestation, - spec: &ChainSpec, - ) -> bool { - if slashable_attestation.custody_bitfield.num_set_bits() > 0 { - return false; - } - - if slashable_attestation.validator_indices.is_empty() { - return false; - } - - for i in 0..(slashable_attestation.validator_indices.len() - 1) { - if slashable_attestation.validator_indices[i] - >= slashable_attestation.validator_indices[i + 1] - { - return false; - } - } - - if !verify_bitfield_length( - &slashable_attestation.custody_bitfield, - slashable_attestation.validator_indices.len(), - ) { - return false; - } - - if slashable_attestation.validator_indices.len() - > spec.max_indices_per_slashable_vote as usize - { - return false; - } - - let mut aggregate_pubs = vec![AggregatePublicKey::new(); 2]; - let mut message_exists = vec![false; 2]; - - for (i, v) in slashable_attestation.validator_indices.iter().enumerate() { - let custody_bit = match slashable_attestation.custody_bitfield.get(i) { - Ok(bit) => bit, - Err(_) => unreachable!(), - }; - - message_exists[custody_bit as usize] = true; - - match self.validator_registry.get(*v as usize) { - Some(validator) => { - aggregate_pubs[custody_bit as usize].add(&validator.pubkey); - } - None => return false, - }; - } - - let message_0 = AttestationDataAndCustodyBit { - data: slashable_attestation.data.clone(), - custody_bit: false, - } - .hash_tree_root(); - let message_1 = AttestationDataAndCustodyBit { - data: slashable_attestation.data.clone(), - custody_bit: true, - } - .hash_tree_root(); - - let mut messages = vec![]; - let mut keys = vec![]; - - if message_exists[0] { - messages.push(&message_0[..]); - keys.push(&aggregate_pubs[0]); - } - if message_exists[1] { - messages.push(&message_1[..]); - keys.push(&aggregate_pubs[1]); - } - - slashable_attestation.aggregate_signature.verify_multiple( - &messages[..], - spec.domain_attestation, - &keys[..], - ) - } - /// Return the epoch at which an activation or exit triggered in ``epoch`` takes effect. /// /// Spec v0.4.0 @@ -1163,8 +1081,11 @@ impl BeaconState { proof_of_possession.verify( &proof_of_possession_data.hash_tree_root(), - self.fork - .get_domain(self.slot.epoch(spec.slots_per_epoch), spec.domain_deposit), + spec.get_domain( + self.slot.epoch(spec.slots_per_epoch), + Domain::Deposit, + &self.fork, + ), &pubkey, ) } @@ -1338,6 +1259,7 @@ impl Encodable for BeaconState { s.append(&self.batched_block_roots); s.append(&self.latest_eth1_data); s.append(&self.eth1_data_votes); + s.append(&self.deposit_index); } } @@ -1368,6 +1290,7 @@ impl Decodable for BeaconState { let (batched_block_roots, i) = <_>::ssz_decode(bytes, i)?; let (latest_eth1_data, i) = <_>::ssz_decode(bytes, i)?; let (eth1_data_votes, i) = <_>::ssz_decode(bytes, i)?; + let (deposit_index, i) = <_>::ssz_decode(bytes, i)?; Ok(( Self { @@ -1396,6 +1319,7 @@ impl Decodable for BeaconState { batched_block_roots, latest_eth1_data, eth1_data_votes, + deposit_index, cache_index_offset: 0, caches: vec![EpochCache::empty(); CACHED_EPOCHS], }, @@ -1440,6 +1364,7 @@ impl TreeHash for BeaconState { result.append(&mut self.batched_block_roots.hash_tree_root_internal()); result.append(&mut self.latest_eth1_data.hash_tree_root_internal()); result.append(&mut self.eth1_data_votes.hash_tree_root_internal()); + result.append(&mut self.deposit_index.hash_tree_root_internal()); hash(&result) } } @@ -1472,6 +1397,7 @@ impl TestRandom for BeaconState { batched_block_roots: <_>::random_for_test(rng), latest_eth1_data: <_>::random_for_test(rng), eth1_data_votes: <_>::random_for_test(rng), + deposit_index: <_>::random_for_test(rng), cache_index_offset: 0, caches: vec![EpochCache::empty(); CACHED_EPOCHS], } diff --git a/eth2/types/src/chain_spec.rs b/eth2/types/src/chain_spec.rs index dea079755..789bb6c0c 100644 --- a/eth2/types/src/chain_spec.rs +++ b/eth2/types/src/chain_spec.rs @@ -1,8 +1,17 @@ -use crate::{Address, Epoch, Hash256, Slot}; +use crate::{Address, Epoch, Fork, Hash256, Slot}; use bls::Signature; const GWEI: u64 = 1_000_000_000; +pub enum Domain { + Deposit, + Attestation, + Proposal, + Exit, + Randao, + Transfer, +} + /// Holds all the "constants" for a BeaconChain. /// /// Spec v0.4.0 @@ -85,14 +94,20 @@ pub struct ChainSpec { /* * Signature domains + * + * Fields should be private to prevent accessing a domain that hasn't been modified to suit + * some `Fork`. + * + * Use `ChainSpec::get_domain(..)` to access these values. */ - pub domain_deposit: u64, - pub domain_attestation: u64, - pub domain_proposal: u64, - pub domain_exit: u64, - pub domain_randao: u64, - pub domain_transfer: u64, + domain_deposit: u64, + domain_attestation: u64, + domain_proposal: u64, + domain_exit: u64, + domain_randao: u64, + domain_transfer: u64, } + impl ChainSpec { /// Return the number of committees in one epoch. /// @@ -107,6 +122,23 @@ impl ChainSpec { ) * self.slots_per_epoch } + /// Get the domain number that represents the fork meta and signature domain. + /// + /// Spec v0.4.0 + pub fn get_domain(&self, epoch: Epoch, domain: Domain, fork: &Fork) -> u64 { + let domain_constant = match domain { + Domain::Deposit => self.domain_deposit, + Domain::Attestation => self.domain_attestation, + Domain::Proposal => self.domain_proposal, + Domain::Exit => self.domain_exit, + Domain::Randao => self.domain_randao, + Domain::Transfer => self.domain_transfer, + }; + + let fork_version = fork.get_fork_version(epoch); + fork_version * u64::pow(2, 32) + domain_constant + } + /// Returns a `ChainSpec` compatible with the Ethereum Foundation specification. /// /// Spec v0.4.0 diff --git a/eth2/types/src/fork.rs b/eth2/types/src/fork.rs index 6c524a2d9..0acd6da90 100644 --- a/eth2/types/src/fork.rs +++ b/eth2/types/src/fork.rs @@ -24,14 +24,6 @@ impl Fork { } self.current_version } - - /// Get the domain number that represents the fork meta and signature domain. - /// - /// Spec v0.4.0 - pub fn get_domain(&self, epoch: Epoch, domain_type: u64) -> u64 { - let fork_version = self.get_fork_version(epoch); - fork_version * u64::pow(2, 32) + domain_type - } } #[cfg(test)] diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs index f88cc6a17..e595684bc 100644 --- a/eth2/types/src/lib.rs +++ b/eth2/types/src/lib.rs @@ -43,7 +43,7 @@ pub use crate::beacon_block_body::BeaconBlockBody; pub use crate::beacon_state::{ BeaconState, Error as BeaconStateError, InclusionError, RelativeEpoch, }; -pub use crate::chain_spec::ChainSpec; +pub use crate::chain_spec::{ChainSpec, Domain}; pub use crate::crosslink::Crosslink; pub use crate::deposit::Deposit; pub use crate::deposit_data::DepositData; diff --git a/eth2/types/src/proposer_slashing/builder.rs b/eth2/types/src/proposer_slashing/builder.rs index 8dc1abfbe..1110bdf30 100644 --- a/eth2/types/src/proposer_slashing/builder.rs +++ b/eth2/types/src/proposer_slashing/builder.rs @@ -12,12 +12,12 @@ impl ProposerSlashingBuilder { /// - `validator_index: u64` /// - `message: &[u8]` /// - `epoch: Epoch` - /// - `domain: u64` + /// - `domain: Domain` /// /// Where domain is a domain "constant" (e.g., `spec.domain_attestation`). pub fn double_vote(proposer_index: u64, signer: F, spec: &ChainSpec) -> ProposerSlashing where - F: Fn(u64, &[u8], Epoch, u64) -> Signature, + F: Fn(u64, &[u8], Epoch, Domain) -> Signature, { let slot = Slot::new(0); let shard = 0; @@ -39,15 +39,13 @@ impl ProposerSlashingBuilder { proposal_1.signature = { let message = proposal_1.signed_root(); let epoch = slot.epoch(spec.slots_per_epoch); - let domain = spec.domain_proposal; - signer(proposer_index, &message[..], epoch, domain) + signer(proposer_index, &message[..], epoch, Domain::Proposal) }; proposal_2.signature = { let message = proposal_2.signed_root(); let epoch = slot.epoch(spec.slots_per_epoch); - let domain = spec.domain_proposal; - signer(proposer_index, &message[..], epoch, domain) + signer(proposer_index, &message[..], epoch, Domain::Proposal) }; ProposerSlashing { From 599948b26b5a430fd971c458dd10af99da7066b7 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 16:24:56 +1100 Subject: [PATCH 15/31] Add comments to block_processing code --- eth2/state_processing/src/errors.rs | 148 +++++++++++++++--- .../src/per_block_processing.rs | 20 +++ .../validate_attestation.rs | 74 ++++++--- .../verify_attester_slashing.rs | 8 +- .../per_block_processing/verify_deposit.rs | 16 +- .../src/per_block_processing/verify_exit.rs | 11 +- .../verify_proposer_slashing.rs | 28 +++- .../verify_slashable_attestation.rs | 19 ++- .../per_block_processing/verify_transfer.rs | 15 +- 9 files changed, 258 insertions(+), 81 deletions(-) diff --git a/eth2/state_processing/src/errors.rs b/eth2/state_processing/src/errors.rs index 89cd82b24..6c9719fc2 100644 --- a/eth2/state_processing/src/errors.rs +++ b/eth2/state_processing/src/errors.rs @@ -1,4 +1,4 @@ -use types::BeaconStateError; +use types::*; macro_rules! impl_from_beacon_state_error { ($type: ident) => { @@ -39,23 +39,31 @@ macro_rules! impl_into_with_index_without_beacon_error { }; } +/// A conversion that consumes `self` and adds an `index` variable to resulting struct. +/// +/// Used here to allow converting an error into an upstream error that points to the object that +/// caused the error. For example, pointing to the index of an attestation that caused the +/// `AttestationInvalid` error. pub trait IntoWithIndex: Sized { - fn into_with_index(self, i: usize) -> T; + fn into_with_index(self, index: usize) -> T; } /* * Block Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum BlockProcessingError { - /// The `BeaconBlock` is invalid. + /// Validation completed successfully and the object is invalid. Invalid(BlockInvalid), + /// Encountered a `BeaconStateError` whilst attempting to determine validity. BeaconStateError(BeaconStateError), } impl_from_beacon_state_error!(BlockProcessingError); +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum BlockInvalid { StateSlotMismatch, @@ -87,28 +95,61 @@ impl Into for BlockInvalid { * Attestation Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum AttestationValidationError { - /// The `Attestation` is invalid. + /// Validation completed successfully and the object is invalid. Invalid(AttestationInvalid), /// Encountered a `BeaconStateError` whilst attempting to determine validity. BeaconStateError(BeaconStateError), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum AttestationInvalid { - PreGenesis, - IncludedTooEarly, - IncludedTooLate, - WrongJustifiedSlot, - WrongJustifiedRoot, + /// Attestation references a pre-genesis slot. + /// + /// (genesis_slot, attestation_slot) + PreGenesis(Slot, Slot), + /// Attestation included before the inclusion delay. + /// + /// (state_slot, inclusion_delay, attestation_slot) + IncludedTooEarly(Slot, u64, Slot), + /// Attestation slot is too far in the past to be included in a block. + /// + /// (state_slot, attestation_slot) + IncludedTooLate(Slot, Slot), + /// Attestation justified epoch does not match the states current or previous justified epoch. + /// + /// (attestation_justified_epoch, state_epoch, used_previous_epoch) + WrongJustifiedEpoch(Epoch, Epoch, bool), + /// Attestation justified epoch root does not match root known to the state. + /// + /// (state_justified_root, attestation_justified_root) + WrongJustifiedRoot(Hash256, Hash256), + /// Attestation crosslink root does not match the state crosslink root for the attestations + /// slot. BadLatestCrosslinkRoot, + /// The custody bitfield has some bits set `true`. This is not allowed in phase 0. CustodyBitfieldHasSetBits, + /// There are no set bits on the attestation -- an attestation must be signed by at least one + /// validator. AggregationBitfieldIsEmpty, - BadAggregationBitfieldLength, - BadCustodyBitfieldLength, - NoCommitteeForShard, + /// The custody bitfield length is not the smallest possible size to represent the committee. + /// + /// (committee_len, bitfield_len) + BadCustodyBitfieldLength(usize, usize), + /// The aggregation bitfield length is not the smallest possible size to represent the committee. + /// + /// (committee_len, bitfield_len) + BadAggregationBitfieldLength(usize, usize), + /// There was no known committee for the given shard in the given slot. + /// + /// (attestation_data_shard, attestation_data_slot) + NoCommitteeForShard(u64, Slot), + /// The attestation signature verification failed. BadSignature, + /// The shard block root was not set to zero. This is a phase 0 requirement. ShardBlockRootNotZero, } @@ -119,21 +160,29 @@ impl_into_with_index_with_beacon_error!(AttestationValidationError, AttestationI * `AttesterSlashing` Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum AttesterSlashingValidationError { - /// The `SlashableAttestation` is invalid. + /// Validation completed successfully and the object is invalid. Invalid(AttesterSlashingInvalid), /// Encountered a `BeaconStateError` whilst attempting to determine validity. BeaconStateError(BeaconStateError), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum AttesterSlashingInvalid { + /// The attestation data is identical, an attestation cannot conflict with itself. AttestationDataIdentical, + /// The attestations were not in conflict. NotSlashable, + /// The first `SlashableAttestation` was invalid. SlashableAttestation1Invalid(SlashableAttestationInvalid), + /// The second `SlashableAttestation` was invalid. SlashableAttestation2Invalid(SlashableAttestationInvalid), - UnknownValidator, + /// The validator index is unknown. One cannot slash one who does not exist. + UnknownValidator(u64), + /// There were no indices able to be slashed. NoSlashableIndices, } @@ -144,19 +193,35 @@ impl_into_with_index_with_beacon_error!(AttesterSlashingValidationError, Atteste * `SlashableAttestation` Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum SlashableAttestationValidationError { + /// Validation completed successfully and the object is invalid. Invalid(SlashableAttestationInvalid), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum SlashableAttestationInvalid { + /// The custody bitfield has some bits set `true`. This is not allowed in phase 0. CustodyBitfieldHasSetBits, + /// No validator indices were specified. NoValidatorIndices, - BadValidatorIndicesOrdering, - BadCustodyBitfieldLength, - MaxIndicesExceed, - UnknownValidator, + /// The validator indices were not in increasing order. + /// + /// The error occured between the given `index` and `index + 1` + BadValidatorIndicesOrdering(usize), + /// The custody bitfield length is not the smallest possible size to represent the validators. + /// + /// (validators_len, bitfield_len) + BadCustodyBitfieldLength(usize, usize), + /// The number of slashable indices exceed the global maximum. + /// + /// (max_indices, indices_given) + MaxIndicesExceed(usize, usize), + /// The validator index is unknown. One cannot slash one who does not exist. + UnknownValidator(u64), + /// The slashable attestation aggregate signature was not valid. BadSignature, } @@ -172,19 +237,35 @@ impl Into for SlashableAttestationValidationError { * `ProposerSlashing` Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum ProposerSlashingValidationError { + /// Validation completed successfully and the object is invalid. Invalid(ProposerSlashingInvalid), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum ProposerSlashingInvalid { - ProposerUnknown, - ProposalSlotMismatch, - ProposalShardMismatch, - ProposalBlockRootMismatch, + /// The proposer index is not a known validator. + ProposerUnknown(u64), + /// The two proposal have different slots. + /// + /// (proposal_1_slot, proposal_2_slot) + ProposalSlotMismatch(Slot, Slot), + /// The two proposal have different shards. + /// + /// (proposal_1_shard, proposal_2_shard) + ProposalShardMismatch(u64, u64), + /// The two proposal have different block roots. + /// + /// (proposal_1_root, proposal_2_root) + ProposalBlockRootMismatch(Hash256, Hash256), + /// The specified proposer has already been slashed. ProposerAlreadySlashed, + /// The first proposal signature was invalid. BadProposal1Signature, + /// The second proposal signature was invalid. BadProposal2Signature, } @@ -197,14 +278,20 @@ impl_into_with_index_without_beacon_error!( * `Deposit` Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum DepositValidationError { + /// Validation completed successfully and the object is invalid. Invalid(DepositInvalid), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum DepositInvalid { - BadIndex, + /// The deposit index does not match the state index. + /// + /// (state_index, deposit_index) + BadIndex(u64, u64), } impl_into_with_index_without_beacon_error!(DepositValidationError, DepositInvalid); @@ -213,16 +300,24 @@ impl_into_with_index_without_beacon_error!(DepositValidationError, DepositInvali * `Exit` Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum ExitValidationError { + /// Validation completed successfully and the object is invalid. Invalid(ExitInvalid), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum ExitInvalid { - ValidatorUnknown, + /// The specified validator is not in the state's validator registry. + ValidatorUnknown(u64), AlreadyExited, - FutureEpoch, + /// The exit is for a future epoch. + /// + /// (state_epoch, exit_epoch) + FutureEpoch(Epoch, Epoch), + /// The exit signature was not signed by the validator. BadSignature, } @@ -232,11 +327,14 @@ impl_into_with_index_without_beacon_error!(ExitValidationError, ExitInvalid); * `Transfer` Validation */ +/// The object is invalid or validation failed. #[derive(Debug, PartialEq)] pub enum TransferValidationError { + /// Validation completed successfully and the object is invalid. Invalid(TransferInvalid), } +/// Describes why an object is invalid. #[derive(Debug, PartialEq)] pub enum TransferInvalid {} diff --git a/eth2/state_processing/src/per_block_processing.rs b/eth2/state_processing/src/per_block_processing.rs index 06fe3b556..b9006d6f9 100644 --- a/eth2/state_processing/src/per_block_processing.rs +++ b/eth2/state_processing/src/per_block_processing.rs @@ -19,6 +19,12 @@ mod verify_proposer_slashing; mod verify_slashable_attestation; mod verify_transfer; +/// Updates the state for a new block, whilst validating that the block is valid. +/// +/// Returns `Ok(())` if the block is valid and the state was successfully updated. Otherwise +/// returns an error describing why the block was invalid or how the function failed to execute. +/// +/// Spec v0.4.0 pub fn per_block_processing( state: &mut BeaconState, block: &BeaconBlock, @@ -27,6 +33,13 @@ pub fn per_block_processing( per_block_processing_signature_optional(state, block, true, spec) } +/// Updates the state for a new block, whilst validating that the block is valid, without actually +/// checking the block proposer signature. +/// +/// Returns `Ok(())` if the block is valid and the state was successfully updated. Otherwise +/// returns an error describing why the block was invalid or how the function failed to execute. +/// +/// Spec v0.4.0 pub fn per_block_processing_without_verifying_block_signature( state: &mut BeaconState, block: &BeaconBlock, @@ -35,6 +48,13 @@ pub fn per_block_processing_without_verifying_block_signature( per_block_processing_signature_optional(state, block, false, spec) } +/// Updates the state for a new block, whilst validating that the block is valid, optionally +/// checking the block proposer signature. +/// +/// Returns `Ok(())` if the block is valid and the state was successfully updated. Otherwise +/// returns an error describing why the block was invalid or how the function failed to execute. +/// +/// Spec v0.4.0 fn per_block_processing_signature_optional( mut state: &mut BeaconState, block: &BeaconBlock, diff --git a/eth2/state_processing/src/per_block_processing/validate_attestation.rs b/eth2/state_processing/src/per_block_processing/validate_attestation.rs index 8214e8d9a..8749bc5ea 100644 --- a/eth2/state_processing/src/per_block_processing/validate_attestation.rs +++ b/eth2/state_processing/src/per_block_processing/validate_attestation.rs @@ -3,7 +3,10 @@ use ssz::TreeHash; use types::beacon_state::helpers::*; use types::*; -/// Validate an attestation, checking the aggregate signature. +/// Indicates if an `Attestation` is valid to be included in a block in the current epoch of the +/// given state. +/// +/// Returns `Ok(())` if the `Attestation` is valid, otherwise indicates the reason for invalidity. /// /// Spec v0.4.0 pub fn validate_attestation( @@ -14,7 +17,10 @@ pub fn validate_attestation( validate_attestation_signature_optional(state, attestation, spec, true) } -/// Validate an attestation, without checking the aggregate signature. +/// Indicates if an `Attestation` is valid to be included in a block in the current epoch of the +/// given state, without validating the aggregate signature. +/// +/// Returns `Ok(())` if the `Attestation` is valid, otherwise indicates the reason for invalidity. /// /// Spec v0.4.0 pub fn validate_attestation_without_signature( @@ -25,7 +31,9 @@ pub fn validate_attestation_without_signature( validate_attestation_signature_optional(state, attestation, spec, false) } -/// Validate an attestation, optionally checking the aggregate signature. +/// Indicates if an `Attestation` is valid to be included in a block in the current epoch of the +/// given state, optionally validating the aggregate signature. +/// /// /// Spec v0.4.0 fn validate_attestation_signature_optional( @@ -37,19 +45,23 @@ fn validate_attestation_signature_optional( // Verify that `attestation.data.slot >= GENESIS_SLOT`. verify!( attestation.data.slot >= spec.genesis_slot, - Invalid::PreGenesis + Invalid::PreGenesis(spec.genesis_slot, attestation.data.slot) ); // Verify that `attestation.data.slot + MIN_ATTESTATION_INCLUSION_DELAY <= state.slot`. verify!( attestation.data.slot + spec.min_attestation_inclusion_delay <= state.slot, - Invalid::IncludedTooEarly + Invalid::IncludedTooEarly( + state.slot, + spec.min_attestation_inclusion_delay, + attestation.data.slot + ) ); // Verify that `state.slot < attestation.data.slot + SLOTS_PER_EPOCH`. verify!( state.slot < attestation.data.slot + spec.slots_per_epoch, - Invalid::IncludedTooLate + Invalid::IncludedTooLate(state.slot, attestation.data.slot) ); // Verify that `attestation.data.justified_epoch` is equal to `state.justified_epoch` if @@ -58,29 +70,37 @@ fn validate_attestation_signature_optional( if (attestation.data.slot + 1).epoch(spec.slots_per_epoch) >= state.current_epoch(spec) { verify!( attestation.data.justified_epoch == state.justified_epoch, - Invalid::WrongJustifiedSlot + Invalid::WrongJustifiedEpoch( + attestation.data.justified_epoch, + state.justified_epoch, + false + ) ); } else { verify!( attestation.data.justified_epoch == state.previous_justified_epoch, - Invalid::WrongJustifiedSlot + Invalid::WrongJustifiedEpoch( + attestation.data.justified_epoch, + state.previous_justified_epoch, + true + ) ); } // Verify that `attestation.data.justified_block_root` is equal to `get_block_root(state, // get_epoch_start_slot(attestation.data.justified_epoch))`. + let justified_block_root = *state + .get_block_root( + attestation + .data + .justified_epoch + .start_slot(spec.slots_per_epoch), + &spec, + ) + .ok_or(BeaconStateError::InsufficientBlockRoots)?; verify!( - attestation.data.justified_block_root - == *state - .get_block_root( - attestation - .data - .justified_epoch - .start_slot(spec.slots_per_epoch), - &spec - ) - .ok_or(BeaconStateError::InsufficientBlockRoots)?, - Invalid::WrongJustifiedRoot + attestation.data.justified_block_root == justified_block_root, + Invalid::WrongJustifiedRoot(justified_block_root, attestation.data.justified_block_root) ); // Verify that either: @@ -106,7 +126,12 @@ fn validate_attestation_signature_optional( .get_crosslink_committees_at_slot(attestation.data.slot, spec)? .iter() .find(|(_committee, shard)| *shard == attestation.data.shard) - .ok_or_else(|| Error::Invalid(Invalid::NoCommitteeForShard))?; + .ok_or_else(|| { + Error::Invalid(Invalid::NoCommitteeForShard( + attestation.data.shard, + attestation.data.slot, + )) + })?; // Custody bitfield is all zeros (phase 0 requirement). verify!( @@ -115,8 +140,8 @@ fn validate_attestation_signature_optional( ); // Custody bitfield length is correct. verify!( - verify_bitfield_length(&attestation.aggregation_bitfield, committee.len()), - Invalid::BadCustodyBitfieldLength + verify_bitfield_length(&attestation.custody_bitfield, committee.len()), + Invalid::BadCustodyBitfieldLength(committee.len(), attestation.custody_bitfield.len()) ); // Aggregation bitfield isn't empty. verify!( @@ -126,7 +151,10 @@ fn validate_attestation_signature_optional( // Aggregation bitfield length is correct. verify!( verify_bitfield_length(&attestation.aggregation_bitfield, committee.len()), - Invalid::BadAggregationBitfieldLength + Invalid::BadAggregationBitfieldLength( + committee.len(), + attestation.aggregation_bitfield.len() + ) ); if verify_signature { diff --git a/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs index b12ffa5ae..aef09943a 100644 --- a/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs +++ b/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs @@ -2,10 +2,10 @@ use super::verify_slashable_attestation::verify_slashable_attestation; use crate::errors::{AttesterSlashingInvalid as Invalid, AttesterSlashingValidationError as Error}; use types::*; -/// Returns `Ok(())` if some `AttesterSlashing` is valid to be included in some `BeaconState`, -/// otherwise returns an `Err`. +/// Indicates if an `AttesterSlashing` is valid to be included in a block in the current epoch of the given +/// state. /// -/// Returns the slashable indices from the `AttesterSlashing`. +/// Returns `Ok(())` if the `AttesterSlashing` is valid, otherwise indicates the reason for invalidity. /// /// Spec v0.4.0 pub fn verify_attester_slashing( @@ -36,7 +36,7 @@ pub fn verify_attester_slashing( let validator = state .validator_registry .get(*i as usize) - .ok_or_else(|| Error::Invalid(Invalid::UnknownValidator))?; + .ok_or_else(|| Error::Invalid(Invalid::UnknownValidator(*i)))?; if slashable_attestation_1.validator_indices.contains(&i) & !validator.slashed { slashable_indices.push(*i); diff --git a/eth2/state_processing/src/per_block_processing/verify_deposit.rs b/eth2/state_processing/src/per_block_processing/verify_deposit.rs index 20ed2f0b2..59a2a66c4 100644 --- a/eth2/state_processing/src/per_block_processing/verify_deposit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_deposit.rs @@ -1,22 +1,26 @@ use crate::errors::{DepositInvalid as Invalid, DepositValidationError as Error}; -use ssz::TreeHash; -use types::beacon_state::helpers::verify_bitfield_length; use types::*; -/// Verify validity of ``slashable_attestation`` fields. +/// Indicates if a `Deposit` is valid to be included in a block in the current epoch of the given +/// state. /// -/// Returns `Ok(())` if all fields are valid. +/// Returns `Ok(())` if the `Deposit` is valid, otherwise indicates the reason for invalidity. +/// +/// Note: this function is incomplete. /// /// Spec v0.4.0 pub fn verify_deposit( state: &BeaconState, deposit: &Deposit, - spec: &ChainSpec, + _spec: &ChainSpec, ) -> Result<(), Error> { // TODO: verify serialized deposit data. // TODO: verify deposit index. - verify!(deposit.index == state.deposit_index, Invalid::BadIndex); + verify!( + deposit.index == state.deposit_index, + Invalid::BadIndex(state.deposit_index, deposit.index) + ); // TODO: verify merkle branch. diff --git a/eth2/state_processing/src/per_block_processing/verify_exit.rs b/eth2/state_processing/src/per_block_processing/verify_exit.rs index d4c2f7baa..34c55c55e 100644 --- a/eth2/state_processing/src/per_block_processing/verify_exit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_exit.rs @@ -2,9 +2,10 @@ use crate::errors::{ExitInvalid as Invalid, ExitValidationError as Error}; use ssz::SignedRoot; use types::*; -/// Verify validity of ``slashable_attestation`` fields. +/// Indicates if an `Exit` is valid to be included in a block in the current epoch of the given +/// state. /// -/// Returns `Ok(())` if all fields are valid. +/// Returns `Ok(())` if the `Exit` is valid, otherwise indicates the reason for invalidity. /// /// Spec v0.4.0 pub fn verify_exit( @@ -15,7 +16,9 @@ pub fn verify_exit( let validator = state .validator_registry .get(exit.validator_index as usize) - .ok_or(Error::Invalid(Invalid::ValidatorUnknown))?; + .ok_or(Error::Invalid(Invalid::ValidatorUnknown( + exit.validator_index, + )))?; verify!( validator.exit_epoch @@ -25,7 +28,7 @@ pub fn verify_exit( verify!( state.current_epoch(spec) >= exit.epoch, - Invalid::FutureEpoch + Invalid::FutureEpoch(state.current_epoch(spec), exit.epoch) ); let message = exit.signed_root(); diff --git a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs index a7b344b2c..c4e51b1a8 100644 --- a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs +++ b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs @@ -2,8 +2,10 @@ use crate::errors::{ProposerSlashingInvalid as Invalid, ProposerSlashingValidati use ssz::SignedRoot; use types::*; -/// Returns `Ok(())` if some `ProposerSlashing` is valid to be included in some `BeaconState`, -/// otherwise returns an `Err`. +/// Indicates if a `ProposerSlashing` is valid to be included in a block in the current epoch of the given +/// state. +/// +/// Returns `Ok(())` if the `ProposerSlashing` is valid, otherwise indicates the reason for invalidity. /// /// Spec v0.4.0 pub fn verify_proposer_slashing( @@ -14,21 +16,32 @@ pub fn verify_proposer_slashing( let proposer = state .validator_registry .get(proposer_slashing.proposer_index as usize) - .ok_or(Error::Invalid(Invalid::ProposerUnknown))?; + .ok_or(Error::Invalid(Invalid::ProposerUnknown( + proposer_slashing.proposer_index, + )))?; verify!( proposer_slashing.proposal_1.slot == proposer_slashing.proposal_2.slot, - Invalid::ProposalSlotMismatch + Invalid::ProposalSlotMismatch( + proposer_slashing.proposal_1.slot, + proposer_slashing.proposal_2.slot + ) ); verify!( proposer_slashing.proposal_1.shard == proposer_slashing.proposal_2.shard, - Invalid::ProposalShardMismatch + Invalid::ProposalShardMismatch( + proposer_slashing.proposal_1.shard, + proposer_slashing.proposal_2.shard + ) ); verify!( proposer_slashing.proposal_1.block_root != proposer_slashing.proposal_2.block_root, - Invalid::ProposalBlockRootMismatch + Invalid::ProposalBlockRootMismatch( + proposer_slashing.proposal_1.block_root, + proposer_slashing.proposal_2.block_root + ) ); verify!(!proposer.slashed, Invalid::ProposerAlreadySlashed); @@ -55,6 +68,9 @@ pub fn verify_proposer_slashing( Ok(()) } +/// Verifies the signature of a proposal. +/// +/// Returns `true` if the signature is valid. fn verify_proposal_signature( proposal: &Proposal, pubkey: &PublicKey, diff --git a/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs b/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs index cd0f9a201..0b948ad89 100644 --- a/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs +++ b/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs @@ -5,9 +5,10 @@ use ssz::TreeHash; use types::beacon_state::helpers::verify_bitfield_length; use types::*; -/// Verify validity of ``slashable_attestation`` fields. +/// Indicates if a `SlashableAttestation` is valid to be included in a block in the current epoch of the given +/// state. /// -/// Returns `Ok(())` if all fields are valid. +/// Returns `Ok(())` if the `SlashableAttestation` is valid, otherwise indicates the reason for invalidity. /// /// Spec v0.4.0 pub fn verify_slashable_attestation( @@ -27,7 +28,7 @@ pub fn verify_slashable_attestation( if slashable_attestation.validator_indices[i] >= slashable_attestation.validator_indices[i + 1] { - invalid!(Invalid::BadValidatorIndicesOrdering); + invalid!(Invalid::BadValidatorIndicesOrdering(i)); } } @@ -35,12 +36,18 @@ pub fn verify_slashable_attestation( &slashable_attestation.custody_bitfield, slashable_attestation.validator_indices.len(), ) { - invalid!(Invalid::BadCustodyBitfieldLength); + invalid!(Invalid::BadCustodyBitfieldLength( + slashable_attestation.validator_indices.len(), + slashable_attestation.custody_bitfield.len() + )); } if slashable_attestation.validator_indices.len() > spec.max_indices_per_slashable_vote as usize { - invalid!(Invalid::MaxIndicesExceed); + invalid!(Invalid::MaxIndicesExceed( + spec.max_indices_per_slashable_vote as usize, + slashable_attestation.validator_indices.len() + )); } // TODO: this signature verification could likely be replaced with: @@ -62,7 +69,7 @@ pub fn verify_slashable_attestation( Some(validator) => { aggregate_pubs[custody_bit as usize].add(&validator.pubkey); } - None => invalid!(Invalid::UnknownValidator), + None => invalid!(Invalid::UnknownValidator(*v)), }; } diff --git a/eth2/state_processing/src/per_block_processing/verify_transfer.rs b/eth2/state_processing/src/per_block_processing/verify_transfer.rs index 0dee9a7d2..220f5e496 100644 --- a/eth2/state_processing/src/per_block_processing/verify_transfer.rs +++ b/eth2/state_processing/src/per_block_processing/verify_transfer.rs @@ -1,17 +1,18 @@ use crate::errors::{TransferInvalid as Invalid, TransferValidationError as Error}; -use ssz::TreeHash; -use types::beacon_state::helpers::verify_bitfield_length; use types::*; -/// Verify validity of ``slashable_attestation`` fields. +/// Indicates if a `Transfer` is valid to be included in a block in the current epoch of the given +/// state. /// -/// Returns `Ok(())` if all fields are valid. +/// Returns `Ok(())` if the `Transfer` is valid, otherwise indicates the reason for invalidity. +/// +/// Note: this function is incomplete. /// /// Spec v0.4.0 pub fn verify_transfer( - state: &BeaconState, - transfer: &Transfer, - spec: &ChainSpec, + _state: &BeaconState, + _transfer: &Transfer, + _spec: &ChainSpec, ) -> Result<(), Error> { // TODO: verify transfer. From 521d48d37c3bf1e1c5034876cb409202ea83a92b Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 17:03:18 +1100 Subject: [PATCH 16/31] Break per-block-processing into smaller fns Will enable benchmarking of each individual fn --- .../src/per_block_processing.rs | 418 +++++++++++------- 1 file changed, 257 insertions(+), 161 deletions(-) diff --git a/eth2/state_processing/src/per_block_processing.rs b/eth2/state_processing/src/per_block_processing.rs index b9006d6f9..573513819 100644 --- a/eth2/state_processing/src/per_block_processing.rs +++ b/eth2/state_processing/src/per_block_processing.rs @@ -64,161 +64,22 @@ fn per_block_processing_signature_optional( // Verify that `block.slot == state.slot`. verify!(block.slot == state.slot, Invalid::StateSlotMismatch); - // Get the epoch for future ergonomics. - let epoch = block.slot.epoch(spec.slots_per_epoch); - // Ensure the current epoch cache is built. state.build_epoch_cache(RelativeEpoch::Current, spec)?; - // Let `proposer = state.validator_registry[get_beacon_proposer_index(state, state.slot)]`. - let block_proposer = - &state.validator_registry[state.get_beacon_proposer_index(block.slot, spec)?]; - - // Block signature if should_verify_block_signature { - verify!( - verify_block_signature(&block, &block_proposer, &state.fork, spec,), - Invalid::BadSignature - ); + verify_block_signature(&state, &block, &spec)?; } + process_randao(&mut state, &block, &spec)?; + process_eth1_data(&mut state, &block.eth1_data)?; + process_proposer_slashings(&mut state, &block.body.proposer_slashings[..], spec)?; + process_attester_slashings(&mut state, &block.body.attester_slashings[..], spec)?; + process_attestations(&mut state, &block.body.attestations[..], spec)?; + process_deposits(&mut state, &block.body.deposits[..], spec)?; + process_exits(&mut state, &block.body.voluntary_exits[..], spec)?; + process_transfers(&mut state, &block.body.transfers[..], spec)?; - // Randao - - // Verify that `bls_verify(pubkey=proposer.pubkey, - // message_hash=hash_tree_root(get_current_epoch(state)), signature=block.randao_reveal, - // domain=get_domain(state.fork, get_current_epoch(state), DOMAIN_RANDAO))`. - verify!( - block.randao_reveal.verify( - &state.current_epoch(spec).hash_tree_root()[..], - spec.get_domain(epoch, Domain::Randao, &state.fork), - &block_proposer.pubkey - ), - Invalid::BadRandaoSignature - ); - - // Update the state's RANDAO mix with the one revealed in the block. - update_randao(&mut state, &block.randao_reveal, spec)?; - - // Eth1 Data - - // Either increment the eth1_data vote count, or add a new eth1_data. - let matching_eth1_vote_index = state - .eth1_data_votes - .iter() - .position(|vote| vote.eth1_data == block.eth1_data); - if let Some(index) = matching_eth1_vote_index { - state.eth1_data_votes[index].vote_count += 1; - } else { - state.eth1_data_votes.push(Eth1DataVote { - eth1_data: block.eth1_data.clone(), - vote_count: 1, - }); - } - - //Proposer slashings - - verify!( - block.body.proposer_slashings.len() as u64 <= spec.max_proposer_slashings, - Invalid::MaxProposerSlashingsExceeded - ); - for (i, proposer_slashing) in block.body.proposer_slashings.iter().enumerate() { - verify_proposer_slashing(proposer_slashing, &state, spec) - .map_err(|e| e.into_with_index(i))?; - state.slash_validator(proposer_slashing.proposer_index as usize, spec)?; - } - - // Attester Slashings - - verify!( - block.body.attester_slashings.len() as u64 <= spec.max_attester_slashings, - Invalid::MaxAttesterSlashingsExceed - ); - for (i, attester_slashing) in block.body.attester_slashings.iter().enumerate() { - let slashable_indices = verify_attester_slashing(&state, &attester_slashing, spec) - .map_err(|e| e.into_with_index(i))?; - for i in slashable_indices { - state.slash_validator(i as usize, spec)?; - } - } - - // Attestations - - verify!( - block.body.attestations.len() as u64 <= spec.max_attestations, - Invalid::MaxAttestationsExceeded - ); - for (i, attestation) in block.body.attestations.iter().enumerate() { - // Build the previous epoch cache only if required by an attestation. - if attestation.data.slot.epoch(spec.slots_per_epoch) == state.previous_epoch(spec) { - state.build_epoch_cache(RelativeEpoch::Previous, spec)?; - } - - validate_attestation(&mut state, attestation, spec).map_err(|e| e.into_with_index(i))?; - - let pending_attestation = PendingAttestation { - data: attestation.data.clone(), - aggregation_bitfield: attestation.aggregation_bitfield.clone(), - custody_bitfield: attestation.custody_bitfield.clone(), - inclusion_slot: state.slot, - }; - state.latest_attestations.push(pending_attestation); - } - - // Deposits - - verify!( - block.body.deposits.len() as u64 <= spec.max_deposits, - Invalid::MaxDepositsExceeded - ); - for (i, deposit) in block.body.deposits.iter().enumerate() { - verify_deposit(&mut state, deposit, spec).map_err(|e| e.into_with_index(i))?; - - state - .process_deposit( - deposit.deposit_data.deposit_input.pubkey.clone(), - deposit.deposit_data.amount, - deposit - .deposit_data - .deposit_input - .proof_of_possession - .clone(), - deposit.deposit_data.deposit_input.withdrawal_credentials, - None, - spec, - ) - .map_err(|_| Error::Invalid(Invalid::DepositProcessingFailed(i)))?; - - state.deposit_index += 1; - } - - // Exits - - verify!( - block.body.voluntary_exits.len() as u64 <= spec.max_voluntary_exits, - Invalid::MaxExitsExceeded - ); - for (i, exit) in block.body.voluntary_exits.iter().enumerate() { - verify_exit(&state, exit, spec).map_err(|e| e.into_with_index(i))?; - - state.initiate_validator_exit(exit.validator_index as usize); - } - - // Transfers - verify!( - block.body.transfers.len() as u64 <= spec.max_transfers, - Invalid::MaxTransfersExceed - ); - for (i, transfer) in block.body.transfers.iter().enumerate() { - verify_transfer(&state, transfer, spec).map_err(|e| e.into_with_index(i))?; - - let block_proposer = state.get_beacon_proposer_index(state.slot, spec)?; - - state.validator_balances[transfer.from as usize] -= transfer.amount + transfer.fee; - state.validator_balances[transfer.to as usize] += transfer.amount + transfer.fee; - state.validator_balances[block_proposer as usize] += transfer.fee; - } - - debug!("State transition complete."); + debug!("per_block_processing complete."); Ok(()) } @@ -227,13 +88,13 @@ fn per_block_processing_signature_optional( /// /// Spec v0.4.0 pub fn verify_block_signature( + state: &BeaconState, block: &BeaconBlock, - block_proposer: &Validator, - fork: &Fork, spec: &ChainSpec, -) -> bool { - // Let proposal = `Proposal(block.slot, BEACON_CHAIN_SHARD_NUMBER, signed_root(block, - // "signature"), block.signature)`. +) -> Result<(), Error> { + let block_proposer = + &state.validator_registry[state.get_beacon_proposer_index(block.slot, spec)?]; + let proposal = Proposal { slot: block.slot, shard: spec.beacon_chain_shard_number, @@ -243,14 +104,73 @@ pub fn verify_block_signature( let domain = spec.get_domain( block.slot.epoch(spec.slots_per_epoch), Domain::Proposal, - fork, + &state.fork, ); - // Verify that `bls_verify(pubkey=proposer.pubkey, message_hash=signed_root(proposal, - // "signature"), signature=proposal.signature, domain=get_domain(state.fork, - // get_current_epoch(state), DOMAIN_PROPOSAL))`. - proposal - .signature - .verify(&proposal.signed_root()[..], domain, &block_proposer.pubkey) + + verify!( + proposal + .signature + .verify(&proposal.signed_root()[..], domain, &block_proposer.pubkey), + Invalid::BadSignature + ); + + Ok(()) +} + +/// Verifies the `randao_reveal` against the block's proposer pubkey and updates +/// `state.latest_randao_mixes`. +/// +/// Spec v0.4.0 +pub fn process_randao( + state: &mut BeaconState, + block: &BeaconBlock, + spec: &ChainSpec, +) -> Result<(), Error> { + // Let `proposer = state.validator_registry[get_beacon_proposer_index(state, state.slot)]`. + let block_proposer = + &state.validator_registry[state.get_beacon_proposer_index(block.slot, spec)?]; + + // Verify that `bls_verify(pubkey=proposer.pubkey, + // message_hash=hash_tree_root(get_current_epoch(state)), signature=block.randao_reveal, + // domain=get_domain(state.fork, get_current_epoch(state), DOMAIN_RANDAO))`. + verify!( + block.randao_reveal.verify( + &state.current_epoch(spec).hash_tree_root()[..], + spec.get_domain( + block.slot.epoch(spec.slots_per_epoch), + Domain::Randao, + &state.fork + ), + &block_proposer.pubkey + ), + Invalid::BadRandaoSignature + ); + + // Update the state's RANDAO mix with the one revealed in the block. + update_randao(state, &block.randao_reveal, spec)?; + + Ok(()) +} + +/// Update the `state.eth1_data_votes` based upon the `eth1_data` provided. +/// +/// Spec v0.4.0 +pub fn process_eth1_data(state: &mut BeaconState, eth1_data: &Eth1Data) -> Result<(), Error> { + // Either increment the eth1_data vote count, or add a new eth1_data. + let matching_eth1_vote_index = state + .eth1_data_votes + .iter() + .position(|vote| vote.eth1_data == *eth1_data); + if let Some(index) = matching_eth1_vote_index { + state.eth1_data_votes[index].vote_count += 1; + } else { + state.eth1_data_votes.push(Eth1DataVote { + eth1_data: eth1_data.clone(), + vote_count: 1, + }); + } + + Ok(()) } /// Updates the present randao mix. @@ -286,3 +206,179 @@ pub fn update_randao( Err(BeaconStateError::InsufficientRandaoMixes) } } + +/// Validates each `ProposerSlashing` and updates the state, short-circuiting on an invalid object. +/// +/// Returns `Ok(())` if the validation and state updates completed successfully, otherwise returns +/// an `Err` describing the invalid object or cause of failure. +/// +/// Spec v0.4.0 +pub fn process_proposer_slashings( + state: &mut BeaconState, + proposer_slashings: &[ProposerSlashing], + spec: &ChainSpec, +) -> Result<(), Error> { + verify!( + proposer_slashings.len() as u64 <= spec.max_proposer_slashings, + Invalid::MaxProposerSlashingsExceeded + ); + for (i, proposer_slashing) in proposer_slashings.iter().enumerate() { + verify_proposer_slashing(proposer_slashing, &state, spec) + .map_err(|e| e.into_with_index(i))?; + state.slash_validator(proposer_slashing.proposer_index as usize, spec)?; + } + + Ok(()) +} + +/// Validates each `AttesterSlsashing` and updates the state, short-circuiting on an invalid object. +/// +/// Returns `Ok(())` if the validation and state updates completed successfully, otherwise returns +/// an `Err` describing the invalid object or cause of failure. +/// +/// Spec v0.4.0 +pub fn process_attester_slashings( + state: &mut BeaconState, + attester_slashings: &[AttesterSlashing], + spec: &ChainSpec, +) -> Result<(), Error> { + verify!( + attester_slashings.len() as u64 <= spec.max_attester_slashings, + Invalid::MaxAttesterSlashingsExceed + ); + for (i, attester_slashing) in attester_slashings.iter().enumerate() { + let slashable_indices = verify_attester_slashing(&state, &attester_slashing, spec) + .map_err(|e| e.into_with_index(i))?; + for i in slashable_indices { + state.slash_validator(i as usize, spec)?; + } + } + + Ok(()) +} + +/// Validates each `Attestation` and updates the state, short-circuiting on an invalid object. +/// +/// Returns `Ok(())` if the validation and state updates completed successfully, otherwise returns +/// an `Err` describing the invalid object or cause of failure. +/// +/// Spec v0.4.0 +pub fn process_attestations( + state: &mut BeaconState, + attestations: &[Attestation], + spec: &ChainSpec, +) -> Result<(), Error> { + verify!( + attestations.len() as u64 <= spec.max_attestations, + Invalid::MaxAttestationsExceeded + ); + for (i, attestation) in attestations.iter().enumerate() { + // Build the previous epoch cache only if required by an attestation. + if attestation.data.slot.epoch(spec.slots_per_epoch) == state.previous_epoch(spec) { + state.build_epoch_cache(RelativeEpoch::Previous, spec)?; + } + + validate_attestation(state, attestation, spec).map_err(|e| e.into_with_index(i))?; + + let pending_attestation = PendingAttestation { + data: attestation.data.clone(), + aggregation_bitfield: attestation.aggregation_bitfield.clone(), + custody_bitfield: attestation.custody_bitfield.clone(), + inclusion_slot: state.slot, + }; + state.latest_attestations.push(pending_attestation); + } + + Ok(()) +} + +/// Validates each `Deposit` and updates the state, short-circuiting on an invalid object. +/// +/// Returns `Ok(())` if the validation and state updates completed successfully, otherwise returns +/// an `Err` describing the invalid object or cause of failure. +/// +/// Spec v0.4.0 +pub fn process_deposits( + state: &mut BeaconState, + deposits: &[Deposit], + spec: &ChainSpec, +) -> Result<(), Error> { + verify!( + deposits.len() as u64 <= spec.max_deposits, + Invalid::MaxDepositsExceeded + ); + for (i, deposit) in deposits.iter().enumerate() { + verify_deposit(state, deposit, spec).map_err(|e| e.into_with_index(i))?; + + state + .process_deposit( + deposit.deposit_data.deposit_input.pubkey.clone(), + deposit.deposit_data.amount, + deposit + .deposit_data + .deposit_input + .proof_of_possession + .clone(), + deposit.deposit_data.deposit_input.withdrawal_credentials, + None, + spec, + ) + .map_err(|_| Error::Invalid(Invalid::DepositProcessingFailed(i)))?; + + state.deposit_index += 1; + } + + Ok(()) +} + +/// Validates each `Exit` and updates the state, short-circuiting on an invalid object. +/// +/// Returns `Ok(())` if the validation and state updates completed successfully, otherwise returns +/// an `Err` describing the invalid object or cause of failure. +/// +/// Spec v0.4.0 +pub fn process_exits( + state: &mut BeaconState, + voluntary_exits: &[VoluntaryExit], + spec: &ChainSpec, +) -> Result<(), Error> { + verify!( + voluntary_exits.len() as u64 <= spec.max_voluntary_exits, + Invalid::MaxExitsExceeded + ); + for (i, exit) in voluntary_exits.iter().enumerate() { + verify_exit(&state, exit, spec).map_err(|e| e.into_with_index(i))?; + + state.initiate_validator_exit(exit.validator_index as usize); + } + + Ok(()) +} + +/// Validates each `Transfer` and updates the state, short-circuiting on an invalid object. +/// +/// Returns `Ok(())` if the validation and state updates completed successfully, otherwise returns +/// an `Err` describing the invalid object or cause of failure. +/// +/// Spec v0.4.0 +pub fn process_transfers( + state: &mut BeaconState, + transfers: &[Transfer], + spec: &ChainSpec, +) -> Result<(), Error> { + verify!( + transfers.len() as u64 <= spec.max_transfers, + Invalid::MaxTransfersExceed + ); + for (i, transfer) in transfers.iter().enumerate() { + verify_transfer(&state, transfer, spec).map_err(|e| e.into_with_index(i))?; + + let block_proposer = state.get_beacon_proposer_index(state.slot, spec)?; + + state.validator_balances[transfer.from as usize] -= transfer.amount + transfer.fee; + state.validator_balances[transfer.to as usize] += transfer.amount + transfer.fee; + state.validator_balances[block_proposer as usize] += transfer.fee; + } + + Ok(()) +} From 17210faf3a3c9dd6f1266e19941888ecbdf71e6a Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 17:14:54 +1100 Subject: [PATCH 17/31] Start reorg of per_epoch_processing --- eth2/state_processing/src/lib.rs | 6 +- .../src/per_block_processing.rs | 3 +- .../src/{ => per_block_processing}/errors.rs | 0 .../validate_attestation.rs | 2 +- .../verify_attester_slashing.rs | 2 +- .../per_block_processing/verify_deposit.rs | 2 +- .../src/per_block_processing/verify_exit.rs | 2 +- .../verify_proposer_slashing.rs | 2 +- .../verify_slashable_attestation.rs | 2 +- .../per_block_processing/verify_transfer.rs | 2 +- ...processable.rs => per_epoch_processing.rs} | 121 +----------------- .../src/per_epoch_processing/errors.rs | 36 ++++++ .../tests.rs | 0 .../src/per_epoch_processing/winning_root.rs | 85 ++++++++++++ 14 files changed, 136 insertions(+), 129 deletions(-) rename eth2/state_processing/src/{ => per_block_processing}/errors.rs (100%) rename eth2/state_processing/src/{epoch_processable.rs => per_epoch_processing.rs} (88%) create mode 100644 eth2/state_processing/src/per_epoch_processing/errors.rs rename eth2/state_processing/src/{epoch_processable => per_epoch_processing}/tests.rs (100%) create mode 100644 eth2/state_processing/src/per_epoch_processing/winning_root.rs diff --git a/eth2/state_processing/src/lib.rs b/eth2/state_processing/src/lib.rs index ec883ddca..a5cc4f26e 100644 --- a/eth2/state_processing/src/lib.rs +++ b/eth2/state_processing/src/lib.rs @@ -1,12 +1,12 @@ #[macro_use] mod macros; + pub mod per_block_processing; -// mod epoch_processable; -pub mod errors; +pub mod per_epoch_processing; // mod slot_processable; -pub use errors::{BlockInvalid, BlockProcessingError}; pub use per_block_processing::{ + errors::{BlockInvalid, BlockProcessingError}, per_block_processing, per_block_processing_without_verifying_block_signature, }; // pub use epoch_processable::{EpochProcessable, Error as EpochProcessingError}; diff --git a/eth2/state_processing/src/per_block_processing.rs b/eth2/state_processing/src/per_block_processing.rs index 573513819..fc3a8204e 100644 --- a/eth2/state_processing/src/per_block_processing.rs +++ b/eth2/state_processing/src/per_block_processing.rs @@ -1,5 +1,5 @@ use self::verify_proposer_slashing::verify_proposer_slashing; -use crate::errors::{BlockInvalid as Invalid, BlockProcessingError as Error, IntoWithIndex}; +use errors::{BlockInvalid as Invalid, BlockProcessingError as Error, IntoWithIndex}; use hashing::hash; use log::debug; use ssz::{ssz_encode, SignedRoot, TreeHash}; @@ -11,6 +11,7 @@ pub use verify_deposit::verify_deposit; pub use verify_exit::verify_exit; pub use verify_transfer::verify_transfer; +pub mod errors; mod validate_attestation; mod verify_attester_slashing; mod verify_deposit; diff --git a/eth2/state_processing/src/errors.rs b/eth2/state_processing/src/per_block_processing/errors.rs similarity index 100% rename from eth2/state_processing/src/errors.rs rename to eth2/state_processing/src/per_block_processing/errors.rs diff --git a/eth2/state_processing/src/per_block_processing/validate_attestation.rs b/eth2/state_processing/src/per_block_processing/validate_attestation.rs index 8749bc5ea..54bd2d332 100644 --- a/eth2/state_processing/src/per_block_processing/validate_attestation.rs +++ b/eth2/state_processing/src/per_block_processing/validate_attestation.rs @@ -1,4 +1,4 @@ -use crate::errors::{AttestationInvalid as Invalid, AttestationValidationError as Error}; +use super::errors::{AttestationInvalid as Invalid, AttestationValidationError as Error}; use ssz::TreeHash; use types::beacon_state::helpers::*; use types::*; diff --git a/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs index aef09943a..71ac97469 100644 --- a/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs +++ b/eth2/state_processing/src/per_block_processing/verify_attester_slashing.rs @@ -1,5 +1,5 @@ +use super::errors::{AttesterSlashingInvalid as Invalid, AttesterSlashingValidationError as Error}; use super::verify_slashable_attestation::verify_slashable_attestation; -use crate::errors::{AttesterSlashingInvalid as Invalid, AttesterSlashingValidationError as Error}; use types::*; /// Indicates if an `AttesterSlashing` is valid to be included in a block in the current epoch of the given diff --git a/eth2/state_processing/src/per_block_processing/verify_deposit.rs b/eth2/state_processing/src/per_block_processing/verify_deposit.rs index 59a2a66c4..a1731f1a1 100644 --- a/eth2/state_processing/src/per_block_processing/verify_deposit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_deposit.rs @@ -1,4 +1,4 @@ -use crate::errors::{DepositInvalid as Invalid, DepositValidationError as Error}; +use super::errors::{DepositInvalid as Invalid, DepositValidationError as Error}; use types::*; /// Indicates if a `Deposit` is valid to be included in a block in the current epoch of the given diff --git a/eth2/state_processing/src/per_block_processing/verify_exit.rs b/eth2/state_processing/src/per_block_processing/verify_exit.rs index 34c55c55e..408b77077 100644 --- a/eth2/state_processing/src/per_block_processing/verify_exit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_exit.rs @@ -1,4 +1,4 @@ -use crate::errors::{ExitInvalid as Invalid, ExitValidationError as Error}; +use super::errors::{ExitInvalid as Invalid, ExitValidationError as Error}; use ssz::SignedRoot; use types::*; diff --git a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs index c4e51b1a8..0350255ec 100644 --- a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs +++ b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs @@ -1,4 +1,4 @@ -use crate::errors::{ProposerSlashingInvalid as Invalid, ProposerSlashingValidationError as Error}; +use super::errors::{ProposerSlashingInvalid as Invalid, ProposerSlashingValidationError as Error}; use ssz::SignedRoot; use types::*; diff --git a/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs b/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs index 0b948ad89..f0d371043 100644 --- a/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs +++ b/eth2/state_processing/src/per_block_processing/verify_slashable_attestation.rs @@ -1,4 +1,4 @@ -use crate::errors::{ +use super::errors::{ SlashableAttestationInvalid as Invalid, SlashableAttestationValidationError as Error, }; use ssz::TreeHash; diff --git a/eth2/state_processing/src/per_block_processing/verify_transfer.rs b/eth2/state_processing/src/per_block_processing/verify_transfer.rs index 220f5e496..cd7bcb42c 100644 --- a/eth2/state_processing/src/per_block_processing/verify_transfer.rs +++ b/eth2/state_processing/src/per_block_processing/verify_transfer.rs @@ -1,4 +1,4 @@ -use crate::errors::{TransferInvalid as Invalid, TransferValidationError as Error}; +use super::errors::{TransferInvalid as Invalid, TransferValidationError as Error}; use types::*; /// Indicates if a `Transfer` is valid to be included in a block in the current epoch of the given diff --git a/eth2/state_processing/src/epoch_processable.rs b/eth2/state_processing/src/per_epoch_processing.rs similarity index 88% rename from eth2/state_processing/src/epoch_processable.rs rename to eth2/state_processing/src/per_epoch_processing.rs index 0d6ca8038..4c66d8ddc 100644 --- a/eth2/state_processing/src/epoch_processable.rs +++ b/eth2/state_processing/src/per_epoch_processing.rs @@ -1,3 +1,4 @@ +use errors::EpochProcessingError as Error; use integer_sqrt::IntegerSquareRoot; use log::{debug, trace}; use rayon::prelude::*; @@ -9,7 +10,9 @@ use types::{ Crosslink, Epoch, Hash256, InclusionError, PendingAttestation, RelativeEpoch, }; +mod errors; mod tests; +mod winning_root; macro_rules! safe_add_assign { ($a: expr, $b: expr) => { @@ -22,31 +25,6 @@ macro_rules! safe_sub_assign { }; } -#[derive(Debug, PartialEq)] -pub enum Error { - UnableToDetermineProducer, - NoBlockRoots, - BaseRewardQuotientIsZero, - NoRandaoSeed, - BeaconStateError(BeaconStateError), - InclusionError(InclusionError), - WinningRootError(WinningRootError), -} - -#[derive(Debug, PartialEq)] -pub enum WinningRootError { - NoWinningRoot, - BeaconStateError(BeaconStateError), -} - -#[derive(Clone)] -pub struct WinningRoot { - pub shard_block_root: Hash256, - pub attesting_validator_indices: Vec, - pub total_balance: u64, - pub total_attesting_balance: u64, -} - pub trait EpochProcessable { fn per_epoch_processing(&mut self, spec: &ChainSpec) -> Result<(), Error>; } @@ -628,96 +606,3 @@ impl EpochProcessable for BeaconState { fn hash_tree_root(input: Vec) -> Hash256 { Hash256::from(&input.hash_tree_root()[..]) } - -fn winning_root( - state: &BeaconState, - shard: u64, - current_epoch_attestations: &[&PendingAttestation], - previous_epoch_attestations: &[&PendingAttestation], - spec: &ChainSpec, -) -> Result { - let mut attestations = current_epoch_attestations.to_vec(); - attestations.append(&mut previous_epoch_attestations.to_vec()); - - let mut candidates: HashMap = HashMap::new(); - - let mut highest_seen_balance = 0; - - for a in &attestations { - if a.data.shard != shard { - continue; - } - - let shard_block_root = &a.data.shard_block_root; - - if candidates.contains_key(shard_block_root) { - continue; - } - - let attesting_validator_indices = attestations - .iter() - .try_fold::<_, _, Result<_, BeaconStateError>>(vec![], |mut acc, a| { - if (a.data.shard == shard) && (a.data.shard_block_root == *shard_block_root) { - acc.append(&mut state.get_attestation_participants( - &a.data, - &a.aggregation_bitfield, - spec, - )?); - } - Ok(acc) - })?; - - let total_balance: u64 = attesting_validator_indices - .iter() - .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); - - let total_attesting_balance: u64 = attesting_validator_indices - .iter() - .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); - - if total_attesting_balance > highest_seen_balance { - highest_seen_balance = total_attesting_balance; - } - - let candidate_root = WinningRoot { - shard_block_root: *shard_block_root, - attesting_validator_indices, - total_attesting_balance, - total_balance, - }; - - candidates.insert(*shard_block_root, candidate_root); - } - - Ok(candidates - .iter() - .filter_map(|(_hash, candidate)| { - if candidate.total_attesting_balance == highest_seen_balance { - Some(candidate) - } else { - None - } - }) - .min_by_key(|candidate| candidate.shard_block_root) - .ok_or_else(|| WinningRootError::NoWinningRoot)? - // TODO: avoid clone. - .clone()) -} - -impl From for Error { - fn from(e: InclusionError) -> Error { - Error::InclusionError(e) - } -} - -impl From for Error { - fn from(e: BeaconStateError) -> Error { - Error::BeaconStateError(e) - } -} - -impl From for WinningRootError { - fn from(e: BeaconStateError) -> WinningRootError { - WinningRootError::BeaconStateError(e) - } -} diff --git a/eth2/state_processing/src/per_epoch_processing/errors.rs b/eth2/state_processing/src/per_epoch_processing/errors.rs new file mode 100644 index 000000000..0f7063e3b --- /dev/null +++ b/eth2/state_processing/src/per_epoch_processing/errors.rs @@ -0,0 +1,36 @@ +use types::*; + +#[derive(Debug, PartialEq)] +pub enum WinningRootError { + NoWinningRoot, + BeaconStateError(BeaconStateError), +} + +#[derive(Debug, PartialEq)] +pub enum EpochProcessingError { + UnableToDetermineProducer, + NoBlockRoots, + BaseRewardQuotientIsZero, + NoRandaoSeed, + BeaconStateError(BeaconStateError), + InclusionError(InclusionError), + WinningRootError(WinningRootError), +} + +impl From for EpochProcessingError { + fn from(e: InclusionError) -> EpochProcessingError { + EpochProcessingError::InclusionError(e) + } +} + +impl From for EpochProcessingError { + fn from(e: BeaconStateError) -> EpochProcessingError { + EpochProcessingError::BeaconStateError(e) + } +} + +impl From for WinningRootError { + fn from(e: BeaconStateError) -> WinningRootError { + WinningRootError::BeaconStateError(e) + } +} diff --git a/eth2/state_processing/src/epoch_processable/tests.rs b/eth2/state_processing/src/per_epoch_processing/tests.rs similarity index 100% rename from eth2/state_processing/src/epoch_processable/tests.rs rename to eth2/state_processing/src/per_epoch_processing/tests.rs diff --git a/eth2/state_processing/src/per_epoch_processing/winning_root.rs b/eth2/state_processing/src/per_epoch_processing/winning_root.rs new file mode 100644 index 000000000..5b1e5925f --- /dev/null +++ b/eth2/state_processing/src/per_epoch_processing/winning_root.rs @@ -0,0 +1,85 @@ +use super::WinningRootError; +use types::*; + +#[derive(Clone)] +pub struct WinningRoot { + pub shard_block_root: Hash256, + pub attesting_validator_indices: Vec, + pub total_balance: u64, + pub total_attesting_balance: u64, +} + +fn winning_root( + state: &BeaconState, + shard: u64, + current_epoch_attestations: &[&PendingAttestation], + previous_epoch_attestations: &[&PendingAttestation], + spec: &ChainSpec, +) -> Result { + let mut attestations = current_epoch_attestations.to_vec(); + attestations.append(&mut previous_epoch_attestations.to_vec()); + + let mut candidates: HashMap = HashMap::new(); + + let mut highest_seen_balance = 0; + + for a in &attestations { + if a.data.shard != shard { + continue; + } + + let shard_block_root = &a.data.shard_block_root; + + if candidates.contains_key(shard_block_root) { + continue; + } + + let attesting_validator_indices = attestations + .iter() + .try_fold::<_, _, Result<_, BeaconStateError>>(vec![], |mut acc, a| { + if (a.data.shard == shard) && (a.data.shard_block_root == *shard_block_root) { + acc.append(&mut state.get_attestation_participants( + &a.data, + &a.aggregation_bitfield, + spec, + )?); + } + Ok(acc) + })?; + + let total_balance: u64 = attesting_validator_indices + .iter() + .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); + + let total_attesting_balance: u64 = attesting_validator_indices + .iter() + .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); + + if total_attesting_balance > highest_seen_balance { + highest_seen_balance = total_attesting_balance; + } + + let candidate_root = WinningRoot { + shard_block_root: *shard_block_root, + attesting_validator_indices, + total_attesting_balance, + total_balance, + }; + + candidates.insert(*shard_block_root, candidate_root); + } + + Ok(candidates + .iter() + .filter_map(|(_hash, candidate)| { + if candidate.total_attesting_balance == highest_seen_balance { + Some(candidate) + } else { + None + } + }) + .min_by_key(|candidate| candidate.shard_block_root) + .ok_or_else(|| WinningRootError::NoWinningRoot)? + // TODO: avoid clone. + .clone()) +} From 8a25fd48cfe7740a77c7837b59407035bf909da2 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 6 Mar 2019 18:57:41 +1100 Subject: [PATCH 18/31] Fix per_epoch_processing so it compiles again --- eth2/state_processing/src/lib.rs | 1 + .../src/per_epoch_processing.rs | 1063 ++++++++--------- .../per_epoch_processing/grouped_attesters.rs | 98 ++ .../src/per_epoch_processing/tests.rs | 4 +- .../src/per_epoch_processing/winning_root.rs | 19 +- 5 files changed, 592 insertions(+), 593 deletions(-) create mode 100644 eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs diff --git a/eth2/state_processing/src/lib.rs b/eth2/state_processing/src/lib.rs index a5cc4f26e..44c0e28a0 100644 --- a/eth2/state_processing/src/lib.rs +++ b/eth2/state_processing/src/lib.rs @@ -9,5 +9,6 @@ pub use per_block_processing::{ errors::{BlockInvalid, BlockProcessingError}, per_block_processing, per_block_processing_without_verifying_block_signature, }; +pub use per_epoch_processing::{errors::EpochProcessingError, per_epoch_processing}; // pub use epoch_processable::{EpochProcessable, Error as EpochProcessingError}; // pub use slot_processable::{Error as SlotProcessingError, SlotProcessable}; diff --git a/eth2/state_processing/src/per_epoch_processing.rs b/eth2/state_processing/src/per_epoch_processing.rs index 4c66d8ddc..a54518364 100644 --- a/eth2/state_processing/src/per_epoch_processing.rs +++ b/eth2/state_processing/src/per_epoch_processing.rs @@ -1,16 +1,16 @@ -use errors::EpochProcessingError as Error; +use errors::{EpochProcessingError as Error, WinningRootError}; +use grouped_attesters::GroupedAttesters; use integer_sqrt::IntegerSquareRoot; use log::{debug, trace}; use rayon::prelude::*; use ssz::TreeHash; use std::collections::{HashMap, HashSet}; use std::iter::FromIterator; -use types::{ - validator_registry::get_active_validator_indices, BeaconState, BeaconStateError, ChainSpec, - Crosslink, Epoch, Hash256, InclusionError, PendingAttestation, RelativeEpoch, -}; +use types::{validator_registry::get_active_validator_indices, *}; +use winning_root::{winning_root, WinningRoot}; -mod errors; +pub mod errors; +mod grouped_attesters; mod tests; mod winning_root; @@ -25,584 +25,483 @@ macro_rules! safe_sub_assign { }; } -pub trait EpochProcessable { - fn per_epoch_processing(&mut self, spec: &ChainSpec) -> Result<(), Error>; -} - -impl EpochProcessable for BeaconState { - // Cyclomatic complexity is ignored. It would be ideal to split this function apart, however it - // remains monolithic to allow for easier spec updates. Once the spec is more stable we can - // optimise. - #[allow(clippy::cyclomatic_complexity)] - fn per_epoch_processing(&mut self, spec: &ChainSpec) -> Result<(), Error> { - let current_epoch = self.current_epoch(spec); - let previous_epoch = self.previous_epoch(spec); - let next_epoch = self.next_epoch(spec); - - debug!( - "Starting per-epoch processing on epoch {}...", - self.current_epoch(spec) - ); - - // Ensure all of the caches are built. - self.build_epoch_cache(RelativeEpoch::Previous, spec)?; - self.build_epoch_cache(RelativeEpoch::Current, spec)?; - self.build_epoch_cache(RelativeEpoch::Next, spec)?; - - /* - * Validators attesting during the current epoch. - */ - let active_validator_indices = get_active_validator_indices( - &self.validator_registry, - self.slot.epoch(spec.slots_per_epoch), - ); - let current_total_balance = self.get_total_balance(&active_validator_indices[..], spec); - - trace!( - "{} validators with a total balance of {} wei.", - active_validator_indices.len(), - current_total_balance - ); - - let current_epoch_attestations: Vec<&PendingAttestation> = self - .latest_attestations - .par_iter() - .filter(|a| { - (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) - == self.current_epoch(spec) - }) - .collect(); - - trace!( - "Current epoch attestations: {}", - current_epoch_attestations.len() - ); - - let current_epoch_boundary_attestations: Vec<&PendingAttestation> = - current_epoch_attestations - .par_iter() - .filter( - |a| match self.get_block_root(self.current_epoch_start_slot(spec), spec) { - Some(block_root) => { - (a.data.epoch_boundary_root == *block_root) - && (a.data.justified_epoch == self.justified_epoch) - } - None => unreachable!(), - }, - ) - .cloned() - .collect(); - - let current_epoch_boundary_attester_indices = self - .get_attestation_participants_union(¤t_epoch_boundary_attestations[..], spec)?; - let current_epoch_boundary_attesting_balance = - self.get_total_balance(¤t_epoch_boundary_attester_indices[..], spec); - - trace!( - "Current epoch boundary attesters: {}", - current_epoch_boundary_attester_indices.len() - ); - - /* - * Validators attesting during the previous epoch - */ - - /* - * Validators that made an attestation during the previous epoch - */ - let previous_epoch_attestations: Vec<&PendingAttestation> = self - .latest_attestations - .par_iter() - .filter(|a| { - //TODO: ensure these saturating subs are correct. - (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) - == self.previous_epoch(spec) - }) - .collect(); - - debug!( - "previous epoch attestations: {}", - previous_epoch_attestations.len() - ); - - let previous_epoch_attester_indices = - self.get_attestation_participants_union(&previous_epoch_attestations[..], spec)?; - let previous_total_balance = self.get_total_balance( - &get_active_validator_indices(&self.validator_registry, previous_epoch), - spec, - ); - - /* - * Validators targetting the previous justified slot - */ - let previous_epoch_justified_attestations: Vec<&PendingAttestation> = { - let mut a: Vec<&PendingAttestation> = current_epoch_attestations - .iter() - .filter(|a| a.data.justified_epoch == self.previous_justified_epoch) - .cloned() - .collect(); - let mut b: Vec<&PendingAttestation> = previous_epoch_attestations - .iter() - .filter(|a| a.data.justified_epoch == self.previous_justified_epoch) - .cloned() - .collect(); - a.append(&mut b); - a - }; - - let previous_epoch_justified_attester_indices = self - .get_attestation_participants_union(&previous_epoch_justified_attestations[..], spec)?; - let previous_epoch_justified_attesting_balance = - self.get_total_balance(&previous_epoch_justified_attester_indices[..], spec); - - /* - * Validators justifying the epoch boundary block at the start of the previous epoch - */ - let previous_epoch_boundary_attestations: Vec<&PendingAttestation> = - previous_epoch_justified_attestations - .iter() - .filter( - |a| match self.get_block_root(self.previous_epoch_start_slot(spec), spec) { - Some(block_root) => a.data.epoch_boundary_root == *block_root, - None => unreachable!(), - }, - ) - .cloned() - .collect(); - - let previous_epoch_boundary_attester_indices = self - .get_attestation_participants_union(&previous_epoch_boundary_attestations[..], spec)?; - let previous_epoch_boundary_attesting_balance = - self.get_total_balance(&previous_epoch_boundary_attester_indices[..], spec); - - /* - * Validators attesting to the expected beacon chain head during the previous epoch. - */ - let previous_epoch_head_attestations: Vec<&PendingAttestation> = - previous_epoch_attestations - .iter() - .filter(|a| match self.get_block_root(a.data.slot, spec) { - Some(block_root) => a.data.beacon_block_root == *block_root, - None => unreachable!(), - }) - .cloned() - .collect(); - - let previous_epoch_head_attester_indices = - self.get_attestation_participants_union(&previous_epoch_head_attestations[..], spec)?; - let previous_epoch_head_attesting_balance = - self.get_total_balance(&previous_epoch_head_attester_indices[..], spec); - - debug!( - "previous_epoch_head_attester_balance of {} wei.", - previous_epoch_head_attesting_balance - ); - - /* - * Eth1 Data - */ - if self.next_epoch(spec) % spec.eth1_data_voting_period == 0 { - for eth1_data_vote in &self.eth1_data_votes { - if eth1_data_vote.vote_count * 2 > spec.eth1_data_voting_period { - self.latest_eth1_data = eth1_data_vote.eth1_data.clone(); - } - } - self.eth1_data_votes = vec![]; - } - - /* - * Justification - */ - - let mut new_justified_epoch = self.justified_epoch; - self.justification_bitfield <<= 1; - - // If > 2/3 of the total balance attested to the previous epoch boundary - // - // - Set the 2nd bit of the bitfield. - // - Set the previous epoch to be justified. - if (3 * previous_epoch_boundary_attesting_balance) >= (2 * current_total_balance) { - self.justification_bitfield |= 2; - new_justified_epoch = previous_epoch; - trace!(">= 2/3 voted for previous epoch boundary"); - } - // If > 2/3 of the total balance attested to the previous epoch boundary - // - // - Set the 1st bit of the bitfield. - // - Set the current epoch to be justified. - if (3 * current_epoch_boundary_attesting_balance) >= (2 * current_total_balance) { - self.justification_bitfield |= 1; - new_justified_epoch = current_epoch; - trace!(">= 2/3 voted for current epoch boundary"); - } - - // If: - // - // - All three epochs prior to this epoch have been justified. - // - The previous justified justified epoch was three epochs ago. - // - // Then, set the finalized epoch to be three epochs ago. - if ((self.justification_bitfield >> 1) % 8 == 0b111) - & (self.previous_justified_epoch == previous_epoch - 2) - { - self.finalized_epoch = self.previous_justified_epoch; - trace!("epoch - 3 was finalized (1st condition)."); - } - // If: - // - // - Both two epochs prior to this epoch have been justified. - // - The previous justified epoch was two epochs ago. - // - // Then, set the finalized epoch to two epochs ago. - if ((self.justification_bitfield >> 1) % 4 == 0b11) - & (self.previous_justified_epoch == previous_epoch - 1) - { - self.finalized_epoch = self.previous_justified_epoch; - trace!("epoch - 2 was finalized (2nd condition)."); - } - // If: - // - // - This epoch and the two prior have been justified. - // - The presently justified epoch was two epochs ago. - // - // Then, set the finalized epoch to two epochs ago. - if (self.justification_bitfield % 8 == 0b111) & (self.justified_epoch == previous_epoch - 1) - { - self.finalized_epoch = self.justified_epoch; - trace!("epoch - 2 was finalized (3rd condition)."); - } - // If: - // - // - This epoch and the epoch prior to it have been justified. - // - Set the previous epoch to be justified. - // - // Then, set the finalized epoch to be the previous epoch. - if (self.justification_bitfield % 4 == 0b11) & (self.justified_epoch == previous_epoch) { - self.finalized_epoch = self.justified_epoch; - trace!("epoch - 1 was finalized (4th condition)."); - } - - self.previous_justified_epoch = self.justified_epoch; - self.justified_epoch = new_justified_epoch; - - debug!( - "Finalized epoch {}, justified epoch {}.", - self.finalized_epoch, self.justified_epoch - ); - - /* - * Crosslinks - */ - - // Cached for later lookups. - let mut winning_root_for_shards: HashMap> = - HashMap::new(); - - // for slot in self.slot.saturating_sub(2 * spec.slots_per_epoch)..self.slot { - for slot in self.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { - trace!( - "Finding winning root for slot: {} (epoch: {})", - slot, - slot.epoch(spec.slots_per_epoch) - ); - - // Clone is used to remove the borrow. It becomes an issue later when trying to mutate - // `self.balances`. - let crosslink_committees_at_slot = - self.get_crosslink_committees_at_slot(slot, spec)?.clone(); - - for (crosslink_committee, shard) in crosslink_committees_at_slot { - let shard = shard as u64; - - let winning_root = winning_root( - self, - shard, - ¤t_epoch_attestations, - &previous_epoch_attestations, - spec, - ); - - if let Ok(winning_root) = &winning_root { - let total_committee_balance = - self.get_total_balance(&crosslink_committee[..], spec); - - if (3 * winning_root.total_attesting_balance) >= (2 * total_committee_balance) { - self.latest_crosslinks[shard as usize] = Crosslink { - epoch: current_epoch, - shard_block_root: winning_root.shard_block_root, - } - } - } - winning_root_for_shards.insert(shard, winning_root); - } - } - - trace!( - "Found {} winning shard roots.", - winning_root_for_shards.len() - ); - - /* - * Rewards and Penalities - */ - let base_reward_quotient = - previous_total_balance.integer_sqrt() / spec.base_reward_quotient; - if base_reward_quotient == 0 { - return Err(Error::BaseRewardQuotientIsZero); - } - - /* - * Justification and finalization - */ - let epochs_since_finality = next_epoch - self.finalized_epoch; - - let previous_epoch_justified_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_justified_attester_indices.iter().cloned()); - let previous_epoch_boundary_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_boundary_attester_indices.iter().cloned()); - let previous_epoch_head_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_head_attester_indices.iter().cloned()); - let previous_epoch_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_attester_indices.iter().cloned()); - let active_validator_indices_hashset: HashSet = - HashSet::from_iter(active_validator_indices.iter().cloned()); - - debug!("previous epoch justified attesters: {}, previous epoch boundary attesters: {}, previous epoch head attesters: {}, previous epoch attesters: {}", previous_epoch_justified_attester_indices.len(), previous_epoch_boundary_attester_indices.len(), previous_epoch_head_attester_indices.len(), previous_epoch_attester_indices.len()); - - debug!("{} epochs since finality.", epochs_since_finality); - - if epochs_since_finality <= 4 { - for index in 0..self.validator_balances.len() { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - - if previous_epoch_justified_attester_indices_hashset.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * previous_epoch_justified_attesting_balance - / previous_total_balance - ); - } else if active_validator_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - - if previous_epoch_boundary_attester_indices_hashset.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * previous_epoch_boundary_attesting_balance - / previous_total_balance - ); - } else if active_validator_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - - if previous_epoch_head_attester_indices_hashset.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * previous_epoch_head_attesting_balance - / previous_total_balance - ); - } else if active_validator_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - } - - for index in previous_epoch_attester_indices { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - let inclusion_distance = - self.inclusion_distance(&previous_epoch_attestations, index, spec)?; - - safe_add_assign!( - self.validator_balances[index], - base_reward * spec.min_attestation_inclusion_delay / inclusion_distance - ) - } - } else { - for index in 0..self.validator_balances.len() { - let inactivity_penalty = self.inactivity_penalty( - index, - epochs_since_finality, - base_reward_quotient, - spec, - ); - if active_validator_indices_hashset.contains(&index) { - if !previous_epoch_justified_attester_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], inactivity_penalty); - } - if !previous_epoch_boundary_attester_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], inactivity_penalty); - } - if !previous_epoch_head_attester_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], inactivity_penalty); - } - - if self.validator_registry[index].penalized_epoch <= current_epoch { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - safe_sub_assign!( - self.validator_balances[index], - 2 * inactivity_penalty + base_reward - ); - } - } - } - - for index in previous_epoch_attester_indices { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - let inclusion_distance = - self.inclusion_distance(&previous_epoch_attestations, index, spec)?; - - safe_sub_assign!( - self.validator_balances[index], - base_reward - - base_reward * spec.min_attestation_inclusion_delay / inclusion_distance - ); - } - } - - trace!("Processed validator justification and finalization rewards/penalities."); - - /* - * Attestation inclusion - */ - for &index in &previous_epoch_attester_indices_hashset { - let inclusion_slot = - self.inclusion_slot(&previous_epoch_attestations[..], index, spec)?; - let proposer_index = self - .get_beacon_proposer_index(inclusion_slot, spec) - .map_err(|_| Error::UnableToDetermineProducer)?; - let base_reward = self.base_reward(proposer_index, base_reward_quotient, spec); - safe_add_assign!( - self.validator_balances[proposer_index], - base_reward / spec.includer_reward_quotient - ); - } - - trace!( - "Previous epoch attesters: {}.", - previous_epoch_attester_indices_hashset.len() - ); - - /* - * Crosslinks - */ - for slot in self.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { - // Clone is used to remove the borrow. It becomes an issue later when trying to mutate - // `self.balances`. - let crosslink_committees_at_slot = - self.get_crosslink_committees_at_slot(slot, spec)?.clone(); - - for (_crosslink_committee, shard) in crosslink_committees_at_slot { - let shard = shard as u64; - - if let Some(Ok(winning_root)) = winning_root_for_shards.get(&shard) { - // TODO: remove the map. - let attesting_validator_indices: HashSet = HashSet::from_iter( - winning_root.attesting_validator_indices.iter().cloned(), - ); - - for index in 0..self.validator_balances.len() { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - - if attesting_validator_indices.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * winning_root.total_attesting_balance - / winning_root.total_balance - ); - } else { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - } - - for index in &winning_root.attesting_validator_indices { - let base_reward = self.base_reward(*index, base_reward_quotient, spec); - safe_add_assign!( - self.validator_balances[*index], - base_reward * winning_root.total_attesting_balance - / winning_root.total_balance - ); - } - } - } - } - - /* - * Ejections - */ - self.process_ejections(spec); - - /* - * Validator Registry - */ - self.previous_shuffling_epoch = self.current_shuffling_epoch; - self.previous_epoch_start_shard = self.current_epoch_start_shard; - - debug!( - "setting previous_shuffling_seed to : {}", - self.current_shuffling_seed - ); - - self.previous_shuffling_seed = self.current_shuffling_seed; - - let should_update_validator_registy = if self.finalized_epoch - > self.validator_registry_update_epoch - { - (0..self.get_current_epoch_committee_count(spec)).all(|i| { - let shard = (self.current_epoch_start_shard + i as u64) % spec.shard_count; - self.latest_crosslinks[shard as usize].epoch > self.validator_registry_update_epoch - }) - } else { - false - }; - - if should_update_validator_registy { - trace!("updating validator registry."); - self.update_validator_registry(spec); - - self.current_shuffling_epoch = next_epoch; - self.current_epoch_start_shard = (self.current_epoch_start_shard - + self.get_current_epoch_committee_count(spec) as u64) - % spec.shard_count; - self.current_shuffling_seed = self.generate_seed(self.current_shuffling_epoch, spec)? - } else { - trace!("not updating validator registry."); - let epochs_since_last_registry_update = - current_epoch - self.validator_registry_update_epoch; - if (epochs_since_last_registry_update > 1) - & epochs_since_last_registry_update.is_power_of_two() - { - self.current_shuffling_epoch = next_epoch; - self.current_shuffling_seed = - self.generate_seed(self.current_shuffling_epoch, spec)? - } - } - - self.process_penalties_and_exits(spec); - - self.latest_index_roots[(next_epoch.as_usize() + spec.entry_exit_delay as usize) - % spec.latest_index_roots_length] = hash_tree_root(get_active_validator_indices( - &self.validator_registry, - next_epoch + Epoch::from(spec.entry_exit_delay), - )); - self.latest_penalized_balances[next_epoch.as_usize() % spec.latest_penalized_exit_length] = - self.latest_penalized_balances - [current_epoch.as_usize() % spec.latest_penalized_exit_length]; - self.latest_randao_mixes[next_epoch.as_usize() % spec.latest_randao_mixes_length] = self - .get_randao_mix(current_epoch, spec) - .and_then(|x| Some(*x)) - .ok_or_else(|| Error::NoRandaoSeed)?; - self.latest_attestations = self - .latest_attestations - .iter() - .filter(|a| a.data.slot.epoch(spec.slots_per_epoch) >= current_epoch) - .cloned() - .collect(); - - debug!("Epoch transition complete."); - - Ok(()) - } +pub fn per_epoch_processing(state: &mut BeaconState, spec: &ChainSpec) -> Result<(), Error> { + let current_epoch = state.current_epoch(spec); + let previous_epoch = state.previous_epoch(spec); + let next_epoch = state.next_epoch(spec); + + debug!( + "Starting per-epoch processing on epoch {}...", + state.current_epoch(spec) + ); + + // Ensure all of the caches are built. + state.build_epoch_cache(RelativeEpoch::Previous, spec)?; + state.build_epoch_cache(RelativeEpoch::Current, spec)?; + state.build_epoch_cache(RelativeEpoch::Next, spec)?; + + let attesters = GroupedAttesters::new(&state, spec)?; + + let active_validator_indices = get_active_validator_indices( + &state.validator_registry, + state.slot.epoch(spec.slots_per_epoch), + ); + + let current_total_balance = state.get_total_balance(&active_validator_indices[..], spec); + let previous_total_balance = state.get_total_balance( + &get_active_validator_indices(&state.validator_registry, previous_epoch)[..], + spec, + ); + + process_eth1_data(state, spec); + + process_justification( + state, + current_total_balance, + previous_total_balance, + attesters.previous_epoch_boundary.balance, + attesters.current_epoch_boundary.balance, + spec, + ); + + // Crosslinks + let winning_root_for_shards = process_crosslinks(state, spec)?; + + // Rewards and Penalities + let active_validator_indices_hashset: HashSet = + HashSet::from_iter(active_validator_indices.iter().cloned()); + process_rewards_and_penalities( + state, + active_validator_indices_hashset, + &attesters, + previous_total_balance, + &winning_root_for_shards, + spec, + )?; + + // Ejections + state.process_ejections(spec); + + // Validator Registry + process_validator_registry(state, spec)?; + + // Final updates + state.latest_active_index_roots[(next_epoch.as_usize() + + spec.activation_exit_delay as usize) + % spec.latest_active_index_roots_length] = hash_tree_root(get_active_validator_indices( + &state.validator_registry, + next_epoch + Epoch::from(spec.activation_exit_delay), + )); + + state.latest_slashed_balances[next_epoch.as_usize() % spec.latest_slashed_exit_length] = + state.latest_slashed_balances[current_epoch.as_usize() % spec.latest_slashed_exit_length]; + state.latest_randao_mixes[next_epoch.as_usize() % spec.latest_randao_mixes_length] = state + .get_randao_mix(current_epoch, spec) + .and_then(|x| Some(*x)) + .ok_or_else(|| Error::NoRandaoSeed)?; + state.latest_attestations = state + .latest_attestations + .iter() + .filter(|a| a.data.slot.epoch(spec.slots_per_epoch) >= current_epoch) + .cloned() + .collect(); + + // Rotate the epoch caches to suit the epoch transition. + state.advance_caches(); + + debug!("Epoch transition complete."); + + Ok(()) } fn hash_tree_root(input: Vec) -> Hash256 { Hash256::from(&input.hash_tree_root()[..]) } + +/// Spec v0.4.0 +fn process_eth1_data(state: &mut BeaconState, spec: &ChainSpec) { + let next_epoch = state.next_epoch(spec); + let voting_period = spec.epochs_per_eth1_voting_period; + + if next_epoch % voting_period == 0 { + for eth1_data_vote in &state.eth1_data_votes { + if eth1_data_vote.vote_count * 2 > voting_period { + state.latest_eth1_data = eth1_data_vote.eth1_data.clone(); + } + } + state.eth1_data_votes = vec![]; + } +} + +/// Spec v0.4.0 +fn process_justification( + state: &mut BeaconState, + current_total_balance: u64, + previous_total_balance: u64, + previous_epoch_boundary_attesting_balance: u64, + current_epoch_boundary_attesting_balance: u64, + spec: &ChainSpec, +) { + let previous_epoch = state.previous_epoch(spec); + let current_epoch = state.current_epoch(spec); + + let mut new_justified_epoch = state.justified_epoch; + state.justification_bitfield <<= 1; + + // If > 2/3 of the total balance attested to the previous epoch boundary + // + // - Set the 2nd bit of the bitfield. + // - Set the previous epoch to be justified. + if (3 * previous_epoch_boundary_attesting_balance) >= (2 * previous_total_balance) { + state.justification_bitfield |= 2; + new_justified_epoch = previous_epoch; + } + // If > 2/3 of the total balance attested to the previous epoch boundary + // + // - Set the 1st bit of the bitfield. + // - Set the current epoch to be justified. + if (3 * current_epoch_boundary_attesting_balance) >= (2 * current_total_balance) { + state.justification_bitfield |= 1; + new_justified_epoch = current_epoch; + } + + // If: + // + // - All three epochs prior to this epoch have been justified. + // - The previous justified justified epoch was three epochs ago. + // + // Then, set the finalized epoch to be three epochs ago. + if ((state.justification_bitfield >> 1) % 8 == 0b111) + & (state.previous_justified_epoch == previous_epoch - 2) + { + state.finalized_epoch = state.previous_justified_epoch; + } + // If: + // + // - Both two epochs prior to this epoch have been justified. + // - The previous justified epoch was two epochs ago. + // + // Then, set the finalized epoch to two epochs ago. + if ((state.justification_bitfield >> 1) % 4 == 0b11) + & (state.previous_justified_epoch == previous_epoch - 1) + { + state.finalized_epoch = state.previous_justified_epoch; + } + // If: + // + // - This epoch and the two prior have been justified. + // - The presently justified epoch was two epochs ago. + // + // Then, set the finalized epoch to two epochs ago. + if (state.justification_bitfield % 8 == 0b111) & (state.justified_epoch == previous_epoch - 1) { + state.finalized_epoch = state.justified_epoch; + } + // If: + // + // - This epoch and the epoch prior to it have been justified. + // - Set the previous epoch to be justified. + // + // Then, set the finalized epoch to be the previous epoch. + if (state.justification_bitfield % 4 == 0b11) & (state.justified_epoch == previous_epoch) { + state.finalized_epoch = state.justified_epoch; + } + + state.previous_justified_epoch = state.justified_epoch; + state.justified_epoch = new_justified_epoch; +} + +pub type WinningRootHashSet = HashMap>; + +fn process_crosslinks( + state: &mut BeaconState, + spec: &ChainSpec, +) -> Result { + let current_epoch_attestations: Vec<&PendingAttestation> = state + .latest_attestations + .par_iter() + .filter(|a| { + (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) + == state.current_epoch(spec) + }) + .collect(); + + let previous_epoch_attestations: Vec<&PendingAttestation> = state + .latest_attestations + .par_iter() + .filter(|a| { + (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) + == state.previous_epoch(spec) + }) + .collect(); + + let mut winning_root_for_shards: HashMap> = + HashMap::new(); + // for slot in state.slot.saturating_sub(2 * spec.slots_per_epoch)..state.slot { + for slot in state.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { + trace!( + "Finding winning root for slot: {} (epoch: {})", + slot, + slot.epoch(spec.slots_per_epoch) + ); + + // Clone is used to remove the borrow. It becomes an issue later when trying to mutate + // `state.balances`. + let crosslink_committees_at_slot = + state.get_crosslink_committees_at_slot(slot, spec)?.clone(); + + for (crosslink_committee, shard) in crosslink_committees_at_slot { + let shard = shard as u64; + + let winning_root = winning_root( + state, + shard, + ¤t_epoch_attestations[..], + &previous_epoch_attestations[..], + spec, + ); + + if let Ok(winning_root) = &winning_root { + let total_committee_balance = state.get_total_balance(&crosslink_committee, spec); + + if (3 * winning_root.total_attesting_balance) >= (2 * total_committee_balance) { + state.latest_crosslinks[shard as usize] = Crosslink { + epoch: state.current_epoch(spec), + crosslink_data_root: winning_root.crosslink_data_root, + } + } + } + winning_root_for_shards.insert(shard, winning_root); + } + } + + Ok(winning_root_for_shards) +} + +fn process_rewards_and_penalities( + state: &mut BeaconState, + active_validator_indices: HashSet, + attesters: &GroupedAttesters, + previous_total_balance: u64, + winning_root_for_shards: &HashMap>, + spec: &ChainSpec, +) -> Result<(), Error> { + let next_epoch = state.next_epoch(spec); + + let previous_epoch_attestations: Vec<&PendingAttestation> = state + .latest_attestations + .par_iter() + .filter(|a| { + (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) + == state.previous_epoch(spec) + }) + .collect(); + + let base_reward_quotient = previous_total_balance.integer_sqrt() / spec.base_reward_quotient; + if base_reward_quotient == 0 { + return Err(Error::BaseRewardQuotientIsZero); + } + + /* + * Justification and finalization + */ + let epochs_since_finality = next_epoch - state.finalized_epoch; + + let active_validator_indices_hashset: HashSet = + HashSet::from_iter(active_validator_indices.iter().cloned()); + + if epochs_since_finality <= 4 { + for index in 0..state.validator_balances.len() { + let base_reward = state.base_reward(index, base_reward_quotient, spec); + + if attesters.previous_epoch.indices.contains(&index) { + safe_add_assign!( + state.validator_balances[index], + base_reward * attesters.previous_epoch.balance / previous_total_balance + ); + } else if active_validator_indices_hashset.contains(&index) { + safe_sub_assign!(state.validator_balances[index], base_reward); + } + + if attesters.previous_epoch_boundary.indices.contains(&index) { + safe_add_assign!( + state.validator_balances[index], + base_reward * attesters.previous_epoch_boundary.balance + / previous_total_balance + ); + } else if active_validator_indices_hashset.contains(&index) { + safe_sub_assign!(state.validator_balances[index], base_reward); + } + + if attesters.previous_epoch_head.indices.contains(&index) { + safe_add_assign!( + state.validator_balances[index], + base_reward * attesters.previous_epoch_head.balance / previous_total_balance + ); + } else if active_validator_indices_hashset.contains(&index) { + safe_sub_assign!(state.validator_balances[index], base_reward); + } + } + + for &index in &attesters.previous_epoch.indices { + let base_reward = state.base_reward(index, base_reward_quotient, spec); + let inclusion_distance = + state.inclusion_distance(&previous_epoch_attestations, index, spec)?; + + safe_add_assign!( + state.validator_balances[index], + base_reward * spec.min_attestation_inclusion_delay / inclusion_distance + ) + } + } else { + for index in 0..state.validator_balances.len() { + let inactivity_penalty = + state.inactivity_penalty(index, epochs_since_finality, base_reward_quotient, spec); + if active_validator_indices_hashset.contains(&index) { + if !attesters.previous_epoch.indices.contains(&index) { + safe_sub_assign!(state.validator_balances[index], inactivity_penalty); + } + if !attesters.previous_epoch_boundary.indices.contains(&index) { + safe_sub_assign!(state.validator_balances[index], inactivity_penalty); + } + if !attesters.previous_epoch_head.indices.contains(&index) { + safe_sub_assign!(state.validator_balances[index], inactivity_penalty); + } + + if state.validator_registry[index].slashed { + let base_reward = state.base_reward(index, base_reward_quotient, spec); + safe_sub_assign!( + state.validator_balances[index], + 2 * inactivity_penalty + base_reward + ); + } + } + } + + for &index in &attesters.previous_epoch.indices { + let base_reward = state.base_reward(index, base_reward_quotient, spec); + let inclusion_distance = + state.inclusion_distance(&previous_epoch_attestations, index, spec)?; + + safe_sub_assign!( + state.validator_balances[index], + base_reward + - base_reward * spec.min_attestation_inclusion_delay / inclusion_distance + ); + } + } + + trace!("Processed validator justification and finalization rewards/penalities."); + + /* + * Attestation inclusion + */ + for &index in &attesters.previous_epoch.indices { + let inclusion_slot = state.inclusion_slot(&previous_epoch_attestations[..], index, spec)?; + let proposer_index = state + .get_beacon_proposer_index(inclusion_slot, spec) + .map_err(|_| Error::UnableToDetermineProducer)?; + let base_reward = state.base_reward(proposer_index, base_reward_quotient, spec); + safe_add_assign!( + state.validator_balances[proposer_index], + base_reward / spec.attestation_inclusion_reward_quotient + ); + } + + /* + * Crosslinks + */ + for slot in state.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { + // Clone is used to remove the borrow. It becomes an issue later when trying to mutate + // `state.balances`. + let crosslink_committees_at_slot = + state.get_crosslink_committees_at_slot(slot, spec)?.clone(); + + for (_crosslink_committee, shard) in crosslink_committees_at_slot { + let shard = shard as u64; + + if let Some(Ok(winning_root)) = winning_root_for_shards.get(&shard) { + // TODO: remove the map. + let attesting_validator_indices: HashSet = + HashSet::from_iter(winning_root.attesting_validator_indices.iter().cloned()); + + for index in 0..state.validator_balances.len() { + let base_reward = state.base_reward(index, base_reward_quotient, spec); + + if attesting_validator_indices.contains(&index) { + safe_add_assign!( + state.validator_balances[index], + base_reward * winning_root.total_attesting_balance + / winning_root.total_balance + ); + } else { + safe_sub_assign!(state.validator_balances[index], base_reward); + } + } + + for index in &winning_root.attesting_validator_indices { + let base_reward = state.base_reward(*index, base_reward_quotient, spec); + safe_add_assign!( + state.validator_balances[*index], + base_reward * winning_root.total_attesting_balance + / winning_root.total_balance + ); + } + } + } + } + + Ok(()) +} + +fn process_validator_registry(state: &mut BeaconState, spec: &ChainSpec) -> Result<(), Error> { + let current_epoch = state.current_epoch(spec); + let next_epoch = state.next_epoch(spec); + + state.previous_shuffling_epoch = state.current_shuffling_epoch; + state.previous_shuffling_start_shard = state.current_shuffling_start_shard; + + debug!( + "setting previous_shuffling_seed to : {}", + state.current_shuffling_seed + ); + + state.previous_shuffling_seed = state.current_shuffling_seed; + + let should_update_validator_registy = if state.finalized_epoch + > state.validator_registry_update_epoch + { + (0..state.get_current_epoch_committee_count(spec)).all(|i| { + let shard = (state.current_shuffling_start_shard + i as u64) % spec.shard_count; + state.latest_crosslinks[shard as usize].epoch > state.validator_registry_update_epoch + }) + } else { + false + }; + + if should_update_validator_registy { + trace!("updating validator registry."); + state.update_validator_registry(spec); + + state.current_shuffling_epoch = next_epoch; + state.current_shuffling_start_shard = (state.current_shuffling_start_shard + + state.get_current_epoch_committee_count(spec) as u64) + % spec.shard_count; + state.current_shuffling_seed = state.generate_seed(state.current_shuffling_epoch, spec)? + } else { + trace!("not updating validator registry."); + let epochs_since_last_registry_update = + current_epoch - state.validator_registry_update_epoch; + if (epochs_since_last_registry_update > 1) + & epochs_since_last_registry_update.is_power_of_two() + { + state.current_shuffling_epoch = next_epoch; + state.current_shuffling_seed = + state.generate_seed(state.current_shuffling_epoch, spec)? + } + } + + state.process_slashings(spec); + state.process_exit_queue(spec); + + Ok(()) +} diff --git a/eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs b/eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs new file mode 100644 index 000000000..02dbc4050 --- /dev/null +++ b/eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs @@ -0,0 +1,98 @@ +use std::collections::HashSet; +use types::*; + +#[derive(Default)] +pub struct Attesters { + pub indices: HashSet, + pub balance: u64, +} + +impl Attesters { + fn add(&mut self, additional_indices: &[usize], additional_balance: u64) { + self.indices.reserve(additional_indices.len()); + for i in additional_indices { + self.indices.insert(*i); + } + self.balance.saturating_add(additional_balance); + } +} + +pub struct GroupedAttesters { + pub current_epoch: Attesters, + pub current_epoch_boundary: Attesters, + pub previous_epoch: Attesters, + pub previous_epoch_boundary: Attesters, + pub previous_epoch_head: Attesters, +} + +impl GroupedAttesters { + pub fn new(state: &BeaconState, spec: &ChainSpec) -> Result { + let mut current_epoch = Attesters::default(); + let mut current_epoch_boundary = Attesters::default(); + let mut previous_epoch = Attesters::default(); + let mut previous_epoch_boundary = Attesters::default(); + let mut previous_epoch_head = Attesters::default(); + + for a in &state.latest_attestations { + let attesting_indices = + state.get_attestation_participants(&a.data, &a.aggregation_bitfield, spec)?; + let attesting_balance = state.get_total_balance(&attesting_indices, spec); + + if is_from_epoch(a, state.current_epoch(spec), spec) { + current_epoch.add(&attesting_indices, attesting_balance); + + if has_common_epoch_boundary_root(a, state, state.current_epoch(spec), spec)? { + current_epoch_boundary.add(&attesting_indices, attesting_balance); + } + } else if is_from_epoch(a, state.previous_epoch(spec), spec) { + previous_epoch.add(&attesting_indices, attesting_balance); + + if has_common_epoch_boundary_root(a, state, state.previous_epoch(spec), spec)? { + previous_epoch_boundary.add(&attesting_indices, attesting_balance); + } + + if has_common_beacon_block_root(a, state, spec)? { + previous_epoch_head.add(&attesting_indices, attesting_balance); + } + } + } + + Ok(Self { + current_epoch, + current_epoch_boundary, + previous_epoch, + previous_epoch_boundary, + previous_epoch_head, + }) + } +} + +fn is_from_epoch(a: &PendingAttestation, epoch: Epoch, spec: &ChainSpec) -> bool { + a.data.slot.epoch(spec.slots_per_epoch) == epoch +} + +fn has_common_epoch_boundary_root( + a: &PendingAttestation, + state: &BeaconState, + epoch: Epoch, + spec: &ChainSpec, +) -> Result { + let slot = epoch.start_slot(spec.slots_per_epoch); + let state_boundary_root = *state + .get_block_root(slot, spec) + .ok_or_else(|| BeaconStateError::InsufficientBlockRoots)?; + + Ok(a.data.epoch_boundary_root == state_boundary_root) +} + +fn has_common_beacon_block_root( + a: &PendingAttestation, + state: &BeaconState, + spec: &ChainSpec, +) -> Result { + let state_block_root = *state + .get_block_root(a.data.slot, spec) + .ok_or_else(|| BeaconStateError::InsufficientBlockRoots)?; + + Ok(a.data.beacon_block_root == state_block_root) +} diff --git a/eth2/state_processing/src/per_epoch_processing/tests.rs b/eth2/state_processing/src/per_epoch_processing/tests.rs index d683d3971..627df858b 100644 --- a/eth2/state_processing/src/per_epoch_processing/tests.rs +++ b/eth2/state_processing/src/per_epoch_processing/tests.rs @@ -1,5 +1,5 @@ #![cfg(test)] -use crate::EpochProcessable; +use crate::per_epoch_processing; use env_logger::{Builder, Env}; use types::beacon_state::BeaconStateBuilder; use types::*; @@ -17,5 +17,5 @@ fn runs_without_error() { let mut state = builder.cloned_state(); let spec = &builder.spec; - state.per_epoch_processing(spec).unwrap(); + per_epoch_processing(&mut state, spec).unwrap(); } diff --git a/eth2/state_processing/src/per_epoch_processing/winning_root.rs b/eth2/state_processing/src/per_epoch_processing/winning_root.rs index 5b1e5925f..c3b650c3d 100644 --- a/eth2/state_processing/src/per_epoch_processing/winning_root.rs +++ b/eth2/state_processing/src/per_epoch_processing/winning_root.rs @@ -1,15 +1,16 @@ -use super::WinningRootError; +use super::errors::WinningRootError; +use std::collections::HashMap; use types::*; #[derive(Clone)] pub struct WinningRoot { - pub shard_block_root: Hash256, + pub crosslink_data_root: Hash256, pub attesting_validator_indices: Vec, pub total_balance: u64, pub total_attesting_balance: u64, } -fn winning_root( +pub fn winning_root( state: &BeaconState, shard: u64, current_epoch_attestations: &[&PendingAttestation], @@ -28,16 +29,16 @@ fn winning_root( continue; } - let shard_block_root = &a.data.shard_block_root; + let crosslink_data_root = &a.data.crosslink_data_root; - if candidates.contains_key(shard_block_root) { + if candidates.contains_key(crosslink_data_root) { continue; } let attesting_validator_indices = attestations .iter() .try_fold::<_, _, Result<_, BeaconStateError>>(vec![], |mut acc, a| { - if (a.data.shard == shard) && (a.data.shard_block_root == *shard_block_root) { + if (a.data.shard == shard) && (a.data.crosslink_data_root == *crosslink_data_root) { acc.append(&mut state.get_attestation_participants( &a.data, &a.aggregation_bitfield, @@ -60,13 +61,13 @@ fn winning_root( } let candidate_root = WinningRoot { - shard_block_root: *shard_block_root, + crosslink_data_root: *crosslink_data_root, attesting_validator_indices, total_attesting_balance, total_balance, }; - candidates.insert(*shard_block_root, candidate_root); + candidates.insert(*crosslink_data_root, candidate_root); } Ok(candidates @@ -78,7 +79,7 @@ fn winning_root( None } }) - .min_by_key(|candidate| candidate.shard_block_root) + .min_by_key(|candidate| candidate.crosslink_data_root) .ok_or_else(|| WinningRootError::NoWinningRoot)? // TODO: avoid clone. .clone()) From 5a225d2983817f8fb7ff40ee11f83e272285e4f3 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 08:37:13 +1100 Subject: [PATCH 19/31] Update per-slot processing to v0.4.0 --- eth2/state_processing/src/lib.rs | 5 +- .../src/per_slot_processing.rs | 58 +++++++++++++++ eth2/state_processing/src/slot_processable.rs | 71 ------------------- 3 files changed, 60 insertions(+), 74 deletions(-) create mode 100644 eth2/state_processing/src/per_slot_processing.rs delete mode 100644 eth2/state_processing/src/slot_processable.rs diff --git a/eth2/state_processing/src/lib.rs b/eth2/state_processing/src/lib.rs index 44c0e28a0..2b30844cb 100644 --- a/eth2/state_processing/src/lib.rs +++ b/eth2/state_processing/src/lib.rs @@ -3,12 +3,11 @@ mod macros; pub mod per_block_processing; pub mod per_epoch_processing; -// mod slot_processable; +pub mod per_slot_processing; pub use per_block_processing::{ errors::{BlockInvalid, BlockProcessingError}, per_block_processing, per_block_processing_without_verifying_block_signature, }; pub use per_epoch_processing::{errors::EpochProcessingError, per_epoch_processing}; -// pub use epoch_processable::{EpochProcessable, Error as EpochProcessingError}; -// pub use slot_processable::{Error as SlotProcessingError, SlotProcessable}; +pub use per_slot_processing::{per_slot_processing, Error as SlotProcessingError}; diff --git a/eth2/state_processing/src/per_slot_processing.rs b/eth2/state_processing/src/per_slot_processing.rs new file mode 100644 index 000000000..0bb405c98 --- /dev/null +++ b/eth2/state_processing/src/per_slot_processing.rs @@ -0,0 +1,58 @@ +use crate::*; +use types::{BeaconState, BeaconStateError, ChainSpec, Hash256}; + +#[derive(Debug, PartialEq)] +pub enum Error { + BeaconStateError(BeaconStateError), + EpochProcessingError(EpochProcessingError), +} + +/// Advances a state forward by one slot, performing per-epoch processing if required. +/// +/// Spec v0.4.0 +pub fn per_slot_processing( + state: &mut BeaconState, + previous_block_root: Hash256, + spec: &ChainSpec, +) -> Result<(), Error> { + if (state.slot + 1) % spec.slots_per_epoch == 0 { + per_epoch_processing(state, spec)?; + state.advance_caches(); + } + + state.slot += 1; + + update_block_roots(state, previous_block_root, spec); + + Ok(()) +} + +/// Updates the state's block roots as per-slot processing is performed. +/// +/// Spec v0.4.0 +pub fn update_block_roots(state: &mut BeaconState, previous_block_root: Hash256, spec: &ChainSpec) { + state.latest_block_roots[(state.slot.as_usize() - 1) % spec.latest_block_roots_length] = + previous_block_root; + + if state.slot.as_usize() % spec.latest_block_roots_length == 0 { + let root = merkle_root(&state.latest_block_roots[..]); + state.batched_block_roots.push(root); + } +} + +fn merkle_root(_input: &[Hash256]) -> Hash256 { + // TODO: implement correctly. + Hash256::zero() +} + +impl From for Error { + fn from(e: BeaconStateError) -> Error { + Error::BeaconStateError(e) + } +} + +impl From for Error { + fn from(e: EpochProcessingError) -> Error { + Error::EpochProcessingError(e) + } +} diff --git a/eth2/state_processing/src/slot_processable.rs b/eth2/state_processing/src/slot_processable.rs deleted file mode 100644 index 8d6506c36..000000000 --- a/eth2/state_processing/src/slot_processable.rs +++ /dev/null @@ -1,71 +0,0 @@ -use crate::{EpochProcessable, EpochProcessingError}; -use types::{BeaconState, BeaconStateError, ChainSpec, Hash256}; - -#[derive(Debug, PartialEq)] -pub enum Error { - BeaconStateError(BeaconStateError), - EpochProcessingError(EpochProcessingError), -} - -pub trait SlotProcessable { - fn per_slot_processing( - &mut self, - previous_block_root: Hash256, - spec: &ChainSpec, - ) -> Result<(), Error>; -} - -impl SlotProcessable for BeaconState -where - BeaconState: EpochProcessable, -{ - fn per_slot_processing( - &mut self, - previous_block_root: Hash256, - spec: &ChainSpec, - ) -> Result<(), Error> { - if (self.slot + 1) % spec.slots_per_epoch == 0 { - self.per_epoch_processing(spec)?; - self.advance_caches(); - } - - self.slot += 1; - - self.latest_randao_mixes[self.slot.as_usize() % spec.latest_randao_mixes_length] = - self.latest_randao_mixes[(self.slot.as_usize() - 1) % spec.latest_randao_mixes_length]; - - // Block roots. - self.latest_block_roots[(self.slot.as_usize() - 1) % spec.latest_block_roots_length] = - previous_block_root; - - if self.slot.as_usize() % spec.latest_block_roots_length == 0 { - let root = merkle_root(&self.latest_block_roots[..]); - self.batched_block_roots.push(root); - } - Ok(()) - } -} - -fn merkle_root(_input: &[Hash256]) -> Hash256 { - Hash256::zero() -} - -impl From for Error { - fn from(e: BeaconStateError) -> Error { - Error::BeaconStateError(e) - } -} - -impl From for Error { - fn from(e: EpochProcessingError) -> Error { - Error::EpochProcessingError(e) - } -} - -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} From e6526c9895635fc800b957a126a8ef7cf520ac01 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 11:32:53 +1100 Subject: [PATCH 20/31] Refactor winning root logic --- eth2/state_processing/src/macros.rs | 11 ++ .../src/per_epoch_processing.rs | 178 ++++++++---------- ...{grouped_attesters.rs => attester_sets.rs} | 4 +- .../src/per_epoch_processing/errors.rs | 20 +- .../inclusion_distance.rs | 61 ++++++ .../src/per_epoch_processing/winning_root.rs | 142 ++++++++------ eth2/types/src/beacon_state.rs | 74 -------- eth2/types/src/lib.rs | 4 +- 8 files changed, 253 insertions(+), 241 deletions(-) rename eth2/state_processing/src/per_epoch_processing/{grouped_attesters.rs => attester_sets.rs} (98%) create mode 100644 eth2/state_processing/src/per_epoch_processing/inclusion_distance.rs diff --git a/eth2/state_processing/src/macros.rs b/eth2/state_processing/src/macros.rs index 5a0d0dc11..93a42764b 100644 --- a/eth2/state_processing/src/macros.rs +++ b/eth2/state_processing/src/macros.rs @@ -11,3 +11,14 @@ macro_rules! invalid { return Err(Error::Invalid($result)); }; } + +macro_rules! safe_add_assign { + ($a: expr, $b: expr) => { + $a = $a.saturating_add($b); + }; +} +macro_rules! safe_sub_assign { + ($a: expr, $b: expr) => { + $a = $a.saturating_sub($b); + }; +} diff --git a/eth2/state_processing/src/per_epoch_processing.rs b/eth2/state_processing/src/per_epoch_processing.rs index a54518364..732a6e48f 100644 --- a/eth2/state_processing/src/per_epoch_processing.rs +++ b/eth2/state_processing/src/per_epoch_processing.rs @@ -1,7 +1,8 @@ -use errors::{EpochProcessingError as Error, WinningRootError}; -use grouped_attesters::GroupedAttesters; +use attester_sets::AttesterSets; +use errors::EpochProcessingError as Error; +use inclusion_distance::{inclusion_distance, inclusion_slot}; use integer_sqrt::IntegerSquareRoot; -use log::{debug, trace}; +use log::debug; use rayon::prelude::*; use ssz::TreeHash; use std::collections::{HashMap, HashSet}; @@ -9,21 +10,11 @@ use std::iter::FromIterator; use types::{validator_registry::get_active_validator_indices, *}; use winning_root::{winning_root, WinningRoot}; +pub mod attester_sets; pub mod errors; -mod grouped_attesters; -mod tests; -mod winning_root; - -macro_rules! safe_add_assign { - ($a: expr, $b: expr) => { - $a = $a.saturating_add($b); - }; -} -macro_rules! safe_sub_assign { - ($a: expr, $b: expr) => { - $a = $a.saturating_sub($b); - }; -} +pub mod inclusion_distance; +pub mod tests; +pub mod winning_root; pub fn per_epoch_processing(state: &mut BeaconState, spec: &ChainSpec) -> Result<(), Error> { let current_epoch = state.current_epoch(spec); @@ -40,7 +31,7 @@ pub fn per_epoch_processing(state: &mut BeaconState, spec: &ChainSpec) -> Result state.build_epoch_cache(RelativeEpoch::Current, spec)?; state.build_epoch_cache(RelativeEpoch::Next, spec)?; - let attesters = GroupedAttesters::new(&state, spec)?; + let attesters = AttesterSets::new(&state, spec)?; let active_validator_indices = get_active_validator_indices( &state.validator_registry, @@ -86,12 +77,14 @@ pub fn per_epoch_processing(state: &mut BeaconState, spec: &ChainSpec) -> Result process_validator_registry(state, spec)?; // Final updates - state.latest_active_index_roots[(next_epoch.as_usize() - + spec.activation_exit_delay as usize) - % spec.latest_active_index_roots_length] = hash_tree_root(get_active_validator_indices( + let active_tree_root = get_active_validator_indices( &state.validator_registry, next_epoch + Epoch::from(spec.activation_exit_delay), - )); + ) + .hash_tree_root(); + state.latest_active_index_roots[(next_epoch.as_usize() + + spec.activation_exit_delay as usize) + % spec.latest_active_index_roots_length] = Hash256::from(&active_tree_root[..]); state.latest_slashed_balances[next_epoch.as_usize() % spec.latest_slashed_exit_length] = state.latest_slashed_balances[current_epoch.as_usize() % spec.latest_slashed_exit_length]; @@ -114,10 +107,6 @@ pub fn per_epoch_processing(state: &mut BeaconState, spec: &ChainSpec) -> Result Ok(()) } -fn hash_tree_root(input: Vec) -> Hash256 { - Hash256::from(&input.hash_tree_root()[..]) -} - /// Spec v0.4.0 fn process_eth1_data(state: &mut BeaconState, spec: &ChainSpec) { let next_epoch = state.next_epoch(spec); @@ -210,7 +199,7 @@ fn process_justification( state.justified_epoch = new_justified_epoch; } -pub type WinningRootHashSet = HashMap>; +pub type WinningRootHashSet = HashMap; fn process_crosslinks( state: &mut BeaconState, @@ -219,33 +208,25 @@ fn process_crosslinks( let current_epoch_attestations: Vec<&PendingAttestation> = state .latest_attestations .par_iter() - .filter(|a| { - (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) - == state.current_epoch(spec) - }) + .filter(|a| a.data.slot.epoch(spec.slots_per_epoch) == state.current_epoch(spec)) .collect(); let previous_epoch_attestations: Vec<&PendingAttestation> = state .latest_attestations .par_iter() - .filter(|a| { - (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) - == state.previous_epoch(spec) - }) + .filter(|a| a.data.slot.epoch(spec.slots_per_epoch) == state.previous_epoch(spec)) .collect(); - let mut winning_root_for_shards: HashMap> = - HashMap::new(); - // for slot in state.slot.saturating_sub(2 * spec.slots_per_epoch)..state.slot { - for slot in state.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { - trace!( - "Finding winning root for slot: {} (epoch: {})", - slot, - slot.epoch(spec.slots_per_epoch) - ); + let mut winning_root_for_shards: WinningRootHashSet = HashMap::new(); - // Clone is used to remove the borrow. It becomes an issue later when trying to mutate - // `state.balances`. + let previous_and_current_epoch_slots: Vec = state + .previous_epoch(spec) + .slot_iter(spec.slots_per_epoch) + .chain(state.current_epoch(spec).slot_iter(spec.slots_per_epoch)) + .collect(); + + for slot in previous_and_current_epoch_slots { + // Clone removes the borrow which becomes an issue when mutating `state.balances`. let crosslink_committees_at_slot = state.get_crosslink_committees_at_slot(slot, spec)?.clone(); @@ -258,31 +239,33 @@ fn process_crosslinks( ¤t_epoch_attestations[..], &previous_epoch_attestations[..], spec, - ); + )?; - if let Ok(winning_root) = &winning_root { + if let Some(winning_root) = winning_root { let total_committee_balance = state.get_total_balance(&crosslink_committee, spec); + // TODO: I think this has a bug. if (3 * winning_root.total_attesting_balance) >= (2 * total_committee_balance) { state.latest_crosslinks[shard as usize] = Crosslink { epoch: state.current_epoch(spec), crosslink_data_root: winning_root.crosslink_data_root, } } + winning_root_for_shards.insert(shard, winning_root); } - winning_root_for_shards.insert(shard, winning_root); } } Ok(winning_root_for_shards) } +/// Spec v0.4.0 fn process_rewards_and_penalities( state: &mut BeaconState, active_validator_indices: HashSet, - attesters: &GroupedAttesters, + attesters: &AttesterSets, previous_total_balance: u64, - winning_root_for_shards: &HashMap>, + winning_root_for_shards: &WinningRootHashSet, spec: &ChainSpec, ) -> Result<(), Error> { let next_epoch = state.next_epoch(spec); @@ -290,62 +273,60 @@ fn process_rewards_and_penalities( let previous_epoch_attestations: Vec<&PendingAttestation> = state .latest_attestations .par_iter() - .filter(|a| { - (a.data.slot / spec.slots_per_epoch).epoch(spec.slots_per_epoch) - == state.previous_epoch(spec) - }) + .filter(|a| a.data.slot.epoch(spec.slots_per_epoch) == state.previous_epoch(spec)) .collect(); let base_reward_quotient = previous_total_balance.integer_sqrt() / spec.base_reward_quotient; + if base_reward_quotient == 0 { return Err(Error::BaseRewardQuotientIsZero); } - /* - * Justification and finalization - */ - let epochs_since_finality = next_epoch - state.finalized_epoch; + // Justification and finalization - let active_validator_indices_hashset: HashSet = - HashSet::from_iter(active_validator_indices.iter().cloned()); + let epochs_since_finality = next_epoch - state.finalized_epoch; if epochs_since_finality <= 4 { for index in 0..state.validator_balances.len() { let base_reward = state.base_reward(index, base_reward_quotient, spec); + // Expected FFG source if attesters.previous_epoch.indices.contains(&index) { safe_add_assign!( state.validator_balances[index], base_reward * attesters.previous_epoch.balance / previous_total_balance ); - } else if active_validator_indices_hashset.contains(&index) { + } else if active_validator_indices.contains(&index) { safe_sub_assign!(state.validator_balances[index], base_reward); } + // Expected FFG target if attesters.previous_epoch_boundary.indices.contains(&index) { safe_add_assign!( state.validator_balances[index], base_reward * attesters.previous_epoch_boundary.balance / previous_total_balance ); - } else if active_validator_indices_hashset.contains(&index) { + } else if active_validator_indices.contains(&index) { safe_sub_assign!(state.validator_balances[index], base_reward); } + // Expected beacon chain head if attesters.previous_epoch_head.indices.contains(&index) { safe_add_assign!( state.validator_balances[index], base_reward * attesters.previous_epoch_head.balance / previous_total_balance ); - } else if active_validator_indices_hashset.contains(&index) { + } else if active_validator_indices.contains(&index) { safe_sub_assign!(state.validator_balances[index], base_reward); } } + // Inclusion distance for &index in &attesters.previous_epoch.indices { let base_reward = state.base_reward(index, base_reward_quotient, spec); let inclusion_distance = - state.inclusion_distance(&previous_epoch_attestations, index, spec)?; + inclusion_distance(state, &previous_epoch_attestations, index, spec)?; safe_add_assign!( state.validator_balances[index], @@ -356,7 +337,8 @@ fn process_rewards_and_penalities( for index in 0..state.validator_balances.len() { let inactivity_penalty = state.inactivity_penalty(index, epochs_since_finality, base_reward_quotient, spec); - if active_validator_indices_hashset.contains(&index) { + + if active_validator_indices.contains(&index) { if !attesters.previous_epoch.indices.contains(&index) { safe_sub_assign!(state.validator_balances[index], inactivity_penalty); } @@ -380,7 +362,7 @@ fn process_rewards_and_penalities( for &index in &attesters.previous_epoch.indices { let base_reward = state.base_reward(index, base_reward_quotient, spec); let inclusion_distance = - state.inclusion_distance(&previous_epoch_attestations, index, spec)?; + inclusion_distance(state, &previous_epoch_attestations, index, spec)?; safe_sub_assign!( state.validator_balances[index], @@ -390,61 +372,69 @@ fn process_rewards_and_penalities( } } - trace!("Processed validator justification and finalization rewards/penalities."); + // Attestation inclusion - /* - * Attestation inclusion - */ for &index in &attesters.previous_epoch.indices { - let inclusion_slot = state.inclusion_slot(&previous_epoch_attestations[..], index, spec)?; + let inclusion_slot = inclusion_slot(state, &previous_epoch_attestations[..], index, spec)?; + let proposer_index = state .get_beacon_proposer_index(inclusion_slot, spec) .map_err(|_| Error::UnableToDetermineProducer)?; + let base_reward = state.base_reward(proposer_index, base_reward_quotient, spec); + safe_add_assign!( state.validator_balances[proposer_index], base_reward / spec.attestation_inclusion_reward_quotient ); } - /* - * Crosslinks - */ + //Crosslinks + for slot in state.previous_epoch(spec).slot_iter(spec.slots_per_epoch) { - // Clone is used to remove the borrow. It becomes an issue later when trying to mutate - // `state.balances`. + // Clone removes the borrow which becomes an issue when mutating `state.balances`. let crosslink_committees_at_slot = state.get_crosslink_committees_at_slot(slot, spec)?.clone(); - for (_crosslink_committee, shard) in crosslink_committees_at_slot { + for (crosslink_committee, shard) in crosslink_committees_at_slot { let shard = shard as u64; - if let Some(Ok(winning_root)) = winning_root_for_shards.get(&shard) { - // TODO: remove the map. + // Note: I'm a little uncertain of the logic here -- I am waiting for spec v0.5.0 to + // clear it up. + // + // What happens here is: + // + // - If there was some crosslink root elected by the super-majority of this committee, + // then we reward all who voted for that root and penalize all that did not. + // - However, if there _was not_ some super-majority-voted crosslink root, then penalize + // all the validators. + // + // I'm not quite sure that the second case (no super-majority crosslink) is correct. + if let Some(winning_root) = winning_root_for_shards.get(&shard) { + // Hash set de-dedups and (hopefully) offers a speed improvement from faster + // lookups. let attesting_validator_indices: HashSet = HashSet::from_iter(winning_root.attesting_validator_indices.iter().cloned()); - for index in 0..state.validator_balances.len() { + for &index in &crosslink_committee { let base_reward = state.base_reward(index, base_reward_quotient, spec); + let total_balance = state.get_total_balance(&crosslink_committee, spec); + if attesting_validator_indices.contains(&index) { safe_add_assign!( state.validator_balances[index], - base_reward * winning_root.total_attesting_balance - / winning_root.total_balance + base_reward * winning_root.total_attesting_balance / total_balance ); } else { safe_sub_assign!(state.validator_balances[index], base_reward); } } + } else { + for &index in &crosslink_committee { + let base_reward = state.base_reward(index, base_reward_quotient, spec); - for index in &winning_root.attesting_validator_indices { - let base_reward = state.base_reward(*index, base_reward_quotient, spec); - safe_add_assign!( - state.validator_balances[*index], - base_reward * winning_root.total_attesting_balance - / winning_root.total_balance - ); + safe_sub_assign!(state.validator_balances[index], base_reward); } } } @@ -453,6 +443,7 @@ fn process_rewards_and_penalities( Ok(()) } +// Spec v0.4.0 fn process_validator_registry(state: &mut BeaconState, spec: &ChainSpec) -> Result<(), Error> { let current_epoch = state.current_epoch(spec); let next_epoch = state.next_epoch(spec); @@ -460,11 +451,6 @@ fn process_validator_registry(state: &mut BeaconState, spec: &ChainSpec) -> Resu state.previous_shuffling_epoch = state.current_shuffling_epoch; state.previous_shuffling_start_shard = state.current_shuffling_start_shard; - debug!( - "setting previous_shuffling_seed to : {}", - state.current_shuffling_seed - ); - state.previous_shuffling_seed = state.current_shuffling_seed; let should_update_validator_registy = if state.finalized_epoch @@ -479,7 +465,6 @@ fn process_validator_registry(state: &mut BeaconState, spec: &ChainSpec) -> Resu }; if should_update_validator_registy { - trace!("updating validator registry."); state.update_validator_registry(spec); state.current_shuffling_epoch = next_epoch; @@ -488,7 +473,6 @@ fn process_validator_registry(state: &mut BeaconState, spec: &ChainSpec) -> Resu % spec.shard_count; state.current_shuffling_seed = state.generate_seed(state.current_shuffling_epoch, spec)? } else { - trace!("not updating validator registry."); let epochs_since_last_registry_update = current_epoch - state.validator_registry_update_epoch; if (epochs_since_last_registry_update > 1) diff --git a/eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs b/eth2/state_processing/src/per_epoch_processing/attester_sets.rs similarity index 98% rename from eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs rename to eth2/state_processing/src/per_epoch_processing/attester_sets.rs index 02dbc4050..2b674e1bc 100644 --- a/eth2/state_processing/src/per_epoch_processing/grouped_attesters.rs +++ b/eth2/state_processing/src/per_epoch_processing/attester_sets.rs @@ -17,7 +17,7 @@ impl Attesters { } } -pub struct GroupedAttesters { +pub struct AttesterSets { pub current_epoch: Attesters, pub current_epoch_boundary: Attesters, pub previous_epoch: Attesters, @@ -25,7 +25,7 @@ pub struct GroupedAttesters { pub previous_epoch_head: Attesters, } -impl GroupedAttesters { +impl AttesterSets { pub fn new(state: &BeaconState, spec: &ChainSpec) -> Result { let mut current_epoch = Attesters::default(); let mut current_epoch_boundary = Attesters::default(); diff --git a/eth2/state_processing/src/per_epoch_processing/errors.rs b/eth2/state_processing/src/per_epoch_processing/errors.rs index 0f7063e3b..51e9b253c 100644 --- a/eth2/state_processing/src/per_epoch_processing/errors.rs +++ b/eth2/state_processing/src/per_epoch_processing/errors.rs @@ -1,11 +1,5 @@ use types::*; -#[derive(Debug, PartialEq)] -pub enum WinningRootError { - NoWinningRoot, - BeaconStateError(BeaconStateError), -} - #[derive(Debug, PartialEq)] pub enum EpochProcessingError { UnableToDetermineProducer, @@ -14,7 +8,6 @@ pub enum EpochProcessingError { NoRandaoSeed, BeaconStateError(BeaconStateError), InclusionError(InclusionError), - WinningRootError(WinningRootError), } impl From for EpochProcessingError { @@ -29,8 +22,15 @@ impl From for EpochProcessingError { } } -impl From for WinningRootError { - fn from(e: BeaconStateError) -> WinningRootError { - WinningRootError::BeaconStateError(e) +#[derive(Debug, PartialEq)] +pub enum InclusionError { + /// The validator did not participate in an attestation in this period. + NoAttestationsForValidator, + BeaconStateError(BeaconStateError), +} + +impl From for InclusionError { + fn from(e: BeaconStateError) -> InclusionError { + InclusionError::BeaconStateError(e) } } diff --git a/eth2/state_processing/src/per_epoch_processing/inclusion_distance.rs b/eth2/state_processing/src/per_epoch_processing/inclusion_distance.rs new file mode 100644 index 000000000..243dc67f0 --- /dev/null +++ b/eth2/state_processing/src/per_epoch_processing/inclusion_distance.rs @@ -0,0 +1,61 @@ +use super::errors::InclusionError; +use types::*; + +/// Returns the distance between the first included attestation for some validator and this +/// slot. +/// +/// Note: In the spec this is defined "inline", not as a helper function. +/// +/// Spec v0.4.0 +pub fn inclusion_distance( + state: &BeaconState, + attestations: &[&PendingAttestation], + validator_index: usize, + spec: &ChainSpec, +) -> Result { + let attestation = earliest_included_attestation(state, attestations, validator_index, spec)?; + Ok((attestation.inclusion_slot - attestation.data.slot).as_u64()) +} + +/// Returns the slot of the earliest included attestation for some validator. +/// +/// Note: In the spec this is defined "inline", not as a helper function. +/// +/// Spec v0.4.0 +pub fn inclusion_slot( + state: &BeaconState, + attestations: &[&PendingAttestation], + validator_index: usize, + spec: &ChainSpec, +) -> Result { + let attestation = earliest_included_attestation(state, attestations, validator_index, spec)?; + Ok(attestation.inclusion_slot) +} + +/// Finds the earliest included attestation for some validator. +/// +/// Note: In the spec this is defined "inline", not as a helper function. +/// +/// Spec v0.4.0 +fn earliest_included_attestation( + state: &BeaconState, + attestations: &[&PendingAttestation], + validator_index: usize, + spec: &ChainSpec, +) -> Result { + let mut included_attestations = vec![]; + + for (i, a) in attestations.iter().enumerate() { + let participants = + state.get_attestation_participants(&a.data, &a.aggregation_bitfield, spec)?; + if participants.iter().any(|i| *i == validator_index) { + included_attestations.push(i); + } + } + + let earliest_attestation_index = included_attestations + .iter() + .min_by_key(|i| attestations[**i].inclusion_slot) + .ok_or_else(|| InclusionError::NoAttestationsForValidator)?; + Ok(attestations[*earliest_attestation_index].clone()) +} diff --git a/eth2/state_processing/src/per_epoch_processing/winning_root.rs b/eth2/state_processing/src/per_epoch_processing/winning_root.rs index c3b650c3d..07678f93b 100644 --- a/eth2/state_processing/src/per_epoch_processing/winning_root.rs +++ b/eth2/state_processing/src/per_epoch_processing/winning_root.rs @@ -1,86 +1,118 @@ -use super::errors::WinningRootError; -use std::collections::HashMap; +use std::collections::HashSet; +use std::iter::FromIterator; use types::*; #[derive(Clone)] pub struct WinningRoot { pub crosslink_data_root: Hash256, pub attesting_validator_indices: Vec, - pub total_balance: u64, pub total_attesting_balance: u64, } +impl WinningRoot { + /// Returns `true` if `self` is a "better" candidate than `other`. + /// + /// A winning root is "better" than another if it has a higher `total_attesting_balance`. Ties + /// are broken by favouring the lower `crosslink_data_root` value. + /// + /// Spec v0.4.0 + pub fn is_better_than(&self, other: &Self) -> bool { + if self.total_attesting_balance > other.total_attesting_balance { + true + } else if self.total_attesting_balance == other.total_attesting_balance { + self.crosslink_data_root < other.crosslink_data_root + } else { + false + } + } +} + +/// Returns the `crosslink_data_root` with the highest total attesting balance for the given shard. +/// Breaks ties by favouring the smaller `crosslink_data_root` hash. +/// +/// The `WinningRoot` object also contains additional fields that are useful in later stages of +/// per-epoch processing. +/// +/// Spec v0.4.0 pub fn winning_root( state: &BeaconState, shard: u64, current_epoch_attestations: &[&PendingAttestation], previous_epoch_attestations: &[&PendingAttestation], spec: &ChainSpec, -) -> Result { - let mut attestations = current_epoch_attestations.to_vec(); - attestations.append(&mut previous_epoch_attestations.to_vec()); +) -> Result, BeaconStateError> { + let mut winning_root: Option = None; - let mut candidates: HashMap = HashMap::new(); - - let mut highest_seen_balance = 0; - - for a in &attestations { - if a.data.shard != shard { - continue; - } - - let crosslink_data_root = &a.data.crosslink_data_root; - - if candidates.contains_key(crosslink_data_root) { - continue; - } - - let attesting_validator_indices = attestations + let crosslink_data_roots: HashSet = HashSet::from_iter( + previous_epoch_attestations .iter() - .try_fold::<_, _, Result<_, BeaconStateError>>(vec![], |mut acc, a| { - if (a.data.shard == shard) && (a.data.crosslink_data_root == *crosslink_data_root) { - acc.append(&mut state.get_attestation_participants( - &a.data, - &a.aggregation_bitfield, - spec, - )?); + .chain(current_epoch_attestations.iter()) + .filter_map(|a| { + if a.data.shard == shard { + Some(a.data.crosslink_data_root) + } else { + None } - Ok(acc) - })?; + }), + ); - let total_balance: u64 = attesting_validator_indices - .iter() - .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); + for crosslink_data_root in crosslink_data_roots { + let attesting_validator_indices = get_attesting_validator_indices( + state, + shard, + current_epoch_attestations, + previous_epoch_attestations, + &crosslink_data_root, + spec, + )?; let total_attesting_balance: u64 = attesting_validator_indices .iter() .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); - if total_attesting_balance > highest_seen_balance { - highest_seen_balance = total_attesting_balance; - } - - let candidate_root = WinningRoot { - crosslink_data_root: *crosslink_data_root, + let candidate = WinningRoot { + crosslink_data_root, attesting_validator_indices, total_attesting_balance, - total_balance, }; - candidates.insert(*crosslink_data_root, candidate_root); + if let Some(ref winner) = winning_root { + if candidate.is_better_than(&winner) { + winning_root = Some(candidate); + } + } else { + winning_root = Some(candidate); + } } - Ok(candidates - .iter() - .filter_map(|(_hash, candidate)| { - if candidate.total_attesting_balance == highest_seen_balance { - Some(candidate) - } else { - None - } - }) - .min_by_key(|candidate| candidate.crosslink_data_root) - .ok_or_else(|| WinningRootError::NoWinningRoot)? - // TODO: avoid clone. - .clone()) + Ok(winning_root) +} + +/// Returns all indices which voted for a given crosslink. May contain duplicates. +/// +/// Spec v0.4.0 +fn get_attesting_validator_indices( + state: &BeaconState, + shard: u64, + current_epoch_attestations: &[&PendingAttestation], + previous_epoch_attestations: &[&PendingAttestation], + crosslink_data_root: &Hash256, + spec: &ChainSpec, +) -> Result, BeaconStateError> { + let mut indices = vec![]; + + for a in current_epoch_attestations + .iter() + .chain(previous_epoch_attestations.iter()) + { + if (a.data.shard == shard) && (a.data.crosslink_data_root == *crosslink_data_root) { + indices.append(&mut state.get_attestation_participants( + &a.data, + &a.aggregation_bitfield, + spec, + )?); + } + } + + Ok(indices) } diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index 76b97b21d..bb77981ab 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -56,13 +56,6 @@ pub enum Error { EpochCacheUninitialized(RelativeEpoch), } -#[derive(Debug, PartialEq)] -pub enum InclusionError { - /// The validator did not participate in an attestation in this period. - NoAttestationsForValidator, - Error(Error), -} - macro_rules! safe_add_assign { ($a: expr, $b: expr) => { $a = $a.saturating_add($b); @@ -1123,67 +1116,6 @@ impl BeaconState { / 2 } - /// Returns the distance between the first included attestation for some validator and this - /// slot. - /// - /// Note: In the spec this is defined "inline", not as a helper function. - /// - /// Spec v0.4.0 - pub fn inclusion_distance( - &self, - attestations: &[&PendingAttestation], - validator_index: usize, - spec: &ChainSpec, - ) -> Result { - let attestation = - self.earliest_included_attestation(attestations, validator_index, spec)?; - Ok((attestation.inclusion_slot - attestation.data.slot).as_u64()) - } - - /// Returns the slot of the earliest included attestation for some validator. - /// - /// Note: In the spec this is defined "inline", not as a helper function. - /// - /// Spec v0.4.0 - pub fn inclusion_slot( - &self, - attestations: &[&PendingAttestation], - validator_index: usize, - spec: &ChainSpec, - ) -> Result { - let attestation = - self.earliest_included_attestation(attestations, validator_index, spec)?; - Ok(attestation.inclusion_slot) - } - - /// Finds the earliest included attestation for some validator. - /// - /// Note: In the spec this is defined "inline", not as a helper function. - /// - /// Spec v0.4.0 - fn earliest_included_attestation( - &self, - attestations: &[&PendingAttestation], - validator_index: usize, - spec: &ChainSpec, - ) -> Result { - let mut included_attestations = vec![]; - - for (i, a) in attestations.iter().enumerate() { - let participants = - self.get_attestation_participants(&a.data, &a.aggregation_bitfield, spec)?; - if participants.iter().any(|i| *i == validator_index) { - included_attestations.push(i); - } - } - - let earliest_attestation_index = included_attestations - .iter() - .min_by_key(|i| attestations[**i].inclusion_slot) - .ok_or_else(|| InclusionError::NoAttestationsForValidator)?; - Ok(attestations[*earliest_attestation_index].clone()) - } - /// Returns the base reward for some validator. /// /// Note: In the spec this is defined "inline", not as a helper function. @@ -1226,12 +1158,6 @@ fn hash_tree_root(input: Vec) -> Hash256 { Hash256::from(&input.hash_tree_root()[..]) } -impl From for InclusionError { - fn from(e: Error) -> InclusionError { - InclusionError::Error(e) - } -} - impl Encodable for BeaconState { fn ssz_append(&self, s: &mut SszStream) { s.append(&self.slot); diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs index e595684bc..9bf60f2c9 100644 --- a/eth2/types/src/lib.rs +++ b/eth2/types/src/lib.rs @@ -40,9 +40,7 @@ pub use crate::attestation_data_and_custody_bit::AttestationDataAndCustodyBit; pub use crate::attester_slashing::AttesterSlashing; pub use crate::beacon_block::BeaconBlock; pub use crate::beacon_block_body::BeaconBlockBody; -pub use crate::beacon_state::{ - BeaconState, Error as BeaconStateError, InclusionError, RelativeEpoch, -}; +pub use crate::beacon_state::{BeaconState, Error as BeaconStateError, RelativeEpoch}; pub use crate::chain_spec::{ChainSpec, Domain}; pub use crate::crosslink::Crosslink; pub use crate::deposit::Deposit; From dad140a338a9f011e6f184863c1f5ce04117e5c8 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 12:11:17 +1100 Subject: [PATCH 21/31] Fix attester and proposer compile issues - Updated to use new signed roots (`SignedRoot`, `TreeHash`) - Added a temporary domain value Note: these changes are not a fully v0.4.0 upgrade. --- eth2/attester/src/lib.rs | 15 ++++++++++----- eth2/block_proposer/src/lib.rs | 23 +++++++++++++++++------ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/eth2/attester/src/lib.rs b/eth2/attester/src/lib.rs index 5bffd0c50..8838f022d 100644 --- a/eth2/attester/src/lib.rs +++ b/eth2/attester/src/lib.rs @@ -2,8 +2,9 @@ pub mod test_utils; mod traits; use slot_clock::SlotClock; +use ssz::TreeHash; use std::sync::Arc; -use types::{AttestationData, FreeAttestation, Signature, Slot}; +use types::{AttestationData, AttestationDataAndCustodyBit, FreeAttestation, Signature, Slot}; pub use self::traits::{ BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer, @@ -137,10 +138,14 @@ impl Attester Option { self.store_produce(attestation_data); - self.signer.sign_attestation_message( - &attestation_data.signable_message(PHASE_0_CUSTODY_BIT)[..], - DOMAIN_ATTESTATION, - ) + let message = AttestationDataAndCustodyBit { + data: attestation_data.clone(), + custody_bit: PHASE_0_CUSTODY_BIT, + } + .hash_tree_root(); + + self.signer + .sign_attestation_message(&message[..], DOMAIN_ATTESTATION) } /// Returns `true` if signing some attestation_data is safe (non-slashable). diff --git a/eth2/block_proposer/src/lib.rs b/eth2/block_proposer/src/lib.rs index cea855627..55461d986 100644 --- a/eth2/block_proposer/src/lib.rs +++ b/eth2/block_proposer/src/lib.rs @@ -3,13 +3,17 @@ mod traits; use int_to_bytes::int_to_bytes32; use slot_clock::SlotClock; +use ssz::SignedRoot; use std::sync::Arc; -use types::{BeaconBlock, ChainSpec, Slot}; +use types::{BeaconBlock, ChainSpec, Hash256, Proposal, Slot}; pub use self::traits::{ BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer, }; +//TODO: obtain the correct domain using a `Fork`. +pub const TEMPORARY_DOMAIN_VALUE: u64 = 0; + #[derive(Debug, PartialEq)] pub enum PollOutcome { /// A new block was produced. @@ -136,7 +140,7 @@ impl BlockProducer return Ok(PollOutcome::SignerRejection(slot)), Some(signature) => signature, @@ -169,10 +173,17 @@ impl BlockProducer Option { self.store_produce(&block); - match self.signer.sign_block_proposal( - &block.proposal_root(&self.spec)[..], - self.spec.domain_proposal, - ) { + let proposal = Proposal { + slot: block.slot, + shard: self.spec.beacon_chain_shard_number, + block_root: Hash256::from_slice(&block.signed_root()[..]), + signature: block.signature.clone(), + }; + + match self + .signer + .sign_block_proposal(&proposal.signed_root()[..], TEMPORARY_DOMAIN_VALUE) + { None => None, Some(signature) => { block.signature = signature; From e44888210254c22a80223f1d57ae6e760906531c Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 12:25:00 +1100 Subject: [PATCH 22/31] Re-add `canonical_root` methods to block & state Turns out they were pretty useful --- eth2/types/src/beacon_block.rs | 5 +++++ eth2/types/src/beacon_state.rs | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/eth2/types/src/beacon_block.rs b/eth2/types/src/beacon_block.rs index 111ca1b4b..2e1e24ef7 100644 --- a/eth2/types/src/beacon_block.rs +++ b/eth2/types/src/beacon_block.rs @@ -44,6 +44,11 @@ impl BeaconBlock { }, } } + + /// Returns the `hash_tree_root` of the block. + pub fn canonical_root(&self) -> Hash256 { + Hash256::from_slice(&self.hash_tree_root()[..]) + } } #[cfg(test)] diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs index ac8cf164d..809408b32 100644 --- a/eth2/types/src/beacon_state.rs +++ b/eth2/types/src/beacon_state.rs @@ -233,6 +233,11 @@ impl BeaconState { Ok(genesis_state) } + /// Returns the `hash_tree_root` of the state. + pub fn canonical_root(&self) -> Hash256 { + Hash256::from_slice(&self.hash_tree_root()[..]) + } + /// Build an epoch cache, unless it is has already been built. pub fn build_epoch_cache( &mut self, From a4e604a41ea7d90b9eacb3fac17a112c786a9f55 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 12:25:29 +1100 Subject: [PATCH 23/31] Update BeaconChain to spec v0.4.0 --- .../src/attestation_aggregator.rs | 24 ++++++++-------- beacon_node/beacon_chain/src/beacon_chain.rs | 28 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/beacon_node/beacon_chain/src/attestation_aggregator.rs b/beacon_node/beacon_chain/src/attestation_aggregator.rs index 54f178068..75cfd7ee5 100644 --- a/beacon_node/beacon_chain/src/attestation_aggregator.rs +++ b/beacon_node/beacon_chain/src/attestation_aggregator.rs @@ -1,10 +1,8 @@ use log::trace; -use state_processing::validate_attestation_without_signature; +use ssz::TreeHash; +use state_processing::per_block_processing::validate_attestation_without_signature; use std::collections::{HashMap, HashSet}; -use types::{ - AggregateSignature, Attestation, AttestationData, BeaconState, BeaconStateError, Bitfield, - ChainSpec, FreeAttestation, Signature, -}; +use types::*; const PHASE_0_CUSTODY_BIT: bool = false; @@ -84,11 +82,11 @@ impl AttestationAggregator { /// - The signature is verified against that of the validator at `validator_index`. pub fn process_free_attestation( &mut self, - cached_state: &BeaconState, + state: &BeaconState, free_attestation: &FreeAttestation, spec: &ChainSpec, ) -> Result { - let attestation_duties = match cached_state.attestation_slot_and_shard_for_validator( + let attestation_duties = match state.attestation_slot_and_shard_for_validator( free_attestation.validator_index as usize, spec, ) { @@ -119,9 +117,13 @@ impl AttestationAggregator { invalid_outcome!(Message::BadShard); } - let signable_message = free_attestation.data.signable_message(PHASE_0_CUSTODY_BIT); + let signable_message = AttestationDataAndCustodyBit { + data: free_attestation.data.clone(), + custody_bit: PHASE_0_CUSTODY_BIT, + } + .hash_tree_root(); - let validator_record = match cached_state + let validator_record = match state .validator_registry .get(free_attestation.validator_index as usize) { @@ -131,9 +133,7 @@ impl AttestationAggregator { if !free_attestation.signature.verify( &signable_message, - cached_state - .fork - .get_domain(cached_state.current_epoch(spec), spec.domain_attestation), + spec.get_domain(state.current_epoch(spec), Domain::Attestation, &state.fork), &validator_record.pubkey, ) { invalid_outcome!(Message::BadSignature); diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index ddb9514db..93a806864 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -10,7 +10,8 @@ use parking_lot::{RwLock, RwLockReadGuard}; use slot_clock::SlotClock; use ssz::ssz_encode; use state_processing::{ - BlockProcessable, BlockProcessingError, SlotProcessable, SlotProcessingError, + per_block_processing, per_block_processing_without_verifying_block_signature, + per_slot_processing, BlockProcessingError, SlotProcessingError, }; use std::sync::Arc; use types::{ @@ -65,7 +66,7 @@ pub struct BeaconChain { pub slot_clock: U, pub attestation_aggregator: RwLock, pub deposits_for_inclusion: RwLock>, - pub exits_for_inclusion: RwLock>, + pub exits_for_inclusion: RwLock>, pub proposer_slashings_for_inclusion: RwLock>, pub attester_slashings_for_inclusion: RwLock>, canonical_head: RwLock, @@ -214,9 +215,7 @@ where let state_slot = self.state.read().slot; let head_block_root = self.head().beacon_block_root; for _ in state_slot.as_u64()..slot.as_u64() { - self.state - .write() - .per_slot_processing(head_block_root, &self.spec)?; + per_slot_processing(&mut *self.state.write(), head_block_root, &self.spec)?; } Ok(()) } @@ -333,10 +332,10 @@ where shard, beacon_block_root: self.head().beacon_block_root, epoch_boundary_root, - shard_block_root: Hash256::zero(), + crosslink_data_root: Hash256::zero(), latest_crosslink: Crosslink { epoch: self.state.read().slot.epoch(self.spec.slots_per_epoch), - shard_block_root: Hash256::zero(), + crosslink_data_root: Hash256::zero(), }, justified_epoch, justified_block_root, @@ -411,7 +410,7 @@ where } /// Accept some exit and queue it for inclusion in an appropriate block. - pub fn receive_exit_for_inclusion(&self, exit: Exit) { + pub fn receive_exit_for_inclusion(&self, exit: VoluntaryExit) { // TODO: exits are not checked for validity; check them. // // https://github.com/sigp/lighthouse/issues/276 @@ -419,7 +418,7 @@ where } /// Return a vec of exits suitable for inclusion in some block. - pub fn get_exits_for_block(&self) -> Vec { + pub fn get_exits_for_block(&self) -> Vec { // TODO: exits are indiscriminately included; check them for validity. // // https://github.com/sigp/lighthouse/issues/275 @@ -430,7 +429,7 @@ where /// inclusion queue. /// /// This ensures that `Deposits` are not included twice in successive blocks. - pub fn set_exits_as_included(&self, included_exits: &[Exit]) { + pub fn set_exits_as_included(&self, included_exits: &[VoluntaryExit]) { // TODO: method does not take forks into account; consider this. let mut indices_to_delete = vec![]; @@ -647,7 +646,7 @@ where // Transition the parent state to the present slot. let mut state = parent_state; for _ in state.slot.as_u64()..present_slot.as_u64() { - if let Err(e) = state.per_slot_processing(parent_block_root, &self.spec) { + if let Err(e) = per_slot_processing(&mut state, parent_block_root, &self.spec) { return Ok(BlockProcessingOutcome::InvalidBlock( InvalidBlock::SlotProcessingError(e), )); @@ -656,7 +655,7 @@ where // Apply the received block to its parent state (which has been transitioned into this // slot). - if let Err(e) = state.per_block_processing(&block, &self.spec) { + if let Err(e) = per_block_processing(&mut state, &block, &self.spec) { return Ok(BlockProcessingOutcome::InvalidBlock( InvalidBlock::PerBlockProcessingError(e), )); @@ -736,14 +735,15 @@ where attester_slashings: self.get_attester_slashings_for_block(), attestations, deposits: self.get_deposits_for_block(), - exits: self.get_exits_for_block(), + voluntary_exits: self.get_exits_for_block(), + transfers: vec![], }, }; trace!("BeaconChain::produce_block: updating state for new block.",); let result = - state.per_block_processing_without_verifying_block_signature(&block, &self.spec); + per_block_processing_without_verifying_block_signature(&mut state, &block, &self.spec); debug!( "BeaconNode::produce_block: state processing result: {:?}", result From 5a21e19a31adc2cf37f59d0beb643dc4c425d87d Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 12:53:15 +1100 Subject: [PATCH 24/31] Fix all compile errors from v0.4.0 update --- beacon_node/beacon_chain/src/beacon_chain.rs | 34 ++++++------------- beacon_node/beacon_chain/src/errors.rs | 33 ++++++++++++++++++ beacon_node/beacon_chain/src/lib.rs | 6 ++-- .../test_harness/src/beacon_chain_harness.rs | 13 +++---- .../test_harness/src/test_case.rs | 19 ++++------- .../test_harness/src/test_case/state_check.rs | 4 +-- .../validator_harness/direct_beacon_node.rs | 4 +-- beacon_node/src/main.rs | 2 +- eth2/fork_choice/tests/tests.rs | 9 ++--- eth2/types/src/attester_slashing/builder.rs | 6 +--- .../beacon_block_grpc_client.rs | 3 +- validator_client/src/main.rs | 6 ++-- 12 files changed, 74 insertions(+), 65 deletions(-) create mode 100644 beacon_node/beacon_chain/src/errors.rs diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 93a806864..653b2900d 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -1,5 +1,6 @@ use crate::attestation_aggregator::{AttestationAggregator, Outcome as AggregationOutcome}; use crate::checkpoint::CheckPoint; +use crate::errors::{BeaconChainError as Error, BlockProductionError}; use db::{ stores::{BeaconBlockStore, BeaconStateStore}, ClientDB, DBError, @@ -19,18 +20,6 @@ use types::{ *, }; -#[derive(Debug, PartialEq)] -pub enum Error { - InsufficientValidators, - BadRecentBlockRoots, - BeaconStateError(BeaconStateError), - DBInconsistent(String), - DBError(String), - ForkChoiceError(ForkChoiceError), - MissingBeaconBlock(Hash256), - MissingBeaconState(Hash256), -} - #[derive(Debug, PartialEq)] pub enum ValidBlock { /// The block was successfully processed. @@ -700,7 +689,10 @@ where /// /// The produced block will not be inherently valid, it must be signed by a block producer. /// Block signing is out of the scope of this function and should be done by a separate program. - pub fn produce_block(&self, randao_reveal: Signature) -> Option<(BeaconBlock, BeaconState)> { + pub fn produce_block( + &self, + randao_reveal: Signature, + ) -> Result<(BeaconBlock, BeaconState), BlockProductionError> { debug!("Producing block at slot {}...", self.state.read().slot); let mut state = self.state.read().clone(); @@ -717,7 +709,9 @@ where attestations.len() ); - let parent_root = *state.get_block_root(state.slot.saturating_sub(1_u64), &self.spec)?; + let parent_root = *state + .get_block_root(state.slot.saturating_sub(1_u64), &self.spec) + .ok_or_else(|| BlockProductionError::UnableToGetBlockRootFromState)?; let mut block = BeaconBlock { slot: state.slot, @@ -742,21 +736,13 @@ where trace!("BeaconChain::produce_block: updating state for new block.",); - let result = - per_block_processing_without_verifying_block_signature(&mut state, &block, &self.spec); - debug!( - "BeaconNode::produce_block: state processing result: {:?}", - result - ); - result.ok()?; + per_block_processing_without_verifying_block_signature(&mut state, &block, &self.spec)?; let state_root = state.canonical_root(); block.state_root = state_root; - trace!("Block produced."); - - Some((block, state)) + Ok((block, state)) } // TODO: Left this as is, modify later diff --git a/beacon_node/beacon_chain/src/errors.rs b/beacon_node/beacon_chain/src/errors.rs new file mode 100644 index 000000000..58c3f87ae --- /dev/null +++ b/beacon_node/beacon_chain/src/errors.rs @@ -0,0 +1,33 @@ +use fork_choice::ForkChoiceError; +use state_processing::BlockProcessingError; +use types::*; + +macro_rules! easy_from_to { + ($from: ident, $to: ident) => { + impl From<$from> for $to { + fn from(e: $from) -> $to { + $to::$from(e) + } + } + }; +} + +#[derive(Debug, PartialEq)] +pub enum BeaconChainError { + InsufficientValidators, + BadRecentBlockRoots, + BeaconStateError(BeaconStateError), + DBInconsistent(String), + DBError(String), + ForkChoiceError(ForkChoiceError), + MissingBeaconBlock(Hash256), + MissingBeaconState(Hash256), +} + +#[derive(Debug, PartialEq)] +pub enum BlockProductionError { + UnableToGetBlockRootFromState, + BlockProcessingError(BlockProcessingError), +} + +easy_from_to!(BlockProcessingError, BlockProductionError); diff --git a/beacon_node/beacon_chain/src/lib.rs b/beacon_node/beacon_chain/src/lib.rs index bd3ee0788..0e879a415 100644 --- a/beacon_node/beacon_chain/src/lib.rs +++ b/beacon_node/beacon_chain/src/lib.rs @@ -1,9 +1,9 @@ mod attestation_aggregator; mod beacon_chain; mod checkpoint; +mod errors; -pub use self::beacon_chain::{ - BeaconChain, BlockProcessingOutcome, Error, InvalidBlock, ValidBlock, -}; +pub use self::beacon_chain::{BeaconChain, BlockProcessingOutcome, InvalidBlock, ValidBlock}; pub use self::checkpoint::CheckPoint; +pub use self::errors::BeaconChainError; pub use fork_choice::{ForkChoice, ForkChoiceAlgorithm, ForkChoiceError}; diff --git a/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs b/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs index 105a6d6e1..38c41e38c 100644 --- a/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs +++ b/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs @@ -1,6 +1,6 @@ use super::ValidatorHarness; use beacon_chain::{BeaconChain, BlockProcessingOutcome}; -pub use beacon_chain::{CheckPoint, Error as BeaconChainError}; +pub use beacon_chain::{BeaconChainError, CheckPoint}; use bls::create_proof_of_possession; use db::{ stores::{BeaconBlockStore, BeaconStateStore}, @@ -250,16 +250,13 @@ impl BeaconChainHarness { validator_index: usize, message: &[u8], epoch: Epoch, - domain_type: u64, + domain_type: Domain, ) -> Option { let validator = self.validators.get(validator_index)?; let domain = self - .beacon_chain - .state - .read() - .fork - .get_domain(epoch, domain_type); + .spec + .get_domain(epoch, domain_type, &self.beacon_chain.state.read().fork); Some(Signature::new(message, domain, &validator.keypair.sk)) } @@ -285,7 +282,7 @@ impl BeaconChainHarness { /// Note: the `ValidatorHarness` for this validator continues to exist. Once it is exited it /// will stop receiving duties from the beacon chain and just do nothing when prompted to /// produce/attest. - pub fn add_exit(&mut self, exit: Exit) { + pub fn add_exit(&mut self, exit: VoluntaryExit) { self.beacon_chain.receive_exit_for_inclusion(exit); } diff --git a/beacon_node/beacon_chain/test_harness/src/test_case.rs b/beacon_node/beacon_chain/test_harness/src/test_case.rs index 1a5ebfbe1..cde3f55a8 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case.rs @@ -200,14 +200,14 @@ impl TestCase { } } -fn build_exit(harness: &BeaconChainHarness, validator_index: u64) -> Exit { +fn build_exit(harness: &BeaconChainHarness, validator_index: u64) -> VoluntaryExit { let epoch = harness .beacon_chain .state .read() .current_epoch(&harness.spec); - let mut exit = Exit { + let mut exit = VoluntaryExit { epoch, validator_index, signature: Signature::empty_signature(), @@ -216,13 +216,8 @@ fn build_exit(harness: &BeaconChainHarness, validator_index: u64) -> Exit { let message = exit.hash_tree_root(); exit.signature = harness - .validator_sign( - validator_index as usize, - &message[..], - epoch, - harness.spec.domain_exit, - ) - .expect("Unable to sign Exit"); + .validator_sign(validator_index as usize, &message[..], epoch, Domain::Exit) + .expect("Unable to sign VoluntaryExit"); exit } @@ -234,20 +229,20 @@ fn build_double_vote_attester_slashing( harness: &BeaconChainHarness, validator_indices: &[u64], ) -> AttesterSlashing { - let signer = |validator_index: u64, message: &[u8], epoch: Epoch, domain: u64| { + let signer = |validator_index: u64, message: &[u8], epoch: Epoch, domain: Domain| { harness .validator_sign(validator_index as usize, message, epoch, domain) .expect("Unable to sign AttesterSlashing") }; - AttesterSlashingBuilder::double_vote(validator_indices, signer, &harness.spec) + AttesterSlashingBuilder::double_vote(validator_indices, signer) } /// Builds an `ProposerSlashing` for some `validator_index`. /// /// Signs the message using a `BeaconChainHarness`. fn build_proposer_slashing(harness: &BeaconChainHarness, validator_index: u64) -> ProposerSlashing { - let signer = |validator_index: u64, message: &[u8], epoch: Epoch, domain: u64| { + let signer = |validator_index: u64, message: &[u8], epoch: Epoch, domain: Domain| { harness .validator_sign(validator_index as usize, message, epoch, domain) .expect("Unable to sign AttesterSlashing") diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs b/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs index b52dc7d6b..6fa75364a 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs @@ -66,7 +66,7 @@ impl StateCheck { .iter() .enumerate() .filter_map(|(i, validator)| { - if validator.is_penalized_at(state_epoch) { + if validator.slashed { Some(i as u64) } else { None @@ -108,7 +108,7 @@ impl StateCheck { .iter() .enumerate() .filter_map(|(i, validator)| { - if validator.has_initiated_exit() { + if validator.initiated_exit { Some(i as u64) } else { None diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs index 06d3e7c72..d2de354d7 100644 --- a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs +++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs @@ -80,8 +80,8 @@ impl BeaconBlockNode for DirectBeaconN let (block, _state) = self .beacon_chain .produce_block(randao_reveal.clone()) - .ok_or_else(|| { - BeaconBlockNodeError::RemoteFailure("Did not produce block.".to_string()) + .map_err(|e| { + BeaconBlockNodeError::RemoteFailure(format!("Did not produce block: {:?}", e)) })?; if block.slot == slot { diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs index b9ef2c8a7..072315b6b 100644 --- a/beacon_node/src/main.rs +++ b/beacon_node/src/main.rs @@ -78,7 +78,7 @@ fn main() { // Slot clock let genesis_time = 1_549_935_547; // 12th Feb 2018 (arbitrary value in the past). - let slot_clock = SystemTimeSlotClock::new(genesis_time, spec.slot_duration) + let slot_clock = SystemTimeSlotClock::new(genesis_time, spec.seconds_per_slot) .expect("Unable to load SystemTimeSlotClock"); // Choose the fork choice let fork_choice = BitwiseLMDGhost::new(block_store.clone(), state_store.clone()); diff --git a/eth2/fork_choice/tests/tests.rs b/eth2/fork_choice/tests/tests.rs index 1d93cd0db..a3cab6a7c 100644 --- a/eth2/fork_choice/tests/tests.rs +++ b/eth2/fork_choice/tests/tests.rs @@ -81,7 +81,8 @@ fn test_yaml_vectors( attester_slashings: vec![], attestations: vec![], deposits: vec![], - exits: vec![], + voluntary_exits: vec![], + transfers: vec![], }; // process the tests @@ -249,9 +250,9 @@ fn setup_inital_state( withdrawal_credentials: zero_hash, activation_epoch: Epoch::from(0u64), exit_epoch: spec.far_future_epoch, - withdrawal_epoch: spec.far_future_epoch, - penalized_epoch: spec.far_future_epoch, - status_flags: None, + withdrawable_epoch: spec.far_future_epoch, + initiated_exit: false, + slashed: false, }; // activate the validators for _ in 0..no_validators { diff --git a/eth2/types/src/attester_slashing/builder.rs b/eth2/types/src/attester_slashing/builder.rs index 46dcaf174..05301f30b 100644 --- a/eth2/types/src/attester_slashing/builder.rs +++ b/eth2/types/src/attester_slashing/builder.rs @@ -15,11 +15,7 @@ impl AttesterSlashingBuilder { /// - `domain: Domain` /// /// Where domain is a domain "constant" (e.g., `spec.domain_attestation`). - pub fn double_vote( - validator_indices: &[u64], - signer: F, - spec: &ChainSpec, - ) -> AttesterSlashing + pub fn double_vote(validator_indices: &[u64], signer: F) -> AttesterSlashing where F: Fn(u64, &[u8], Epoch, Domain) -> Signature, { diff --git a/validator_client/src/block_producer_service/beacon_block_grpc_client.rs b/validator_client/src/block_producer_service/beacon_block_grpc_client.rs index 6bf3005d4..6ce5c0fa0 100644 --- a/validator_client/src/block_producer_service/beacon_block_grpc_client.rs +++ b/validator_client/src/block_producer_service/beacon_block_grpc_client.rs @@ -63,7 +63,8 @@ impl BeaconNode for BeaconBlockGrpcClient { attester_slashings: vec![], attestations: vec![], deposits: vec![], - exits: vec![], + voluntary_exits: vec![], + transfers: vec![], }, })) } else { diff --git a/validator_client/src/main.rs b/validator_client/src/main.rs index eea213a45..ebab8538c 100644 --- a/validator_client/src/main.rs +++ b/validator_client/src/main.rs @@ -111,13 +111,13 @@ fn main() { let genesis_time = 1_549_935_547; let slot_clock = { info!(log, "Genesis time"; "unix_epoch_seconds" => genesis_time); - let clock = SystemTimeSlotClock::new(genesis_time, spec.slot_duration) + let clock = SystemTimeSlotClock::new(genesis_time, spec.seconds_per_slot) .expect("Unable to instantiate SystemTimeSlotClock."); Arc::new(clock) }; - let poll_interval_millis = spec.slot_duration * 1000 / 10; // 10% epoch time precision. - info!(log, "Starting block producer service"; "polls_per_epoch" => spec.slot_duration * 1000 / poll_interval_millis); + let poll_interval_millis = spec.seconds_per_slot * 1000 / 10; // 10% epoch time precision. + info!(log, "Starting block producer service"; "polls_per_epoch" => spec.seconds_per_slot * 1000 / poll_interval_millis); /* * Start threads. From 20ac1bf1f0531e73d01a973bfa6d79c23828baba Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 13:53:17 +1100 Subject: [PATCH 25/31] Remove unused files They were accidentally introduced by a merge --- .../state_processing/src/block_processable.rs | 455 ----------- .../state_processing/src/epoch_processable.rs | 723 ------------------ 2 files changed, 1178 deletions(-) delete mode 100644 eth2/state_processing/src/block_processable.rs delete mode 100644 eth2/state_processing/src/epoch_processable.rs diff --git a/eth2/state_processing/src/block_processable.rs b/eth2/state_processing/src/block_processable.rs deleted file mode 100644 index a54bb96d4..000000000 --- a/eth2/state_processing/src/block_processable.rs +++ /dev/null @@ -1,455 +0,0 @@ -use self::verify_slashable_attestation::verify_slashable_attestation; -use crate::SlotProcessingError; -use hashing::hash; -use int_to_bytes::int_to_bytes32; -use log::{debug, trace}; -use ssz::{ssz_encode, TreeHash}; -use types::*; - -mod verify_slashable_attestation; - -const PHASE_0_CUSTODY_BIT: bool = false; - -#[derive(Debug, PartialEq)] -pub enum Error { - DBError(String), - StateAlreadyTransitioned, - PresentSlotIsNone, - UnableToDecodeBlock, - MissingParentState(Hash256), - InvalidParentState(Hash256), - MissingBeaconBlock(Hash256), - InvalidBeaconBlock(Hash256), - MissingParentBlock(Hash256), - StateSlotMismatch, - BadBlockSignature, - BadRandaoSignature, - MaxProposerSlashingsExceeded, - BadProposerSlashing, - MaxAttesterSlashingsExceed, - MaxAttestationsExceeded, - BadAttesterSlashing, - InvalidAttestation(AttestationValidationError), - NoBlockRoot, - MaxDepositsExceeded, - BadDeposit, - MaxExitsExceeded, - BadExit, - BadCustodyReseeds, - BadCustodyChallenges, - BadCustodyResponses, - BeaconStateError(BeaconStateError), - SlotProcessingError(SlotProcessingError), -} - -#[derive(Debug, PartialEq)] -pub enum AttestationValidationError { - IncludedTooEarly, - IncludedTooLate, - WrongJustifiedSlot, - WrongJustifiedRoot, - BadLatestCrosslinkRoot, - BadSignature, - ShardBlockRootNotZero, - NoBlockRoot, - BeaconStateError(BeaconStateError), -} - -macro_rules! ensure { - ($condition: expr, $result: expr) => { - if !$condition { - return Err($result); - } - }; -} - -pub trait BlockProcessable { - fn per_block_processing(&mut self, block: &BeaconBlock, spec: &ChainSpec) -> Result<(), Error>; - fn per_block_processing_without_verifying_block_signature( - &mut self, - block: &BeaconBlock, - spec: &ChainSpec, - ) -> Result<(), Error>; -} - -impl BlockProcessable for BeaconState { - fn per_block_processing(&mut self, block: &BeaconBlock, spec: &ChainSpec) -> Result<(), Error> { - per_block_processing_signature_optional(self, block, true, spec) - } - - fn per_block_processing_without_verifying_block_signature( - &mut self, - block: &BeaconBlock, - spec: &ChainSpec, - ) -> Result<(), Error> { - per_block_processing_signature_optional(self, block, false, spec) - } -} - -fn per_block_processing_signature_optional( - mut state: &mut BeaconState, - block: &BeaconBlock, - verify_block_signature: bool, - spec: &ChainSpec, -) -> Result<(), Error> { - ensure!(block.slot == state.slot, Error::StateSlotMismatch); - - // Building the previous epoch could be delayed until an attestation from a previous epoch is - // included. This is left for future optimisation. - state.build_epoch_cache(RelativeEpoch::Previous, spec)?; - state.build_epoch_cache(RelativeEpoch::Current, spec)?; - - /* - * Proposer Signature - */ - let block_proposer_index = state.get_beacon_proposer_index(block.slot, spec)?; - let block_proposer = &state.validator_registry[block_proposer_index]; - - if verify_block_signature { - ensure!( - bls_verify( - &block_proposer.pubkey, - &block.proposal_root(spec)[..], - &block.signature, - get_domain(&state.fork, state.current_epoch(spec), spec.domain_proposal) - ), - Error::BadBlockSignature - ); - } - - /* - * RANDAO - */ - ensure!( - bls_verify( - &block_proposer.pubkey, - &int_to_bytes32(state.current_epoch(spec).as_u64()), - &block.randao_reveal, - get_domain(&state.fork, state.current_epoch(spec), spec.domain_randao) - ), - Error::BadRandaoSignature - ); - - // TODO: check this is correct. - let new_mix = { - let mut mix = state.latest_randao_mixes - [state.slot.as_usize() % spec.latest_randao_mixes_length] - .as_bytes() - .to_vec(); - mix.append(&mut ssz_encode(&block.randao_reveal)); - Hash256::from_slice(&hash(&mix)[..]) - }; - - state.latest_randao_mixes[state.slot.as_usize() % spec.latest_randao_mixes_length] = new_mix; - - /* - * Eth1 data - */ - // TODO: Eth1 data processing. - - /* - * Proposer slashings - */ - ensure!( - block.body.proposer_slashings.len() as u64 <= spec.max_proposer_slashings, - Error::MaxProposerSlashingsExceeded - ); - for proposer_slashing in &block.body.proposer_slashings { - let proposer = state - .validator_registry - .get(proposer_slashing.proposer_index as usize) - .ok_or(Error::BadProposerSlashing)?; - ensure!( - proposer_slashing.proposal_data_1.slot == proposer_slashing.proposal_data_2.slot, - Error::BadProposerSlashing - ); - ensure!( - proposer_slashing.proposal_data_1.shard == proposer_slashing.proposal_data_2.shard, - Error::BadProposerSlashing - ); - ensure!( - proposer_slashing.proposal_data_1.block_root - != proposer_slashing.proposal_data_2.block_root, - Error::BadProposerSlashing - ); - ensure!( - proposer.penalized_epoch > state.current_epoch(spec), - Error::BadProposerSlashing - ); - ensure!( - bls_verify( - &proposer.pubkey, - &proposer_slashing.proposal_data_1.hash_tree_root(), - &proposer_slashing.proposal_signature_1, - get_domain( - &state.fork, - proposer_slashing - .proposal_data_1 - .slot - .epoch(spec.epoch_length), - spec.domain_proposal - ) - ), - Error::BadProposerSlashing - ); - ensure!( - bls_verify( - &proposer.pubkey, - &proposer_slashing.proposal_data_2.hash_tree_root(), - &proposer_slashing.proposal_signature_2, - get_domain( - &state.fork, - proposer_slashing - .proposal_data_2 - .slot - .epoch(spec.epoch_length), - spec.domain_proposal - ) - ), - Error::BadProposerSlashing - ); - state.penalize_validator(proposer_slashing.proposer_index as usize, spec)?; - } - - /* - * Attester slashings - */ - ensure!( - block.body.attester_slashings.len() as u64 <= spec.max_attester_slashings, - Error::MaxAttesterSlashingsExceed - ); - for attester_slashing in &block.body.attester_slashings { - verify_slashable_attestation(&mut state, &attester_slashing, spec)?; - } - - /* - * Attestations - */ - ensure!( - block.body.attestations.len() as u64 <= spec.max_attestations, - Error::MaxAttestationsExceeded - ); - - debug!("Verifying {} attestations.", block.body.attestations.len()); - - for attestation in &block.body.attestations { - validate_attestation(&state, attestation, spec)?; - - let pending_attestation = PendingAttestation { - data: attestation.data.clone(), - aggregation_bitfield: attestation.aggregation_bitfield.clone(), - custody_bitfield: attestation.custody_bitfield.clone(), - inclusion_slot: state.slot, - }; - state.latest_attestations.push(pending_attestation); - } - - /* - * Deposits - */ - ensure!( - block.body.deposits.len() as u64 <= spec.max_deposits, - Error::MaxDepositsExceeded - ); - - // TODO: verify deposit merkle branches. - for deposit in &block.body.deposits { - debug!( - "Processing deposit for pubkey {:?}", - deposit.deposit_data.deposit_input.pubkey - ); - state - .process_deposit( - deposit.deposit_data.deposit_input.pubkey.clone(), - deposit.deposit_data.amount, - deposit - .deposit_data - .deposit_input - .proof_of_possession - .clone(), - deposit.deposit_data.deposit_input.withdrawal_credentials, - None, - spec, - ) - .map_err(|_| Error::BadDeposit)?; - } - - /* - * Exits - */ - ensure!( - block.body.exits.len() as u64 <= spec.max_exits, - Error::MaxExitsExceeded - ); - - for exit in &block.body.exits { - let validator = state - .validator_registry - .get(exit.validator_index as usize) - .ok_or(Error::BadExit)?; - ensure!( - validator.exit_epoch - > state.get_entry_exit_effect_epoch(state.current_epoch(spec), spec), - Error::BadExit - ); - ensure!(state.current_epoch(spec) >= exit.epoch, Error::BadExit); - let exit_message = { - let exit_struct = Exit { - epoch: exit.epoch, - validator_index: exit.validator_index, - signature: spec.empty_signature.clone(), - }; - exit_struct.hash_tree_root() - }; - ensure!( - bls_verify( - &validator.pubkey, - &exit_message, - &exit.signature, - get_domain(&state.fork, exit.epoch, spec.domain_exit) - ), - Error::BadProposerSlashing - ); - state.initiate_validator_exit(exit.validator_index as usize); - } - - debug!("State transition complete."); - - Ok(()) -} - -pub fn validate_attestation( - state: &BeaconState, - attestation: &Attestation, - spec: &ChainSpec, -) -> Result<(), AttestationValidationError> { - validate_attestation_signature_optional(state, attestation, spec, true) -} - -pub fn validate_attestation_without_signature( - state: &BeaconState, - attestation: &Attestation, - spec: &ChainSpec, -) -> Result<(), AttestationValidationError> { - validate_attestation_signature_optional(state, attestation, spec, false) -} - -fn validate_attestation_signature_optional( - state: &BeaconState, - attestation: &Attestation, - spec: &ChainSpec, - verify_signature: bool, -) -> Result<(), AttestationValidationError> { - trace!( - "validate_attestation_signature_optional: attestation epoch: {}", - attestation.data.slot.epoch(spec.epoch_length) - ); - ensure!( - attestation.data.slot + spec.min_attestation_inclusion_delay <= state.slot, - AttestationValidationError::IncludedTooEarly - ); - ensure!( - attestation.data.slot + spec.epoch_length >= state.slot, - AttestationValidationError::IncludedTooLate - ); - if attestation.data.slot >= state.current_epoch_start_slot(spec) { - ensure!( - attestation.data.justified_epoch == state.justified_epoch, - AttestationValidationError::WrongJustifiedSlot - ); - } else { - ensure!( - attestation.data.justified_epoch == state.previous_justified_epoch, - AttestationValidationError::WrongJustifiedSlot - ); - } - ensure!( - attestation.data.justified_block_root - == *state - .get_block_root( - attestation - .data - .justified_epoch - .start_slot(spec.epoch_length), - &spec - ) - .ok_or(AttestationValidationError::NoBlockRoot)?, - AttestationValidationError::WrongJustifiedRoot - ); - let potential_crosslink = Crosslink { - shard_block_root: attestation.data.shard_block_root, - epoch: attestation.data.slot.epoch(spec.epoch_length), - }; - ensure!( - (attestation.data.latest_crosslink - == state.latest_crosslinks[attestation.data.shard as usize]) - | (attestation.data.latest_crosslink == potential_crosslink), - AttestationValidationError::BadLatestCrosslinkRoot - ); - if verify_signature { - let participants = state.get_attestation_participants( - &attestation.data, - &attestation.aggregation_bitfield, - spec, - )?; - trace!( - "slot: {}, shard: {}, participants: {:?}", - attestation.data.slot, - attestation.data.shard, - participants - ); - let mut group_public_key = AggregatePublicKey::new(); - for participant in participants { - group_public_key.add(&state.validator_registry[participant as usize].pubkey) - } - ensure!( - attestation.verify_signature( - &group_public_key, - PHASE_0_CUSTODY_BIT, - get_domain( - &state.fork, - attestation.data.slot.epoch(spec.epoch_length), - spec.domain_attestation, - ) - ), - AttestationValidationError::BadSignature - ); - } - ensure!( - attestation.data.shard_block_root == spec.zero_hash, - AttestationValidationError::ShardBlockRootNotZero - ); - Ok(()) -} - -fn get_domain(fork: &Fork, epoch: Epoch, domain_type: u64) -> u64 { - fork.get_domain(epoch, domain_type) -} - -fn bls_verify(pubkey: &PublicKey, message: &[u8], signature: &Signature, domain: u64) -> bool { - signature.verify(message, domain, pubkey) -} - -impl From for Error { - fn from(e: AttestationValidationError) -> Error { - Error::InvalidAttestation(e) - } -} - -impl From for Error { - fn from(e: BeaconStateError) -> Error { - Error::BeaconStateError(e) - } -} - -impl From for Error { - fn from(e: SlotProcessingError) -> Error { - Error::SlotProcessingError(e) - } -} - -impl From for AttestationValidationError { - fn from(e: BeaconStateError) -> AttestationValidationError { - AttestationValidationError::BeaconStateError(e) - } -} diff --git a/eth2/state_processing/src/epoch_processable.rs b/eth2/state_processing/src/epoch_processable.rs deleted file mode 100644 index ff6f18113..000000000 --- a/eth2/state_processing/src/epoch_processable.rs +++ /dev/null @@ -1,723 +0,0 @@ -use integer_sqrt::IntegerSquareRoot; -use log::{debug, trace}; -use rayon::prelude::*; -use ssz::TreeHash; -use std::collections::{HashMap, HashSet}; -use std::iter::FromIterator; -use types::{ - validator_registry::get_active_validator_indices, BeaconState, BeaconStateError, ChainSpec, - Crosslink, Epoch, Hash256, InclusionError, PendingAttestation, RelativeEpoch, -}; - -mod tests; - -macro_rules! safe_add_assign { - ($a: expr, $b: expr) => { - $a = $a.saturating_add($b); - }; -} -macro_rules! safe_sub_assign { - ($a: expr, $b: expr) => { - $a = $a.saturating_sub($b); - }; -} - -#[derive(Debug, PartialEq)] -pub enum Error { - UnableToDetermineProducer, - NoBlockRoots, - BaseRewardQuotientIsZero, - NoRandaoSeed, - BeaconStateError(BeaconStateError), - InclusionError(InclusionError), - WinningRootError(WinningRootError), -} - -#[derive(Debug, PartialEq)] -pub enum WinningRootError { - NoWinningRoot, - BeaconStateError(BeaconStateError), -} - -#[derive(Clone)] -pub struct WinningRoot { - pub shard_block_root: Hash256, - pub attesting_validator_indices: Vec, - pub total_balance: u64, - pub total_attesting_balance: u64, -} - -pub trait EpochProcessable { - fn per_epoch_processing(&mut self, spec: &ChainSpec) -> Result<(), Error>; -} - -impl EpochProcessable for BeaconState { - // Cyclomatic complexity is ignored. It would be ideal to split this function apart, however it - // remains monolithic to allow for easier spec updates. Once the spec is more stable we can - // optimise. - #[allow(clippy::cyclomatic_complexity)] - fn per_epoch_processing(&mut self, spec: &ChainSpec) -> Result<(), Error> { - let current_epoch = self.current_epoch(spec); - let previous_epoch = self.previous_epoch(spec); - let next_epoch = self.next_epoch(spec); - - debug!( - "Starting per-epoch processing on epoch {}...", - self.current_epoch(spec) - ); - - // Ensure all of the caches are built. - self.build_epoch_cache(RelativeEpoch::Previous, spec)?; - self.build_epoch_cache(RelativeEpoch::Current, spec)?; - self.build_epoch_cache(RelativeEpoch::Next, spec)?; - - /* - * Validators attesting during the current epoch. - */ - let active_validator_indices = get_active_validator_indices( - &self.validator_registry, - self.slot.epoch(spec.epoch_length), - ); - let current_total_balance = self.get_total_balance(&active_validator_indices[..], spec); - - trace!( - "{} validators with a total balance of {} wei.", - active_validator_indices.len(), - current_total_balance - ); - - let current_epoch_attestations: Vec<&PendingAttestation> = self - .latest_attestations - .par_iter() - .filter(|a| { - (a.data.slot / spec.epoch_length).epoch(spec.epoch_length) - == self.current_epoch(spec) - }) - .collect(); - - trace!( - "Current epoch attestations: {}", - current_epoch_attestations.len() - ); - - let current_epoch_boundary_attestations: Vec<&PendingAttestation> = - current_epoch_attestations - .par_iter() - .filter( - |a| match self.get_block_root(self.current_epoch_start_slot(spec), spec) { - Some(block_root) => { - (a.data.epoch_boundary_root == *block_root) - && (a.data.justified_epoch == self.justified_epoch) - } - None => unreachable!(), - }, - ) - .cloned() - .collect(); - - let current_epoch_boundary_attester_indices = self - .get_attestation_participants_union(¤t_epoch_boundary_attestations[..], spec)?; - let current_epoch_boundary_attesting_balance = - self.get_total_balance(¤t_epoch_boundary_attester_indices[..], spec); - - trace!( - "Current epoch boundary attesters: {}", - current_epoch_boundary_attester_indices.len() - ); - - /* - * Validators attesting during the previous epoch - */ - - /* - * Validators that made an attestation during the previous epoch - */ - let previous_epoch_attestations: Vec<&PendingAttestation> = self - .latest_attestations - .par_iter() - .filter(|a| { - //TODO: ensure these saturating subs are correct. - (a.data.slot / spec.epoch_length).epoch(spec.epoch_length) - == self.previous_epoch(spec) - }) - .collect(); - - debug!( - "previous epoch attestations: {}", - previous_epoch_attestations.len() - ); - - let previous_epoch_attester_indices = - self.get_attestation_participants_union(&previous_epoch_attestations[..], spec)?; - let previous_total_balance = self.get_total_balance( - &get_active_validator_indices(&self.validator_registry, previous_epoch), - spec, - ); - - /* - * Validators targetting the previous justified slot - */ - let previous_epoch_justified_attestations: Vec<&PendingAttestation> = { - let mut a: Vec<&PendingAttestation> = current_epoch_attestations - .iter() - .filter(|a| a.data.justified_epoch == self.previous_justified_epoch) - .cloned() - .collect(); - let mut b: Vec<&PendingAttestation> = previous_epoch_attestations - .iter() - .filter(|a| a.data.justified_epoch == self.previous_justified_epoch) - .cloned() - .collect(); - a.append(&mut b); - a - }; - - let previous_epoch_justified_attester_indices = self - .get_attestation_participants_union(&previous_epoch_justified_attestations[..], spec)?; - let previous_epoch_justified_attesting_balance = - self.get_total_balance(&previous_epoch_justified_attester_indices[..], spec); - - /* - * Validators justifying the epoch boundary block at the start of the previous epoch - */ - let previous_epoch_boundary_attestations: Vec<&PendingAttestation> = - previous_epoch_justified_attestations - .iter() - .filter( - |a| match self.get_block_root(self.previous_epoch_start_slot(spec), spec) { - Some(block_root) => a.data.epoch_boundary_root == *block_root, - None => unreachable!(), - }, - ) - .cloned() - .collect(); - - let previous_epoch_boundary_attester_indices = self - .get_attestation_participants_union(&previous_epoch_boundary_attestations[..], spec)?; - let previous_epoch_boundary_attesting_balance = - self.get_total_balance(&previous_epoch_boundary_attester_indices[..], spec); - - /* - * Validators attesting to the expected beacon chain head during the previous epoch. - */ - let previous_epoch_head_attestations: Vec<&PendingAttestation> = - previous_epoch_attestations - .iter() - .filter(|a| match self.get_block_root(a.data.slot, spec) { - Some(block_root) => a.data.beacon_block_root == *block_root, - None => unreachable!(), - }) - .cloned() - .collect(); - - let previous_epoch_head_attester_indices = - self.get_attestation_participants_union(&previous_epoch_head_attestations[..], spec)?; - let previous_epoch_head_attesting_balance = - self.get_total_balance(&previous_epoch_head_attester_indices[..], spec); - - debug!( - "previous_epoch_head_attester_balance of {} wei.", - previous_epoch_head_attesting_balance - ); - - /* - * Eth1 Data - */ - if self.next_epoch(spec) % spec.eth1_data_voting_period == 0 { - for eth1_data_vote in &self.eth1_data_votes { - if eth1_data_vote.vote_count * 2 > spec.eth1_data_voting_period { - self.latest_eth1_data = eth1_data_vote.eth1_data.clone(); - } - } - self.eth1_data_votes = vec![]; - } - - /* - * Justification - */ - - let mut new_justified_epoch = self.justified_epoch; - self.justification_bitfield <<= 1; - - // If > 2/3 of the total balance attested to the previous epoch boundary - // - // - Set the 2nd bit of the bitfield. - // - Set the previous epoch to be justified. - if (3 * previous_epoch_boundary_attesting_balance) >= (2 * current_total_balance) { - self.justification_bitfield |= 2; - new_justified_epoch = previous_epoch; - trace!(">= 2/3 voted for previous epoch boundary"); - } - // If > 2/3 of the total balance attested to the previous epoch boundary - // - // - Set the 1st bit of the bitfield. - // - Set the current epoch to be justified. - if (3 * current_epoch_boundary_attesting_balance) >= (2 * current_total_balance) { - self.justification_bitfield |= 1; - new_justified_epoch = current_epoch; - trace!(">= 2/3 voted for current epoch boundary"); - } - - // If: - // - // - All three epochs prior to this epoch have been justified. - // - The previous justified justified epoch was three epochs ago. - // - // Then, set the finalized epoch to be three epochs ago. - if ((self.justification_bitfield >> 1) % 8 == 0b111) - & (self.previous_justified_epoch == previous_epoch - 2) - { - self.finalized_epoch = self.previous_justified_epoch; - trace!("epoch - 3 was finalized (1st condition)."); - } - // If: - // - // - Both two epochs prior to this epoch have been justified. - // - The previous justified epoch was two epochs ago. - // - // Then, set the finalized epoch to two epochs ago. - if ((self.justification_bitfield >> 1) % 4 == 0b11) - & (self.previous_justified_epoch == previous_epoch - 1) - { - self.finalized_epoch = self.previous_justified_epoch; - trace!("epoch - 2 was finalized (2nd condition)."); - } - // If: - // - // - This epoch and the two prior have been justified. - // - The presently justified epoch was two epochs ago. - // - // Then, set the finalized epoch to two epochs ago. - if (self.justification_bitfield % 8 == 0b111) & (self.justified_epoch == previous_epoch - 1) - { - self.finalized_epoch = self.justified_epoch; - trace!("epoch - 2 was finalized (3rd condition)."); - } - // If: - // - // - This epoch and the epoch prior to it have been justified. - // - Set the previous epoch to be justified. - // - // Then, set the finalized epoch to be the previous epoch. - if (self.justification_bitfield % 4 == 0b11) & (self.justified_epoch == previous_epoch) { - self.finalized_epoch = self.justified_epoch; - trace!("epoch - 1 was finalized (4th condition)."); - } - - self.previous_justified_epoch = self.justified_epoch; - self.justified_epoch = new_justified_epoch; - - debug!( - "Finalized epoch {}, justified epoch {}.", - self.finalized_epoch, self.justified_epoch - ); - - /* - * Crosslinks - */ - - // Cached for later lookups. - let mut winning_root_for_shards: HashMap> = - HashMap::new(); - - // for slot in self.slot.saturating_sub(2 * spec.epoch_length)..self.slot { - for slot in self.previous_epoch(spec).slot_iter(spec.epoch_length) { - trace!( - "Finding winning root for slot: {} (epoch: {})", - slot, - slot.epoch(spec.epoch_length) - ); - - // Clone is used to remove the borrow. It becomes an issue later when trying to mutate - // `self.balances`. - let crosslink_committees_at_slot = - self.get_crosslink_committees_at_slot(slot, spec)?.clone(); - - for (crosslink_committee, shard) in crosslink_committees_at_slot { - let shard = shard as u64; - - let winning_root = winning_root( - self, - shard, - ¤t_epoch_attestations, - &previous_epoch_attestations, - spec, - ); - - if let Ok(winning_root) = &winning_root { - let total_committee_balance = - self.get_total_balance(&crosslink_committee[..], spec); - - if (3 * winning_root.total_attesting_balance) >= (2 * total_committee_balance) { - self.latest_crosslinks[shard as usize] = Crosslink { - epoch: current_epoch, - shard_block_root: winning_root.shard_block_root, - } - } - } - winning_root_for_shards.insert(shard, winning_root); - } - } - - trace!( - "Found {} winning shard roots.", - winning_root_for_shards.len() - ); - - /* - * Rewards and Penalities - */ - let base_reward_quotient = - previous_total_balance.integer_sqrt() / spec.base_reward_quotient; - if base_reward_quotient == 0 { - return Err(Error::BaseRewardQuotientIsZero); - } - - /* - * Justification and finalization - */ - let epochs_since_finality = next_epoch - self.finalized_epoch; - - let previous_epoch_justified_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_justified_attester_indices.iter().cloned()); - let previous_epoch_boundary_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_boundary_attester_indices.iter().cloned()); - let previous_epoch_head_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_head_attester_indices.iter().cloned()); - let previous_epoch_attester_indices_hashset: HashSet = - HashSet::from_iter(previous_epoch_attester_indices.iter().cloned()); - let active_validator_indices_hashset: HashSet = - HashSet::from_iter(active_validator_indices.iter().cloned()); - - debug!("previous epoch justified attesters: {}, previous epoch boundary attesters: {}, previous epoch head attesters: {}, previous epoch attesters: {}", previous_epoch_justified_attester_indices.len(), previous_epoch_boundary_attester_indices.len(), previous_epoch_head_attester_indices.len(), previous_epoch_attester_indices.len()); - - debug!("{} epochs since finality.", epochs_since_finality); - - if epochs_since_finality <= 4 { - for index in 0..self.validator_balances.len() { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - - if previous_epoch_justified_attester_indices_hashset.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * previous_epoch_justified_attesting_balance - / previous_total_balance - ); - } else if active_validator_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - - if previous_epoch_boundary_attester_indices_hashset.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * previous_epoch_boundary_attesting_balance - / previous_total_balance - ); - } else if active_validator_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - - if previous_epoch_head_attester_indices_hashset.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * previous_epoch_head_attesting_balance - / previous_total_balance - ); - } else if active_validator_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - } - - for index in previous_epoch_attester_indices { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - let inclusion_distance = - self.inclusion_distance(&previous_epoch_attestations, index, spec)?; - - safe_add_assign!( - self.validator_balances[index], - base_reward * spec.min_attestation_inclusion_delay / inclusion_distance - ) - } - } else { - for index in 0..self.validator_balances.len() { - let inactivity_penalty = self.inactivity_penalty( - index, - epochs_since_finality, - base_reward_quotient, - spec, - ); - if active_validator_indices_hashset.contains(&index) { - if !previous_epoch_justified_attester_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], inactivity_penalty); - } - if !previous_epoch_boundary_attester_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], inactivity_penalty); - } - if !previous_epoch_head_attester_indices_hashset.contains(&index) { - safe_sub_assign!(self.validator_balances[index], inactivity_penalty); - } - - if self.validator_registry[index].penalized_epoch <= current_epoch { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - safe_sub_assign!( - self.validator_balances[index], - 2 * inactivity_penalty + base_reward - ); - } - } - } - - for index in previous_epoch_attester_indices { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - let inclusion_distance = - self.inclusion_distance(&previous_epoch_attestations, index, spec)?; - - safe_sub_assign!( - self.validator_balances[index], - base_reward - - base_reward * spec.min_attestation_inclusion_delay / inclusion_distance - ); - } - } - - trace!("Processed validator justification and finalization rewards/penalities."); - - /* - * Attestation inclusion - */ - for &index in &previous_epoch_attester_indices_hashset { - let inclusion_slot = - self.inclusion_slot(&previous_epoch_attestations[..], index, spec)?; - let proposer_index = self - .get_beacon_proposer_index(inclusion_slot, spec) - .map_err(|_| Error::UnableToDetermineProducer)?; - let base_reward = self.base_reward(proposer_index, base_reward_quotient, spec); - safe_add_assign!( - self.validator_balances[proposer_index], - base_reward / spec.includer_reward_quotient - ); - } - - trace!( - "Previous epoch attesters: {}.", - previous_epoch_attester_indices_hashset.len() - ); - - /* - * Crosslinks - */ - for slot in self.previous_epoch(spec).slot_iter(spec.epoch_length) { - // Clone is used to remove the borrow. It becomes an issue later when trying to mutate - // `self.balances`. - let crosslink_committees_at_slot = - self.get_crosslink_committees_at_slot(slot, spec)?.clone(); - - for (_crosslink_committee, shard) in crosslink_committees_at_slot { - let shard = shard as u64; - - if let Some(Ok(winning_root)) = winning_root_for_shards.get(&shard) { - // TODO: remove the map. - let attesting_validator_indices: HashSet = HashSet::from_iter( - winning_root.attesting_validator_indices.iter().cloned(), - ); - - for index in 0..self.validator_balances.len() { - let base_reward = self.base_reward(index, base_reward_quotient, spec); - - if attesting_validator_indices.contains(&index) { - safe_add_assign!( - self.validator_balances[index], - base_reward * winning_root.total_attesting_balance - / winning_root.total_balance - ); - } else { - safe_sub_assign!(self.validator_balances[index], base_reward); - } - } - - for index in &winning_root.attesting_validator_indices { - let base_reward = self.base_reward(*index, base_reward_quotient, spec); - safe_add_assign!( - self.validator_balances[*index], - base_reward * winning_root.total_attesting_balance - / winning_root.total_balance - ); - } - } - } - } - - /* - * Ejections - */ - self.process_ejections(spec); - - /* - * Validator Registry - */ - self.previous_calculation_epoch = self.current_calculation_epoch; - self.previous_epoch_start_shard = self.current_epoch_start_shard; - - debug!( - "setting previous_epoch_seed to : {}", - self.current_epoch_seed - ); - - self.previous_epoch_seed = self.current_epoch_seed; - - let should_update_validator_registy = if self.finalized_epoch - > self.validator_registry_update_epoch - { - (0..self.get_current_epoch_committee_count(spec)).all(|i| { - let shard = (self.current_epoch_start_shard + i as u64) % spec.shard_count; - self.latest_crosslinks[shard as usize].epoch > self.validator_registry_update_epoch - }) - } else { - false - }; - - if should_update_validator_registy { - trace!("updating validator registry."); - self.update_validator_registry(spec); - - self.current_calculation_epoch = next_epoch; - self.current_epoch_start_shard = (self.current_epoch_start_shard - + self.get_current_epoch_committee_count(spec) as u64) - % spec.shard_count; - self.current_epoch_seed = self.generate_seed(self.current_calculation_epoch, spec)? - } else { - trace!("not updating validator registry."); - let epochs_since_last_registry_update = - current_epoch - self.validator_registry_update_epoch; - if (epochs_since_last_registry_update > 1) - & epochs_since_last_registry_update.is_power_of_two() - { - self.current_calculation_epoch = next_epoch; - self.current_epoch_seed = - self.generate_seed(self.current_calculation_epoch, spec)? - } - } - - self.process_penalties_and_exits(spec); - - self.latest_index_roots[(next_epoch.as_usize() + spec.entry_exit_delay as usize) - % spec.latest_index_roots_length] = hash_tree_root(get_active_validator_indices( - &self.validator_registry, - next_epoch + Epoch::from(spec.entry_exit_delay), - )); - self.latest_penalized_balances[next_epoch.as_usize() % spec.latest_penalized_exit_length] = - self.latest_penalized_balances - [current_epoch.as_usize() % spec.latest_penalized_exit_length]; - self.latest_randao_mixes[next_epoch.as_usize() % spec.latest_randao_mixes_length] = self - .get_randao_mix(current_epoch, spec) - .and_then(|x| Some(*x)) - .ok_or_else(|| Error::NoRandaoSeed)?; - self.latest_attestations = self - .latest_attestations - .iter() - .filter(|a| a.data.slot.epoch(spec.epoch_length) >= current_epoch) - .cloned() - .collect(); - - debug!("Epoch transition complete."); - - Ok(()) - } -} - -fn hash_tree_root(input: Vec) -> Hash256 { - Hash256::from_slice(&input.hash_tree_root()[..]) -} - -fn winning_root( - state: &BeaconState, - shard: u64, - current_epoch_attestations: &[&PendingAttestation], - previous_epoch_attestations: &[&PendingAttestation], - spec: &ChainSpec, -) -> Result { - let mut attestations = current_epoch_attestations.to_vec(); - attestations.append(&mut previous_epoch_attestations.to_vec()); - - let mut candidates: HashMap = HashMap::new(); - - let mut highest_seen_balance = 0; - - for a in &attestations { - if a.data.shard != shard { - continue; - } - - let shard_block_root = &a.data.shard_block_root; - - if candidates.contains_key(shard_block_root) { - continue; - } - - let attesting_validator_indices = attestations - .iter() - .try_fold::<_, _, Result<_, BeaconStateError>>(vec![], |mut acc, a| { - if (a.data.shard == shard) && (a.data.shard_block_root == *shard_block_root) { - acc.append(&mut state.get_attestation_participants( - &a.data, - &a.aggregation_bitfield, - spec, - )?); - } - Ok(acc) - })?; - - let total_balance: u64 = attesting_validator_indices - .iter() - .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); - - let total_attesting_balance: u64 = attesting_validator_indices - .iter() - .fold(0, |acc, i| acc + state.get_effective_balance(*i, spec)); - - if total_attesting_balance > highest_seen_balance { - highest_seen_balance = total_attesting_balance; - } - - let candidate_root = WinningRoot { - shard_block_root: *shard_block_root, - attesting_validator_indices, - total_attesting_balance, - total_balance, - }; - - candidates.insert(*shard_block_root, candidate_root); - } - - Ok(candidates - .iter() - .filter_map(|(_hash, candidate)| { - if candidate.total_attesting_balance == highest_seen_balance { - Some(candidate) - } else { - None - } - }) - .min_by_key(|candidate| candidate.shard_block_root) - .ok_or_else(|| WinningRootError::NoWinningRoot)? - // TODO: avoid clone. - .clone()) -} - -impl From for Error { - fn from(e: InclusionError) -> Error { - Error::InclusionError(e) - } -} - -impl From for Error { - fn from(e: BeaconStateError) -> Error { - Error::BeaconStateError(e) - } -} - -impl From for WinningRootError { - fn from(e: BeaconStateError) -> WinningRootError { - WinningRootError::BeaconStateError(e) - } -} From db3b6cba6d54c404071386c239cf0c91a49bb13c Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 13:54:56 +1100 Subject: [PATCH 26/31] Introduce `Fork` struct to `block_producer` It's a pretty crappy solution, IMO. It shouldn't really belong in "duties" but this gets the job done for now. --- .../src/validator_harness/direct_duties.rs | 6 ++- eth2/block_proposer/src/lib.rs | 37 ++++++++++++------- .../src/test_utils/epoch_map.rs | 10 ++++- eth2/block_proposer/src/traits.rs | 3 +- .../src/block_producer_service/mod.rs | 3 ++ validator_client/src/duties/epoch_duties.rs | 13 ++++++- 6 files changed, 54 insertions(+), 18 deletions(-) diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs index 5bed59531..dec93c334 100644 --- a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs +++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs @@ -9,7 +9,7 @@ use db::ClientDB; use fork_choice::ForkChoice; use slot_clock::SlotClock; use std::sync::Arc; -use types::{PublicKey, Slot}; +use types::{Fork, PublicKey, Slot}; /// Connects directly to a borrowed `BeaconChain` and reads attester/proposer duties directly from /// it. @@ -40,6 +40,10 @@ impl ProducerDutiesReader for DirectDu Err(_) => Err(ProducerDutiesReaderError::UnknownEpoch), } } + + fn fork(&self) -> Result { + Ok(self.beacon_chain.state.read().fork.clone()) + } } impl AttesterDutiesReader for DirectDuties { diff --git a/eth2/block_proposer/src/lib.rs b/eth2/block_proposer/src/lib.rs index 55461d986..5cddbaedc 100644 --- a/eth2/block_proposer/src/lib.rs +++ b/eth2/block_proposer/src/lib.rs @@ -1,19 +1,15 @@ pub mod test_utils; mod traits; -use int_to_bytes::int_to_bytes32; use slot_clock::SlotClock; -use ssz::SignedRoot; +use ssz::{SignedRoot, TreeHash}; use std::sync::Arc; -use types::{BeaconBlock, ChainSpec, Hash256, Proposal, Slot}; +use types::{BeaconBlock, ChainSpec, Domain, Hash256, Proposal, Slot}; pub use self::traits::{ BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer, }; -//TODO: obtain the correct domain using a `Fork`. -pub const TEMPORARY_DOMAIN_VALUE: u64 = 0; - #[derive(Debug, PartialEq)] pub enum PollOutcome { /// A new block was produced. @@ -32,6 +28,8 @@ pub enum PollOutcome { SignerRejection(Slot), /// The public key for this validator is not an active validator. ValidatorIsUnknown(Slot), + /// Unable to determine a `Fork` for signature domain generation. + UnableToGetFork(Slot), } #[derive(Debug, PartialEq)] @@ -134,14 +132,20 @@ impl BlockProducer Result { + let fork = match self.epoch_map.fork() { + Ok(fork) => fork, + Err(_) => return Ok(PollOutcome::UnableToGetFork(slot)), + }; + let randao_reveal = { // TODO: add domain, etc to this message. Also ensure result matches `into_to_bytes32`. - let message = int_to_bytes32(slot.epoch(self.spec.slots_per_epoch).as_u64()); + let message = slot.epoch(self.spec.slots_per_epoch).hash_tree_root(); - match self - .signer - .sign_randao_reveal(&message, TEMPORARY_DOMAIN_VALUE) - { + match self.signer.sign_randao_reveal( + &message, + self.spec + .get_domain(slot.epoch(self.spec.slots_per_epoch), Domain::Randao, &fork), + ) { None => return Ok(PollOutcome::SignerRejection(slot)), Some(signature) => signature, } @@ -152,7 +156,12 @@ impl BlockProducer BlockProducer Option { + fn sign_block(&mut self, mut block: BeaconBlock, domain: u64) -> Option { self.store_produce(&block); let proposal = Proposal { @@ -182,7 +191,7 @@ impl BlockProducer None, Some(signature) => { diff --git a/eth2/block_proposer/src/test_utils/epoch_map.rs b/eth2/block_proposer/src/test_utils/epoch_map.rs index f7d8dcdcb..6658c7526 100644 --- a/eth2/block_proposer/src/test_utils/epoch_map.rs +++ b/eth2/block_proposer/src/test_utils/epoch_map.rs @@ -1,6 +1,6 @@ use crate::{DutiesReader, DutiesReaderError}; use std::collections::HashMap; -use types::{Epoch, Slot}; +use types::{Epoch, Fork, Slot}; pub struct EpochMap { slots_per_epoch: u64, @@ -25,4 +25,12 @@ impl DutiesReader for EpochMap { _ => Err(DutiesReaderError::UnknownEpoch), } } + + fn fork(&self) -> Result { + Ok(Fork { + previous_version: 0, + current_version: 0, + epoch: Epoch::new(0), + }) + } } diff --git a/eth2/block_proposer/src/traits.rs b/eth2/block_proposer/src/traits.rs index c6e57d833..1c0da9acf 100644 --- a/eth2/block_proposer/src/traits.rs +++ b/eth2/block_proposer/src/traits.rs @@ -1,4 +1,4 @@ -use types::{BeaconBlock, Signature, Slot}; +use types::{BeaconBlock, Fork, Signature, Slot}; #[derive(Debug, PartialEq, Clone)] pub enum BeaconNodeError { @@ -40,6 +40,7 @@ pub enum DutiesReaderError { /// Informs a validator of their duties (e.g., block production). pub trait DutiesReader: Send + Sync { fn is_block_production_slot(&self, slot: Slot) -> Result; + fn fork(&self) -> Result; } /// Signs message using an internally-maintained private key. diff --git a/validator_client/src/block_producer_service/mod.rs b/validator_client/src/block_producer_service/mod.rs index bd1e691cb..91e7606a7 100644 --- a/validator_client/src/block_producer_service/mod.rs +++ b/validator_client/src/block_producer_service/mod.rs @@ -50,6 +50,9 @@ impl BlockProducerServi Ok(BlockProducerPollOutcome::ValidatorIsUnknown(slot)) => { error!(self.log, "The Beacon Node does not recognise the validator"; "slot" => slot) } + Ok(BlockProducerPollOutcome::UnableToGetFork(slot)) => { + error!(self.log, "Unable to get a `Fork` struct to generate signature domains"; "slot" => slot) + } }; std::thread::sleep(Duration::from_millis(self.poll_interval_millis)); diff --git a/validator_client/src/duties/epoch_duties.rs b/validator_client/src/duties/epoch_duties.rs index d1bbfa156..35668b4a9 100644 --- a/validator_client/src/duties/epoch_duties.rs +++ b/validator_client/src/duties/epoch_duties.rs @@ -1,7 +1,7 @@ use block_proposer::{DutiesReader, DutiesReaderError}; use std::collections::HashMap; use std::sync::RwLock; -use types::{Epoch, Slot}; +use types::{Epoch, Fork, Slot}; /// The information required for a validator to propose and attest during some epoch. /// @@ -75,6 +75,17 @@ impl DutiesReader for EpochDutiesMap { .ok_or_else(|| DutiesReaderError::UnknownEpoch)?; Ok(duties.is_block_production_slot(slot)) } + + fn fork(&self) -> Result { + // TODO: this is garbage data. + // + // It will almost certainly cause signatures to fail verification. + Ok(Fork { + previous_version: 0, + current_version: 0, + epoch: Epoch::new(0), + }) + } } // TODO: add tests. From 195cb16a417c6eb621f306f3e87b95a1c1338227 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 14:29:21 +1100 Subject: [PATCH 27/31] Update `test_harness` for spec v0.4.0 --- .../test_harness/src/test_case.rs | 51 +++++++++++++++++-- .../test_harness/src/test_case/config.rs | 25 ++------- .../per_block_processing/verify_deposit.rs | 1 - 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/beacon_node/beacon_chain/test_harness/src/test_case.rs b/beacon_node/beacon_chain/test_harness/src/test_case.rs index cde3f55a8..e3bcf740a 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case.rs @@ -3,9 +3,11 @@ use crate::beacon_chain_harness::BeaconChainHarness; use beacon_chain::CheckPoint; +use bls::create_proof_of_possession; use log::{info, warn}; -use ssz::TreeHash; +use ssz::SignedRoot; use types::*; + use types::{ attester_slashing::AttesterSlashingBuilder, proposer_slashing::ProposerSlashingBuilder, }; @@ -83,12 +85,18 @@ impl TestCase { // -1 slots because genesis counts as a slot. for slot_height in 0..slots - 1 { + // Used to ensure that deposits in the same slot have incremental deposit indices. + let mut deposit_index_offset = 0; + // Feed deposits to the BeaconChain. if let Some(ref deposits) = self.config.deposits { - for (slot, deposit, keypair) in deposits { + for (slot, amount) in deposits { if *slot == slot_height { info!("Including deposit at slot height {}.", slot_height); - harness.add_deposit(deposit.clone(), Some(keypair.clone())); + let (deposit, keypair) = + build_deposit(&harness, *amount, deposit_index_offset); + harness.add_deposit(deposit, Some(keypair.clone())); + deposit_index_offset += 1; } } } @@ -200,6 +208,41 @@ impl TestCase { } } +/// Builds a `Deposit` this is valid for the given `BeaconChainHarness`. +/// +/// `index_offset` is used to ensure that `deposit.index == state.index` when adding multiple +/// deposits. +fn build_deposit( + harness: &BeaconChainHarness, + amount: u64, + index_offset: u64, +) -> (Deposit, Keypair) { + let keypair = Keypair::random(); + let proof_of_possession = create_proof_of_possession(&keypair); + let index = harness.beacon_chain.state.read().deposit_index + index_offset; + + info!("index: {}, index_offset: {}", index, index_offset); + + let deposit = Deposit { + // Note: `branch` and `index` will need to be updated once the spec defines their + // validity. + branch: vec![], + index, + deposit_data: DepositData { + amount, + timestamp: 1, + deposit_input: DepositInput { + pubkey: keypair.pk.clone(), + withdrawal_credentials: Hash256::zero(), + proof_of_possession, + }, + }, + }; + + (deposit, keypair) +} + +/// Builds a `VoluntaryExit` this is valid for the given `BeaconChainHarness`. fn build_exit(harness: &BeaconChainHarness, validator_index: u64) -> VoluntaryExit { let epoch = harness .beacon_chain @@ -213,7 +256,7 @@ fn build_exit(harness: &BeaconChainHarness, validator_index: u64) -> VoluntaryEx signature: Signature::empty_signature(), }; - let message = exit.hash_tree_root(); + let message = exit.signed_root(); exit.signature = harness .validator_sign(validator_index as usize, &message[..], epoch, Domain::Exit) diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/config.rs b/beacon_node/beacon_chain/test_harness/src/test_case/config.rs index 4034c8ddc..140fc4128 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/config.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/config.rs @@ -1,12 +1,12 @@ use super::yaml_helpers::{as_u64, as_usize, as_vec_u64}; -use bls::create_proof_of_possession; use types::*; use yaml_rust::Yaml; pub type ValidatorIndex = u64; pub type ValidatorIndices = Vec; +pub type GweiAmount = u64; -pub type DepositTuple = (SlotHeight, Deposit, Keypair); +pub type DepositTuple = (SlotHeight, GweiAmount); pub type ExitTuple = (SlotHeight, ValidatorIndex); pub type ProposerSlashingTuple = (SlotHeight, ValidatorIndex); pub type AttesterSlashingTuple = (SlotHeight, ValidatorIndices); @@ -101,30 +101,11 @@ fn parse_deposits(yaml: &Yaml) -> Option> { let mut deposits = vec![]; for deposit in yaml["deposits"].as_vec()? { - let keypair = Keypair::random(); - let proof_of_possession = create_proof_of_possession(&keypair); - let slot = as_u64(deposit, "slot").expect("Incomplete deposit (slot)"); let amount = as_u64(deposit, "amount").expect("Incomplete deposit (amount)") * 1_000_000_000; - let deposit = Deposit { - // Note: `branch` and `index` will need to be updated once the spec defines their - // validity. - branch: vec![], - index: 0, - deposit_data: DepositData { - amount, - timestamp: 1, - deposit_input: DepositInput { - pubkey: keypair.pk.clone(), - withdrawal_credentials: Hash256::zero(), - proof_of_possession, - }, - }, - }; - - deposits.push((SlotHeight::from(slot), deposit, keypair)); + deposits.push((SlotHeight::from(slot), amount)) } Some(deposits) diff --git a/eth2/state_processing/src/per_block_processing/verify_deposit.rs b/eth2/state_processing/src/per_block_processing/verify_deposit.rs index a1731f1a1..702c6b9e0 100644 --- a/eth2/state_processing/src/per_block_processing/verify_deposit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_deposit.rs @@ -16,7 +16,6 @@ pub fn verify_deposit( ) -> Result<(), Error> { // TODO: verify serialized deposit data. - // TODO: verify deposit index. verify!( deposit.index == state.deposit_index, Invalid::BadIndex(state.deposit_index, deposit.index) From 15e4aabd8a99a1c5116241810aca2902254ec342 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 16:15:38 +1100 Subject: [PATCH 28/31] Add deposit processing, fix clippy lints --- eth2/fork_choice/src/bitwise_lmd_ghost.rs | 2 +- eth2/state_processing/Cargo.toml | 1 + .../src/per_block_processing.rs | 9 +- .../src/per_block_processing/errors.rs | 45 ++++++- .../src/per_block_processing/verify_exit.rs | 4 +- .../verify_proposer_slashing.rs | 6 +- .../per_block_processing/verify_transfer.rs | 120 +++++++++++++++++- eth2/types/src/transfer.rs | 5 +- eth2/utils/bls/src/lib.rs | 10 ++ eth2/utils/merkle_proof/src/lib.rs | 6 +- eth2/utils/ssz_derive/src/lib.rs | 2 +- 11 files changed, 184 insertions(+), 26 deletions(-) diff --git a/eth2/fork_choice/src/bitwise_lmd_ghost.rs b/eth2/fork_choice/src/bitwise_lmd_ghost.rs index d50471f56..fd1c3dea4 100644 --- a/eth2/fork_choice/src/bitwise_lmd_ghost.rs +++ b/eth2/fork_choice/src/bitwise_lmd_ghost.rs @@ -379,7 +379,7 @@ impl ForkChoice for BitwiseLMDGhost { trace!("Current Step: {}", step); if let Some(clear_winner) = self.get_clear_winner( &latest_votes, - block_height - (block_height % u64::from(step)) + u64::from(step), + block_height - (block_height % step) + step, spec, ) { current_head = clear_winner; diff --git a/eth2/state_processing/Cargo.toml b/eth2/state_processing/Cargo.toml index bdc14c1d7..b673996ae 100644 --- a/eth2/state_processing/Cargo.toml +++ b/eth2/state_processing/Cargo.toml @@ -13,6 +13,7 @@ criterion = "0.2" env_logger = "0.6.0" [dependencies] +bls = { path = "../utils/bls" } hashing = { path = "../utils/hashing" } int_to_bytes = { path = "../utils/int_to_bytes" } integer-sqrt = "0.1" diff --git a/eth2/state_processing/src/per_block_processing.rs b/eth2/state_processing/src/per_block_processing.rs index 06a5f81c7..61b12bedb 100644 --- a/eth2/state_processing/src/per_block_processing.rs +++ b/eth2/state_processing/src/per_block_processing.rs @@ -9,7 +9,7 @@ pub use self::verify_attester_slashing::verify_attester_slashing; pub use validate_attestation::{validate_attestation, validate_attestation_without_signature}; pub use verify_deposit::verify_deposit; pub use verify_exit::verify_exit; -pub use verify_transfer::verify_transfer; +pub use verify_transfer::{execute_transfer, verify_transfer}; pub mod errors; mod validate_attestation; @@ -373,12 +373,7 @@ pub fn process_transfers( ); for (i, transfer) in transfers.iter().enumerate() { verify_transfer(&state, transfer, spec).map_err(|e| e.into_with_index(i))?; - - let block_proposer = state.get_beacon_proposer_index(state.slot, spec)?; - - state.validator_balances[transfer.from as usize] -= transfer.amount + transfer.fee; - state.validator_balances[transfer.to as usize] += transfer.amount + transfer.fee; - state.validator_balances[block_proposer as usize] += transfer.fee; + execute_transfer(state, transfer, spec).map_err(|e| e.into_with_index(i))?; } Ok(()) diff --git a/eth2/state_processing/src/per_block_processing/errors.rs b/eth2/state_processing/src/per_block_processing/errors.rs index 6c9719fc2..59d3f2f80 100644 --- a/eth2/state_processing/src/per_block_processing/errors.rs +++ b/eth2/state_processing/src/per_block_processing/errors.rs @@ -332,10 +332,51 @@ impl_into_with_index_without_beacon_error!(ExitValidationError, ExitInvalid); pub enum TransferValidationError { /// Validation completed successfully and the object is invalid. Invalid(TransferInvalid), + /// Encountered a `BeaconStateError` whilst attempting to determine validity. + BeaconStateError(BeaconStateError), } /// Describes why an object is invalid. #[derive(Debug, PartialEq)] -pub enum TransferInvalid {} +pub enum TransferInvalid { + /// The validator indicated by `transfer.from` is unknown. + FromValidatorUnknown(u64), + /// The validator indicated by `transfer.to` is unknown. + ToValidatorUnknown(u64), + /// The balance of `transfer.from` is insufficient. + /// + /// (required, available) + FromBalanceInsufficient(u64, u64), + /// Adding `transfer.fee` to `transfer.amount` causes an overflow. + /// + /// (transfer_fee, transfer_amount) + FeeOverflow(u64, u64), + /// This transfer would result in the `transfer.from` account to have `0 < balance < + /// min_deposit_amount` + /// + /// (resulting_amount, min_deposit_amount) + InvalidResultingFromBalance(u64, u64), + /// The state slot does not match `transfer.slot`. + /// + /// (state_slot, transfer_slot) + StateSlotMismatch(Slot, Slot), + /// The `transfer.from` validator has been activated and is not withdrawable. + /// + /// (from_validator) + FromValidatorIneligableForTransfer(u64), + /// The validators withdrawal credentials do not match `transfer.pubkey`. + WithdrawalCredentialsMismatch, + /// The deposit was not signed by `deposit.pubkey`. + BadSignature, + /// Overflow when adding to `transfer.to` balance. + /// + /// (to_balance, transfer_amount) + ToBalanceOverflow(u64, u64), + /// Overflow when adding to beacon proposer balance. + /// + /// (proposer_balance, transfer_fee) + ProposerBalanceOverflow(u64, u64), +} -impl_into_with_index_without_beacon_error!(TransferValidationError, TransferInvalid); +impl_from_beacon_state_error!(TransferValidationError); +impl_into_with_index_with_beacon_error!(TransferValidationError, TransferInvalid); diff --git a/eth2/state_processing/src/per_block_processing/verify_exit.rs b/eth2/state_processing/src/per_block_processing/verify_exit.rs index 408b77077..8cd54fb69 100644 --- a/eth2/state_processing/src/per_block_processing/verify_exit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_exit.rs @@ -16,9 +16,7 @@ pub fn verify_exit( let validator = state .validator_registry .get(exit.validator_index as usize) - .ok_or(Error::Invalid(Invalid::ValidatorUnknown( - exit.validator_index, - )))?; + .ok_or_else(|| Error::Invalid(Invalid::ValidatorUnknown(exit.validator_index)))?; verify!( validator.exit_epoch diff --git a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs index 0350255ec..c3c0079a9 100644 --- a/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs +++ b/eth2/state_processing/src/per_block_processing/verify_proposer_slashing.rs @@ -16,9 +16,9 @@ pub fn verify_proposer_slashing( let proposer = state .validator_registry .get(proposer_slashing.proposer_index as usize) - .ok_or(Error::Invalid(Invalid::ProposerUnknown( - proposer_slashing.proposer_index, - )))?; + .ok_or_else(|| { + Error::Invalid(Invalid::ProposerUnknown(proposer_slashing.proposer_index)) + })?; verify!( proposer_slashing.proposal_1.slot == proposer_slashing.proposal_2.slot, diff --git a/eth2/state_processing/src/per_block_processing/verify_transfer.rs b/eth2/state_processing/src/per_block_processing/verify_transfer.rs index cd7bcb42c..15ec17142 100644 --- a/eth2/state_processing/src/per_block_processing/verify_transfer.rs +++ b/eth2/state_processing/src/per_block_processing/verify_transfer.rs @@ -1,4 +1,6 @@ use super::errors::{TransferInvalid as Invalid, TransferValidationError as Error}; +use bls::get_withdrawal_credentials; +use ssz::SignedRoot; use types::*; /// Indicates if a `Transfer` is valid to be included in a block in the current epoch of the given @@ -10,11 +12,121 @@ use types::*; /// /// Spec v0.4.0 pub fn verify_transfer( - _state: &BeaconState, - _transfer: &Transfer, - _spec: &ChainSpec, + state: &BeaconState, + transfer: &Transfer, + spec: &ChainSpec, ) -> Result<(), Error> { - // TODO: verify transfer. + let from_balance = *state + .validator_balances + .get(transfer.from as usize) + .ok_or_else(|| Error::Invalid(Invalid::FromValidatorUnknown(transfer.from)))?; + + let total_amount = transfer + .amount + .checked_add(transfer.fee) + .ok_or_else(|| Error::Invalid(Invalid::FeeOverflow(transfer.amount, transfer.fee)))?; + + verify!( + from_balance >= transfer.amount, + Invalid::FromBalanceInsufficient(transfer.amount, from_balance) + ); + + verify!( + from_balance >= transfer.fee, + Invalid::FromBalanceInsufficient(transfer.fee, from_balance) + ); + + verify!( + (from_balance == total_amount) + || (from_balance >= (total_amount + spec.min_deposit_amount)), + Invalid::InvalidResultingFromBalance(from_balance - total_amount, spec.min_deposit_amount) + ); + + verify!( + state.slot == transfer.slot, + Invalid::StateSlotMismatch(state.slot, transfer.slot) + ); + + let from_validator = state + .validator_registry + .get(transfer.from as usize) + .ok_or_else(|| Error::Invalid(Invalid::FromValidatorUnknown(transfer.from)))?; + let epoch = state.slot.epoch(spec.slots_per_epoch); + + verify!( + from_validator.is_withdrawable_at(epoch) + || from_validator.activation_epoch == spec.far_future_epoch, + Invalid::FromValidatorIneligableForTransfer(transfer.from) + ); + + let transfer_withdrawal_credentials = Hash256::from_slice( + &get_withdrawal_credentials(&transfer.pubkey, spec.bls_withdrawal_prefix_byte)[..], + ); + verify!( + from_validator.withdrawal_credentials == transfer_withdrawal_credentials, + Invalid::WithdrawalCredentialsMismatch + ); + + let message = transfer.signed_root(); + let domain = spec.get_domain( + transfer.slot.epoch(spec.slots_per_epoch), + Domain::Transfer, + &state.fork, + ); + + verify!( + transfer + .signature + .verify(&message[..], domain, &transfer.pubkey), + Invalid::BadSignature + ); + + Ok(()) +} + +/// Executes a transfer on the state. +/// +/// Does not check that the transfer is valid, however checks for overflow in all actions. +/// +/// Spec v0.4.0 +pub fn execute_transfer( + state: &mut BeaconState, + transfer: &Transfer, + spec: &ChainSpec, +) -> Result<(), Error> { + let from_balance = *state + .validator_balances + .get(transfer.from as usize) + .ok_or_else(|| Error::Invalid(Invalid::FromValidatorUnknown(transfer.from)))?; + let to_balance = *state + .validator_balances + .get(transfer.to as usize) + .ok_or_else(|| Error::Invalid(Invalid::ToValidatorUnknown(transfer.to)))?; + + let proposer_index = state.get_beacon_proposer_index(state.slot, spec)?; + let proposer_balance = state.validator_balances[proposer_index]; + + let total_amount = transfer + .amount + .checked_add(transfer.fee) + .ok_or_else(|| Error::Invalid(Invalid::FeeOverflow(transfer.amount, transfer.fee)))?; + + state.validator_balances[transfer.from as usize] = + from_balance.checked_sub(total_amount).ok_or_else(|| { + Error::Invalid(Invalid::FromBalanceInsufficient(total_amount, from_balance)) + })?; + + state.validator_balances[transfer.to as usize] = to_balance + .checked_add(transfer.amount) + .ok_or_else(|| Error::Invalid(Invalid::ToBalanceOverflow(to_balance, transfer.amount)))?; + + state.validator_balances[proposer_index] = + proposer_balance.checked_add(transfer.fee).ok_or_else(|| { + Error::Invalid(Invalid::ProposerBalanceOverflow( + proposer_balance, + transfer.fee, + )) + })?; Ok(()) } diff --git a/eth2/types/src/transfer.rs b/eth2/types/src/transfer.rs index f23d3845e..0382dee11 100644 --- a/eth2/types/src/transfer.rs +++ b/eth2/types/src/transfer.rs @@ -3,13 +3,14 @@ use crate::test_utils::TestRandom; use bls::{PublicKey, Signature}; use rand::RngCore; use serde_derive::Serialize; -use ssz_derive::{Decode, Encode, TreeHash}; +use ssz::TreeHash; +use ssz_derive::{Decode, Encode, SignedRoot, TreeHash}; use test_random_derive::TestRandom; /// The data submitted to the deposit contract. /// /// Spec v0.4.0 -#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom)] +#[derive(Debug, PartialEq, Clone, Serialize, Encode, Decode, TreeHash, TestRandom, SignedRoot)] pub struct Transfer { pub from: u64, pub to: u64, diff --git a/eth2/utils/bls/src/lib.rs b/eth2/utils/bls/src/lib.rs index 865b8d82d..bb109b0a1 100644 --- a/eth2/utils/bls/src/lib.rs +++ b/eth2/utils/bls/src/lib.rs @@ -17,6 +17,7 @@ pub use crate::signature::Signature; pub const BLS_AGG_SIG_BYTE_SIZE: usize = 96; +use hashing::hash; use ssz::ssz_encode; /// For some signature and public key, ensure that the signature message was the public key and it @@ -33,6 +34,15 @@ pub fn create_proof_of_possession(keypair: &Keypair) -> Signature { Signature::new(&ssz_encode(&keypair.pk), 0, &keypair.sk) } +/// Returns the withdrawal credentials for a given public key. +pub fn get_withdrawal_credentials(pubkey: &PublicKey, prefix_byte: u8) -> Vec { + let hashed = hash(&ssz_encode(pubkey)); + let mut prefixed = vec![prefix_byte]; + prefixed.extend_from_slice(&hashed[1..]); + + prefixed +} + pub fn bls_verify_aggregate( pubkey: &AggregatePublicKey, message: &[u8], diff --git a/eth2/utils/merkle_proof/src/lib.rs b/eth2/utils/merkle_proof/src/lib.rs index 4d0abcea3..5ff8f79e6 100644 --- a/eth2/utils/merkle_proof/src/lib.rs +++ b/eth2/utils/merkle_proof/src/lib.rs @@ -25,14 +25,14 @@ fn merkle_root_from_branch(leaf: H256, branch: &[H256], depth: usize, index: usi let mut merkle_root = leaf.as_bytes().to_vec(); - for i in 0..depth { + for (i, leaf) in branch.iter().enumerate().take(depth) { let ith_bit = (index >> i) & 0x01; if ith_bit == 1 { - let input = concat(branch[i].as_bytes().to_vec(), merkle_root); + let input = concat(leaf.as_bytes().to_vec(), merkle_root); merkle_root = hash(&input); } else { let mut input = merkle_root; - input.extend_from_slice(branch[i].as_bytes()); + input.extend_from_slice(leaf.as_bytes()); merkle_root = hash(&input); } } diff --git a/eth2/utils/ssz_derive/src/lib.rs b/eth2/utils/ssz_derive/src/lib.rs index 4c6b9dc11..0d2e17f76 100644 --- a/eth2/utils/ssz_derive/src/lib.rs +++ b/eth2/utils/ssz_derive/src/lib.rs @@ -172,7 +172,7 @@ fn type_ident_is_signature(ident: &syn::Ident) -> bool { /// the final `Ident` in that path. /// /// E.g., for `types::Signature` returns `Signature`. -fn final_type_ident<'a>(field: &'a syn::Field) -> &'a syn::Ident { +fn final_type_ident(field: &syn::Field) -> &syn::Ident { match &field.ty { syn::Type::Path(path) => &path.path.segments.last().unwrap().value().ident, _ => panic!("ssz_derive only supports Path types."), From 1ef2652cacd225403b295fc5ae322de1682969fc Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 7 Mar 2019 17:23:11 +1100 Subject: [PATCH 29/31] Add transfer processing to BeaconChain --- beacon_node/beacon_chain/src/beacon_chain.rs | 44 +++++++++++++++- .../specs/validator_registry.yaml | 20 ++++++-- .../test_harness/src/beacon_chain_harness.rs | 15 +++++- .../test_harness/src/test_case.rs | 51 ++++++++++++++++--- .../test_harness/src/test_case/config.rs | 24 ++++++++- .../test_harness/src/test_case/state_check.rs | 50 ++++++++++++++++++ .../src/per_block_processing/errors.rs | 4 +- .../per_block_processing/verify_transfer.rs | 5 +- 8 files changed, 196 insertions(+), 17 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 653b2900d..3a8a3ea14 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -56,6 +56,7 @@ pub struct BeaconChain { pub attestation_aggregator: RwLock, pub deposits_for_inclusion: RwLock>, pub exits_for_inclusion: RwLock>, + pub transfers_for_inclusion: RwLock>, pub proposer_slashings_for_inclusion: RwLock>, pub attester_slashings_for_inclusion: RwLock>, canonical_head: RwLock, @@ -126,6 +127,7 @@ where attestation_aggregator, deposits_for_inclusion: RwLock::new(vec![]), exits_for_inclusion: RwLock::new(vec![]), + transfers_for_inclusion: RwLock::new(vec![]), proposer_slashings_for_inclusion: RwLock::new(vec![]), attester_slashings_for_inclusion: RwLock::new(vec![]), state: RwLock::new(genesis_state), @@ -436,6 +438,44 @@ where } } + /// Accept some transfer and queue it for inclusion in an appropriate block. + pub fn receive_transfer_for_inclusion(&self, transfer: Transfer) { + // TODO: transfers are not checked for validity; check them. + // + // https://github.com/sigp/lighthouse/issues/276 + self.transfers_for_inclusion.write().push(transfer); + } + + /// Return a vec of transfers suitable for inclusion in some block. + pub fn get_transfers_for_block(&self) -> Vec { + // TODO: transfers are indiscriminately included; check them for validity. + // + // https://github.com/sigp/lighthouse/issues/275 + self.transfers_for_inclusion.read().clone() + } + + /// Takes a list of `Deposits` that were included in recent blocks and removes them from the + /// inclusion queue. + /// + /// This ensures that `Deposits` are not included twice in successive blocks. + pub fn set_transfers_as_included(&self, included_transfers: &[Transfer]) { + // TODO: method does not take forks into account; consider this. + let mut indices_to_delete = vec![]; + + for included in included_transfers { + for (i, for_inclusion) in self.transfers_for_inclusion.read().iter().enumerate() { + if included == for_inclusion { + indices_to_delete.push(i); + } + } + } + + let transfers_for_inclusion = &mut self.transfers_for_inclusion.write(); + for i in indices_to_delete { + transfers_for_inclusion.remove(i); + } + } + /// Accept some proposer slashing and queue it for inclusion in an appropriate block. pub fn receive_proposer_slashing_for_inclusion(&self, proposer_slashing: ProposerSlashing) { // TODO: proposer_slashings are not checked for validity; check them. @@ -664,6 +704,8 @@ where // Update the inclusion queues so they aren't re-submitted. self.set_deposits_as_included(&block.body.deposits[..]); + self.set_transfers_as_included(&block.body.transfers[..]); + self.set_exits_as_included(&block.body.voluntary_exits[..]); self.set_proposer_slashings_as_included(&block.body.proposer_slashings[..]); self.set_attester_slashings_as_included(&block.body.attester_slashings[..]); @@ -730,7 +772,7 @@ where attestations, deposits: self.get_deposits_for_block(), voluntary_exits: self.get_exits_for_block(), - transfers: vec![], + transfers: self.get_transfers_for_block(), }, }; diff --git a/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml b/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml index a6021dbe5..aea7dcf31 100644 --- a/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml +++ b/beacon_node/beacon_chain/test_harness/specs/validator_registry.yaml @@ -10,18 +10,23 @@ test_cases: num_slots: 64 skip_slots: [2, 3] deposits: - # At slot 1, create a new validator deposit of 32 ETH. + # At slot 1, create a new validator deposit of 5 ETH. - slot: 1 - amount: 32 + amount: 5000000000 # Trigger more deposits... - slot: 3 - amount: 32 + amount: 5000000000 - slot: 5 - amount: 32 + amount: 32000000000 exits: # At slot 10, submit an exit for validator #50. - slot: 10 validator_index: 50 + transfers: + - slot: 6 + from: 1000 + to: 1001 + amount: 5000000000 proposer_slashings: # At slot 2, trigger a proposer slashing for validator #42. - slot: 2 @@ -44,4 +49,11 @@ test_cases: slashed_validators: [11, 12, 13, 14, 42] exited_validators: [] exit_initiated_validators: [50] + balances: + - validator_index: 1000 + comparison: "eq" + balance: 0 + - validator_index: 1001 + comparison: "eq" + balance: 10000000000 diff --git a/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs b/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs index 38c41e38c..f220619ce 100644 --- a/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs +++ b/beacon_node/beacon_chain/test_harness/src/beacon_chain_harness.rs @@ -1,7 +1,7 @@ use super::ValidatorHarness; use beacon_chain::{BeaconChain, BlockProcessingOutcome}; pub use beacon_chain::{BeaconChainError, CheckPoint}; -use bls::create_proof_of_possession; +use bls::{create_proof_of_possession, get_withdrawal_credentials}; use db::{ stores::{BeaconBlockStore, BeaconStateStore}, MemoryDB, @@ -67,7 +67,13 @@ impl BeaconChainHarness { timestamp: genesis_time - 1, deposit_input: DepositInput { pubkey: keypair.pk.clone(), - withdrawal_credentials: Hash256::zero(), // Withdrawal not possible. + // Validator can withdraw using their main keypair. + withdrawal_credentials: Hash256::from_slice( + &get_withdrawal_credentials( + &keypair.pk, + spec.bls_withdrawal_prefix_byte, + )[..], + ), proof_of_possession: create_proof_of_possession(&keypair), }, }, @@ -286,6 +292,11 @@ impl BeaconChainHarness { self.beacon_chain.receive_exit_for_inclusion(exit); } + /// Submit an transfer to the `BeaconChain` for inclusion in some block. + pub fn add_transfer(&mut self, transfer: Transfer) { + self.beacon_chain.receive_transfer_for_inclusion(transfer); + } + /// Submit a proposer slashing to the `BeaconChain` for inclusion in some block. pub fn add_proposer_slashing(&mut self, proposer_slashing: ProposerSlashing) { self.beacon_chain diff --git a/beacon_node/beacon_chain/test_harness/src/test_case.rs b/beacon_node/beacon_chain/test_harness/src/test_case.rs index e3bcf740a..97b4bb3d4 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case.rs @@ -3,7 +3,7 @@ use crate::beacon_chain_harness::BeaconChainHarness; use beacon_chain::CheckPoint; -use bls::create_proof_of_possession; +use bls::{create_proof_of_possession, get_withdrawal_credentials}; use log::{info, warn}; use ssz::SignedRoot; use types::*; @@ -83,8 +83,8 @@ impl TestCase { info!("Starting simulation across {} slots...", slots); - // -1 slots because genesis counts as a slot. - for slot_height in 0..slots - 1 { + // Start at 1 because genesis counts as a slot. + for slot_height in 1..slots { // Used to ensure that deposits in the same slot have incremental deposit indices. let mut deposit_index_offset = 0; @@ -144,6 +144,20 @@ impl TestCase { } } + // Feed transfers to the BeaconChain. + if let Some(ref transfers) = self.config.transfers { + for (slot, from, to, amount) in transfers { + if *slot == slot_height { + info!( + "Including transfer at slot height {} from validator {}.", + slot_height, from + ); + let transfer = build_transfer(&harness, *from, *to, *amount); + harness.add_transfer(transfer); + } + } + } + // Build a block or skip a slot. match self.config.skip_slots { Some(ref skip_slots) if skip_slots.contains(&slot_height) => { @@ -208,6 +222,30 @@ impl TestCase { } } +/// Builds a `Deposit` this is valid for the given `BeaconChainHarness` at its next slot. +fn build_transfer(harness: &BeaconChainHarness, from: u64, to: u64, amount: u64) -> Transfer { + let slot = harness.beacon_chain.state.read().slot + 1; + + let mut transfer = Transfer { + from, + to, + amount, + fee: 0, + slot, + pubkey: harness.validators[from as usize].keypair.pk.clone(), + signature: Signature::empty_signature(), + }; + + let message = transfer.signed_root(); + let epoch = slot.epoch(harness.spec.slots_per_epoch); + + transfer.signature = harness + .validator_sign(from as usize, &message[..], epoch, Domain::Transfer) + .expect("Unable to sign Transfer"); + + transfer +} + /// Builds a `Deposit` this is valid for the given `BeaconChainHarness`. /// /// `index_offset` is used to ensure that `deposit.index == state.index` when adding multiple @@ -220,8 +258,9 @@ fn build_deposit( let keypair = Keypair::random(); let proof_of_possession = create_proof_of_possession(&keypair); let index = harness.beacon_chain.state.read().deposit_index + index_offset; - - info!("index: {}, index_offset: {}", index, index_offset); + let withdrawal_credentials = Hash256::from_slice( + &get_withdrawal_credentials(&keypair.pk, harness.spec.bls_withdrawal_prefix_byte)[..], + ); let deposit = Deposit { // Note: `branch` and `index` will need to be updated once the spec defines their @@ -233,7 +272,7 @@ fn build_deposit( timestamp: 1, deposit_input: DepositInput { pubkey: keypair.pk.clone(), - withdrawal_credentials: Hash256::zero(), + withdrawal_credentials, proof_of_possession, }, }, diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/config.rs b/beacon_node/beacon_chain/test_harness/src/test_case/config.rs index 140fc4128..f336b9d53 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/config.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/config.rs @@ -10,6 +10,8 @@ pub type DepositTuple = (SlotHeight, GweiAmount); pub type ExitTuple = (SlotHeight, ValidatorIndex); pub type ProposerSlashingTuple = (SlotHeight, ValidatorIndex); pub type AttesterSlashingTuple = (SlotHeight, ValidatorIndices); +/// (slot_height, from, to, amount) +pub type TransferTuple = (SlotHeight, ValidatorIndex, ValidatorIndex, GweiAmount); /// Defines the execution of a `BeaconStateHarness` across a series of slots. #[derive(Debug)] @@ -30,6 +32,8 @@ pub struct Config { pub attester_slashings: Option>, /// Exits to be including during execution. pub exits: Option>, + /// Transfers to be including during execution. + pub transfers: Option>, } impl Config { @@ -47,10 +51,27 @@ impl Config { proposer_slashings: parse_proposer_slashings(&yaml), attester_slashings: parse_attester_slashings(&yaml), exits: parse_exits(&yaml), + transfers: parse_transfers(&yaml), } } } +/// Parse the `transfers` section of the YAML document. +fn parse_transfers(yaml: &Yaml) -> Option> { + let mut tuples = vec![]; + + for exit in yaml["transfers"].as_vec()? { + let slot = as_u64(exit, "slot").expect("Incomplete transfer (slot)"); + let from = as_u64(exit, "from").expect("Incomplete transfer (from)"); + let to = as_u64(exit, "to").expect("Incomplete transfer (to)"); + let amount = as_u64(exit, "amount").expect("Incomplete transfer (amount)"); + + tuples.push((SlotHeight::from(slot), from, to, amount)); + } + + Some(tuples) +} + /// Parse the `attester_slashings` section of the YAML document. fn parse_exits(yaml: &Yaml) -> Option> { let mut tuples = vec![]; @@ -102,8 +123,7 @@ fn parse_deposits(yaml: &Yaml) -> Option> { for deposit in yaml["deposits"].as_vec()? { let slot = as_u64(deposit, "slot").expect("Incomplete deposit (slot)"); - let amount = - as_u64(deposit, "amount").expect("Incomplete deposit (amount)") * 1_000_000_000; + let amount = as_u64(deposit, "amount").expect("Incomplete deposit (amount)"); deposits.push((SlotHeight::from(slot), amount)) } diff --git a/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs b/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs index 6fa75364a..4d2bfd07d 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case/state_check.rs @@ -3,6 +3,11 @@ use log::info; use types::*; use yaml_rust::Yaml; +type ValidatorIndex = u64; +type BalanceGwei = u64; + +type BalanceCheckTuple = (ValidatorIndex, String, BalanceGwei); + /// Tests to be conducted upon a `BeaconState` object generated during the execution of a /// `TestCase`. #[derive(Debug)] @@ -17,6 +22,8 @@ pub struct StateCheck { pub exited_validators: Option>, /// A list of validator indices which have had an exit initiated. Must be in ascending order. pub exit_initiated_validators: Option>, + /// A list of balances to check. + pub balances: Option>, } impl StateCheck { @@ -30,6 +37,7 @@ impl StateCheck { slashed_validators: as_vec_u64(&yaml, "slashed_validators"), exited_validators: as_vec_u64(&yaml, "exited_validators"), exit_initiated_validators: as_vec_u64(&yaml, "exit_initiated_validators"), + balances: parse_balances(&yaml), } } @@ -124,5 +132,47 @@ impl StateCheck { exit_initiated_validators ); } + + // Check validator balances. + if let Some(ref balances) = self.balances { + for (index, comparison, expected) in balances { + let actual = *state + .validator_balances + .get(*index as usize) + .expect("Balance check specifies unknown validator"); + + let result = match comparison.as_ref() { + "eq" => actual == *expected, + _ => panic!("Unknown balance comparison (use `eq`)"), + }; + assert!( + result, + format!( + "Validator balance for {}: {} !{} {}.", + index, actual, comparison, expected + ) + ); + info!("OK: validator balance for {:?}.", index); + } + } } } + +/// Parse the `transfers` section of the YAML document. +fn parse_balances(yaml: &Yaml) -> Option> { + let mut tuples = vec![]; + + for exit in yaml["balances"].as_vec()? { + let from = + as_u64(exit, "validator_index").expect("Incomplete balance check (validator_index)"); + let comparison = exit["comparison"] + .clone() + .into_string() + .expect("Incomplete balance check (amount)"); + let balance = as_u64(exit, "balance").expect("Incomplete balance check (balance)"); + + tuples.push((from, comparison, balance)); + } + + Some(tuples) +} diff --git a/eth2/state_processing/src/per_block_processing/errors.rs b/eth2/state_processing/src/per_block_processing/errors.rs index 59d3f2f80..36b0d4942 100644 --- a/eth2/state_processing/src/per_block_processing/errors.rs +++ b/eth2/state_processing/src/per_block_processing/errors.rs @@ -365,7 +365,9 @@ pub enum TransferInvalid { /// (from_validator) FromValidatorIneligableForTransfer(u64), /// The validators withdrawal credentials do not match `transfer.pubkey`. - WithdrawalCredentialsMismatch, + /// + /// (state_credentials, transfer_pubkey_credentials) + WithdrawalCredentialsMismatch(Hash256, Hash256), /// The deposit was not signed by `deposit.pubkey`. BadSignature, /// Overflow when adding to `transfer.to` balance. diff --git a/eth2/state_processing/src/per_block_processing/verify_transfer.rs b/eth2/state_processing/src/per_block_processing/verify_transfer.rs index 15ec17142..4746fc75c 100644 --- a/eth2/state_processing/src/per_block_processing/verify_transfer.rs +++ b/eth2/state_processing/src/per_block_processing/verify_transfer.rs @@ -64,7 +64,10 @@ pub fn verify_transfer( ); verify!( from_validator.withdrawal_credentials == transfer_withdrawal_credentials, - Invalid::WithdrawalCredentialsMismatch + Invalid::WithdrawalCredentialsMismatch( + from_validator.withdrawal_credentials, + transfer_withdrawal_credentials + ) ); let message = transfer.signed_root(); From 60098a051d2615552621b3bd2b9c36e601d8c307 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Fri, 8 Mar 2019 09:23:57 +1100 Subject: [PATCH 30/31] Fix/silence clippy lints --- beacon_node/beacon_chain/src/beacon_chain.rs | 1 + .../test_harness/src/test_case.rs | 1 + .../test_harness/src/validator_harness/mod.rs | 28 +++++++++++-------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 3a8a3ea14..3d2efa8ae 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -73,6 +73,7 @@ where F: ForkChoice, { /// Instantiate a new Beacon Chain, from genesis. + #[allow(clippy::too_many_arguments)] // Will be re-factored in the coming weeks. pub fn genesis( state_store: Arc>, block_store: Arc>, diff --git a/beacon_node/beacon_chain/test_harness/src/test_case.rs b/beacon_node/beacon_chain/test_harness/src/test_case.rs index 97b4bb3d4..b2709edfc 100644 --- a/beacon_node/beacon_chain/test_harness/src/test_case.rs +++ b/beacon_node/beacon_chain/test_harness/src/test_case.rs @@ -69,6 +69,7 @@ impl TestCase { } /// Executes the test case, returning an `ExecutionResult`. + #[allow(clippy::cyclomatic_complexity)] pub fn execute(&self) -> ExecutionResult { let spec = self.spec(); let validator_count = self.config.deposits_for_chain_start; diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs index 60c2f8ecf..91a679463 100644 --- a/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs +++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs @@ -28,24 +28,28 @@ pub enum AttestationProduceError { PollError(AttestationPollError), } +type TestingBlockProducer = BlockProducer< + TestingSlotClock, + DirectBeaconNode>, + DirectDuties>, + LocalSigner, +>; + +type TestingAttester = Attester< + TestingSlotClock, + DirectBeaconNode>, + DirectDuties>, + LocalSigner, +>; + /// A `BlockProducer` and `Attester` which sign using a common keypair. /// /// The test validator connects directly to a borrowed `BeaconChain` struct. It is useful for /// testing that the core proposer and attester logic is functioning. Also for supporting beacon /// chain tests. pub struct ValidatorHarness { - pub block_producer: BlockProducer< - TestingSlotClock, - DirectBeaconNode>, - DirectDuties>, - LocalSigner, - >, - pub attester: Attester< - TestingSlotClock, - DirectBeaconNode>, - DirectDuties>, - LocalSigner, - >, + pub block_producer: TestingBlockProducer, + pub attester: TestingAttester, pub spec: Arc, pub epoch_map: Arc>>, pub keypair: Keypair, From f479beb87e8959a09d88a281686f7717108fbd35 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Fri, 8 Mar 2019 09:26:03 +1100 Subject: [PATCH 31/31] Implement deposit merkle root verification. It is currently disabled, but it's there for later. --- eth2/state_processing/Cargo.toml | 2 + .../src/per_block_processing.rs | 8 ++- .../src/per_block_processing/errors.rs | 3 ++ .../per_block_processing/verify_deposit.rs | 54 +++++++++++++++++-- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/eth2/state_processing/Cargo.toml b/eth2/state_processing/Cargo.toml index b673996ae..c51ce8372 100644 --- a/eth2/state_processing/Cargo.toml +++ b/eth2/state_processing/Cargo.toml @@ -18,6 +18,8 @@ hashing = { path = "../utils/hashing" } int_to_bytes = { path = "../utils/int_to_bytes" } integer-sqrt = "0.1" log = "0.4" +merkle_proof = { path = "../utils/merkle_proof" } ssz = { path = "../utils/ssz" } +ssz_derive = { path = "../utils/ssz_derive" } types = { path = "../types" } rayon = "1.0" diff --git a/eth2/state_processing/src/per_block_processing.rs b/eth2/state_processing/src/per_block_processing.rs index 61b12bedb..1ab1eed71 100644 --- a/eth2/state_processing/src/per_block_processing.rs +++ b/eth2/state_processing/src/per_block_processing.rs @@ -20,6 +20,11 @@ mod verify_proposer_slashing; mod verify_slashable_attestation; mod verify_transfer; +// Set to `true` to check the merkle proof that a deposit is in the eth1 deposit root. +// +// Presently disabled to make testing easier. +const VERIFY_DEPOSIT_MERKLE_PROOFS: bool = false; + /// Updates the state for a new block, whilst validating that the block is valid. /// /// Returns `Ok(())` if the block is valid and the state was successfully updated. Otherwise @@ -309,7 +314,8 @@ pub fn process_deposits( Invalid::MaxDepositsExceeded ); for (i, deposit) in deposits.iter().enumerate() { - verify_deposit(state, deposit, spec).map_err(|e| e.into_with_index(i))?; + verify_deposit(state, deposit, VERIFY_DEPOSIT_MERKLE_PROOFS, spec) + .map_err(|e| e.into_with_index(i))?; state .process_deposit( diff --git a/eth2/state_processing/src/per_block_processing/errors.rs b/eth2/state_processing/src/per_block_processing/errors.rs index 36b0d4942..b97d8bacc 100644 --- a/eth2/state_processing/src/per_block_processing/errors.rs +++ b/eth2/state_processing/src/per_block_processing/errors.rs @@ -292,6 +292,9 @@ pub enum DepositInvalid { /// /// (state_index, deposit_index) BadIndex(u64, u64), + /// The specified `branch` and `index` did not form a valid proof that the deposit is included + /// in the eth1 deposit root. + BadMerkleProof, } impl_into_with_index_without_beacon_error!(DepositValidationError, DepositInvalid); diff --git a/eth2/state_processing/src/per_block_processing/verify_deposit.rs b/eth2/state_processing/src/per_block_processing/verify_deposit.rs index 702c6b9e0..69dae1533 100644 --- a/eth2/state_processing/src/per_block_processing/verify_deposit.rs +++ b/eth2/state_processing/src/per_block_processing/verify_deposit.rs @@ -1,4 +1,8 @@ use super::errors::{DepositInvalid as Invalid, DepositValidationError as Error}; +use hashing::hash; +use merkle_proof::verify_merkle_proof; +use ssz::ssz_encode; +use ssz_derive::Encode; use types::*; /// Indicates if a `Deposit` is valid to be included in a block in the current epoch of the given @@ -12,16 +16,58 @@ use types::*; pub fn verify_deposit( state: &BeaconState, deposit: &Deposit, - _spec: &ChainSpec, + verify_merkle_branch: bool, + spec: &ChainSpec, ) -> Result<(), Error> { - // TODO: verify serialized deposit data. - verify!( deposit.index == state.deposit_index, Invalid::BadIndex(state.deposit_index, deposit.index) ); - // TODO: verify merkle branch. + if verify_merkle_branch { + verify!( + verify_deposit_merkle_proof(state, deposit, spec), + Invalid::BadMerkleProof + ); + } Ok(()) } + +/// Verify that a deposit is included in the state's eth1 deposit root. +/// +/// Spec v0.4.0 +fn verify_deposit_merkle_proof(state: &BeaconState, deposit: &Deposit, spec: &ChainSpec) -> bool { + let leaf = hash(&get_serialized_deposit_data(deposit)); + verify_merkle_proof( + Hash256::from_slice(&leaf), + &deposit.branch, + spec.deposit_contract_tree_depth as usize, + deposit.index as usize, + state.latest_eth1_data.deposit_root, + ) +} + +/// Helper struct for easily getting the serialized data generated by the deposit contract. +/// +/// Spec v0.4.0 +#[derive(Encode)] +struct SerializedDepositData { + amount: u64, + timestamp: u64, + input: DepositInput, +} + +/// Return the serialized data generated by the deposit contract that is used to generate the +/// merkle proof. +/// +/// Spec v0.4.0 +fn get_serialized_deposit_data(deposit: &Deposit) -> Vec { + let serialized_deposit_data = SerializedDepositData { + amount: deposit.deposit_data.amount, + timestamp: deposit.deposit_data.timestamp, + input: deposit.deposit_data.deposit_input.clone(), + }; + + ssz_encode(&serialized_deposit_data) +}