Use verify_proof_of_possession

This commit is contained in:
Kirk Baird 2019-02-18 12:06:47 +11:00
parent 2c8aa17e0d
commit 21d75f1853
No known key found for this signature in database
GPG Key ID: BF864B7ED0BEA33F
2 changed files with 21 additions and 8 deletions

View File

@ -4,6 +4,7 @@ use crate::{
Bitfield, ChainSpec, Crosslink, Deposit, DepositInput, Epoch, Eth1Data, Eth1DataVote, Fork, Bitfield, ChainSpec, Crosslink, Deposit, DepositInput, Epoch, Eth1Data, Eth1DataVote, Fork,
Hash256, PendingAttestation, PublicKey, Signature, Slot, Validator, Hash256, PendingAttestation, PublicKey, Signature, Slot, Validator,
}; };
use bls::verify_proof_of_possession;
use honey_badger_split::SplitExt; use honey_badger_split::SplitExt;
use log::trace; use log::trace;
use rand::RngCore; use rand::RngCore;
@ -389,6 +390,7 @@ impl BeaconState {
&self, &self,
slot: Slot, slot: Slot,
registry_change: bool, registry_change: bool,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<Vec<(Vec<usize>, u64)>, BeaconStateError> { ) -> Result<Vec<(Vec<usize>, u64)>, BeaconStateError> {
let epoch = slot.epoch(spec.epoch_length); let epoch = slot.epoch(spec.epoch_length);
@ -668,12 +670,17 @@ impl BeaconState {
withdrawal_credentials: Hash256, withdrawal_credentials: Hash256,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<usize, ()> { ) -> Result<usize, ()> {
if !self.validate_proof_of_possession( // TODO: update proof of possession to function written above (
pubkey.clone(), // requires bls::create_proof_of_possession to be updated
proof_of_possession, // https://github.com/sigp/lighthouse/issues/239
withdrawal_credentials, if !verify_proof_of_possession(&proof_of_possession, &pubkey)
&spec, //if !self.validate_proof_of_possession(
) { // pubkey.clone(),
// proof_of_possession,
// withdrawal_credentials,
// &spec,
// )
{
return Err(()); return Err(());
} }

View File

@ -16,7 +16,7 @@ pub use crate::signature::Signature;
pub use self::bls_aggregates::AggregatePublicKey; pub use self::bls_aggregates::AggregatePublicKey;
pub const BLS_AGG_SIG_BYTE_SIZE: usize = 97; pub const BLS_AGG_SIG_BYTE_SIZE: usize = 96;
use hashing::hash; use hashing::hash;
use ssz::ssz_encode; use ssz::ssz_encode;
@ -29,7 +29,14 @@ fn extend_if_needed(hash: &mut Vec<u8>) {
/// For some signature and public key, ensure that the signature message was the public key and it /// For some signature and public key, ensure that the signature message was the public key and it
/// was signed by the secret key that corresponds to that public key. /// was signed by the secret key that corresponds to that public key.
pub fn verify_proof_of_possession(sig: &Signature, pubkey: &PublicKey) -> bool {
// TODO: replace this function with state.validate_proof_of_possession
// https://github.com/sigp/lighthouse/issues/239
sig.verify(&ssz_encode(pubkey), 0, &pubkey)
}
// TODO: Update this method
// https://github.com/sigp/lighthouse/issues/239
pub fn create_proof_of_possession(keypair: &Keypair) -> Signature { pub fn create_proof_of_possession(keypair: &Keypair) -> Signature {
Signature::new(&ssz_encode(&keypair.pk), 0, &keypair.sk) Signature::new(&ssz_encode(&keypair.pk), 0, &keypair.sk)
} }
@ -40,6 +47,5 @@ pub fn bls_verify_aggregate(
signature: &AggregateSignature, signature: &AggregateSignature,
domain: u64, domain: u64,
) -> bool { ) -> bool {
// TODO: add domain
signature.verify(message, domain, pubkey) signature.verify(message, domain, pubkey)
} }