Merge branch 'master' into proto-array + more changes

eth2/state_processing/src/common/initiate_validator_exit.rs

@@ -18,19 +18,22 @@ pub fn initiate_validator_exit<T: EthSpec>(
         return Ok(());
     }
 
+    // Ensure the exit cache is built.
+    state.exit_cache.build(&state.validators, spec)?;
+
     // Compute exit queue epoch
     let delayed_epoch = state.compute_activation_exit_epoch(state.current_epoch(), spec);
     let mut exit_queue_epoch = state
         .exit_cache
-        .max_epoch()
+        .max_epoch()?
         .map_or(delayed_epoch, |epoch| max(epoch, delayed_epoch));
-    let exit_queue_churn = state.exit_cache.get_churn_at(exit_queue_epoch);
+    let exit_queue_churn = state.exit_cache.get_churn_at(exit_queue_epoch)?;
 
     if exit_queue_churn >= state.get_churn_limit(spec)? {
         exit_queue_epoch += 1;
     }
 
-    state.exit_cache.record_validator_exit(exit_queue_epoch);
+    state.exit_cache.record_validator_exit(exit_queue_epoch)?;
     state.validators[index].exit_epoch = exit_queue_epoch;
     state.validators[index].withdrawable_epoch =
         exit_queue_epoch + spec.min_validator_withdrawability_delay;

eth2/state_processing/src/per_block_processing/errors.rs

@@ -7,7 +7,7 @@ use types::*;
 /// Any of the `...Error` variants indicate that at some point during block (and block operation)
 /// verification, there was an error. There is no indication as to _where_ that error happened
 /// (e.g., when processing attestations instead of when processing deposits).
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum BlockProcessingError {
     RandaoSignatureInvalid,
     BulkSignatureVerificationFailed,
@@ -122,7 +122,7 @@ pub type AttestationValidationError = BlockOperationError<AttestationInvalid>;
 pub type DepositValidationError = BlockOperationError<DepositInvalid>;
 pub type ExitValidationError = BlockOperationError<ExitInvalid>;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum BlockOperationError<T> {
     Invalid(T),
     BeaconStateError(BeaconStateError),
@@ -153,7 +153,7 @@ impl<T> From<ssz_types::Error> for BlockOperationError<T> {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum HeaderInvalid {
     ProposalSignatureInvalid,
     StateSlotMismatch,
@@ -161,7 +161,7 @@ pub enum HeaderInvalid {
     ProposerSlashed(usize),
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum ProposerSlashingInvalid {
     /// The proposer index is not a known validator.
     ProposerUnknown(u64),
@@ -179,7 +179,7 @@ pub enum ProposerSlashingInvalid {
     BadProposal2Signature,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum AttesterSlashingInvalid {
     /// The attestations were not in conflict.
     NotSlashable,
@@ -196,7 +196,7 @@ pub enum AttesterSlashingInvalid {
 }
 
 /// Describes why an object is invalid.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum AttestationInvalid {
     /// Commmittee index exceeds number of committees in that slot.
     BadCommitteeIndex,
@@ -251,7 +251,7 @@ impl From<BlockOperationError<IndexedAttestationInvalid>>
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum IndexedAttestationInvalid {
     /// The number of indices exceeds the global maximum.
     ///
@@ -270,7 +270,7 @@ pub enum IndexedAttestationInvalid {
     SignatureSetError(SignatureSetError),
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum DepositInvalid {
     /// The signature (proof-of-possession) does not match the given pubkey.
     BadSignature,
@@ -281,7 +281,7 @@ pub enum DepositInvalid {
     BadMerkleProof,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum ExitInvalid {
     /// The specified validator is not active.
     NotActive(u64),

eth2/state_processing/src/per_block_processing/signature_sets.rs

@@ -14,7 +14,7 @@ use types::{
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum Error {
     /// Signature verification failed. The block is invalid.
     SignatureInvalid,
@@ -248,10 +248,14 @@ fn validator_pubkey<'a, T: EthSpec>(
         .ok_or_else(|| Error::ValidatorUnknown(validator_index as u64))?
         .pubkey;
 
-    pubkey_bytes
-        .try_into()
-        .map(|pubkey: PublicKey| Cow::Owned(pubkey.as_raw().point.clone()))
-        .map_err(|_| Error::BadBlsBytes {
-            validator_index: validator_index as u64,
-        })
+    if let Some(pubkey) = pubkey_bytes.decompressed() {
+        Ok(Cow::Borrowed(&pubkey.as_raw().point))
+    } else {
+        pubkey_bytes
+            .try_into()
+            .map(|pubkey: PublicKey| Cow::Owned(pubkey.as_raw().point.clone()))
+            .map_err(|_| Error::BadBlsBytes {
+                validator_index: validator_index as u64,
+            })
+    }
 }