cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into lmd-ghost

Browse Source
This commit is contained in:
Paul Hauner 2019-01-24 12:06:23 +11:00
commit 298f9acd6a
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
23 changed files with 346 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eth2/genesis/src/beacon_block.rs
View File

@ -1,14 +1,17 @@
use spec::ChainSpec; use spec::ChainSpec;
use types::{BeaconBlock, BeaconBlockBody, Hash256}; use types::{BeaconBlock, BeaconBlockBody, Eth1Data, Hash256};
/// Generate a genesis BeaconBlock. /// Generate a genesis BeaconBlock.
pub fn genesis_beacon_block(state_root: Hash256, spec: &ChainSpec) -> BeaconBlock { pub fn genesis_beacon_block(state_root: Hash256, spec: &ChainSpec) -> BeaconBlock {
BeaconBlock { BeaconBlock {
slot: spec.genesis_slot_number, slot: spec.genesis_slot,
parent_root: spec.zero_hash, parent_root: spec.zero_hash,
state_root, state_root,
randao_reveal: spec.empty_signature.clone(), randao_reveal: spec.empty_signature.clone(),
candidate_pow_receipt_root: spec.zero_hash, eth1_data: Eth1Data {
deposit_root: spec.zero_hash,
block_hash: spec.zero_hash,
},
signature: spec.empty_signature.clone(), signature: spec.empty_signature.clone(),
body: BeaconBlockBody { body: BeaconBlockBody {
proposer_slashings: vec![], proposer_slashings: vec![],
@ -47,8 +50,9 @@ mod tests {
assert!(genesis_block.slot == 0); assert!(genesis_block.slot == 0);
assert!(genesis_block.parent_root.is_zero()); assert!(genesis_block.parent_root.is_zero());
assert_eq!(genesis_block.randao_reveal, spec.empty_signature); assert_eq!(genesis_block.randao_reveal, Signature::empty_signature());
assert!(genesis_block.candidate_pow_receipt_root.is_zero()); // aka deposit_root assert!(genesis_block.eth1_data.deposit_root.is_zero());
assert!(genesis_block.eth1_data.block_hash.is_zero());
} }
#[test] #[test]

37
eth2/genesis/src/beacon_state.rs
View File

@ -1,5 +1,5 @@
use spec::ChainSpec; use spec::ChainSpec;
use types::{BeaconState, CrosslinkRecord, ForkData}; use types::{BeaconState, Crosslink, Fork};
use validator_shuffling::{shard_and_committees_for_cycle, ValidatorAssignmentError}; use validator_shuffling::{shard_and_committees_for_cycle, ValidatorAssignmentError};
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
@ -20,8 +20,8 @@ pub fn genesis_beacon_state(spec: &ChainSpec) -> Result<BeaconState, Error> {
a a
}; };
let initial_crosslink = CrosslinkRecord { let initial_crosslink = Crosslink {
slot: spec.genesis_slot_number, slot: spec.genesis_slot,
shard_block_root: spec.zero_hash, shard_block_root: spec.zero_hash,
}; };
@ -29,19 +29,19 @@ pub fn genesis_beacon_state(spec: &ChainSpec) -> Result<BeaconState, Error> {
/* /*
* Misc * Misc
*/ */
slot: spec.genesis_slot_number, slot: spec.genesis_slot,
genesis_time: spec.genesis_time, genesis_time: spec.genesis_time,
fork_data: ForkData { fork_data: Fork {
pre_fork_version: spec.genesis_fork_version, pre_fork_version: spec.genesis_fork_version,
post_fork_version: spec.genesis_fork_version, post_fork_version: spec.genesis_fork_version,
fork_slot: spec.genesis_slot_number, fork_slot: spec.genesis_slot,
}, },
/* /*
* Validator registry * Validator registry
*/ */
validator_registry: spec.initial_validators.clone(), validator_registry: spec.initial_validators.clone(),
validator_balances: spec.initial_balances.clone(), validator_balances: spec.initial_balances.clone(),
validator_registry_latest_change_slot: spec.genesis_slot_number, validator_registry_update_slot: spec.genesis_slot,
validator_registry_exit_count: 0, validator_registry_exit_count: 0,
validator_registry_delta_chain_tip: spec.zero_hash, validator_registry_delta_chain_tip: spec.zero_hash,
/* /*
@ -54,8 +54,8 @@ pub fn genesis_beacon_state(spec: &ChainSpec) -> Result<BeaconState, Error> {
], ],
previous_epoch_start_shard: spec.genesis_start_shard, previous_epoch_start_shard: spec.genesis_start_shard,
current_epoch_start_shard: spec.genesis_start_shard, current_epoch_start_shard: spec.genesis_start_shard,
previous_epoch_calculation_slot: spec.genesis_slot_number, previous_epoch_calculation_slot: spec.genesis_slot,
current_epoch_calculation_slot: spec.genesis_slot_number, current_epoch_calculation_slot: spec.genesis_slot,
previous_epoch_randao_mix: spec.zero_hash, previous_epoch_randao_mix: spec.zero_hash,
current_epoch_randao_mix: spec.zero_hash, current_epoch_randao_mix: spec.zero_hash,
/* /*
@ -65,10 +65,10 @@ pub fn genesis_beacon_state(spec: &ChainSpec) -> Result<BeaconState, Error> {
/* /*
* Finality * Finality
*/ */
previous_justified_slot: spec.genesis_slot_number, previous_justified_slot: spec.genesis_slot,
justified_slot: spec.genesis_slot_number, justified_slot: spec.genesis_slot,
justification_bitfield: 0, justification_bitfield: 0,
finalized_slot: spec.genesis_slot_number, finalized_slot: spec.genesis_slot,
/* /*
* Recent state * Recent state
*/ */
@ -80,8 +80,8 @@ pub fn genesis_beacon_state(spec: &ChainSpec) -> Result<BeaconState, Error> {
/* /*
* PoW receipt root * PoW receipt root
*/ */
processed_pow_receipt_root: spec.processed_pow_receipt_root, latest_eth1_data: spec.intial_eth1_data.clone(),
candidate_pow_receipt_roots: vec![], eth1_data_votes: vec![],
}) })
} }
@ -129,7 +129,7 @@ mod tests {
assert_eq!(state.validator_registry, spec.initial_validators); assert_eq!(state.validator_registry, spec.initial_validators);
assert_eq!(state.validator_balances, spec.initial_balances); assert_eq!(state.validator_balances, spec.initial_balances);
assert!(state.validator_registry_latest_change_slot == 0); assert!(state.validator_registry_update_slot == 0);
assert!(state.validator_registry_exit_count == 0); assert!(state.validator_registry_exit_count == 0);
assert_eq!(state.validator_registry_delta_chain_tip, Hash256::zero()); assert_eq!(state.validator_registry_delta_chain_tip, Hash256::zero());
} }
@ -213,10 +213,7 @@ mod tests {
let state = genesis_beacon_state(&spec).unwrap(); let state = genesis_beacon_state(&spec).unwrap();
assert_eq!( assert_eq!(&state.latest_eth1_data, &spec.intial_eth1_data);
state.processed_pow_receipt_root, assert!(state.eth1_data_votes.is_empty());
spec.processed_pow_receipt_root
);
assert!(state.candidate_pow_receipt_roots.is_empty());
} }
} }

29
eth2/spec/src/foundation.rs
View File

