gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-18 20:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add FreeAttesation type

Browse Source
This commit is contained in:
Paul Hauner
2019-01-28 16:21:33 +11:00
parent 5bbffcb053
commit be7e326c33
11 changed files with 92 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
beacon_node/beacon_chain/src/attestation_aggregator.rs
View File

@@ -1,6 +1,7 @@
use std::collections::{HashMap, HashSet};
use types::{
AggregateSignature, Attestation, AttestationData, BeaconState, Bitfield, ChainSpec, Signature,
AggregateSignature, Attestation, AttestationData, BeaconState, Bitfield, ChainSpec,
FreeAttestation, Signature,
};
const PHASE_0_CUSTODY_BIT: bool = false;
@@ -32,27 +33,30 @@ impl AttestationAggregator {
pub fn process_free_attestation(
&mut self,
state: &BeaconState,
attestation_data: &AttestationData,
signature: &Signature,
validator_index: u64,
free_attestation: &FreeAttestation,
) -> Result<ProcessOutcome, ProcessError> {
let validator_index = validator_index as usize;
let validator_index = free_attestation.validator_index as usize;
let signable_message = attestation_data.signable_message(PHASE_0_CUSTODY_BIT);
let signable_message = free_attestation.data.signable_message(PHASE_0_CUSTODY_BIT);
let validator_pubkey = &state
.validator_registry
.get(validator_index)
.ok_or_else(|| ProcessError::BadValidatorIndex)?
.pubkey;
if !signature.verify(&signable_message, &validator_pubkey) {
if !free_attestation
.signature
.verify(&signable_message, &validator_pubkey)
{
return Err(ProcessError::BadSignature);
}
if let Some(existing_attestation) = self.store.get(&signable_message) {
if let Some(updated_attestation) =
aggregate_attestation(existing_attestation, signature, validator_index)
{
if let Some(updated_attestation) = aggregate_attestation(
existing_attestation,
&free_attestation.signature,
validator_index,
) {
self.store.insert(signable_message, updated_attestation);
Ok(ProcessOutcome::Aggregated)
} else {
@@ -60,11 +64,11 @@ impl AttestationAggregator {
}
} else {
let mut aggregate_signature = AggregateSignature::new();
aggregate_signature.add(signature);
aggregate_signature.add(&free_attestation.signature);
let mut aggregation_bitfield = Bitfield::new();
aggregation_bitfield.set(validator_index, true);
let new_attestation = Attestation {
data: attestation_data.clone(),
data: free_attestation.data.clone(),
aggregation_bitfield,
custody_bitfield: Bitfield::new(),
aggregate_signature,

8
beacon_node/beacon_chain/src/attestation_processing.rs
View File

@@ -1,7 +1,7 @@
use super::{BeaconChain, ClientDB, SlotClock};
pub use crate::attestation_aggregator::{ProcessError as AggregatorError, ProcessOutcome};
use crate::canonical_head::Error as HeadError;
use types::{AttestationData, Signature};
use types::FreeAttestation;
#[derive(Debug, PartialEq)]
pub enum Error {
@@ -17,9 +17,7 @@ where
{
pub fn process_free_attestation(
&self,
attestation_data: &AttestationData,
signature: &Signature,
validator_index: u64,
free_attestation: FreeAttestation,
) -> Result<ProcessOutcome, Error> {
let present_slot = self
.present_slot()
@@ -29,7 +27,7 @@ where
self.attestation_aggregator
.write()
.expect("Aggregator unlock failed.")
.process_free_attestation(&state, attestation_data, signature, validator_index)
.process_free_attestation(&state, &free_attestation)
.map_err(|e| e.into())
}
}