015ab7d0a7
## Issue Addressed Closes #2052 ## Proposed Changes - Refactor the attester/proposer duties endpoints in the BN - Performance improvements - Fixes some potential inconsistencies with the dependent root fields. - Removes `http_api::beacon_proposer_cache` and just uses the one on the `BeaconChain` instead. - Move the code for the proposer/attester duties endpoints into separate files, for readability. - Refactor the `DutiesService` in the VC - Required to reduce the delay on broadcasting new blocks. - Gets rid of the `ValidatorDuty` shim struct that came about when we adopted the standard API. - Separate block/attestation duty tasks so that they don't block each other when one is slow. - In the VC, use `PublicKeyBytes` to represent validators instead of `PublicKey`. `PublicKey` is a legit crypto object whilst `PublicKeyBytes` is just a byte-array, it's much faster to clone/hash `PublicKeyBytes` and this change has had a significant impact on runtimes. - Unfortunately this has created lots of dust changes. - In the BN, store `PublicKeyBytes` in the `beacon_proposer_cache` and allow access to them. The HTTP API always sends `PublicKeyBytes` over the wire and the conversion from `PublicKey` -> `PublickeyBytes` is non-trivial, especially when queries have 100s/1000s of validators (like Pyrmont). - Add the `state_processing::state_advance` mod which dedups a lot of the "apply `n` skip slots to the state" code. - This also fixes a bug with some functions which were failing to include a state root as per [this comment](072695284f/consensus/state_processing/src/state_advance.rs (L69-L74)
). I couldn't find any instance of this bug that resulted in anything more severe than keying a shuffling cache by the wrong block root. - Swap the VC block service to use `mpsc` from `tokio` instead of `futures`. This is consistent with the rest of the code base. ~~This PR *reduces* the size of the codebase 🎉~~ It *used* to reduce the size of the code base before I added more comments. ## Observations on Prymont - Proposer duties times down from peaks of 450ms to consistent <1ms. - Current epoch attester duties times down from >1s peaks to a consistent 20-30ms. - Block production down from +600ms to 100-200ms. ## Additional Info - ~~Blocked on #2241~~ - ~~Blocked on #2234~~ ## TODO - [x] ~~Refactor this into some smaller PRs?~~ Leaving this as-is for now. - [x] Address `per_slot_processing` roots. - [x] Investigate slow next epoch times. Not getting added to cache on block processing? - [x] Consider [this](072695284f/beacon_node/store/src/hot_cold_store.rs (L811-L812)
) in the scenario of replacing the state roots Co-authored-by: pawan <pawandhananjay@gmail.com> Co-authored-by: Michael Sproul <michael@sigmaprime.io>
131 lines
3.8 KiB
Rust
131 lines
3.8 KiB
Rust
use crate::generic_public_key_bytes::GenericPublicKeyBytes;
|
|
use crate::Error;
|
|
use serde::de::{Deserialize, Deserializer};
|
|
use serde::ser::{Serialize, Serializer};
|
|
use serde_utils::hex::encode as hex_encode;
|
|
use ssz::{Decode, Encode};
|
|
use std::fmt;
|
|
use std::hash::{Hash, Hasher};
|
|
use tree_hash::TreeHash;
|
|
|
|
/// The byte-length of a BLS public key when serialized in compressed form.
|
|
pub const PUBLIC_KEY_BYTES_LEN: usize = 48;
|
|
|
|
/// Represents the public key at infinity.
|
|
pub const INFINITY_PUBLIC_KEY: [u8; PUBLIC_KEY_BYTES_LEN] = [
|
|
0xc0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
];
|
|
|
|
/// Implemented on some struct from a BLS library so it may be used as the `point` in a
|
|
/// `GenericPublicKey`.
|
|
pub trait TPublicKey: Sized + Clone {
|
|
/// Serialize `self` as compressed bytes.
|
|
fn serialize(&self) -> [u8; PUBLIC_KEY_BYTES_LEN];
|
|
|
|
/// Deserialize `self` from compressed bytes.
|
|
fn deserialize(bytes: &[u8]) -> Result<Self, Error>;
|
|
}
|
|
|
|
/// A BLS aggregate public key that is generic across some BLS point (`Pub`).
|
|
///
|
|
/// Provides generic functionality whilst deferring all serious cryptographic operations to `Pub`.
|
|
#[derive(Clone)]
|
|
pub struct GenericPublicKey<Pub> {
|
|
/// The underlying point which performs *actual* cryptographic operations.
|
|
point: Pub,
|
|
}
|
|
|
|
impl<Pub> GenericPublicKey<Pub>
|
|
where
|
|
Pub: TPublicKey,
|
|
{
|
|
/// Instantiates `Self` from a `point`.
|
|
pub(crate) fn from_point(point: Pub) -> Self {
|
|
Self { point }
|
|
}
|
|
|
|
/// Returns a reference to the underlying BLS point.
|
|
pub(crate) fn point(&self) -> &Pub {
|
|
&self.point
|
|
}
|
|
|
|
/// Returns `self.serialize()` as a `0x`-prefixed hex string.
|
|
pub fn to_hex_string(&self) -> String {
|
|
format!("{:?}", self)
|
|
}
|
|
|
|
/// Returns `self` in the compressed `PublicKeyBytes` representation.
|
|
pub fn compress(&self) -> GenericPublicKeyBytes<Pub> {
|
|
GenericPublicKeyBytes::from(self)
|
|
}
|
|
|
|
/// Serialize `self` as compressed bytes.
|
|
pub fn serialize(&self) -> [u8; PUBLIC_KEY_BYTES_LEN] {
|
|
self.point.serialize()
|
|
}
|
|
|
|
/// Deserialize `self` from compressed bytes.
|
|
pub fn deserialize(bytes: &[u8]) -> Result<Self, Error> {
|
|
if bytes == &INFINITY_PUBLIC_KEY[..] {
|
|
Err(Error::InvalidInfinityPublicKey)
|
|
} else {
|
|
Ok(Self {
|
|
point: Pub::deserialize(bytes)?,
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<Pub: TPublicKey> Eq for GenericPublicKey<Pub> {}
|
|
|
|
impl<Pub: TPublicKey> PartialEq for GenericPublicKey<Pub> {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.serialize()[..] == other.serialize()[..]
|
|
}
|
|
}
|
|
|
|
/// Hashes the `self.serialize()` bytes.
|
|
impl<Pub: TPublicKey> Hash for GenericPublicKey<Pub> {
|
|
fn hash<H: Hasher>(&self, state: &mut H) {
|
|
self.serialize()[..].hash(state);
|
|
}
|
|
}
|
|
|
|
impl<Pub: TPublicKey> Encode for GenericPublicKey<Pub> {
|
|
impl_ssz_encode!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|
|
|
|
impl<Pub: TPublicKey> Decode for GenericPublicKey<Pub> {
|
|
impl_ssz_decode!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|
|
|
|
impl<Pub: TPublicKey> TreeHash for GenericPublicKey<Pub> {
|
|
impl_tree_hash!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|
|
|
|
impl<Pub: TPublicKey> fmt::Display for GenericPublicKey<Pub> {
|
|
impl_display!();
|
|
}
|
|
|
|
impl<Pub: TPublicKey> std::str::FromStr for GenericPublicKey<Pub> {
|
|
impl_from_str!();
|
|
}
|
|
|
|
impl<Pub: TPublicKey> Serialize for GenericPublicKey<Pub> {
|
|
impl_serde_serialize!();
|
|
}
|
|
|
|
impl<'de, Pub: TPublicKey> Deserialize<'de> for GenericPublicKey<Pub> {
|
|
impl_serde_deserialize!();
|
|
}
|
|
|
|
impl<Pub: TPublicKey> fmt::Debug for GenericPublicKey<Pub> {
|
|
impl_debug!();
|
|
}
|
|
|
|
#[cfg(feature = "arbitrary")]
|
|
impl<Pub: TPublicKey + 'static> arbitrary::Arbitrary for GenericPublicKey<Pub> {
|
|
impl_arbitrary!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|