mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-17 11:52:42 +00:00
* Start updating types * WIP * Signature hacking * Existing EF tests passing with fake_crypto * Updates * Delete outdated API spec * The refactor continues * It compiles * WIP test fixes * All release tests passing bar genesis state parsing * Update and test YamlConfig * Update to spec v0.10 compatible BLS * Updates to BLS EF tests * Add EF test for AggregateVerify And delete unused hash2curve tests for uncompressed points * Update EF tests to v0.10.1 * Use optional block root correctly in block proc * Use genesis fork in deposit domain. All tests pass * Cargo fmt * Fast aggregate verify test * Update REST API docs * Cargo fmt * Fix unused import * Bump spec tags to v0.10.1 * Add `seconds_per_eth1_block` to chainspec * Update to timestamp based eth1 voting scheme * Return None from `get_votes_to_consider` if block cache is empty * Handle overflows in `is_candidate_block` * Revert to failing tests * Fix eth1 data sets test * Choose default vote according to spec * Fix collect_valid_votes tests * Fix `get_votes_to_consider` to choose all eligible blocks * Uncomment winning_vote tests * Add comments; remove unused code * Reduce seconds_per_eth1_block for simulation * Addressed review comments * Add test for default vote case * Fix logs * Remove unused functions * Meter default eth1 votes * Fix comments * Address review comments; remove unused dependency * Disable/delete two outdated tests * Bump eth1 default vote warn to error * Delete outdated eth1 test Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>
97 lines
2.8 KiB
Rust
97 lines
2.8 KiB
Rust
use super::{PublicKey, BLS_PUBLIC_KEY_BYTE_SIZE};
|
|
use milagro_bls::{AggregatePublicKey as RawAggregatePublicKey, G1Point};
|
|
use serde::de::{Deserialize, Deserializer};
|
|
use serde::ser::{Serialize, Serializer};
|
|
use serde_hex::{encode as hex_encode, PrefixedHexVisitor};
|
|
use ssz::{Decode, DecodeError, Encode};
|
|
|
|
/// A BLS aggregate public key.
|
|
///
|
|
/// This struct is a wrapper upon a base type and provides helper functions (e.g., SSZ
|
|
/// serialization).
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct AggregatePublicKey(RawAggregatePublicKey);
|
|
|
|
impl AggregatePublicKey {
|
|
pub fn new() -> Self {
|
|
AggregatePublicKey(RawAggregatePublicKey::new())
|
|
}
|
|
|
|
pub fn from_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
|
|
let pubkey = RawAggregatePublicKey::from_bytes(&bytes).map_err(|_| {
|
|
DecodeError::BytesInvalid(
|
|
format!("Invalid AggregatePublicKey bytes: {:?}", bytes).to_string(),
|
|
)
|
|
})?;
|
|
|
|
Ok(AggregatePublicKey(pubkey))
|
|
}
|
|
|
|
pub fn add_without_affine(&mut self, public_key: &PublicKey) {
|
|
self.0.point.add(&public_key.as_raw().point)
|
|
}
|
|
|
|
pub fn affine(&mut self) {
|
|
self.0.point.affine()
|
|
}
|
|
|
|
pub fn add(&mut self, public_key: &PublicKey) {
|
|
self.0.add(public_key.as_raw())
|
|
}
|
|
|
|
pub fn add_point(&mut self, point: &G1Point) {
|
|
self.0.point.add(point)
|
|
}
|
|
|
|
/// Returns the underlying public key.
|
|
pub fn as_raw(&self) -> &RawAggregatePublicKey {
|
|
&self.0
|
|
}
|
|
|
|
/// Returns the underlying point as compressed bytes.
|
|
pub fn as_bytes(&self) -> Vec<u8> {
|
|
self.as_raw().as_bytes()
|
|
}
|
|
|
|
pub fn into_raw(self) -> RawAggregatePublicKey {
|
|
self.0
|
|
}
|
|
|
|
/// Return a hex string representation of this key's bytes.
|
|
#[cfg(test)]
|
|
pub fn as_hex_string(&self) -> String {
|
|
serde_hex::encode(self.as_bytes())
|
|
}
|
|
}
|
|
|
|
impl_ssz!(
|
|
AggregatePublicKey,
|
|
BLS_PUBLIC_KEY_BYTE_SIZE,
|
|
"AggregatePublicKey"
|
|
);
|
|
impl_tree_hash!(AggregatePublicKey, BLS_PUBLIC_KEY_BYTE_SIZE);
|
|
|
|
impl Serialize for AggregatePublicKey {
|
|
/// Serde serialization is compliant the Ethereum YAML test format.
|
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
|
where
|
|
S: Serializer,
|
|
{
|
|
serializer.serialize_str(&hex_encode(self.as_bytes()))
|
|
}
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for AggregatePublicKey {
|
|
/// Serde serialization is compliant the Ethereum YAML test format.
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
let bytes = deserializer.deserialize_str(PrefixedHexVisitor)?;
|
|
let agg_sig = AggregatePublicKey::from_ssz_bytes(&bytes)
|
|
.map_err(|e| serde::de::Error::custom(format!("invalid ssz ({:?})", e)))?;
|
|
|
|
Ok(agg_sig)
|
|
}
|
|
}
|