mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-18 12:22:51 +00:00
- Resolves #1550 - Resolves #824 - Resolves #825 - Resolves #1131 - Resolves #1411 - Resolves #1256 - Resolve #1177 - Includes the `ShufflingId` struct initially defined in #1492. That PR is now closed and the changes are included here, with significant bug fixes. - Implement the https://github.com/ethereum/eth2.0-APIs in a new `http_api` crate using `warp`. This replaces the `rest_api` crate. - Add a new `common/eth2` crate which provides a wrapper around `reqwest`, providing the HTTP client that is used by the validator client and for testing. This replaces the `common/remote_beacon_node` crate. - Create a `http_metrics` crate which is a dedicated server for Prometheus metrics (they are no longer served on the same port as the REST API). We now have flags for `--metrics`, `--metrics-address`, etc. - Allow the `subnet_id` to be an optional parameter for `VerifiedUnaggregatedAttestation::verify`. This means it does not need to be provided unnecessarily by the validator client. - Move `fn map_attestation_committee` in `mod beacon_chain::attestation_verification` to a new `fn with_committee_cache` on the `BeaconChain` so the same cache can be used for obtaining validator duties. - Add some other helpers to `BeaconChain` to assist with common API duties (e.g., `block_root_at_slot`, `head_beacon_block_root`). - Change the `NaiveAggregationPool` so it can index attestations by `hash_tree_root(attestation.data)`. This is a requirement of the API. - Add functions to `BeaconChainHarness` to allow it to create slashings and exits. - Allow for `eth1::Eth1NetworkId` to go to/from a `String`. - Add functions to the `OperationPool` to allow getting all objects in the pool. - Add function to `BeaconState` to check if a committee cache is initialized. - Fix bug where `seconds_per_eth1_block` was not transferring over from `YamlConfig` to `ChainSpec`. - Add the `deposit_contract_address` to `YamlConfig` and `ChainSpec`. We needed to be able to return it in an API response. - Change some uses of serde `serialize_with` and `deserialize_with` to a single use of `with` (code quality). - Impl `Display` and `FromStr` for several BLS fields. - Check for clock discrepancy when VC polls BN for sync state (with +/- 1 slot tolerance). This is not intended to be comprehensive, it was just easy to do. - See #1434 for a per-endpoint overview. - Seeking clarity here: https://github.com/ethereum/eth2.0-APIs/issues/75 - [x] Add docs for prom port to close #1256 - [x] Follow up on this #1177 - [x] ~~Follow up with #1424~~ Will fix in future PR. - [x] Follow up with #1411 - [x] ~~Follow up with #1260~~ Will fix in future PR. - [x] Add quotes to all integers. - [x] Remove `rest_types` - [x] Address missing beacon block error. (#1629) - [x] ~~Add tests for lighthouse/peers endpoints~~ Wontfix - [x] ~~Follow up with validator status proposal~~ Tracked in #1434 - [x] Unify graffiti structs - [x] ~~Start server when waiting for genesis?~~ Will fix in future PR. - [x] TODO in http_api tests - [x] Move lighthouse endpoints off /eth/v1 - [x] Update docs to link to standard - ~~Blocked on #1586~~ Co-authored-by: Michael Sproul <michael@sigmaprime.io>
169 lines
4.6 KiB
Rust
169 lines
4.6 KiB
Rust
use crate::{
|
|
generic_public_key::{GenericPublicKey, TPublicKey},
|
|
Error, INFINITY_PUBLIC_KEY, PUBLIC_KEY_BYTES_LEN,
|
|
};
|
|
use serde::de::{Deserialize, Deserializer};
|
|
use serde::ser::{Serialize, Serializer};
|
|
use serde_utils::hex::encode as hex_encode;
|
|
use ssz::{Decode, Encode};
|
|
use std::convert::TryInto;
|
|
use std::fmt;
|
|
use std::hash::{Hash, Hasher};
|
|
use std::marker::PhantomData;
|
|
use tree_hash::TreeHash;
|
|
|
|
/// A wrapper around some bytes that may or may not be a `PublicKey` in compressed form.
|
|
///
|
|
/// This struct is useful for two things:
|
|
///
|
|
/// - Lazily verifying a serialized public key.
|
|
/// - Storing some bytes that are actually invalid (required in the case of a `Deposit` message).
|
|
#[derive(Clone)]
|
|
pub struct GenericPublicKeyBytes<Pub> {
|
|
bytes: [u8; PUBLIC_KEY_BYTES_LEN],
|
|
_phantom: PhantomData<Pub>,
|
|
}
|
|
|
|
impl<Pub> GenericPublicKeyBytes<Pub>
|
|
where
|
|
Pub: TPublicKey,
|
|
{
|
|
/// Decompress and deserialize the bytes in `self` into an actual public key.
|
|
///
|
|
/// May fail if the bytes are invalid.
|
|
pub fn decompress(&self) -> Result<GenericPublicKey<Pub>, Error> {
|
|
let is_infinity = self.bytes[..] == INFINITY_PUBLIC_KEY[..];
|
|
Pub::deserialize(&self.bytes).map(|point| GenericPublicKey::from_point(point, is_infinity))
|
|
}
|
|
}
|
|
|
|
impl<Pub> GenericPublicKeyBytes<Pub> {
|
|
/// Instantiates `Self` with all-zeros.
|
|
pub fn empty() -> Self {
|
|
Self {
|
|
bytes: [0; PUBLIC_KEY_BYTES_LEN],
|
|
_phantom: PhantomData,
|
|
}
|
|
}
|
|
|
|
/// Returns a slice of the bytes contained in `self`.
|
|
///
|
|
/// The bytes are not verified (i.e., they may not represent a valid BLS point).
|
|
pub fn as_serialized(&self) -> &[u8] {
|
|
&self.bytes
|
|
}
|
|
|
|
/// Clones the bytes in `self`.
|
|
///
|
|
/// The bytes are not verified (i.e., they may not represent a valid BLS point).
|
|
pub fn serialize(&self) -> [u8; PUBLIC_KEY_BYTES_LEN] {
|
|
self.bytes
|
|
}
|
|
|
|
/// Instantiates `Self` from bytes.
|
|
///
|
|
/// The bytes are not fully verified (i.e., they may not represent a valid BLS point). Only the
|
|
/// byte-length is checked.
|
|
pub fn deserialize(bytes: &[u8]) -> Result<Self, Error> {
|
|
if bytes.len() == PUBLIC_KEY_BYTES_LEN {
|
|
let mut pk_bytes = [0; PUBLIC_KEY_BYTES_LEN];
|
|
pk_bytes[..].copy_from_slice(bytes);
|
|
Ok(Self {
|
|
bytes: pk_bytes,
|
|
_phantom: PhantomData,
|
|
})
|
|
} else {
|
|
Err(Error::InvalidByteLength {
|
|
got: bytes.len(),
|
|
expected: PUBLIC_KEY_BYTES_LEN,
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<Pub> Eq for GenericPublicKeyBytes<Pub> {}
|
|
|
|
impl<Pub> PartialEq for GenericPublicKeyBytes<Pub> {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.bytes[..] == other.bytes[..]
|
|
}
|
|
}
|
|
|
|
impl<Pub> Hash for GenericPublicKeyBytes<Pub> {
|
|
fn hash<H: Hasher>(&self, state: &mut H) {
|
|
self.bytes[..].hash(state);
|
|
}
|
|
}
|
|
|
|
/// Serializes the `PublicKey` in compressed form, storing the bytes in the newly created `Self`.
|
|
impl<Pub> From<GenericPublicKey<Pub>> for GenericPublicKeyBytes<Pub>
|
|
where
|
|
Pub: TPublicKey,
|
|
{
|
|
fn from(pk: GenericPublicKey<Pub>) -> Self {
|
|
Self::from(&pk)
|
|
}
|
|
}
|
|
|
|
/// Serializes the `PublicKey` in compressed form, storing the bytes in the newly created `Self`.
|
|
impl<Pub> From<&GenericPublicKey<Pub>> for GenericPublicKeyBytes<Pub>
|
|
where
|
|
Pub: TPublicKey,
|
|
{
|
|
fn from(pk: &GenericPublicKey<Pub>) -> Self {
|
|
Self {
|
|
bytes: pk.serialize(),
|
|
_phantom: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Alias to `self.decompress()`.
|
|
impl<Pub> TryInto<GenericPublicKey<Pub>> for &GenericPublicKeyBytes<Pub>
|
|
where
|
|
Pub: TPublicKey,
|
|
{
|
|
type Error = Error;
|
|
|
|
fn try_into(self) -> Result<GenericPublicKey<Pub>, Self::Error> {
|
|
self.decompress()
|
|
}
|
|
}
|
|
|
|
impl<Pub> Encode for GenericPublicKeyBytes<Pub> {
|
|
impl_ssz_encode!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|
|
|
|
impl<Pub> Decode for GenericPublicKeyBytes<Pub> {
|
|
impl_ssz_decode!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|
|
|
|
impl<Pub> TreeHash for GenericPublicKeyBytes<Pub> {
|
|
impl_tree_hash!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|
|
|
|
impl<Pub> fmt::Display for GenericPublicKeyBytes<Pub> {
|
|
impl_display!();
|
|
}
|
|
|
|
impl<Pub> std::str::FromStr for GenericPublicKeyBytes<Pub> {
|
|
impl_from_str!();
|
|
}
|
|
|
|
impl<Pub> Serialize for GenericPublicKeyBytes<Pub> {
|
|
impl_serde_serialize!();
|
|
}
|
|
|
|
impl<'de, Pub> Deserialize<'de> for GenericPublicKeyBytes<Pub> {
|
|
impl_serde_deserialize!();
|
|
}
|
|
|
|
impl<Pub> fmt::Debug for GenericPublicKeyBytes<Pub> {
|
|
impl_debug!();
|
|
}
|
|
|
|
#[cfg(feature = "arbitrary")]
|
|
impl<Pub: 'static> arbitrary::Arbitrary for GenericPublicKeyBytes<Pub> {
|
|
impl_arbitrary!(PUBLIC_KEY_BYTES_LEN);
|
|
}
|