@ -1,7 +1,7 @@
use super::ChainSpec; use super::ChainSpec;
use bls::{Keypair, PublicKey, SecretKey, Signature}; use bls::{Keypair, PublicKey, SecretKey, Signature};
use types::{Address, Hash256, ValidatorRecord}; use types::{Address, Eth1Data, Hash256, Validator};
/// The size of a validators deposit in GWei. /// The size of a validators deposit in GWei.
pub const DEPOSIT_GWEI: u64 = 32_000_000_000; pub const DEPOSIT_GWEI: u64 = 32_000_000_000;
@ -18,9 +18,8 @@ impl ChainSpec {
*/ */
shard_count: 1_024, shard_count: 1_024,
target_committee_size: 128, target_committee_size: 128,
ejection_balance: 16, ejection_balance: 16 * u64::pow(10, 9),
max_balance_churn_quotient: 32, max_balance_churn_quotient: 32,
gwei_per_eth: u64::pow(10, 9),
beacon_chain_shard_number: u64::max_value(), beacon_chain_shard_number: u64::max_value(),
max_casper_votes: 1_024, max_casper_votes: 1_024,
latest_block_roots_length: 8_192, latest_block_roots_length: 8_192,
@ -32,13 +31,13 @@ impl ChainSpec {
*/ */
deposit_contract_address: Address::from("TBD".as_bytes()), deposit_contract_address: Address::from("TBD".as_bytes()),
deposit_contract_tree_depth: 32, deposit_contract_tree_depth: 32,
min_deposit: 1, min_deposit: 1 * u64::pow(10, 9),
max_deposit: 32, max_deposit: 32 * u64::pow(10, 9),
/* /*
* Initial Values * Initial Values
*/ */
genesis_fork_version: 0, genesis_fork_version: 0,
genesis_slot_number: 0, genesis_slot: 0,
genesis_start_shard: 0, genesis_start_shard: 0,
far_future_slot: u64::max_value(), far_future_slot: u64::max_value(),
zero_hash: Hash256::zero(), zero_hash: Hash256::zero(),
@ -52,12 +51,12 @@ impl ChainSpec {
epoch_length: 64, epoch_length: 64,
seed_lookahead: 64, seed_lookahead: 64,
entry_exit_delay: 256, entry_exit_delay: 256,
pow_receipt_root_voting_period: 1_024, eth1_data_voting_period: 1_024,
min_validator_withdrawal_time: u64::pow(2, 14), min_validator_withdrawal_time: u64::pow(2, 14),
/* /*
* Reward and penalty quotients * Reward and penalty quotients
*/ */
base_reward_quotient: 1_024, base_reward_quotient: 32,
whistleblower_reward_quotient: 512, whistleblower_reward_quotient: 512,
includer_reward_quotient: 8, includer_reward_quotient: 8,
inactivity_penalty_quotient: u64::pow(2, 24), inactivity_penalty_quotient: u64::pow(2, 24),
@ -75,13 +74,16 @@ impl ChainSpec {
initial_validators: initial_validators_for_testing(), initial_validators: initial_validators_for_testing(),
initial_balances: initial_balances_for_testing(), initial_balances: initial_balances_for_testing(),
genesis_time: 1_544_672_897, genesis_time: 1_544_672_897,
processed_pow_receipt_root: Hash256::from("pow_root".as_bytes()), intial_eth1_data: Eth1Data {
deposit_root: Hash256::from("deposit_root".as_bytes()),
block_hash: Hash256::from("block_hash".as_bytes()),
},
} }
} }
} }
/// Generate a set of validator records to use with testing until the real chain starts. /// Generate a set of validator records to use with testing until the real chain starts.
fn initial_validators_for_testing() -> Vec<ValidatorRecord> { fn initial_validators_for_testing() -> Vec<Validator> {
// Some dummy private keys to start with. // Some dummy private keys to start with.
let key_strings = vec![ let key_strings = vec![
"jzjxxgjajfjrmgodszzsgqccmhnyvetcuxobhtynojtpdtbj", "jzjxxgjajfjrmgodszzsgqccmhnyvetcuxobhtynojtpdtbj",
@ -104,23 +106,20 @@ fn initial_validators_for_testing() -> Vec<ValidatorRecord> {
pk: public_key, pk: public_key,
} }
}; };
let validator_record = ValidatorRecord { let validator = Validator {
pubkey: keypair.pk.clone(), pubkey: keypair.pk.clone(),
withdrawal_credentials: Hash256::zero(), withdrawal_credentials: Hash256::zero(),
proposer_slots: 0, proposer_slots: 0,
randao_commitment: Hash256::zero(),
randao_layers: 0,
activation_slot: u64::max_value(), activation_slot: u64::max_value(),
exit_slot: u64::max_value(), exit_slot: u64::max_value(),
withdrawal_slot: u64::max_value(), withdrawal_slot: u64::max_value(),
penalized_slot: u64::max_value(), penalized_slot: u64::max_value(),
exit_count: 0, exit_count: 0,
status_flags: None, status_flags: None,
custody_commitment: Hash256::zero(),
latest_custody_reseed_slot: 0, latest_custody_reseed_slot: 0,
penultimate_custody_reseed_slot: 0, penultimate_custody_reseed_slot: 0,
}; };
initial_validators.push(validator_record); initial_validators.push(validator);
} }
initial_validators initial_validators

11
eth2/spec/src/lib.rs
View File

