gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-02 04:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support multiple BLS implementations (#1335)

Browse Source 
## Issue Addressed

NA

## Proposed Changes

- Refactor the `bls` crate to support multiple BLS "backends" (e.g., milagro, blst, etc).
- Removes some duplicate, unused code in `common/rest_types/src/validator.rs`.
- Removes the old "upgrade legacy keypairs" functionality (these were unencrypted keys that haven't been supported for a few testnets, no one should be using them anymore).

## Additional Info

Most of the files changed are just inconsequential changes to function names.

## TODO

- [x] Optimization levels
- [x] Infinity point: https://github.com/supranational/blst/issues/11
- [x] Ensure milagro *and* blst are tested via CI
- [x] What to do with unsafe code?
- [x] Test infinity point in signature sets
This commit is contained in:
Paul Hauner
2020-07-25 02:03:18 +00:00
parent 21bcc8848d
commit b73c497be2
117 changed files with 3009 additions and 2463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
consensus/state_processing/src/per_block_processing.rs
View File

@@ -3,7 +3,6 @@ use errors::{BlockOperationError, BlockProcessingError, HeaderInvalid, IntoWithI
use rayon::prelude::*;
use safe_arith::{ArithError, SafeArith};
use signature_sets::{block_proposal_signature_set, get_pubkey_from_state, randao_signature_set};
use std::convert::TryInto;
use tree_hash::TreeHash;
use types::*;
@@ -215,7 +214,7 @@ pub fn verify_block_signature<T: EthSpec>(
block_root,
spec
)?
.is_valid(),
.verify(),
HeaderInvalid::ProposalSignatureInvalid
);
@@ -235,8 +234,7 @@ pub fn process_randao<T: EthSpec>(
if verify_signatures.is_true() {
// Verify RANDAO reveal signature.
block_verify!(
randao_signature_set(state, |i| get_pubkey_from_state(state, i), block, spec)?
.is_valid(),
randao_signature_set(state, |i| get_pubkey_from_state(state, i), block, spec)?.verify(),
BlockProcessingError::RandaoSignatureInvalid
);
}
@@ -452,7 +450,7 @@ pub fn process_deposit<T: EthSpec>(
// depositing validator already exists in the registry.
state.update_pubkey_cache()?;
let pubkey: PublicKey = match (&deposit.data.pubkey).try_into() {
let pubkey: PublicKey = match deposit.data.pubkey.decompress() {
Err(_) => return Ok(()), //bad public key => return early
Ok(k) => k,
};

2
consensus/state_processing/src/per_block_processing/block_processing_builder.rs
View File

@@ -126,7 +126,7 @@ impl<'a, T: EthSpec> BlockProcessingBuilder<'a, T> {
let mut attestation = Attestation {
aggregation_bits: BitList::with_capacity(committee.committee.len()).unwrap(),
data,
signature: AggregateSignature::new(),
signature: AggregateSignature::empty(),
};
for (i, &validator_index) in committee.committee.iter().enumerate() {

4
consensus/state_processing/src/per_block_processing/block_signature_verifier.rs
View File

@@ -71,7 +71,7 @@ where
get_pubkey: F,
state: &'a BeaconState<T>,
spec: &'a ChainSpec,
sets: Vec<SignatureSet>,
sets: Vec<SignatureSet<'a>>,
}
impl<'a, T, F> BlockSignatureVerifier<'a, T, F>
@@ -129,7 +129,7 @@ where
.sets
.into_par_iter()
.chunks(num_chunks)
.map(verify_signature_sets)
.map(|chunk| verify_signature_sets(chunk.iter()))
.reduce(|| true, |current, this| current && this);
if result {

2
consensus/state_processing/src/per_block_processing/is_valid_indexed_attestation.rs
View File

@@ -45,7 +45,7 @@ pub fn is_valid_indexed_attestation<T: EthSpec>(
&indexed_attestation,
spec
)?
.is_valid(),
.verify(),
Invalid::BadSignature
);
}

77
consensus/state_processing/src/per_block_processing/signature_sets.rs
View File

@@ -5,7 +5,6 @@
use bls::SignatureSet;
use ssz::DecodeError;
use std::borrow::Cow;
use std::convert::TryInto;
use tree_hash::TreeHash;
use types::{
AggregateSignature, AttesterSlashing, BeaconBlock, BeaconState, BeaconStateError, ChainSpec,
@@ -56,7 +55,7 @@ where
.validators
.get(validator_index)
.and_then(|v| {
let pk: Option<PublicKey> = (&v.pubkey).try_into().ok();
let pk: Option<PublicKey> = v.pubkey.decompress().ok();
pk
})
.map(Cow::Owned)
@@ -69,7 +68,7 @@ pub fn block_proposal_signature_set<'a, T, F>(
signed_block: &'a SignedBeaconBlock<T>,
block_root: Option<Hash256>,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -101,10 +100,10 @@ where
block.signing_root(domain)
};
Ok(SignatureSet::single(
Ok(SignatureSet::single_pubkey(
&signed_block.signature,
get_pubkey(proposer_index).ok_or_else(|| Error::ValidatorUnknown(proposer_index as u64))?,
message.as_bytes().to_vec(),
message,
))
}
@@ -114,7 +113,7 @@ pub fn randao_signature_set<'a, T, F>(
get_pubkey: F,
block: &'a BeaconBlock<T>,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -130,10 +129,10 @@ where
let message = block.slot.epoch(T::slots_per_epoch()).signing_root(domain);
Ok(SignatureSet::single(
Ok(SignatureSet::single_pubkey(
&block.body.randao_reveal,
get_pubkey(proposer_index).ok_or_else(|| Error::ValidatorUnknown(proposer_index as u64))?,
message.as_bytes().to_vec(),
message,
))
}
@@ -143,7 +142,7 @@ pub fn proposer_slashing_signature_set<'a, T, F>(
get_pubkey: F,
proposer_slashing: &'a ProposerSlashing,
spec: &'a ChainSpec,
) -> Result<(SignatureSet, SignatureSet)>
) -> Result<(SignatureSet<'a>, SignatureSet<'a>)>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -174,7 +173,7 @@ fn block_header_signature_set<'a, T: EthSpec>(
signed_header: &'a SignedBeaconBlockHeader,
pubkey: Cow<'a, PublicKey>,
spec: &'a ChainSpec,
) -> Result<SignatureSet> {
) -> Result<SignatureSet<'a>> {
let domain = spec.get_domain(
signed_header.message.slot.epoch(T::slots_per_epoch()),
Domain::BeaconProposer,
@@ -182,13 +181,9 @@ fn block_header_signature_set<'a, T: EthSpec>(
state.genesis_validators_root,
);
let message = signed_header
.message
.signing_root(domain)
.as_bytes()
.to_vec();
let message = signed_header.message.signing_root(domain);
Ok(SignatureSet::single(
Ok(SignatureSet::single_pubkey(
&signed_header.signature,
pubkey,
message,
@@ -202,7 +197,7 @@ pub fn indexed_attestation_signature_set<'a, 'b, T, F>(
signature: &'a AggregateSignature,
indexed_attestation: &'b IndexedAttestation<T>,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -224,9 +219,8 @@ where
);
let message = indexed_attestation.data.signing_root(domain);
let message = message.as_bytes().to_vec();
Ok(SignatureSet::new(signature, pubkeys, message))
Ok(SignatureSet::multiple_pubkeys(signature, pubkeys, message))
}
/// Returns the signature set for the given `indexed_attestation` but pubkeys are supplied directly
@@ -238,7 +232,7 @@ pub fn indexed_attestation_signature_set_from_pubkeys<'a, 'b, T, F>(
fork: &Fork,
genesis_validators_root: Hash256,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -260,9 +254,8 @@ where
);
let message = indexed_attestation.data.signing_root(domain);
let message = message.as_bytes().to_vec();
Ok(SignatureSet::new(signature, pubkeys, message))
Ok(SignatureSet::multiple_pubkeys(signature, pubkeys, message))
}
/// Returns the signature set for the given `attester_slashing` and corresponding `pubkeys`.
@@ -271,7 +264,7 @@ pub fn attester_slashing_signature_sets<'a, T, F>(
get_pubkey: F,
attester_slashing: &'a AttesterSlashing<T>,
spec: &'a ChainSpec,
) -> Result<(SignatureSet, SignatureSet)>
) -> Result<(SignatureSet<'a>, SignatureSet<'a>)>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>> + Clone,
@@ -300,28 +293,24 @@ where
pub fn deposit_pubkey_signature_message(
deposit_data: &DepositData,
spec: &ChainSpec,
) -> Option<(PublicKey, Signature, Vec<u8>)> {
let pubkey = (&deposit_data.pubkey).try_into().ok()?;
let signature = (&deposit_data.signature).try_into().ok()?;
) -> Option<(PublicKey, Signature, Hash256)> {
let pubkey = deposit_data.pubkey.decompress().ok()?;
let signature = deposit_data.signature.decompress().ok()?;
let domain = spec.get_deposit_domain();
let message = deposit_data
.as_deposit_message()
.signing_root(domain)
.as_bytes()
.to_vec();
let message = deposit_data.as_deposit_message().signing_root(domain);
Some((pubkey, signature, message))
}
/// Returns the signature set for some set of deposit signatures, made with
/// `deposit_pubkey_signature_message`.
pub fn deposit_signature_set(
pubkey_signature_message: &(PublicKey, Signature, Vec<u8>),
pubkey_signature_message: &(PublicKey, Signature, Hash256),
) -> SignatureSet {
let (pubkey, signature, message) = pubkey_signature_message;
// Note: Deposits are valid across forks, thus the deposit domain is computed
// with the fok zeroed.
SignatureSet::single(&signature, Cow::Borrowed(pubkey), message.clone())
SignatureSet::single_pubkey(signature, Cow::Borrowed(pubkey), *message)
}
/// Returns a signature set that is valid if the `SignedVoluntaryExit` was signed by the indicated
@@ -331,7 +320,7 @@ pub fn exit_signature_set<'a, T, F>(
get_pubkey: F,
signed_exit: &'a SignedVoluntaryExit,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -346,9 +335,9 @@ where
state.genesis_validators_root,
);
let message = exit.signing_root(domain).as_bytes().to_vec();
let message = exit.signing_root(domain);
Ok(SignatureSet::single(
Ok(SignatureSet::single_pubkey(
&signed_exit.signature,
get_pubkey(proposer_index).ok_or_else(|| Error::ValidatorUnknown(proposer_index as u64))?,
message,
@@ -361,7 +350,7 @@ pub fn signed_aggregate_selection_proof_signature_set<'a, T, F>(
fork: &Fork,
genesis_validators_root: Hash256,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -374,11 +363,11 @@ where
fork,
genesis_validators_root,
);
let message = slot.signing_root(domain).as_bytes().to_vec();
let message = slot.signing_root(domain);
let signature = &signed_aggregate_and_proof.message.selection_proof;
let validator_index = signed_aggregate_and_proof.message.aggregator_index;
Ok(SignatureSet::single(
Ok(SignatureSet::single_pubkey(
signature,
get_pubkey(validator_index as usize)
.ok_or_else(|| Error::ValidatorUnknown(validator_index))?,
@@ -392,7 +381,7 @@ pub fn signed_aggregate_signature_set<'a, T, F>(
fork: &Fork,
genesis_validators_root: Hash256,
spec: &'a ChainSpec,
) -> Result<SignatureSet>
) -> Result<SignatureSet<'a>>
where
T: EthSpec,
F: Fn(usize) -> Option<Cow<'a, PublicKey>>,
@@ -410,15 +399,11 @@ where
fork,
genesis_validators_root,
);
let message = signed_aggregate_and_proof
.message
.signing_root(domain)
.as_bytes()
.to_vec();
let message = signed_aggregate_and_proof.message.signing_root(domain);
let signature = &signed_aggregate_and_proof.signature;
let validator_index = signed_aggregate_and_proof.message.aggregator_index;
Ok(SignatureSet::single(
Ok(SignatureSet::single_pubkey(
signature,
get_pubkey(validator_index as usize)
.ok_or_else(|| Error::ValidatorUnknown(validator_index))?,

2
consensus/state_processing/src/per_block_processing/verify_deposit.rs
View File

@@ -21,7 +21,7 @@ pub fn verify_deposit_signature(deposit_data: &DepositData, spec: &ChainSpec) ->
.ok_or_else(|| error(DepositInvalid::BadBlsBytes))?;
verify!(
deposit_signature_set(&deposit_signature_message).is_valid(),
deposit_signature_set(&deposit_signature_message).verify(),
DepositInvalid::BadSignature
);

2
consensus/state_processing/src/per_block_processing/verify_exit.rs
View File

@@ -93,7 +93,7 @@ fn verify_exit_parametric<T: EthSpec>(
signed_exit,
spec
)?
.is_valid(),
.verify(),
ExitInvalid::BadSignature
);
}

4
consensus/state_processing/src/per_block_processing/verify_proposer_slashing.rs
View File

@@ -57,8 +57,8 @@ pub fn verify_proposer_slashing<T: EthSpec>(
proposer_slashing,
spec,
)?;
verify!(signature_set_1.is_valid(), Invalid::BadProposal1Signature);
verify!(signature_set_2.is_valid(), Invalid::BadProposal2Signature);
verify!(signature_set_1.verify(), Invalid::BadProposal1Signature);
verify!(signature_set_2.verify(), Invalid::BadProposal2Signature);
}
Ok(())

12
consensus/state_processing/tests/tests.rs
View File

@@ -1,11 +1,11 @@
#![cfg(not(feature = "fake_crypto"))]
// #![cfg(not(feature = "fake_crypto"))]
use state_processing::{
per_block_processing, test_utils::BlockBuilder, BlockProcessingError, BlockSignatureStrategy,
};
use types::{
AggregateSignature, BeaconState, ChainSpec, EthSpec, Keypair, MinimalEthSpec, Signature,
SignedBeaconBlock, Slot,
AggregateSignature, BeaconState, ChainSpec, EthSpec, Hash256, Keypair, MinimalEthSpec,
Signature, SignedBeaconBlock, Slot,
};
const VALIDATOR_COUNT: usize = 64;
@@ -92,15 +92,15 @@ where
// TODO: use lazy static
fn agg_sig() -> AggregateSignature {
let mut agg_sig = AggregateSignature::new();
agg_sig.add(&sig());
let mut agg_sig = AggregateSignature::infinity();
agg_sig.add_assign(&sig());
agg_sig
}
// TODO: use lazy static
fn sig() -> Signature {
let keypair = Keypair::random();
Signature::new(&[42, 42], &keypair.sk)
keypair.sk.sign(Hash256::from_low_u64_be(42))
}
type TestEthSpec = MinimalEthSpec;

3
consensus/types/src/aggregate_and_proof.rs
View File

@@ -73,8 +73,7 @@ impl<T: EthSpec> AggregateAndProof<T> {
genesis_validators_root,
);
let message = self.aggregate.data.slot.signing_root(domain);
self.selection_proof
.verify(message.as_bytes(), validator_pubkey)
self.selection_proof.verify(validator_pubkey, message)
}
}

7
consensus/types/src/attestation.rs
View File

@@ -1,6 +1,6 @@
use super::{
AggregateSignature, AttestationData, BitList, ChainSpec, Domain, EthSpec, Fork, SecretKey,
Signature, SignedRoot,
SignedRoot,
};
use crate::{test_utils::TestRandom, Hash256};
use safe_arith::ArithError;
@@ -44,7 +44,7 @@ impl<T: EthSpec> Attestation<T> {
debug_assert!(self.signers_disjoint_from(other));
self.aggregation_bits = self.aggregation_bits.union(&other.aggregation_bits);
self.signature.add_aggregate(&other.signature);
self.signature.add_assign_aggregate(&other.signature);
}
/// Signs `self`, setting the `committee_position`'th bit of `aggregation_bits` to `true`.
@@ -77,8 +77,7 @@ impl<T: EthSpec> Attestation<T> {
);
let message = self.data.signing_root(domain);
self.signature
.add(&Signature::new(message.as_bytes(), secret_key));
self.signature.add_assign(&secret_key.sign(message));
Ok(())
}

12
consensus/types/src/beacon_block.rs
View File

@@ -35,7 +35,7 @@ impl<T: EthSpec> BeaconBlock<T> {
parent_root: Hash256::zero(),
state_root: Hash256::zero(),
body: BeaconBlockBody {
randao_reveal: Signature::empty_signature(),
randao_reveal: Signature::empty(),
eth1_data: Eth1Data {
deposit_root: Hash256::zero(),
block_hash: Hash256::zero(),
@@ -63,7 +63,7 @@ impl<T: EthSpec> BeaconBlock<T> {
let signed_header = SignedBeaconBlockHeader {
message: header,
signature: Signature::empty_signature(),
signature: Signature::empty(),
};
let indexed_attestation: IndexedAttestation<T> = IndexedAttestation {
attesting_indices: VariableList::new(vec![
@@ -72,7 +72,7 @@ impl<T: EthSpec> BeaconBlock<T> {
])
.unwrap(),
data: AttestationData::default(),
signature: AggregateSignature::new(),
signature: AggregateSignature::empty(),
};
let deposit_data = DepositData {
@@ -95,7 +95,7 @@ impl<T: EthSpec> BeaconBlock<T> {
aggregation_bits: BitList::with_capacity(T::MaxValidatorsPerCommittee::to_usize())
.unwrap(),
data: AttestationData::default(),
signature: AggregateSignature::new(),
signature: AggregateSignature::empty(),
};
let deposit = Deposit {
@@ -110,7 +110,7 @@ impl<T: EthSpec> BeaconBlock<T> {
let signed_voluntary_exit = SignedVoluntaryExit {
message: voluntary_exit,
signature: Signature::empty_signature(),
signature: Signature::empty(),
};
let mut block: BeaconBlock<T> = BeaconBlock::empty(spec);
@@ -200,7 +200,7 @@ impl<T: EthSpec> BeaconBlock<T> {
genesis_validators_root,
);
let message = self.signing_root(domain);
let signature = Signature::new(message.as_bytes(), secret_key);
let signature = secret_key.sign(message);
SignedBeaconBlock {
message: self,
signature,

2
consensus/types/src/beacon_block_header.rs
View File

@@ -54,7 +54,7 @@ impl BeaconBlockHeader {
let epoch = self.slot.epoch(E::slots_per_epoch());
let domain = spec.get_domain(epoch, Domain::BeaconProposer, fork, genesis_validators_root);
let message = self.signing_root(domain);
let signature = Signature::new(message.as_bytes(), secret_key);
let signature = secret_key.sign(message);
SignedBeaconBlockHeader {
message: self,
signature,

4
consensus/types/src/beacon_state.rs
View File

@@ -10,7 +10,7 @@ use int_to_bytes::{int_to_bytes4, int_to_bytes8};
use pubkey_cache::PubkeyCache;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use ssz::ssz_encode;
use ssz::{ssz_encode, Encode};
use ssz_derive::{Decode, Encode};
use ssz_types::{typenum::Unsigned, BitVector, FixedVector};
use std::convert::TryInto;
@@ -501,7 +501,7 @@ impl<T: EthSpec> BeaconState<T> {
1,
(committee.committee.len() as u64).safe_div(spec.target_aggregators_per_committee)?,
);
let signature_hash = hash(&slot_signature.as_bytes());
let signature_hash = hash(&slot_signature.as_ssz_bytes());
let signature_hash_int = u64::from_le_bytes(
signature_hash[0..8]
.try_into()

2
consensus/types/src/deposit_data.rs
View File

@@ -38,7 +38,7 @@ impl DepositData {
let domain = spec.get_deposit_domain();
let msg = self.as_deposit_message().signing_root(domain);
SignatureBytes::from(Signature::new(msg.as_bytes(), secret_key))
SignatureBytes::from(secret_key.sign(msg))
}
}

3
consensus/types/src/lib.rs
View File

@@ -96,8 +96,7 @@ pub type Address = H160;
pub type ForkVersion = [u8; 4];
pub use bls::{
AggregatePublicKey, AggregateSignature, Keypair, PublicKey, PublicKeyBytes, SecretKey,
Signature, SignatureBytes,
AggregateSignature, Keypair, PublicKey, PublicKeyBytes, SecretKey, Signature, SignatureBytes,
};
pub use ssz_types::{typenum, typenum::Unsigned, BitList, BitVector, FixedVector, VariableList};
pub use utils::{Graffiti, GRAFFITI_BYTES_LEN};

4
consensus/types/src/selection_proof.rs
View File

@@ -27,7 +27,7 @@ impl SelectionProof {
);
let message = slot.signing_root(domain);
Self(Signature::new(message.as_bytes(), secret_key))
Self(secret_key.sign(message))
}
/// Returns the "modulo" used for determining if a `SelectionProof` elects an aggregator.
@@ -74,7 +74,7 @@ impl SelectionProof {
);
let message = slot.signing_root(domain);
self.0.verify(message.as_bytes(), pubkey)
self.0.verify(pubkey, message)
}
}

4
consensus/types/src/signed_aggregate_and_proof.rs
View File

@@ -57,7 +57,7 @@ impl<T: EthSpec> SignedAggregateAndProof<T> {
SignedAggregateAndProof {
message,
signature: Signature::new(signing_message.as_bytes(), &secret_key),
signature: secret_key.sign(signing_message),
}
}
@@ -77,7 +77,7 @@ impl<T: EthSpec> SignedAggregateAndProof<T> {
genesis_validators_root,
);
let message = self.message.signing_root(domain);
self.signature.verify(message.as_bytes(), validator_pubkey)
self.signature.verify(validator_pubkey, message)
}
/// Verifies the signature of the `AggregateAndProof` as well the underlying selection_proof in

2
consensus/types/src/signed_beacon_block.rs
View File

@@ -78,7 +78,7 @@ impl<E: EthSpec> SignedBeaconBlock<E> {
self.message.signing_root(domain)
};
self.signature.verify(message.as_bytes(), pubkey)
self.signature.verify(pubkey, message)
}
/// Convenience accessor for the block's slot.

2
consensus/types/src/test_utils/builders/testing_attestation_builder.rs
View File

@@ -36,7 +36,7 @@ impl<T: EthSpec> TestingAttestationBuilder<T> {
let attestation = Attestation {
aggregation_bits,
data: data_builder.build(),
signature: AggregateSignature::new(),
signature: AggregateSignature::empty(),
};
Self {

6
consensus/types/src/test_utils/builders/testing_attester_slashing_builder.rs
View File

@@ -64,7 +64,7 @@ impl TestingAttesterSlashingBuilder {
validator_indices.to_vec().into()
},
data: data_1,
signature: AggregateSignature::new(),
signature: AggregateSignature::empty(),
};
let mut attestation_2 = IndexedAttestation {
@@ -76,7 +76,7 @@ impl TestingAttesterSlashingBuilder {
validator_indices.to_vec().into()
},
data: data_2,
signature: AggregateSignature::new(),
signature: AggregateSignature::empty(),
};
let add_signatures = |attestation: &mut IndexedAttestation<T>| {
@@ -90,7 +90,7 @@ impl TestingAttesterSlashingBuilder {
for validator_index in validator_indices {
let signature = signer(*validator_index, message.as_bytes());
attestation.signature.add(&signature);
attestation.signature.add_assign(&signature);
}
};

6
consensus/types/src/test_utils/builders/testing_beacon_block_builder.rs
View File

@@ -101,7 +101,7 @@ impl<T: EthSpec> TestingBeaconBlockBuilder<T> {
let epoch = self.block.slot.epoch(T::slots_per_epoch());
let domain = spec.get_domain(epoch, Domain::Randao, fork, genesis_validators_root);
let message = epoch.signing_root(domain);
self.block.body.randao_reveal = Signature::new(message.as_bytes(), sk);
self.block.body.randao_reveal = sk.sign(message);
}
/// Has the randao reveal been set?
@@ -368,7 +368,7 @@ impl<T: EthSpec> TestingBeaconBlockBuilder<T> {
pub fn build_without_signing(self) -> SignedBeaconBlock<T> {
SignedBeaconBlock {
message: self.block,
signature: Signature::empty_signature(),
signature: Signature::empty(),
}
}
}
@@ -410,7 +410,7 @@ pub fn build_double_vote_attester_slashing<T: EthSpec>(
.iter()
.position(|&i| i == validator_index)
.expect("Unable to find attester slashing key");
Signature::new(message, secret_keys[key_index])
secret_keys[key_index].sign(Hash256::from_slice(message))
};
TestingAttesterSlashingBuilder::double_vote(

2
consensus/types/src/test_utils/builders/testing_deposit_builder.rs
View File

@@ -41,7 +41,7 @@ impl TestingDepositBuilder {
// Creating invalid public key bytes
let mut public_key_bytes: Vec<u8> = vec![0; 48];
public_key_bytes[0] = 255;
pubkeybytes = PublicKeyBytes::from_bytes(&public_key_bytes).unwrap();
pubkeybytes = PublicKeyBytes::deserialize(&public_key_bytes).unwrap();
}
DepositTestTask::BadSig => secret_key = new_key.sk,
_ => (),

4
consensus/types/src/test_utils/builders/testing_proposer_slashing_builder.rs
View File

@@ -37,7 +37,7 @@ impl TestingProposerSlashingBuilder {
state_root: hash_1,
body_root: hash_1,
},
signature: Signature::empty_signature(),
signature: Signature::empty(),
};
let slot_2 = if test_task == ProposerSlashingTestTask::ProposalEpochMismatch {
@@ -52,7 +52,7 @@ impl TestingProposerSlashingBuilder {
slot: slot_2,
..signed_header_1.message
},
signature: Signature::empty_signature(),
signature: Signature::empty(),
};
if test_task != ProposerSlashingTestTask::BadProposal1Signature {

14
consensus/types/src/test_utils/generate_deterministic_keypairs.rs
View File

@@ -27,20 +27,10 @@ pub fn generate_deterministic_keypairs(validator_count: usize) -> Vec<Keypair> {
///
/// This is used for testing only, and not to be used in production!
pub fn generate_deterministic_keypair(validator_index: usize) -> Keypair {
let raw = keypair(validator_index);
Keypair {
pk: PublicKey::from_raw(raw.pk),
sk: SecretKey::from_raw(raw.sk),
}
keypair(validator_index)
}
/// Loads a list of keypairs from file.
pub fn load_keypairs_from_yaml(path: PathBuf) -> Result<Vec<Keypair>, String> {
Ok(keypairs_from_yaml_file(path)?
.into_iter()
.map(|raw| Keypair {
pk: PublicKey::from_raw(raw.pk),
sk: SecretKey::from_raw(raw.sk),
})
.collect())
keypairs_from_yaml_file(path)
}

4
consensus/types/src/test_utils/test_random/aggregate_signature.rs
View File

@@ -4,8 +4,8 @@ use bls::{AggregateSignature, Signature};
impl TestRandom for AggregateSignature {
fn random_for_test(rng: &mut impl RngCore) -> Self {
let signature = Signature::random_for_test(rng);
let mut aggregate_signature = AggregateSignature::new();
aggregate_signature.add(&signature);
let mut aggregate_signature = AggregateSignature::infinity();
aggregate_signature.add_assign(&signature);
aggregate_signature
}
}

3
consensus/types/src/test_utils/test_random/public_key.rs
View File

@@ -3,7 +3,6 @@ use bls::{PublicKey, SecretKey};
impl TestRandom for PublicKey {
fn random_for_test(rng: &mut impl RngCore) -> Self {
let secret_key = SecretKey::random_for_test(rng);
PublicKey::from_secret_key(&secret_key)
SecretKey::random_for_test(rng).public_key()
}
}

4
consensus/types/src/test_utils/test_random/public_key_bytes.rs
View File

@@ -1,6 +1,6 @@
use std::convert::From;
use bls::{PublicKeyBytes, BLS_PUBLIC_KEY_BYTE_SIZE};
use bls::{PublicKeyBytes, PUBLIC_KEY_BYTES_LEN};
use super::*;
@@ -12,7 +12,7 @@ impl TestRandom for PublicKeyBytes {
PublicKeyBytes::from(PublicKey::random_for_test(rng))
} else {
//invalid signature, just random bytes
PublicKeyBytes::from_bytes(&<[u8; BLS_PUBLIC_KEY_BYTE_SIZE]>::random_for_test(rng))
PublicKeyBytes::deserialize(&<[u8; PUBLIC_KEY_BYTES_LEN]>::random_for_test(rng))
.unwrap()
}
}

2
consensus/types/src/test_utils/test_random/signature.rs
View File

@@ -7,6 +7,6 @@ impl TestRandom for Signature {
let mut message = vec![0; 32];
rng.fill_bytes(&mut message);
Signature::new(&message, &secret_key)
secret_key.sign(Hash256::from_slice(&message))
}
}

4
consensus/types/src/test_utils/test_random/signature_bytes.rs
View File

@@ -1,4 +1,4 @@
use bls::{SignatureBytes, BLS_SIG_BYTE_SIZE};
use bls::{SignatureBytes, SIGNATURE_BYTES_LEN};
use super::*;
use std::convert::From;
@@ -11,7 +11,7 @@ impl TestRandom for SignatureBytes {
SignatureBytes::from(Signature::random_for_test(rng))
} else {
//invalid signature, just random bytes
SignatureBytes::from_bytes(&<[u8; BLS_SIG_BYTE_SIZE]>::random_for_test(rng)).unwrap()
SignatureBytes::deserialize(&<[u8; SIGNATURE_BYTES_LEN]>::random_for_test(rng)).unwrap()
}
}
}

2
consensus/types/src/tree_hash_impls.rs
View File

@@ -71,7 +71,7 @@ fn process_pubkey_bytes_field(
leaf: &mut Hash256,
force_update: bool,
) -> bool {
let new_tree_hash = merkle_root(val.as_slice(), 0);
let new_tree_hash = merkle_root(val.as_serialized(), 0);
process_slice_field(new_tree_hash.as_bytes(), leaf, force_update)
}

7
consensus/types/src/voluntary_exit.rs
View File

@@ -1,6 +1,6 @@
use crate::{
test_utils::TestRandom, ChainSpec, Domain, Epoch, Fork, Hash256, SecretKey, Signature,
SignedRoot, SignedVoluntaryExit,
test_utils::TestRandom, ChainSpec, Domain, Epoch, Fork, Hash256, SecretKey, SignedRoot,
SignedVoluntaryExit,
};
use serde_derive::{Deserialize, Serialize};
@@ -36,10 +36,9 @@ impl VoluntaryExit {
genesis_validators_root,
);
let message = self.signing_root(domain);
let signature = Signature::new(message.as_bytes(), &secret_key);
SignedVoluntaryExit {
message: self,
signature,
signature: secret_key.sign(message),
}
}
}