Merge remote-tracking branch 'origin/unstable' into tree-states

beacon_node/http_api/src/block_rewards.rs

@@ -4,7 +4,7 @@ use lru::LruCache;
 use slog::{debug, warn, Logger};
 use state_processing::BlockReplayer;
 use std::sync::Arc;
-use types::BeaconBlock;
+use types::BlindedBeaconBlock;
 use warp_utils::reject::{
     beacon_chain_error, beacon_state_error, custom_bad_request, custom_server_error,
 };
@@ -96,7 +96,7 @@ pub fn get_block_rewards<T: BeaconChainTypes>(
 
 /// Compute block rewards for blocks passed in as input.
 pub fn compute_block_rewards<T: BeaconChainTypes>(
-    blocks: Vec<BeaconBlock<T::EthSpec>>,
+    blocks: Vec<BlindedBeaconBlock<T::EthSpec>>,
     chain: Arc<BeaconChain<T>>,
     log: Logger,
 ) -> Result<Vec<BlockReward>, warp::Rejection> {

beacon_node/http_api/src/lib.rs

@@ -25,7 +25,9 @@ use beacon_chain::{
     BeaconChainTypes, ProduceBlockVerification, WhenSlotSkipped,
 };
 pub use block_id::BlockId;
-use eth2::types::{self as api_types, EndpointVersion, ValidatorId, ValidatorStatus};
+use eth2::types::{
+    self as api_types, EndpointVersion, SkipRandaoVerification, ValidatorId, ValidatorStatus,
+};
 use lighthouse_network::{types::SyncState, EnrExt, NetworkGlobals, PeerId, PubsubMessage};
 use lighthouse_version::version_with_platform;
 use network::{NetworkMessage, NetworkSenders, ValidatorSubscriptionMessage};
@@ -35,7 +37,6 @@ use slot_clock::SlotClock;
 use ssz::Encode;
 pub use state_id::StateId;
 use std::borrow::Cow;
-use std::convert::TryInto;
 use std::future::Future;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::path::PathBuf;
@@ -46,7 +47,7 @@ use tokio_stream::{wrappers::BroadcastStream, StreamExt};
 use types::{
     Attestation, AttestationData, AttesterSlashing, BeaconStateError, BlindedPayload,
     CommitteeCache, ConfigAndPreset, Epoch, EthSpec, ForkName, FullPayload,
-    ProposerPreparationData, ProposerSlashing, RelativeEpoch, Signature, SignedAggregateAndProof,
+    ProposerPreparationData, ProposerSlashing, RelativeEpoch, SignedAggregateAndProof,
     SignedBeaconBlock, SignedBlindedBeaconBlock, SignedContributionAndProof,
     SignedValidatorRegistrationData, SignedVoluntaryExit, Slot, SyncCommitteeMessage,
     SyncContributionData,
@@ -2002,31 +2003,25 @@ pub fn serve<T: BeaconChainTypes>(
              slot: Slot,
              query: api_types::ValidatorBlocksQuery,
              chain: Arc<BeaconChain<T>>| async move {
-                let randao_reveal = query.randao_reveal.as_ref().map_or_else(
-                    || {
-                        if query.verify_randao {
-                            Err(warp_utils::reject::custom_bad_request(
-                                "randao_reveal is mandatory unless verify_randao=false".into(),
-                            ))
-                        } else {
-                            Ok(Signature::empty())
-                        }
-                    },
-                    |sig_bytes| {
-                        sig_bytes.try_into().map_err(|e| {
-                            warp_utils::reject::custom_bad_request(format!(
-                                "randao reveal is not a valid BLS signature: {:?}",
-                                e
-                            ))
-                        })
-                    },
-                )?;
+                let randao_reveal = query.randao_reveal.decompress().map_err(|e| {
+                    warp_utils::reject::custom_bad_request(format!(
+                        "randao reveal is not a valid BLS signature: {:?}",
+                        e
+                    ))
+                })?;
 
-                let randao_verification = if query.verify_randao {
-                    ProduceBlockVerification::VerifyRandao
-                } else {
-                    ProduceBlockVerification::NoVerification
-                };
+                let randao_verification =
+                    if query.skip_randao_verification == SkipRandaoVerification::Yes {
+                        if !randao_reveal.is_infinity() {
+                            return Err(warp_utils::reject::custom_bad_request(
+                                "randao_reveal must be point-at-infinity if verification is skipped"
+                                    .into(),
+                            ));
+                        }
+                        ProduceBlockVerification::NoVerification
+                    } else {
+                        ProduceBlockVerification::VerifyRandao
+                    };
 
                 let (block, _) = chain
                     .produce_block_with_verification::<FullPayload<T::EthSpec>>(
@@ -2064,31 +2059,25 @@ pub fn serve<T: BeaconChainTypes>(
             |slot: Slot,
              query: api_types::ValidatorBlocksQuery,
              chain: Arc<BeaconChain<T>>| async move {
-                let randao_reveal = query.randao_reveal.as_ref().map_or_else(
-                    || {
-                        if query.verify_randao {
-                            Err(warp_utils::reject::custom_bad_request(
-                                "randao_reveal is mandatory unless verify_randao=false".into(),
-                            ))
-                        } else {
-                            Ok(Signature::empty())
-                        }
-                    },
-                    |sig_bytes| {
-                        sig_bytes.try_into().map_err(|e| {
-                            warp_utils::reject::custom_bad_request(format!(
-                                "randao reveal is not a valid BLS signature: {:?}",
-                                e
-                            ))
-                        })
-                    },
-                )?;
+                let randao_reveal = query.randao_reveal.decompress().map_err(|e| {
+                    warp_utils::reject::custom_bad_request(format!(
+                        "randao reveal is not a valid BLS signature: {:?}",
+                        e
+                    ))
+                })?;
 
-                let randao_verification = if query.verify_randao {
-                    ProduceBlockVerification::VerifyRandao
-                } else {
-                    ProduceBlockVerification::NoVerification
-                };
+                let randao_verification =
+                    if query.skip_randao_verification == SkipRandaoVerification::Yes {
+                        if !randao_reveal.is_infinity() {
+                            return Err(warp_utils::reject::custom_bad_request(
+                                "randao_reveal must be point-at-infinity if verification is skipped"
+                                    .into()
+                            ));
+                        }
+                        ProduceBlockVerification::NoVerification
+                    } else {
+                        ProduceBlockVerification::VerifyRandao
+                    };
 
                 let (block, _) = chain
                     .produce_block_with_verification::<BlindedPayload<T::EthSpec>>(
@@ -2103,6 +2092,7 @@ pub fn serve<T: BeaconChainTypes>(
                     .to_ref()
                     .fork_name(&chain.spec)
                     .map_err(inconsistent_fork_rejection)?;
+
                 // Pose as a V2 endpoint so we return the fork `version`.
                 fork_versioned_response(V2, fork_name, block)
                     .map(|response| warp::reply::json(&response))

beacon_node/http_api/tests/tests.rs

@@ -1939,11 +1939,11 @@ impl ApiTester {
 
             let block = self
                 .client
-                .get_validator_blocks_with_verify_randao::<E, FullPayload<E>>(
+                .get_validator_blocks_modular::<E, FullPayload<E>>(
                     slot,
+                    &Signature::infinity().unwrap().into(),
                     None,
-                    None,
-                    Some(false),
+                    SkipRandaoVerification::Yes,
                 )
                 .await
                 .unwrap()
@@ -1993,45 +1993,23 @@ impl ApiTester {
                 sk.sign(message).into()
             };
 
-            // Check failure with no `verify_randao` passed.
+            // Check failure with no `skip_randao_verification` passed.
             self.client
                 .get_validator_blocks::<E, FullPayload<E>>(slot, &bad_randao_reveal, None)
                 .await
                 .unwrap_err();
 
-            // Check failure with `verify_randao=true`.
+            // Check failure with `skip_randao_verification` (requires infinity sig).
             self.client
-                .get_validator_blocks_with_verify_randao::<E, FullPayload<E>>(
+                .get_validator_blocks_modular::<E, FullPayload<E>>(
                     slot,
-                    Some(&bad_randao_reveal),
+                    &bad_randao_reveal,
                     None,
-                    Some(true),
+                    SkipRandaoVerification::Yes,
                 )
                 .await
                 .unwrap_err();
 
-            // Check failure with no randao reveal provided.
-            self.client
-                .get_validator_blocks_with_verify_randao::<E, FullPayload<E>>(
-                    slot, None, None, None,
-                )
-                .await
-                .unwrap_err();
-
-            // Check success with `verify_randao=false`.
-            let block = self
-                .client
-                .get_validator_blocks_with_verify_randao::<E, FullPayload<E>>(
-                    slot,
-                    Some(&bad_randao_reveal),
-                    None,
-                    Some(false),
-                )
-                .await
-                .unwrap()
-                .data;
-
-            assert_eq!(block.slot(), slot);
             self.chain.slot_clock.set_slot(slot.as_u64() + 1);
         }
 
@@ -2106,11 +2084,11 @@ impl ApiTester {
 
             let block = self
                 .client
-                .get_validator_blinded_blocks_with_verify_randao::<E, Payload>(
+                .get_validator_blinded_blocks_modular::<E, Payload>(
                     slot,
+                    &Signature::infinity().unwrap().into(),
                     None,
-                    None,
-                    Some(false),
+                    SkipRandaoVerification::Yes,
                 )
                 .await
                 .unwrap()
@@ -2162,45 +2140,23 @@ impl ApiTester {
                 sk.sign(message).into()
             };
 
-            // Check failure with no `verify_randao` passed.
+            // Check failure with full randao verification enabled.
             self.client
                 .get_validator_blinded_blocks::<E, Payload>(slot, &bad_randao_reveal, None)
                 .await
                 .unwrap_err();
 
-            // Check failure with `verify_randao=true`.
+            // Check failure with `skip_randao_verification` (requires infinity sig).
             self.client
-                .get_validator_blinded_blocks_with_verify_randao::<E, Payload>(
+                .get_validator_blinded_blocks_modular::<E, Payload>(
                     slot,
-                    Some(&bad_randao_reveal),
+                    &bad_randao_reveal,
                     None,
-                    Some(true),
+                    SkipRandaoVerification::Yes,
                 )
                 .await
                 .unwrap_err();
 
-            // Check failure with no randao reveal provided.
-            self.client
-                .get_validator_blinded_blocks_with_verify_randao::<E, Payload>(
-                    slot, None, None, None,
-                )
-                .await
-                .unwrap_err();
-
-            // Check success with `verify_randao=false`.
-            let block = self
-                .client
-                .get_validator_blinded_blocks_with_verify_randao::<E, Payload>(
-                    slot,
-                    Some(&bad_randao_reveal),
-                    None,
-                    Some(false),
-                )
-                .await
-                .unwrap()
-                .data;
-
-            assert_eq!(block.slot(), slot);
             self.chain.slot_clock.set_slot(slot.as_u64() + 1);
         }