@ -4,7 +4,7 @@ extern crate types;
mod foundation; mod foundation;
use bls::Signature; use bls::Signature;
use types::{Address, Hash256, ValidatorRecord}; use types::{Address, Eth1Data, Hash256, Validator};
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
pub struct ChainSpec { pub struct ChainSpec {
@ -15,7 +15,6 @@ pub struct ChainSpec {
pub target_committee_size: u64, pub target_committee_size: u64,
pub ejection_balance: u64, pub ejection_balance: u64,
pub max_balance_churn_quotient: u64, pub max_balance_churn_quotient: u64,
pub gwei_per_eth: u64,
pub beacon_chain_shard_number: u64, pub beacon_chain_shard_number: u64,
pub max_casper_votes: u64, pub max_casper_votes: u64,
pub latest_block_roots_length: u64, pub latest_block_roots_length: u64,
@ -33,7 +32,7 @@ pub struct ChainSpec {
* Initial Values * Initial Values
*/ */
pub genesis_fork_version: u64, pub genesis_fork_version: u64,
pub genesis_slot_number: u64, pub genesis_slot: u64,
pub genesis_start_shard: u64, pub genesis_start_shard: u64,
pub far_future_slot: u64, pub far_future_slot: u64,
pub zero_hash: Hash256, pub zero_hash: Hash256,
@ -47,7 +46,7 @@ pub struct ChainSpec {
pub epoch_length: u64, pub epoch_length: u64,
pub seed_lookahead: u64, pub seed_lookahead: u64,
pub entry_exit_delay: u64, pub entry_exit_delay: u64,
pub pow_receipt_root_voting_period: u64, // a.k.a. deposit_root_voting_period pub eth1_data_voting_period: u64,
pub min_validator_withdrawal_time: u64, pub min_validator_withdrawal_time: u64,
/* /*
* Reward and penalty quotients * Reward and penalty quotients
@ -67,8 +66,8 @@ pub struct ChainSpec {
/* /*
* Intialization parameters * Intialization parameters
*/ */
pub initial_validators: Vec<ValidatorRecord>, pub initial_validators: Vec<Validator>,
pub initial_balances: Vec<u64>, pub initial_balances: Vec<u64>,
pub genesis_time: u64, pub genesis_time: u64,
pub processed_pow_receipt_root: Hash256, pub intial_eth1_data: Eth1Data,
} }

30
eth2/types/src/attestation_data.rs
View File

@ -7,9 +7,9 @@ pub const SSZ_ATTESTION_DATA_LENGTH: usize = {
8 + // slot 8 + // slot
8 + // shard 8 + // shard
32 + // beacon_block_hash 32 + // beacon_block_hash
32 + // epoch_boundary_hash 32 + // epoch_boundary_root
32 + // shard_block_root 32 + // shard_block_hash
32 + // latest_crosslink_root 32 + // latest_crosslink_hash
8 + // justified_slot 8 + // justified_slot
32 // justified_block_root 32 // justified_block_root
}; };
@ -18,8 +18,8 @@ pub const SSZ_ATTESTION_DATA_LENGTH: usize = {
pub struct AttestationData { pub struct AttestationData {
pub slot: u64, pub slot: u64,
pub shard: u64, pub shard: u64,
pub beacon_block_hash: Hash256, pub beacon_block_root: Hash256,
pub epoch_boundary_hash: Hash256, pub epoch_boundary_root: Hash256,
pub shard_block_root: Hash256, pub shard_block_root: Hash256,
pub latest_crosslink_root: Hash256, pub latest_crosslink_root: Hash256,
pub justified_slot: u64, pub justified_slot: u64,
@ -31,8 +31,8 @@ impl AttestationData {
Self { Self {
slot: 0, slot: 0,
shard: 0, shard: 0,
beacon_block_hash: Hash256::zero(), beacon_block_root: Hash256::zero(),
epoch_boundary_hash: Hash256::zero(), epoch_boundary_root: Hash256::zero(),
shard_block_root: Hash256::zero(), shard_block_root: Hash256::zero(),
latest_crosslink_root: Hash256::zero(), latest_crosslink_root: Hash256::zero(),
justified_slot: 0, justified_slot: 0,
@ -51,8 +51,8 @@ impl Encodable for AttestationData {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.slot); s.append(&self.slot);
s.append(&self.shard); s.append(&self.shard);
s.append(&self.beacon_block_hash); s.append(&self.beacon_block_root);
s.append(&self.epoch_boundary_hash); s.append(&self.epoch_boundary_root);
s.append(&self.shard_block_root); s.append(&self.shard_block_root);
s.append(&self.latest_crosslink_root); s.append(&self.latest_crosslink_root);
s.append(&self.justified_slot); s.append(&self.justified_slot);
@ -64,8 +64,8 @@ impl Decodable for AttestationData {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (slot, i) = u64::ssz_decode(bytes, i)?; let (slot, i) = u64::ssz_decode(bytes, i)?;
let (shard, i) = u64::ssz_decode(bytes, i)?; let (shard, i) = u64::ssz_decode(bytes, i)?;
let (beacon_block_hash, i) = Hash256::ssz_decode(bytes, i)?; let (beacon_block_root, i) = Hash256::ssz_decode(bytes, i)?;
let (epoch_boundary_hash, i) = Hash256::ssz_decode(bytes, i)?; let (epoch_boundary_root, i) = Hash256::ssz_decode(bytes, i)?;
let (shard_block_root, i) = Hash256::ssz_decode(bytes, i)?; let (shard_block_root, i) = Hash256::ssz_decode(bytes, i)?;
let (latest_crosslink_root, i) = Hash256::ssz_decode(bytes, i)?; let (latest_crosslink_root, i) = Hash256::ssz_decode(bytes, i)?;
let (justified_slot, i) = u64::ssz_decode(bytes, i)?; let (justified_slot, i) = u64::ssz_decode(bytes, i)?;
@ -74,8 +74,8 @@ impl Decodable for AttestationData {
let attestation_data = AttestationData { let attestation_data = AttestationData {
slot, slot,
shard, shard,
beacon_block_hash, beacon_block_root,
epoch_boundary_hash, epoch_boundary_root,
shard_block_root, shard_block_root,
latest_crosslink_root, latest_crosslink_root,
justified_slot, justified_slot,
@ -90,8 +90,8 @@ impl<T: RngCore> TestRandom<T> for AttestationData {
Self { Self {
slot: <_>::random_for_test(rng), slot: <_>::random_for_test(rng),
shard: <_>::random_for_test(rng), shard: <_>::random_for_test(rng),
beacon_block_hash: <_>::random_for_test(rng), beacon_block_root: <_>::random_for_test(rng),
epoch_boundary_hash: <_>::random_for_test(rng), epoch_boundary_root: <_>::random_for_test(rng),
shard_block_root: <_>::random_for_test(rng), shard_block_root: <_>::random_for_test(rng),
latest_crosslink_root: <_>::random_for_test(rng), latest_crosslink_root: <_>::random_for_test(rng),
justified_slot: <_>::random_for_test(rng), justified_slot: <_>::random_for_test(rng),

12
eth2/types/src/beacon_block.rs
View File

@ -1,5 +1,5 @@
use super::ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream}; use super::ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream};
use super::{BeaconBlockBody, Hash256}; use super::{BeaconBlockBody, Eth1Data, Hash256};
use crate::test_utils::TestRandom; use crate::test_utils::TestRandom;
use bls::Signature; use bls::Signature;
use hashing::canonical_hash; use hashing::canonical_hash;
@ -11,7 +11,7 @@ pub struct BeaconBlock {
pub parent_root: Hash256, pub parent_root: Hash256,
pub state_root: Hash256, pub state_root: Hash256,
pub randao_reveal: Signature, pub randao_reveal: Signature,
pub candidate_pow_receipt_root: Hash256, pub eth1_data: Eth1Data,
pub signature: Signature, pub signature: Signature,
pub body: BeaconBlockBody, pub body: BeaconBlockBody,
} }
@ -30,7 +30,7 @@ impl Encodable for BeaconBlock {
s.append(&self.parent_root); s.append(&self.parent_root);
s.append(&self.state_root); s.append(&self.state_root);
s.append(&self.randao_reveal); s.append(&self.randao_reveal);
s.append(&self.candidate_pow_receipt_root); s.append(&self.eth1_data);
s.append(&self.signature); s.append(&self.signature);
s.append(&self.body); s.append(&self.body);
} }
@ -42,7 +42,7 @@ impl Decodable for BeaconBlock {
let (parent_root, i) = <_>::ssz_decode(bytes, i)?; let (parent_root, i) = <_>::ssz_decode(bytes, i)?;
let (state_root, i) = <_>::ssz_decode(bytes, i)?; let (state_root, i) = <_>::ssz_decode(bytes, i)?;
let (randao_reveal, i) = <_>::ssz_decode(bytes, i)?; let (randao_reveal, i) = <_>::ssz_decode(bytes, i)?;
let (candidate_pow_receipt_root, i) = <_>::ssz_decode(bytes, i)?; let (eth1_data, i) = <_>::ssz_decode(bytes, i)?;
let (signature, i) = <_>::ssz_decode(bytes, i)?; let (signature, i) = <_>::ssz_decode(bytes, i)?;
let (body, i) = <_>::ssz_decode(bytes, i)?; let (body, i) = <_>::ssz_decode(bytes, i)?;
@ -52,7 +52,7 @@ impl Decodable for BeaconBlock {
parent_root, parent_root,
state_root, state_root,
randao_reveal, randao_reveal,
candidate_pow_receipt_root, eth1_data,
signature, signature,
body, body,
}, },
@ -68,7 +68,7 @@ impl<T: RngCore> TestRandom<T> for BeaconBlock {
parent_root: <_>::random_for_test(rng), parent_root: <_>::random_for_test(rng),
state_root: <_>::random_for_test(rng), state_root: <_>::random_for_test(rng),
randao_reveal: <_>::random_for_test(rng), randao_reveal: <_>::random_for_test(rng),
candidate_pow_receipt_root: <_>::random_for_test(rng), eth1_data: <_>::random_for_test(rng),
signature: <_>::random_for_test(rng), signature: <_>::random_for_test(rng),
body: <_>::random_for_test(rng), body: <_>::random_for_test(rng),
} }

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

@ -1,10 +1,11 @@
use crate::candidate_pow_receipt_root_record::CandidatePoWReceiptRootRecord; use super::crosslink::Crosslink;
use crate::crosslink_record::CrosslinkRecord; use super::eth1_data::Eth1Data;
use crate::fork_data::ForkData; use super::eth1_data_vote::Eth1DataVote;
use crate::pending_attestation_record::PendingAttestationRecord; use super::fork::Fork;
use super::pending_attestation::PendingAttestation;
use super::validator::Validator;
use super::Hash256;
use crate::test_utils::TestRandom; use crate::test_utils::TestRandom;
use crate::validator_record::ValidatorRecord;
use crate::Hash256;
use hashing::canonical_hash; use hashing::canonical_hash;
use rand::RngCore; use rand::RngCore;
use ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream}; use ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream};
@ -17,12 +18,12 @@ pub struct BeaconState {
// Misc // Misc
pub slot: u64, pub slot: u64,
pub genesis_time: u64, pub genesis_time: u64,
pub fork_data: ForkData, pub fork_data: Fork,
// Validator registry // Validator registry
pub validator_registry: Vec<ValidatorRecord>, pub validator_registry: Vec<Validator>,
pub validator_balances: Vec<u64>, pub validator_balances: Vec<u64>,
pub validator_registry_latest_change_slot: u64, pub validator_registry_update_slot: u64,
pub validator_registry_exit_count: u64, pub validator_registry_exit_count: u64,
pub validator_registry_delta_chain_tip: Hash256, pub validator_registry_delta_chain_tip: Hash256,
@ -46,15 +47,15 @@ pub struct BeaconState {
pub finalized_slot: u64, pub finalized_slot: u64,
// Recent state // Recent state
pub latest_crosslinks: Vec<CrosslinkRecord>, pub latest_crosslinks: Vec<Crosslink>,
pub latest_block_roots: Vec<Hash256>, pub latest_block_roots: Vec<Hash256>,
pub latest_penalized_exit_balances: Vec<u64>, pub latest_penalized_exit_balances: Vec<u64>,
pub latest_attestations: Vec<PendingAttestationRecord>, pub latest_attestations: Vec<PendingAttestation>,
pub batched_block_roots: Vec<Hash256>, pub batched_block_roots: Vec<Hash256>,
// PoW receipt root (a.k.a. deposit root) // Ethereum 1.0 chain data
pub processed_pow_receipt_root: Hash256, pub latest_eth1_data: Eth1Data,
pub candidate_pow_receipt_roots: Vec<CandidatePoWReceiptRootRecord>, pub eth1_data_votes: Vec<Eth1DataVote>,
} }
impl BeaconState { impl BeaconState {
@ -72,7 +73,7 @@ impl Encodable for BeaconState {
s.append(&self.fork_data); s.append(&self.fork_data);
s.append(&self.validator_registry); s.append(&self.validator_registry);
s.append(&self.validator_balances); s.append(&self.validator_balances);
s.append(&self.validator_registry_latest_change_slot); s.append(&self.validator_registry_update_slot);
s.append(&self.validator_registry_exit_count); s.append(&self.validator_registry_exit_count);
s.append(&self.validator_registry_delta_chain_tip); s.append(&self.validator_registry_delta_chain_tip);
s.append(&self.latest_randao_mixes); s.append(&self.latest_randao_mixes);
@ -93,8 +94,8 @@ impl Encodable for BeaconState {
s.append(&self.latest_penalized_exit_balances); s.append(&self.latest_penalized_exit_balances);
s.append(&self.latest_attestations); s.append(&self.latest_attestations);
s.append(&self.batched_block_roots); s.append(&self.batched_block_roots);
s.append(&self.processed_pow_receipt_root); s.append(&self.latest_eth1_data);
s.append(&self.candidate_pow_receipt_roots); s.append(&self.eth1_data_votes);
} }
} }
@ -105,7 +106,7 @@ impl Decodable for BeaconState {
let (fork_data, i) = <_>::ssz_decode(bytes, i)?; let (fork_data, i) = <_>::ssz_decode(bytes, i)?;
let (validator_registry, i) = <_>::ssz_decode(bytes, i)?; let (validator_registry, i) = <_>::ssz_decode(bytes, i)?;
let (validator_balances, i) = <_>::ssz_decode(bytes, i)?; let (validator_balances, i) = <_>::ssz_decode(bytes, i)?;
let (validator_registry_latest_change_slot, i) = <_>::ssz_decode(bytes, i)?; let (validator_registry_update_slot, i) = <_>::ssz_decode(bytes, i)?;
let (validator_registry_exit_count, i) = <_>::ssz_decode(bytes, i)?; let (validator_registry_exit_count, i) = <_>::ssz_decode(bytes, i)?;
let (validator_registry_delta_chain_tip, i) = <_>::ssz_decode(bytes, i)?; let (validator_registry_delta_chain_tip, i) = <_>::ssz_decode(bytes, i)?;
let (latest_randao_mixes, i) = <_>::ssz_decode(bytes, i)?; let (latest_randao_mixes, i) = <_>::ssz_decode(bytes, i)?;
@ -126,8 +127,8 @@ impl Decodable for BeaconState {
let (latest_penalized_exit_balances, i) = <_>::ssz_decode(bytes, i)?; let (latest_penalized_exit_balances, i) = <_>::ssz_decode(bytes, i)?;
let (latest_attestations, i) = <_>::ssz_decode(bytes, i)?; let (latest_attestations, i) = <_>::ssz_decode(bytes, i)?;
let (batched_block_roots, i) = <_>::ssz_decode(bytes, i)?; let (batched_block_roots, i) = <_>::ssz_decode(bytes, i)?;
let (processed_pow_receipt_root, i) = <_>::ssz_decode(bytes, i)?; let (latest_eth1_data, i) = <_>::ssz_decode(bytes, i)?;
let (candidate_pow_receipt_roots, i) = <_>::ssz_decode(bytes, i)?; let (eth1_data_votes, i) = <_>::ssz_decode(bytes, i)?;
Ok(( Ok((
Self { Self {
@ -136,7 +137,7 @@ impl Decodable for BeaconState {
fork_data, fork_data,
validator_registry, validator_registry,
validator_balances, validator_balances,
validator_registry_latest_change_slot, validator_registry_update_slot,
validator_registry_exit_count, validator_registry_exit_count,
validator_registry_delta_chain_tip, validator_registry_delta_chain_tip,
latest_randao_mixes, latest_randao_mixes,
@ -157,8 +158,8 @@ impl Decodable for BeaconState {
latest_penalized_exit_balances, latest_penalized_exit_balances,
latest_attestations, latest_attestations,
batched_block_roots, batched_block_roots,
processed_pow_receipt_root, latest_eth1_data,
candidate_pow_receipt_roots, eth1_data_votes,
}, },
i, i,
)) ))
@ -173,7 +174,7 @@ impl<T: RngCore> TestRandom<T> for BeaconState {
fork_data: <_>::random_for_test(rng), fork_data: <_>::random_for_test(rng),
validator_registry: <_>::random_for_test(rng), validator_registry: <_>::random_for_test(rng),
validator_balances: <_>::random_for_test(rng), validator_balances: <_>::random_for_test(rng),
validator_registry_latest_change_slot: <_>::random_for_test(rng), validator_registry_update_slot: <_>::random_for_test(rng),
validator_registry_exit_count: <_>::random_for_test(rng), validator_registry_exit_count: <_>::random_for_test(rng),
validator_registry_delta_chain_tip: <_>::random_for_test(rng), validator_registry_delta_chain_tip: <_>::random_for_test(rng),
latest_randao_mixes: <_>::random_for_test(rng), latest_randao_mixes: <_>::random_for_test(rng),
@ -194,8 +195,8 @@ impl<T: RngCore> TestRandom<T> for BeaconState {
latest_penalized_exit_balances: <_>::random_for_test(rng), latest_penalized_exit_balances: <_>::random_for_test(rng),
latest_attestations: <_>::random_for_test(rng), latest_attestations: <_>::random_for_test(rng),
batched_block_roots: <_>::random_for_test(rng), batched_block_roots: <_>::random_for_test(rng),
processed_pow_receipt_root: <_>::random_for_test(rng), latest_eth1_data: <_>::random_for_test(rng),
candidate_pow_receipt_roots: <_>::random_for_test(rng), eth1_data_votes: <_>::random_for_test(rng),
} }
} }
} }

12
eth2/types/src/crosslink_record.rs → eth2/types/src/crosslink.rs
View File

@ -4,12 +4,12 @@ use crate::test_utils::TestRandom;
use rand::RngCore; use rand::RngCore;
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct CrosslinkRecord { pub struct Crosslink {
pub slot: u64, pub slot: u64,
pub shard_block_root: Hash256, pub shard_block_root: Hash256,
} }
impl CrosslinkRecord { impl Crosslink {
/// Generates a new instance where `dynasty` and `hash` are both zero. /// Generates a new instance where `dynasty` and `hash` are both zero.
pub fn zero() -> Self { pub fn zero() -> Self {
Self { Self {
@ -19,14 +19,14 @@ impl CrosslinkRecord {
} }
} }
impl Encodable for CrosslinkRecord { impl Encodable for Crosslink {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.slot); s.append(&self.slot);
s.append(&self.shard_block_root); s.append(&self.shard_block_root);
} }
} }
impl Decodable for CrosslinkRecord { impl Decodable for Crosslink {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (slot, i) = <_>::ssz_decode(bytes, i)?; let (slot, i) = <_>::ssz_decode(bytes, i)?;
let (shard_block_root, i) = <_>::ssz_decode(bytes, i)?; let (shard_block_root, i) = <_>::ssz_decode(bytes, i)?;
@ -41,7 +41,7 @@ impl Decodable for CrosslinkRecord {
} }
} }
impl<T: RngCore> TestRandom<T> for CrosslinkRecord { impl<T: RngCore> TestRandom<T> for Crosslink {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
slot: <_>::random_for_test(rng), slot: <_>::random_for_test(rng),
@ -59,7 +59,7 @@ mod tests {
#[test] #[test]
pub fn test_ssz_round_trip() { pub fn test_ssz_round_trip() {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
let original = CrosslinkRecord::random_for_test(&mut rng); let original = Crosslink::random_for_test(&mut rng);
let bytes = ssz_encode(&original); let bytes = ssz_encode(&original);
let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();

20
eth2/types/src/deposit_data.rs
View File

@ -5,30 +5,30 @@ use rand::RngCore;
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct DepositData { pub struct DepositData {
pub deposit_input: DepositInput, pub amount: u64,
pub value: u64,
pub timestamp: u64, pub timestamp: u64,
pub deposit_input: DepositInput,
} }
impl Encodable for DepositData { impl Encodable for DepositData {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.deposit_input); s.append(&self.amount);
s.append(&self.value);
s.append(&self.timestamp); s.append(&self.timestamp);
s.append(&self.deposit_input);
} }
} }
impl Decodable for DepositData { impl Decodable for DepositData {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (deposit_input, i) = <_>::ssz_decode(bytes, i)?; let (amount, i) = <_>::ssz_decode(bytes, i)?;
let (value, i) = <_>::ssz_decode(bytes, i)?;
let (timestamp, i) = <_>::ssz_decode(bytes, i)?; let (timestamp, i) = <_>::ssz_decode(bytes, i)?;
let (deposit_input, i) = <_>::ssz_decode(bytes, i)?;
Ok(( Ok((
Self { Self {
deposit_input, amount,
value,
timestamp, timestamp,
deposit_input,
}, },
i, i,
)) ))
@ -38,9 +38,9 @@ impl Decodable for DepositData {
impl<T: RngCore> TestRandom<T> for DepositData { impl<T: RngCore> TestRandom<T> for DepositData {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
deposit_input: <_>::random_for_test(rng), amount: <_>::random_for_test(rng),
value: <_>::random_for_test(rng),
timestamp: <_>::random_for_test(rng), timestamp: <_>::random_for_test(rng),
deposit_input: <_>::random_for_test(rng),
} }
} }
} }

10
eth2/types/src/deposit_input.rs
View File

@ -8,8 +8,6 @@ use rand::RngCore;
pub struct DepositInput { pub struct DepositInput {
pub pubkey: PublicKey, pub pubkey: PublicKey,
pub withdrawal_credentials: Hash256, pub withdrawal_credentials: Hash256,
pub randao_commitment: Hash256,
pub custody_commitment: Hash256,
pub proof_of_possession: Signature, pub proof_of_possession: Signature,
} }
@ -17,8 +15,6 @@ impl Encodable for DepositInput {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.pubkey); s.append(&self.pubkey);
s.append(&self.withdrawal_credentials); s.append(&self.withdrawal_credentials);
s.append(&self.randao_commitment);
s.append(&self.custody_commitment);
s.append(&self.proof_of_possession); s.append(&self.proof_of_possession);
} }
} }
@ -27,16 +23,12 @@ impl Decodable for DepositInput {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (pubkey, i) = <_>::ssz_decode(bytes, i)?; let (pubkey, i) = <_>::ssz_decode(bytes, i)?;
let (withdrawal_credentials, i) = <_>::ssz_decode(bytes, i)?; let (withdrawal_credentials, i) = <_>::ssz_decode(bytes, i)?;
let (randao_commitment, i) = <_>::ssz_decode(bytes, i)?;
let (custody_commitment, i) = <_>::ssz_decode(bytes, i)?;
let (proof_of_possession, i) = <_>::ssz_decode(bytes, i)?; let (proof_of_possession, i) = <_>::ssz_decode(bytes, i)?;
Ok(( Ok((
Self { Self {
pubkey, pubkey,
withdrawal_credentials, withdrawal_credentials,
randao_commitment,
custody_commitment,
proof_of_possession, proof_of_possession,
}, },
i, i,
@ -49,8 +41,6 @@ impl<T: RngCore> TestRandom<T> for DepositInput {
Self { Self {
pubkey: <_>::random_for_test(rng), pubkey: <_>::random_for_test(rng),
withdrawal_credentials: <_>::random_for_test(rng), withdrawal_credentials: <_>::random_for_test(rng),
randao_commitment: <_>::random_for_test(rng),
custody_commitment: <_>::random_for_test(rng),
proof_of_possession: <_>::random_for_test(rng), proof_of_possession: <_>::random_for_test(rng),
} }
} }

32
eth2/types/src/candidate_pow_receipt_root_record.rs → eth2/types/src/eth1_data.rs
View File

@ -4,39 +4,39 @@ use crate::test_utils::TestRandom;
use rand::RngCore; use rand::RngCore;
// Note: this is refer to as DepositRootVote in specs // Note: this is refer to as DepositRootVote in specs
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone, Default)]
pub struct CandidatePoWReceiptRootRecord { pub struct Eth1Data {
pub candidate_pow_receipt_root: Hash256, pub deposit_root: Hash256,
pub votes: u64, pub block_hash: Hash256,
} }
impl Encodable for CandidatePoWReceiptRootRecord { impl Encodable for Eth1Data {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.candidate_pow_receipt_root); s.append(&self.deposit_root);
s.append(&self.votes); s.append(&self.block_hash);
} }
} }
impl Decodable for CandidatePoWReceiptRootRecord { impl Decodable for Eth1Data {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (candidate_pow_receipt_root, i) = <_>::ssz_decode(bytes, i)?; let (deposit_root, i) = <_>::ssz_decode(bytes, i)?;
let (votes, i) = <_>::ssz_decode(bytes, i)?; let (block_hash, i) = <_>::ssz_decode(bytes, i)?;
Ok(( Ok((
Self { Self {
candidate_pow_receipt_root, deposit_root,
votes, block_hash,
}, },
i, i,
)) ))
} }
} }
impl<T: RngCore> TestRandom<T> for CandidatePoWReceiptRootRecord { impl<T: RngCore> TestRandom<T> for Eth1Data {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
candidate_pow_receipt_root: <_>::random_for_test(rng), deposit_root: <_>::random_for_test(rng),
votes: <_>::random_for_test(rng), block_hash: <_>::random_for_test(rng),
} }
} }
} }
@ -50,7 +50,7 @@ mod tests {
#[test] #[test]
pub fn test_ssz_round_trip() { pub fn test_ssz_round_trip() {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
let original = CandidatePoWReceiptRootRecord::random_for_test(&mut rng); let original = Eth1Data::random_for_test(&mut rng);
let bytes = ssz_encode(&original); let bytes = ssz_encode(&original);
let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();

60
eth2/types/src/eth1_data_vote.rs Normal file
View File

@ -0,0 +1,60 @@
use super::ssz::{Decodable, DecodeError, Encodable, SszStream};
use super::Eth1Data;
use crate::test_utils::TestRandom;
use rand::RngCore;
// Note: this is refer to as DepositRootVote in specs
#[derive(Debug, PartialEq, Clone, Default)]
pub struct Eth1DataVote {
pub eth1_data: Eth1Data,
pub vote_count: u64,
}
impl Encodable for Eth1DataVote {
fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.eth1_data);
s.append(&self.vote_count);
}
}
impl Decodable for Eth1DataVote {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (eth1_data, i) = <_>::ssz_decode(bytes, i)?;
let (vote_count, i) = <_>::ssz_decode(bytes, i)?;
Ok((
Self {
eth1_data,
vote_count,
},
i,
))
}
}
impl<T: RngCore> TestRandom<T> for Eth1DataVote {
fn random_for_test(rng: &mut T) -> Self {
Self {
eth1_data: <_>::random_for_test(rng),
vote_count: <_>::random_for_test(rng),
}
}
}
#[cfg(test)]
mod tests {
use super::super::ssz::ssz_encode;
use super::*;
use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
#[test]
pub fn test_ssz_round_trip() {
let mut rng = XorShiftRng::from_seed([42; 16]);
let original = Eth1DataVote::random_for_test(&mut rng);
let bytes = ssz_encode(&original);
let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();
assert_eq!(original, decoded);
}
}

