mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-20 05:14:35 +00:00
* Attestation superstruct changes for EIP 7549 (#5644)
* update
* experiment
* superstruct changes
* revert
* superstruct changes
* fix tests
* indexed attestation
* indexed attestation superstruct
* updated TODOs
* `superstruct` the `AttesterSlashing` (#5636)
* `superstruct` Attester Fork Variants
* Push a little further
* Deal with Encode / Decode of AttesterSlashing
* not so sure about this..
* Stop Encode/Decode Bounds from Propagating Out
* Tons of Changes..
* More Conversions to AttestationRef
* Add AsReference trait (#15)
* Add AsReference trait
* Fix some snafus
* Got it Compiling! :D
* Got Tests Building
* Get beacon chain tests compiling
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes
* Make EF Tests Fork-Agnostic (#5713)
* Finish EF Test Fork Agnostic (#5714)
* Superstruct `AggregateAndProof` (#5715)
* Upgrade `superstruct` to `0.8.0`
* superstruct `AggregateAndProof`
* Merge remote-tracking branch 'sigp/unstable' into electra_attestation_changes
* cargo fmt
* Merge pull request #5726 from realbigsean/electra_attestation_changes
Merge unstable into Electra attestation changes
* EIP7549 `get_attestation_indices` (#5657)
* get attesting indices electra impl
* fmt
* get tests to pass
* fmt
* fix some beacon chain tests
* fmt
* fix slasher test
* fmt got me again
* fix more tests
* fix tests
* Some small changes (#5739)
* cargo fmt (#5740)
* Sketch op pool changes
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
* Get `electra_op_pool` up to date (#5756)
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
---------
Co-authored-by: realbigsean <sean@sigmaprime.io>
* Revert "Get `electra_op_pool` up to date (#5756)" (#5757)
This reverts commit ab9e58aa3d.
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool
* Compute on chain aggregate impl (#5752)
* add compute_on_chain_agg impl to op pool changes
* fmt
* get op pool tests to pass
* update the naive agg pool interface (#5760)
* Fix bugs in cross-committee aggregation
* Add comment to max cover optimisation
* Fix assert
* Merge pull request #5749 from sigp/electra_op_pool
Optimise Electra op pool aggregation
* update committee offset
* Fix Electra Fork Choice Tests (#5764)
* Subscribe to the correct subnets for electra attestations (#5782)
* subscribe to the correct att subnets for electra
* subscribe to the correct att subnets for electra
* cargo fmt
* fix slashing handling
* Merge remote-tracking branch 'upstream/unstable'
* Send unagg attestation based on fork
* Publish all aggregates
* just one more check bro plz..
* Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable
Merge `unstable` into `electra_attestation_changes`
* Merge pull request #5835 from realbigsean/fix-validator-logic
Fix validator logic
* Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling
Electra slashing handling
* Electra attestation changes rm decode impl (#5856)
* Remove Crappy Decode impl for Attestation
* Remove Inefficient Attestation Decode impl
* Implement Schema Upgrade / Downgrade
* Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs
Co-authored-by: Michael Sproul <micsproul@gmail.com>
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Fix failing attestation tests and misc electra attestation cleanup (#5810)
* - get attestation related beacon chain tests to pass
- observed attestations are now keyed off of data + committee index
- rename op pool attestationref to compactattestationref
- remove unwraps in agg pool and use options instead
- cherry pick some changes from ef-tests-electra
* cargo fmt
* fix failing test
* Revert dockerfile changes
* make committee_index return option
* function args shouldnt be a ref to attestation ref
* fmt
* fix dup imports
---------
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
* fix some todos (#5817)
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* add consolidations to merkle calc for inclusion proof
* Remove Duplicate KZG Commitment Merkle Proof Code (#5874)
* Remove Duplicate KZG Commitment Merkle Proof Code
* s/tree_lists/fields/
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* fix compile
* Fix slasher tests (#5906)
* Fix electra tests
* Add electra attestations to double vote tests
* Update superstruct to 0.8
* Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes
* Small cleanup in slasher tests
* Clean up Electra observed aggregates (#5929)
* Use consistent key in observed_attestations
* Remove unwraps from observed aggregates
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* De-dup attestation constructor logic
* Remove unwraps in Attestation construction
* Dedup match_attestation_data
* Remove outdated TODO
* Use ForkName Ord in fork-choice tests
* Use ForkName Ord in BeaconBlockBody
* Make to_electra not fallible
* Remove TestRandom impl for IndexedAttestation
* Remove IndexedAttestation faulty Decode impl
* Drop TestRandom impl
* Add PendingAttestationInElectra
* Indexed att on disk (#35)
* indexed att on disk
* fix lints
* Update slasher/src/migrate.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
---------
Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com>
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* add electra fork enabled fn to ForkName impl (#36)
* add electra fork enabled fn to ForkName impl
* remove inadvertent file
* Update common/eth2/src/types.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* Dedup attestation constructor logic in attester cache
* Use if let Ok for committee_bits
* Dedup Attestation constructor code
* Diff reduction in tests
* Fix beacon_chain tests
* Diff reduction
* Use Ord for ForkName in pubsub
* Resolve into_attestation_and_indices todo
* Remove stale TODO
* Fix beacon_chain tests
* Test spec invariant
* Use electra_enabled in pubsub
* Remove get_indexed_attestation_from_signed_aggregate
* Use ok_or instead of if let else
* committees are sorted
* remove dup method `get_indexed_attestation_from_committees`
* Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview
Electra attestations #5712 review
* update default persisted op pool deserialization
* ensure aggregate and proof uses serde untagged on ref
* Fork aware ssz static attestation tests
* Electra attestation changes from Lions review (#5971)
* dedup/cleanup and remove unneeded hashset use
* remove irrelevant TODOs
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* Electra attestation changes sean review (#5972)
* instantiate empty bitlist in unreachable code
* clean up error conversion
* fork enabled bool cleanup
* remove a couple todos
* return bools instead of options in `aggregate` and use the result
* delete commented out code
* use map macros in simple transformations
* remove signers_disjoint_from
* get ef tests compiling
* get ef tests compiling
* update intentionally excluded files
* Avoid changing slasher schema for Electra
* Delete slasher schema v4
* Fix clippy
* Fix compilation of beacon_chain tests
* Update database.rs
* Add electra lightclient types
* Update slasher/src/database.rs
* fix imports
* Merge pull request #5980 from dapplion/electra-lightclient
Add electra lightclient types
* Merge pull request #5975 from michaelsproul/electra-slasher-no-migration
Avoid changing slasher schema for Electra
* Update beacon_node/beacon_chain/src/attestation_verification.rs
* Update beacon_node/beacon_chain/src/attestation_verification.rs
198 lines
6.8 KiB
Rust
198 lines
6.8 KiB
Rust
use crate::Error;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::num::NonZeroUsize;
|
|
use std::path::PathBuf;
|
|
use strum::{Display, EnumString, EnumVariantNames};
|
|
use types::non_zero_usize::new_non_zero_usize;
|
|
use types::{Epoch, EthSpec, IndexedAttestation};
|
|
|
|
pub const DEFAULT_CHUNK_SIZE: usize = 16;
|
|
pub const DEFAULT_VALIDATOR_CHUNK_SIZE: usize = 256;
|
|
pub const DEFAULT_HISTORY_LENGTH: usize = 4096;
|
|
pub const DEFAULT_UPDATE_PERIOD: u64 = 12;
|
|
pub const DEFAULT_SLOT_OFFSET: f64 = 10.5;
|
|
pub const DEFAULT_MAX_DB_SIZE: usize = 512 * 1024; // 512 GiB
|
|
pub const DEFAULT_ATTESTATION_ROOT_CACHE_SIZE: NonZeroUsize = new_non_zero_usize(100_000);
|
|
pub const DEFAULT_BROADCAST: bool = false;
|
|
|
|
#[cfg(all(feature = "mdbx", not(feature = "lmdb")))]
|
|
pub const DEFAULT_BACKEND: DatabaseBackend = DatabaseBackend::Mdbx;
|
|
#[cfg(feature = "lmdb")]
|
|
pub const DEFAULT_BACKEND: DatabaseBackend = DatabaseBackend::Lmdb;
|
|
#[cfg(not(any(feature = "mdbx", feature = "lmdb")))]
|
|
pub const DEFAULT_BACKEND: DatabaseBackend = DatabaseBackend::Disabled;
|
|
|
|
pub const MAX_HISTORY_LENGTH: usize = 1 << 16;
|
|
pub const MEGABYTE: usize = 1 << 20;
|
|
pub const MDBX_DATA_FILENAME: &str = "mdbx.dat";
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct Config {
|
|
pub database_path: PathBuf,
|
|
pub chunk_size: usize,
|
|
pub validator_chunk_size: usize,
|
|
/// Number of epochs of history to keep.
|
|
pub history_length: usize,
|
|
/// Update frequency in seconds.
|
|
pub update_period: u64,
|
|
/// Offset from the start of the slot to begin processing.
|
|
pub slot_offset: f64,
|
|
/// Maximum size of the database in megabytes.
|
|
pub max_db_size_mbs: usize,
|
|
/// Maximum size of the in-memory cache for attestation roots.
|
|
pub attestation_root_cache_size: NonZeroUsize,
|
|
/// Whether to broadcast slashings found to the network.
|
|
pub broadcast: bool,
|
|
/// Database backend to use.
|
|
pub backend: DatabaseBackend,
|
|
}
|
|
|
|
/// Immutable configuration parameters which are stored on disk and checked for consistency.
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
pub struct DiskConfig {
|
|
pub chunk_size: usize,
|
|
pub validator_chunk_size: usize,
|
|
pub history_length: usize,
|
|
}
|
|
|
|
#[derive(
|
|
Debug, Clone, Copy, PartialEq, Serialize, Deserialize, Display, EnumString, EnumVariantNames,
|
|
)]
|
|
#[strum(serialize_all = "lowercase")]
|
|
pub enum DatabaseBackend {
|
|
#[cfg(feature = "mdbx")]
|
|
Mdbx,
|
|
#[cfg(feature = "lmdb")]
|
|
Lmdb,
|
|
Disabled,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum DatabaseBackendOverride {
|
|
Success(DatabaseBackend),
|
|
Failure(PathBuf),
|
|
Noop,
|
|
}
|
|
|
|
impl Config {
|
|
pub fn new(database_path: PathBuf) -> Self {
|
|
Self {
|
|
database_path,
|
|
chunk_size: DEFAULT_CHUNK_SIZE,
|
|
validator_chunk_size: DEFAULT_VALIDATOR_CHUNK_SIZE,
|
|
history_length: DEFAULT_HISTORY_LENGTH,
|
|
update_period: DEFAULT_UPDATE_PERIOD,
|
|
slot_offset: DEFAULT_SLOT_OFFSET,
|
|
max_db_size_mbs: DEFAULT_MAX_DB_SIZE,
|
|
attestation_root_cache_size: DEFAULT_ATTESTATION_ROOT_CACHE_SIZE,
|
|
broadcast: DEFAULT_BROADCAST,
|
|
backend: DEFAULT_BACKEND,
|
|
}
|
|
}
|
|
|
|
pub fn validate(&self) -> Result<(), Error> {
|
|
if self.chunk_size == 0
|
|
|| self.validator_chunk_size == 0
|
|
|| self.history_length == 0
|
|
|| self.max_db_size_mbs == 0
|
|
{
|
|
Err(Error::ConfigInvalidZeroParameter {
|
|
config: self.clone(),
|
|
})
|
|
} else if self.history_length % self.chunk_size != 0 {
|
|
Err(Error::ConfigInvalidChunkSize {
|
|
chunk_size: self.chunk_size,
|
|
history_length: self.history_length,
|
|
})
|
|
} else if self.history_length > MAX_HISTORY_LENGTH {
|
|
Err(Error::ConfigInvalidHistoryLength {
|
|
history_length: self.history_length,
|
|
max_history_length: MAX_HISTORY_LENGTH,
|
|
})
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
pub fn disk_config(&self) -> DiskConfig {
|
|
DiskConfig {
|
|
chunk_size: self.chunk_size,
|
|
validator_chunk_size: self.validator_chunk_size,
|
|
history_length: self.history_length,
|
|
}
|
|
}
|
|
|
|
pub fn chunk_index(&self, epoch: Epoch) -> usize {
|
|
(epoch.as_usize() % self.history_length) / self.chunk_size
|
|
}
|
|
|
|
pub fn validator_chunk_index(&self, validator_index: u64) -> usize {
|
|
validator_index as usize / self.validator_chunk_size
|
|
}
|
|
|
|
pub fn chunk_offset(&self, epoch: Epoch) -> usize {
|
|
epoch.as_usize() % self.chunk_size
|
|
}
|
|
|
|
pub fn validator_offset(&self, validator_index: u64) -> usize {
|
|
validator_index as usize % self.validator_chunk_size
|
|
}
|
|
|
|
/// Map the validator and epoch chunk indexes into a single value for use as a database key.
|
|
pub fn disk_key(&self, validator_chunk_index: usize, chunk_index: usize) -> usize {
|
|
let width = self.history_length / self.chunk_size;
|
|
validator_chunk_index * width + chunk_index
|
|
}
|
|
|
|
/// Map the validator and epoch offsets into an index for `Chunk::data`.
|
|
pub fn cell_index(&self, validator_offset: usize, chunk_offset: usize) -> usize {
|
|
validator_offset * self.chunk_size + chunk_offset
|
|
}
|
|
|
|
/// Return an iterator over all the validator indices in a validator chunk.
|
|
pub fn validator_indices_in_chunk(
|
|
&self,
|
|
validator_chunk_index: usize,
|
|
) -> impl Iterator<Item = u64> {
|
|
(validator_chunk_index * self.validator_chunk_size
|
|
..(validator_chunk_index + 1) * self.validator_chunk_size)
|
|
.map(|index| index as u64)
|
|
}
|
|
|
|
/// Iterate over the attesting indices which belong to the `validator_chunk_index` chunk.
|
|
pub fn attesting_validators_in_chunk<'a, E: EthSpec>(
|
|
&'a self,
|
|
attestation: &'a IndexedAttestation<E>,
|
|
validator_chunk_index: usize,
|
|
) -> impl Iterator<Item = u64> + 'a {
|
|
attestation
|
|
.attesting_indices_iter()
|
|
.filter(move |v| self.validator_chunk_index(**v) == validator_chunk_index)
|
|
.copied()
|
|
}
|
|
|
|
pub fn override_backend(&mut self) -> DatabaseBackendOverride {
|
|
let mdbx_path = self.database_path.join(MDBX_DATA_FILENAME);
|
|
|
|
#[cfg(feature = "mdbx")]
|
|
let already_mdbx = self.backend == DatabaseBackend::Mdbx;
|
|
#[cfg(not(feature = "mdbx"))]
|
|
let already_mdbx = false;
|
|
|
|
if !already_mdbx && mdbx_path.exists() {
|
|
#[cfg(feature = "mdbx")]
|
|
{
|
|
let old_backend = self.backend;
|
|
self.backend = DatabaseBackend::Mdbx;
|
|
DatabaseBackendOverride::Success(old_backend)
|
|
}
|
|
#[cfg(not(feature = "mdbx"))]
|
|
{
|
|
DatabaseBackendOverride::Failure(mdbx_path)
|
|
}
|
|
} else {
|
|
DatabaseBackendOverride::Noop
|
|
}
|
|
}
|
|
}
|