10
eth2/types/src/fork_data.rs → eth2/types/src/fork.rs
View File

@ -3,13 +3,13 @@ use crate::test_utils::TestRandom;
use rand::RngCore; use rand::RngCore;
#[derive(Debug, Clone, PartialEq, Default)] #[derive(Debug, Clone, PartialEq, Default)]
pub struct ForkData { pub struct Fork {
pub pre_fork_version: u64, pub pre_fork_version: u64,
pub post_fork_version: u64, pub post_fork_version: u64,
pub fork_slot: u64, pub fork_slot: u64,
} }
impl Encodable for ForkData { impl Encodable for Fork {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.pre_fork_version); s.append(&self.pre_fork_version);
s.append(&self.post_fork_version); s.append(&self.post_fork_version);
@ -17,7 +17,7 @@ impl Encodable for ForkData {
} }
} }
impl Decodable for ForkData { impl Decodable for Fork {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (pre_fork_version, i) = <_>::ssz_decode(bytes, i)?; let (pre_fork_version, i) = <_>::ssz_decode(bytes, i)?;
let (post_fork_version, i) = <_>::ssz_decode(bytes, i)?; let (post_fork_version, i) = <_>::ssz_decode(bytes, i)?;
@ -34,7 +34,7 @@ impl Decodable for ForkData {
} }
} }
impl<T: RngCore> TestRandom<T> for ForkData { impl<T: RngCore> TestRandom<T> for Fork {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
pre_fork_version: <_>::random_for_test(rng), pre_fork_version: <_>::random_for_test(rng),
@ -53,7 +53,7 @@ mod tests {
#[test] #[test]
pub fn test_ssz_round_trip() { pub fn test_ssz_round_trip() {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
let original = ForkData::random_for_test(&mut rng); let original = Fork::random_for_test(&mut rng);
let bytes = ssz_encode(&original); let bytes = ssz_encode(&original);
let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();

23
eth2/types/src/lib.rs
View File

@ -11,23 +11,25 @@ pub mod attestation_data_and_custody_bit;
pub mod beacon_block; pub mod beacon_block;
pub mod beacon_block_body; pub mod beacon_block_body;
pub mod beacon_state; pub mod beacon_state;
pub mod candidate_pow_receipt_root_record;
pub mod casper_slashing; pub mod casper_slashing;
pub mod crosslink_record; pub mod crosslink;
pub mod deposit; pub mod deposit;
pub mod deposit_data; pub mod deposit_data;
pub mod deposit_input; pub mod deposit_input;
pub mod eth1_data;
pub mod eth1_data_vote;
pub mod exit; pub mod exit;
pub mod fork_data; pub mod fork;
pub mod pending_attestation_record; pub mod pending_attestation;
pub mod proposal_signed_data; pub mod proposal_signed_data;
pub mod proposer_slashing; pub mod proposer_slashing;
pub mod shard_committee; pub mod shard_committee;
pub mod shard_reassignment_record; pub mod shard_reassignment_record;
pub mod slashable_vote_data; pub mod slashable_vote_data;
pub mod special_record; pub mod special_record;
pub mod validator_record; pub mod validator;
pub mod validator_registry; pub mod validator_registry;
pub mod validator_registry_delta_block;
pub mod readers; pub mod readers;
@ -41,19 +43,22 @@ pub use crate::beacon_block::BeaconBlock;
pub use crate::beacon_block_body::BeaconBlockBody; pub use crate::beacon_block_body::BeaconBlockBody;
pub use crate::beacon_state::BeaconState; pub use crate::beacon_state::BeaconState;
pub use crate::casper_slashing::CasperSlashing; pub use crate::casper_slashing::CasperSlashing;
pub use crate::crosslink_record::CrosslinkRecord; pub use crate::crosslink::Crosslink;
pub use crate::deposit::Deposit; pub use crate::deposit::Deposit;
pub use crate::deposit_data::DepositData; pub use crate::deposit_data::DepositData;
pub use crate::deposit_input::DepositInput; 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::exit::Exit;
pub use crate::fork_data::ForkData; pub use crate::fork::Fork;
pub use crate::pending_attestation_record::PendingAttestationRecord; pub use crate::pending_attestation::PendingAttestation;
pub use crate::proposal_signed_data::ProposalSignedData; pub use crate::proposal_signed_data::ProposalSignedData;
pub use crate::proposer_slashing::ProposerSlashing; pub use crate::proposer_slashing::ProposerSlashing;
pub use crate::shard_committee::ShardCommittee; pub use crate::shard_committee::ShardCommittee;
pub use crate::slashable_vote_data::SlashableVoteData; pub use crate::slashable_vote_data::SlashableVoteData;
pub use crate::special_record::{SpecialRecord, SpecialRecordKind}; pub use crate::special_record::{SpecialRecord, SpecialRecordKind};
pub use crate::validator_record::{StatusFlags as ValidatorStatusFlags, ValidatorRecord}; pub use crate::validator::{StatusFlags as ValidatorStatusFlags, Validator};
pub use crate::validator_registry_delta_block::ValidatorRegistryDeltaBlock;
pub type Hash256 = H256; pub type Hash256 = H256;
pub type Address = H160; pub type Address = H160;

10
eth2/types/src/pending_attestation_record.rs → eth2/types/src/pending_attestation.rs
View File

@ -4,14 +4,14 @@ use crate::test_utils::TestRandom;
use rand::RngCore; use rand::RngCore;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub struct PendingAttestationRecord { pub struct PendingAttestation {
pub data: AttestationData, pub data: AttestationData,
pub aggregation_bitfield: Bitfield, pub aggregation_bitfield: Bitfield,
pub custody_bitfield: Bitfield, pub custody_bitfield: Bitfield,
pub slot_included: u64, pub slot_included: u64,
} }
impl Encodable for PendingAttestationRecord { impl Encodable for PendingAttestation {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.data); s.append(&self.data);
s.append(&self.aggregation_bitfield); s.append(&self.aggregation_bitfield);
@ -20,7 +20,7 @@ impl Encodable for PendingAttestationRecord {
} }
} }
impl Decodable for PendingAttestationRecord { impl Decodable for PendingAttestation {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (data, i) = <_>::ssz_decode(bytes, i)?; let (data, i) = <_>::ssz_decode(bytes, i)?;
let (aggregation_bitfield, i) = <_>::ssz_decode(bytes, i)?; let (aggregation_bitfield, i) = <_>::ssz_decode(bytes, i)?;
@ -39,7 +39,7 @@ impl Decodable for PendingAttestationRecord {
} }
} }
impl<T: RngCore> TestRandom<T> for PendingAttestationRecord { impl<T: RngCore> TestRandom<T> for PendingAttestation {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
data: <_>::random_for_test(rng), data: <_>::random_for_test(rng),
@ -59,7 +59,7 @@ mod tests {
#[test] #[test]
pub fn test_ssz_round_trip() { pub fn test_ssz_round_trip() {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
let original = PendingAttestationRecord::random_for_test(&mut rng); let original = PendingAttestation::random_for_test(&mut rng);
let bytes = ssz_encode(&original); let bytes = ssz_encode(&original);
let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();

20
eth2/types/src/slashable_vote_data.rs
View File

@ -6,16 +6,16 @@ use rand::RngCore;
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct SlashableVoteData { pub struct SlashableVoteData {
pub aggregate_signature_poc_0_indices: Vec<u32>, pub custody_bit_0_indices: Vec<u32>,
pub aggregate_signature_poc_1_indices: Vec<u32>, pub custody_bit_1_indices: Vec<u32>,
pub data: AttestationData, pub data: AttestationData,
pub aggregate_signature: AggregateSignature, pub aggregate_signature: AggregateSignature,
} }
impl Encodable for SlashableVoteData { impl Encodable for SlashableVoteData {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append_vec(&self.aggregate_signature_poc_0_indices); s.append_vec(&self.custody_bit_0_indices);
s.append_vec(&self.aggregate_signature_poc_1_indices); s.append_vec(&self.custody_bit_1_indices);
s.append(&self.data); s.append(&self.data);
s.append(&self.aggregate_signature); s.append(&self.aggregate_signature);
} }
@ -23,15 +23,15 @@ impl Encodable for SlashableVoteData {
impl Decodable for SlashableVoteData { impl Decodable for SlashableVoteData {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (aggregate_signature_poc_0_indices, i) = <_>::ssz_decode(bytes, i)?; let (custody_bit_0_indices, i) = <_>::ssz_decode(bytes, i)?;
let (aggregate_signature_poc_1_indices, i) = <_>::ssz_decode(bytes, i)?; let (custody_bit_1_indices, i) = <_>::ssz_decode(bytes, i)?;
let (data, i) = <_>::ssz_decode(bytes, i)?; let (data, i) = <_>::ssz_decode(bytes, i)?;
let (aggregate_signature, i) = <_>::ssz_decode(bytes, i)?; let (aggregate_signature, i) = <_>::ssz_decode(bytes, i)?;
Ok(( Ok((
SlashableVoteData { SlashableVoteData {
aggregate_signature_poc_0_indices, custody_bit_0_indices,
aggregate_signature_poc_1_indices, custody_bit_1_indices,
data, data,
aggregate_signature, aggregate_signature,
}, },
@ -43,8 +43,8 @@ impl Decodable for SlashableVoteData {
impl<T: RngCore> TestRandom<T> for SlashableVoteData { impl<T: RngCore> TestRandom<T> for SlashableVoteData {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
aggregate_signature_poc_0_indices: <_>::random_for_test(rng), custody_bit_0_indices: <_>::random_for_test(rng),
aggregate_signature_poc_1_indices: <_>::random_for_test(rng), custody_bit_1_indices: <_>::random_for_test(rng),
data: <_>::random_for_test(rng), data: <_>::random_for_test(rng),
aggregate_signature: <_>::random_for_test(rng), aggregate_signature: <_>::random_for_test(rng),
} }

40
eth2/types/src/validator_record.rs → eth2/types/src/validator.rs
View File

@ -21,7 +21,7 @@ impl From<StatusFlagsDecodeError> for DecodeError {
} }
} }
/// Handles the serialization logic for the `status_flags` field of the `ValidatorRecord`. /// Handles the serialization logic for the `status_flags` field of the `Validator`.
fn status_flag_to_byte(flag: Option<StatusFlags>) -> u8 { fn status_flag_to_byte(flag: Option<StatusFlags>) -> u8 {
if let Some(flag) = flag { if let Some(flag) = flag {
match flag { match flag {
@ -33,7 +33,7 @@ fn status_flag_to_byte(flag: Option<StatusFlags>) -> u8 {
} }
} }
/// Handles the deserialization logic for the `status_flags` field of the `ValidatorRecord`. /// Handles the deserialization logic for the `status_flags` field of the `Validator`.
fn status_flag_from_byte(flag: u8) -> Result<Option<StatusFlags>, StatusFlagsDecodeError> { fn status_flag_from_byte(flag: u8) -> Result<Option<StatusFlags>, StatusFlagsDecodeError> {
match flag { match flag {
0 => Ok(None), 0 => Ok(None),
@ -44,46 +44,40 @@ fn status_flag_from_byte(flag: u8) -> Result<Option<StatusFlags>, StatusFlagsDec
} }
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub struct ValidatorRecord { pub struct Validator {
pub pubkey: PublicKey, pub pubkey: PublicKey,
pub withdrawal_credentials: Hash256, pub withdrawal_credentials: Hash256,
pub proposer_slots: u64, pub proposer_slots: u64,
pub randao_commitment: Hash256,
pub randao_layers: u64,
pub activation_slot: u64, pub activation_slot: u64,
pub exit_slot: u64, pub exit_slot: u64,
pub withdrawal_slot: u64, pub withdrawal_slot: u64,
pub penalized_slot: u64, pub penalized_slot: u64,
pub exit_count: u64, pub exit_count: u64,
pub status_flags: Option<StatusFlags>, pub status_flags: Option<StatusFlags>,
pub custody_commitment: Hash256,
pub latest_custody_reseed_slot: u64, pub latest_custody_reseed_slot: u64,
pub penultimate_custody_reseed_slot: u64, pub penultimate_custody_reseed_slot: u64,
} }
impl ValidatorRecord { impl Validator {
/// This predicate indicates if the validator represented by this record is considered "active" at `slot`. /// This predicate indicates if the validator represented by this record is considered "active" at `slot`.
pub fn is_active_at(&self, slot: u64) -> bool { pub fn is_active_at(&self, slot: u64) -> bool {
self.activation_slot <= slot && slot < self.exit_slot self.activation_slot <= slot && slot < self.exit_slot
} }
} }
impl Default for ValidatorRecord { impl Default for Validator {
/// Yields a "default" `ValidatorRecord`. Primarily used for testing. /// Yields a "default" `Validator`. Primarily used for testing.
fn default() -> Self { fn default() -> Self {
Self { Self {
pubkey: PublicKey::default(), pubkey: PublicKey::default(),
withdrawal_credentials: Hash256::default(), withdrawal_credentials: Hash256::default(),
proposer_slots: 0, proposer_slots: 0,
randao_commitment: Hash256::default(),
randao_layers: 0,
activation_slot: std::u64::MAX, activation_slot: std::u64::MAX,
exit_slot: std::u64::MAX, exit_slot: std::u64::MAX,
withdrawal_slot: std::u64::MAX, withdrawal_slot: std::u64::MAX,
penalized_slot: std::u64::MAX, penalized_slot: std::u64::MAX,
exit_count: 0, exit_count: 0,
status_flags: None, status_flags: None,
custody_commitment: Hash256::default(),
latest_custody_reseed_slot: 0, // NOTE: is `GENESIS_SLOT` latest_custody_reseed_slot: 0, // NOTE: is `GENESIS_SLOT`
penultimate_custody_reseed_slot: 0, // NOTE: is `GENESIS_SLOT` penultimate_custody_reseed_slot: 0, // NOTE: is `GENESIS_SLOT`
} }
@ -97,39 +91,33 @@ impl<T: RngCore> TestRandom<T> for StatusFlags {
} }
} }
impl Encodable for ValidatorRecord { impl Encodable for Validator {
fn ssz_append(&self, s: &mut SszStream) { fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.pubkey); s.append(&self.pubkey);
s.append(&self.withdrawal_credentials); s.append(&self.withdrawal_credentials);
s.append(&self.proposer_slots); s.append(&self.proposer_slots);
s.append(&self.randao_commitment);
s.append(&self.randao_layers);
s.append(&self.activation_slot); s.append(&self.activation_slot);
s.append(&self.exit_slot); s.append(&self.exit_slot);
s.append(&self.withdrawal_slot); s.append(&self.withdrawal_slot);
s.append(&self.penalized_slot); s.append(&self.penalized_slot);
s.append(&self.exit_count); s.append(&self.exit_count);
s.append(&status_flag_to_byte(self.status_flags)); s.append(&status_flag_to_byte(self.status_flags));
s.append(&self.custody_commitment);
s.append(&self.latest_custody_reseed_slot); s.append(&self.latest_custody_reseed_slot);
s.append(&self.penultimate_custody_reseed_slot); s.append(&self.penultimate_custody_reseed_slot);
} }
} }
impl Decodable for ValidatorRecord { impl Decodable for Validator {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> { fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (pubkey, i) = <_>::ssz_decode(bytes, i)?; let (pubkey, i) = <_>::ssz_decode(bytes, i)?;
let (withdrawal_credentials, i) = <_>::ssz_decode(bytes, i)?; let (withdrawal_credentials, i) = <_>::ssz_decode(bytes, i)?;
let (proposer_slots, i) = <_>::ssz_decode(bytes, i)?; let (proposer_slots, i) = <_>::ssz_decode(bytes, i)?;
let (randao_commitment, i) = <_>::ssz_decode(bytes, i)?;
let (randao_layers, i) = <_>::ssz_decode(bytes, i)?;
let (activation_slot, i) = <_>::ssz_decode(bytes, i)?; let (activation_slot, i) = <_>::ssz_decode(bytes, i)?;
let (exit_slot, i) = <_>::ssz_decode(bytes, i)?; let (exit_slot, i) = <_>::ssz_decode(bytes, i)?;
let (withdrawal_slot, i) = <_>::ssz_decode(bytes, i)?; let (withdrawal_slot, i) = <_>::ssz_decode(bytes, i)?;
let (penalized_slot, i) = <_>::ssz_decode(bytes, i)?; let (penalized_slot, i) = <_>::ssz_decode(bytes, i)?;
let (exit_count, i) = <_>::ssz_decode(bytes, i)?; let (exit_count, i) = <_>::ssz_decode(bytes, i)?;
let (status_flags_byte, i): (u8, usize) = <_>::ssz_decode(bytes, i)?; let (status_flags_byte, i): (u8, usize) = <_>::ssz_decode(bytes, i)?;
let (custody_commitment, i) = <_>::ssz_decode(bytes, i)?;
let (latest_custody_reseed_slot, i) = <_>::ssz_decode(bytes, i)?; let (latest_custody_reseed_slot, i) = <_>::ssz_decode(bytes, i)?;
let (penultimate_custody_reseed_slot, i) = <_>::ssz_decode(bytes, i)?; let (penultimate_custody_reseed_slot, i) = <_>::ssz_decode(bytes, i)?;
@ -140,15 +128,12 @@ impl Decodable for ValidatorRecord {
pubkey, pubkey,
withdrawal_credentials, withdrawal_credentials,
proposer_slots, proposer_slots,
randao_commitment,
randao_layers,
activation_slot, activation_slot,
exit_slot, exit_slot,
withdrawal_slot, withdrawal_slot,
penalized_slot, penalized_slot,
exit_count, exit_count,
status_flags, status_flags,
custody_commitment,
latest_custody_reseed_slot, latest_custody_reseed_slot,
penultimate_custody_reseed_slot, penultimate_custody_reseed_slot,
}, },
@ -157,21 +142,18 @@ impl Decodable for ValidatorRecord {
} }
} }
impl<T: RngCore> TestRandom<T> for ValidatorRecord { impl<T: RngCore> TestRandom<T> for Validator {
fn random_for_test(rng: &mut T) -> Self { fn random_for_test(rng: &mut T) -> Self {
Self { Self {
pubkey: <_>::random_for_test(rng), pubkey: <_>::random_for_test(rng),
withdrawal_credentials: <_>::random_for_test(rng), withdrawal_credentials: <_>::random_for_test(rng),
proposer_slots: <_>::random_for_test(rng), proposer_slots: <_>::random_for_test(rng),
randao_commitment: <_>::random_for_test(rng),
randao_layers: <_>::random_for_test(rng),
activation_slot: <_>::random_for_test(rng), activation_slot: <_>::random_for_test(rng),
exit_slot: <_>::random_for_test(rng), exit_slot: <_>::random_for_test(rng),
withdrawal_slot: <_>::random_for_test(rng), withdrawal_slot: <_>::random_for_test(rng),
penalized_slot: <_>::random_for_test(rng), penalized_slot: <_>::random_for_test(rng),
exit_count: <_>::random_for_test(rng), exit_count: <_>::random_for_test(rng),
status_flags: Some(<_>::random_for_test(rng)), status_flags: Some(<_>::random_for_test(rng)),
custody_commitment: <_>::random_for_test(rng),
latest_custody_reseed_slot: <_>::random_for_test(rng), latest_custody_reseed_slot: <_>::random_for_test(rng),
penultimate_custody_reseed_slot: <_>::random_for_test(rng), penultimate_custody_reseed_slot: <_>::random_for_test(rng),
} }
@ -187,7 +169,7 @@ mod tests {
#[test] #[test]
pub fn test_ssz_round_trip() { pub fn test_ssz_round_trip() {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
let original = ValidatorRecord::random_for_test(&mut rng); let original = Validator::random_for_test(&mut rng);
let bytes = ssz_encode(&original); let bytes = ssz_encode(&original);
let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap(); let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();
@ -198,7 +180,7 @@ mod tests {
#[test] #[test]
fn test_validator_can_be_active() { fn test_validator_can_be_active() {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
let mut validator = ValidatorRecord::random_for_test(&mut rng); let mut validator = Validator::random_for_test(&mut rng);
let activation_slot = u64::random_for_test(&mut rng); let activation_slot = u64::random_for_test(&mut rng);
let exit_slot = activation_slot + 234; let exit_slot = activation_slot + 234;

12
eth2/types/src/validator_registration.rs
View File

@ -1,12 +0,0 @@
use super::{Address, Hash256};
use bls::{PublicKey, Signature};
/// The information gathered from the PoW chain validator registration function.
#[derive(Debug, Clone, PartialEq)]
pub struct ValidatorRegistration {
pub pubkey: PublicKey,
pub withdrawal_shard: u64,
pub withdrawal_address: Address,
pub randao_commitment: Hash256,
pub proof_of_possession: Signature,
}

22
eth2/types/src/validator_registry.rs
View File

@ -1,9 +1,9 @@
/// Contains logic to manipulate a `&[ValidatorRecord]`. /// Contains logic to manipulate a `&[Validator]`.
/// For now, we avoid defining a newtype and just have flat functions here. /// For now, we avoid defining a newtype and just have flat functions here.
use super::validator_record::*; use super::validator::*;
/// Given an indexed sequence of `validators`, return the indices corresponding to validators that are active at `slot`. /// Given an indexed sequence of `validators`, return the indices corresponding to validators that are active at `slot`.
pub fn get_active_validator_indices(validators: &[ValidatorRecord], slot: u64) -> Vec<usize> { pub fn get_active_validator_indices(validators: &[Validator], slot: u64) -> Vec<usize> {
validators validators
.iter() .iter()
.enumerate() .enumerate()
@ -38,7 +38,7 @@ mod tests {
let mut validators = vec![]; let mut validators = vec![];
let count_validators = 10; let count_validators = 10;
for _ in 0..count_validators { for _ in 0..count_validators {
validators.push(ValidatorRecord::default()) validators.push(Validator::default())
} }
let some_slot = u64::random_for_test(&mut rng); let some_slot = u64::random_for_test(&mut rng);
@ -55,7 +55,7 @@ mod tests {
let mut validators = (0..count_validators) let mut validators = (0..count_validators)
.into_iter() .into_iter()
.map(|_| { .map(|_| {
let mut validator = ValidatorRecord::default(); let mut validator = Validator::default();
let activation_offset = u64::random_for_test(&mut rng); let activation_offset = u64::random_for_test(&mut rng);
let exit_offset = u64::random_for_test(&mut rng); let exit_offset = u64::random_for_test(&mut rng);
@ -79,7 +79,7 @@ mod tests {
); );
} }
fn set_validators_to_default_entry_exit(validators: &mut [ValidatorRecord]) { fn set_validators_to_default_entry_exit(validators: &mut [Validator]) {
for validator in validators.iter_mut() { for validator in validators.iter_mut() {
validator.activation_slot = std::u64::MAX; validator.activation_slot = std::u64::MAX;
validator.exit_slot = std::u64::MAX; validator.exit_slot = std::u64::MAX;
@ -87,7 +87,7 @@ mod tests {
} }
// sets all `validators` to be active as of some slot prior to `slot`. returns the activation slot. // sets all `validators` to be active as of some slot prior to `slot`. returns the activation slot.
fn set_validators_to_activated(validators: &mut [ValidatorRecord], slot: u64) -> u64 { fn set_validators_to_activated(validators: &mut [Validator], slot: u64) -> u64 {
let activation_slot = slot - 10; let activation_slot = slot - 10;
for validator in validators.iter_mut() { for validator in validators.iter_mut() {
validator.activation_slot = activation_slot; validator.activation_slot = activation_slot;
@ -96,11 +96,7 @@ mod tests {
} }
// sets all `validators` to be exited as of some slot before `slot`. // sets all `validators` to be exited as of some slot before `slot`.
fn set_validators_to_exited( fn set_validators_to_exited(validators: &mut [Validator], slot: u64, activation_slot: u64) {
validators: &mut [ValidatorRecord],
slot: u64,
activation_slot: u64,
) {
assert!(activation_slot < slot); assert!(activation_slot < slot);
let mut exit_slot = activation_slot + 10; let mut exit_slot = activation_slot + 10;
while exit_slot >= slot { while exit_slot >= slot {
@ -123,7 +119,7 @@ mod tests {
let mut validators = (0..COUNT_VALIDATORS) let mut validators = (0..COUNT_VALIDATORS)
.into_iter() .into_iter()
.map(|_| { .map(|_| {
let mut validator = ValidatorRecord::default(); let mut validator = Validator::default();
let activation_offset = u64::random_for_test(&mut rng); let activation_offset = u64::random_for_test(&mut rng);
let exit_offset = u64::random_for_test(&mut rng); let exit_offset = u64::random_for_test(&mut rng);

89
eth2/types/src/validator_registry_delta_block.rs Normal file
View File

@ -0,0 +1,89 @@
use super::Hash256;
use crate::test_utils::TestRandom;
use bls::PublicKey;
use rand::RngCore;
use ssz::{Decodable, DecodeError, Encodable, SszStream};
// The information gathered from the PoW chain validator registration function.
#[derive(Debug, Clone, PartialEq)]
pub struct ValidatorRegistryDeltaBlock {
pub latest_registry_delta_root: Hash256,
pub validator_index: u32,
pub pubkey: PublicKey,
pub slot: u64,
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: std::u64::MAX,
flag: std::u64::MAX,
}
}
}
impl Encodable for ValidatorRegistryDeltaBlock {
fn ssz_append(&self, s: &mut SszStream) {
s.append(&self.latest_registry_delta_root);
s.append(&self.validator_index);
s.append(&self.pubkey);
s.append(&self.slot);
s.append(&self.flag);
}
}
impl Decodable for ValidatorRegistryDeltaBlock {
fn ssz_decode(bytes: &[u8], i: usize) -> Result<(Self, usize), DecodeError> {
let (latest_registry_delta_root, i) = <_>::ssz_decode(bytes, i)?;
let (validator_index, i) = <_>::ssz_decode(bytes, i)?;
let (pubkey, i) = <_>::ssz_decode(bytes, i)?;
let (slot, i) = <_>::ssz_decode(bytes, i)?;
let (flag, i) = <_>::ssz_decode(bytes, i)?;
Ok((
Self {
latest_registry_delta_root,
validator_index,
pubkey,
slot,
flag,
},
i,
))
}
}
impl<T: RngCore> TestRandom<T> for ValidatorRegistryDeltaBlock {
fn random_for_test(rng: &mut T) -> Self {
Self {
latest_registry_delta_root: <_>::random_for_test(rng),
validator_index: <_>::random_for_test(rng),
pubkey: <_>::random_for_test(rng),
slot: <_>::random_for_test(rng),
flag: <_>::random_for_test(rng),
}
}
}
#[cfg(test)]
mod tests {
use super::super::ssz::ssz_encode;
use super::*;
use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
#[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);
}
}

27
eth2/validator_induction/src/inductor.rs
View File

@ -1,6 +1,6 @@
use bls::verify_proof_of_possession; use bls::verify_proof_of_possession;
use spec::ChainSpec; use spec::ChainSpec;
use types::{BeaconState, Deposit, ValidatorRecord}; use types::{BeaconState, Deposit, Validator};
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum ValidatorInductionError { pub enum ValidatorInductionError {
@ -32,33 +32,30 @@ pub fn process_deposit(
if state.validator_registry[i].withdrawal_credentials if state.validator_registry[i].withdrawal_credentials
== deposit_input.withdrawal_credentials == deposit_input.withdrawal_credentials
{ {
state.validator_balances[i] += deposit_data.value; state.validator_balances[i] += deposit_data.amount;
return Ok(()); return Ok(());
} }
Err(ValidatorInductionError::InvalidWithdrawalCredentials) Err(ValidatorInductionError::InvalidWithdrawalCredentials)
} }
None => { None => {
let validator = ValidatorRecord { let validator = Validator {
pubkey: deposit_input.pubkey.clone(), pubkey: deposit_input.pubkey.clone(),
withdrawal_credentials: deposit_input.withdrawal_credentials, withdrawal_credentials: deposit_input.withdrawal_credentials,
proposer_slots: 0, proposer_slots: 0,
randao_commitment: deposit_input.randao_commitment,
randao_layers: 0,
activation_slot: spec.far_future_slot, activation_slot: spec.far_future_slot,
exit_slot: spec.far_future_slot, exit_slot: spec.far_future_slot,
withdrawal_slot: spec.far_future_slot, withdrawal_slot: spec.far_future_slot,
penalized_slot: spec.far_future_slot, penalized_slot: spec.far_future_slot,
exit_count: 0, exit_count: 0,
status_flags: None, status_flags: None,
custody_commitment: deposit_input.custody_commitment,
latest_custody_reseed_slot: 0, latest_custody_reseed_slot: 0,
penultimate_custody_reseed_slot: 0, penultimate_custody_reseed_slot: 0,
}; };
let _index = state.validator_registry.len(); let _index = state.validator_registry.len();
state.validator_registry.push(validator); state.validator_registry.push(validator);
state.validator_balances.push(deposit_data.value); state.validator_balances.push(deposit_data.amount);
Ok(()) Ok(())
} }
} }
@ -84,15 +81,14 @@ mod tests {
deposit deposit
} }
fn get_validator() -> ValidatorRecord { fn get_validator() -> Validator {
let mut rng = XorShiftRng::from_seed([42; 16]); let mut rng = XorShiftRng::from_seed([42; 16]);
ValidatorRecord::random_for_test(&mut rng) Validator::random_for_test(&mut rng)
} }
fn deposit_equals_record(dep: &Deposit, val: &ValidatorRecord) -> bool { fn deposit_equals_record(dep: &Deposit, val: &Validator) -> bool {
(dep.deposit_data.deposit_input.pubkey == val.pubkey) (dep.deposit_data.deposit_input.pubkey == val.pubkey)
& (dep.deposit_data.deposit_input.withdrawal_credentials == val.withdrawal_credentials) & (dep.deposit_data.deposit_input.withdrawal_credentials == val.withdrawal_credentials)
& (dep.deposit_data.deposit_input.randao_commitment == val.randao_commitment)
& (verify_proof_of_possession( & (verify_proof_of_possession(
&dep.deposit_data.deposit_input.proof_of_possession, &dep.deposit_data.deposit_input.proof_of_possession,
&val.pubkey, &val.pubkey,
@ -104,7 +100,7 @@ mod tests {
let mut state = BeaconState::default(); let mut state = BeaconState::default();
let mut deposit = get_deposit(); let mut deposit = get_deposit();
let spec = ChainSpec::foundation(); let spec = ChainSpec::foundation();
deposit.deposit_data.value = DEPOSIT_GWEI; deposit.deposit_data.amount = DEPOSIT_GWEI;
let result = process_deposit(&mut state, &deposit, &spec); let result = process_deposit(&mut state, &deposit, &spec);
@ -125,7 +121,7 @@ mod tests {
for i in 0..5 { for i in 0..5 {
let mut deposit = get_deposit(); let mut deposit = get_deposit();
let result = process_deposit(&mut state, &deposit, &spec); let result = process_deposit(&mut state, &deposit, &spec);
deposit.deposit_data.value = DEPOSIT_GWEI; deposit.deposit_data.amount = DEPOSIT_GWEI;
assert_eq!(result.unwrap(), ()); assert_eq!(result.unwrap(), ());
assert!(deposit_equals_record( assert!(deposit_equals_record(
&deposit, &deposit,
@ -144,11 +140,10 @@ mod tests {
let mut deposit = get_deposit(); let mut deposit = get_deposit();
let mut validator = get_validator(); let mut validator = get_validator();
deposit.deposit_data.value = DEPOSIT_GWEI; deposit.deposit_data.amount = DEPOSIT_GWEI;
validator.pubkey = deposit.deposit_data.deposit_input.pubkey.clone(); validator.pubkey = deposit.deposit_data.deposit_input.pubkey.clone();
validator.withdrawal_credentials = validator.withdrawal_credentials =
deposit.deposit_data.deposit_input.withdrawal_credentials; deposit.deposit_data.deposit_input.withdrawal_credentials;
validator.randao_commitment = deposit.deposit_data.deposit_input.randao_commitment;
state.validator_registry.push(validator); state.validator_registry.push(validator);
state.validator_balances.push(DEPOSIT_GWEI); state.validator_balances.push(DEPOSIT_GWEI);
@ -170,7 +165,7 @@ mod tests {
let mut state = BeaconState::default(); let mut state = BeaconState::default();
let mut deposit = get_deposit(); let mut deposit = get_deposit();
let spec = ChainSpec::foundation(); let spec = ChainSpec::foundation();
deposit.deposit_data.value = DEPOSIT_GWEI; deposit.deposit_data.amount = DEPOSIT_GWEI;
deposit.deposit_data.deposit_input.proof_of_possession = deposit.deposit_data.deposit_input.proof_of_possession =
create_proof_of_possession(&Keypair::random()); create_proof_of_possession(&Keypair::random());

4
eth2/validator_shuffling/src/shuffle.rs
View File

@ -3,7 +3,7 @@ use std::cmp::min;
use honey_badger_split::SplitExt; use honey_badger_split::SplitExt;
use spec::ChainSpec; use spec::ChainSpec;
use types::validator_registry::get_active_validator_indices; use types::validator_registry::get_active_validator_indices;
use types::{ShardCommittee, ValidatorRecord}; use types::{ShardCommittee, Validator};
use vec_shuffle::{shuffle, ShuffleErr}; use vec_shuffle::{shuffle, ShuffleErr};
type DelegatedCycle = Vec<Vec<ShardCommittee>>; type DelegatedCycle = Vec<Vec<ShardCommittee>>;
@ -20,7 +20,7 @@ pub enum ValidatorAssignmentError {
/// References get_new_shuffling (ethereum 2.1 specification) /// References get_new_shuffling (ethereum 2.1 specification)
pub fn shard_and_committees_for_cycle( pub fn shard_and_committees_for_cycle(
seed: &[u8], seed: &[u8],
validators: &[ValidatorRecord], validators: &[Validator],
crosslinking_shard_start: u16, crosslinking_shard_start: u16,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<DelegatedCycle, ValidatorAssignmentError> { ) -> Result<DelegatedCycle, ValidatorAssignmentError> {

7
validator_client/src/block_producer_service/grpc.rs
View File

@ -5,7 +5,7 @@ use protos::services::{
use protos::services_grpc::BeaconBlockServiceClient; use protos::services_grpc::BeaconBlockServiceClient;
use ssz::{ssz_encode, Decodable}; use ssz::{ssz_encode, Decodable};
use std::sync::Arc; use std::sync::Arc;
use types::{BeaconBlock, BeaconBlockBody, Hash256, Signature}; use types::{BeaconBlock, BeaconBlockBody, Eth1Data, Hash256, Signature};
/// A newtype designed to wrap the gRPC-generated service so the `BeaconNode` trait may be /// A newtype designed to wrap the gRPC-generated service so the `BeaconNode` trait may be
/// implemented upon it. /// implemented upon it.
@ -48,7 +48,10 @@ impl BeaconNode for BeaconBlockGrpcClient {
parent_root: Hash256::zero(), parent_root: Hash256::zero(),
state_root: Hash256::zero(), state_root: Hash256::zero(),
randao_reveal, randao_reveal,
candidate_pow_receipt_root: Hash256::zero(), eth1_data: Eth1Data {
deposit_root: Hash256::zero(),
block_hash: Hash256::zero(),
},
signature, signature,
body: BeaconBlockBody { body: BeaconBlockBody {
proposer_slashings: vec![], proposer_slashings: vec![],