[Merged by Bors] - Rename random to prev_randao

.github/workflows/test-suite.yml

@@ -190,6 +190,9 @@ jobs:
     needs: cargo-fmt
     steps:
     - uses: actions/checkout@v1
+    - uses: actions/setup-go@v2
+      with:
+        go-version: '1.17'
     - name: Get latest version of stable Rust
       run: rustup update stable
     - name: Run exec engine integration tests in release

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -53,7 +53,7 @@ use eth2::types::{
     EventKind, SseBlock, SseChainReorg, SseFinalizedCheckpoint, SseHead, SseLateHead, SyncDuty,
 };
 use execution_layer::{ExecutionLayer, PayloadStatus};
-use fork_choice::{AttestationFromBlock, ForkChoice};
+use fork_choice::{AttestationFromBlock, ForkChoice, InvalidationOperation};
 use futures::channel::mpsc::Sender;
 use itertools::process_results;
 use itertools::Itertools;
@@ -3180,49 +3180,29 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
     /// This method must be called whenever an execution engine indicates that a payload is
     /// invalid.
     ///
-    /// If the `latest_root` is known to fork-choice it will be invalidated. If it is not known, an
-    /// error will be returned.
+    /// Fork choice will be run after the invalidation. The client may be shut down if the `op`
+    /// results in the justified checkpoint being invalidated.
     ///
-    /// If `latest_valid_hash` is `None` or references a block unknown to fork choice, no other
-    /// blocks will be invalidated. If `latest_valid_hash` is a block known to fork choice, all
-    /// blocks between the `latest_root` and the `latest_valid_hash` will be invalidated (which may
-    /// cause further, second-order invalidations).
-    ///
-    /// ## Notes
-    ///
-    /// Use these rules to set `latest_root`:
-    ///
-    /// - When `forkchoiceUpdated` indicates an invalid block, set `latest_root` to be the
-    ///     block root that was the head of the chain when `forkchoiceUpdated` was called.
-    /// - When `executePayload` returns an invalid block *during* block import, set
-    ///     `latest_root` to be the parent of the beacon block containing the invalid
-    ///     payload (because the block containing the payload is not present in fork choice).
-    /// - When `executePayload` returns an invalid block *after* block import, set
-    ///     `latest_root` to be root of the beacon block containing the invalid payload.
+    /// See the documentation of `InvalidationOperation` for information about defining `op`.
     pub fn process_invalid_execution_payload(
         &self,
-        latest_root: Hash256,
-        latest_valid_hash: Option<ExecutionBlockHash>,
+        op: &InvalidationOperation,
     ) -> Result<(), Error> {
         debug!(
             self.log,
             "Invalid execution payload in block";
-            "latest_valid_hash" => ?latest_valid_hash,
-            "latest_root" => ?latest_root,
+            "latest_valid_ancestor" => ?op.latest_valid_ancestor(),
+            "block_root" => ?op.block_root(),
         );
 
         // Update fork choice.
-        if let Err(e) = self
-            .fork_choice
-            .write()
-            .on_invalid_execution_payload(latest_root, latest_valid_hash)
-        {
+        if let Err(e) = self.fork_choice.write().on_invalid_execution_payload(op) {
             crit!(
                 self.log,
                 "Failed to process invalid payload";
                 "error" => ?e,
-                "latest_valid_hash" => ?latest_valid_hash,
-                "latest_root" => ?latest_root,
+                "latest_valid_ancestor" => ?op.latest_valid_ancestor(),
+                "block_root" => ?op.block_root(),
             );
         }
 
@@ -3763,8 +3743,11 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     // The execution engine has stated that all blocks between the
                     // `head_execution_block_hash` and `latest_valid_hash` are invalid.
                     self.process_invalid_execution_payload(
-                        head_block_root,
-                        Some(*latest_valid_hash),
+                        &InvalidationOperation::InvalidateMany {
+                            head_block_root,
+                            always_invalidate_head: true,
+                            latest_valid_ancestor: *latest_valid_hash,
+                        },
                     )?;
 
                     Err(BeaconChainError::ExecutionForkChoiceUpdateInvalid { status })
@@ -3781,7 +3764,11 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     //
                     // Using a `None` latest valid ancestor will result in only the head block
                     // being invalidated (no ancestors).
-                    self.process_invalid_execution_payload(head_block_root, None)?;
+                    self.process_invalid_execution_payload(
+                        &InvalidationOperation::InvalidateOne {
+                            block_root: head_block_root,
+                        },
+                    )?;
 
                     Err(BeaconChainError::ExecutionForkChoiceUpdateInvalid { status })
                 }

beacon_node/beacon_chain/src/execution_payload.rs

@@ -12,7 +12,7 @@ use crate::{
     ExecutionPayloadError,
 };
 use execution_layer::PayloadStatus;
-use fork_choice::PayloadVerificationStatus;
+use fork_choice::{InvalidationOperation, PayloadVerificationStatus};
 use proto_array::{Block as ProtoBlock, ExecutionStatus};
 use slog::debug;
 use slot_clock::SlotClock;
@@ -68,7 +68,13 @@ pub fn notify_new_payload<T: BeaconChainTypes>(
                 // This block has not yet been applied to fork choice, so the latest block that was
                 // imported to fork choice was the parent.
                 let latest_root = block.parent_root();
-                chain.process_invalid_execution_payload(latest_root, Some(latest_valid_hash))?;
+                chain.process_invalid_execution_payload(
+                    &InvalidationOperation::InvalidateMany {
+                        head_block_root: latest_root,
+                        always_invalidate_head: false,
+                        latest_valid_ancestor: latest_valid_hash,
+                    },
+                )?;
 
                 Err(ExecutionPayloadError::RejectedByExecutionEngine { status }.into())
             }
@@ -145,11 +151,19 @@ pub fn validate_merge_block<T: BeaconChainTypes>(
                 .slot_clock
                 .now()
                 .ok_or(BeaconChainError::UnableToReadSlot)?;
-            // Check the optimistic sync conditions. Note that because this is the merge block,
-            // the justified checkpoint can't have execution enabled so we only need to check the
-            // current slot is at least SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY ahead of the block
-            // https://github.com/ethereum/consensus-specs/blob/v1.1.9/sync/optimistic.md#when-to-optimistically-import-blocks
-            if block.slot() + chain.spec.safe_slots_to_import_optimistically <= current_slot {
+
+            // Ensure the block is a candidate for optimistic import.
+            if chain
+                .fork_choice
+                .read()
+                .is_optimistic_candidate_block(
+                    current_slot,
+                    block.slot(),
+                    &block.parent_root(),
+                    &chain.spec,
+                )
+                .map_err(BeaconChainError::from)?
+            {
                 debug!(
                     chain.log,
                     "Optimistically accepting terminal block";

beacon_node/beacon_chain/tests/payload_invalidation.rs

@@ -231,8 +231,10 @@ fn valid_invalid_syncing() {
 /// `latest_valid_hash`.
 #[test]
 fn invalid_payload_invalidates_parent() {
-    let mut rig = InvalidPayloadRig::new();
+    let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
+    rig.import_block(Payload::Valid); // Import a valid transition block.
+    rig.move_to_first_justification(Payload::Syncing);
 
     let roots = vec![
         rig.import_block(Payload::Syncing),
@@ -258,6 +260,7 @@ fn invalid_payload_invalidates_parent() {
 fn justified_checkpoint_becomes_invalid() {
     let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
+    rig.import_block(Payload::Valid); // Import a valid transition block.
     rig.move_to_first_justification(Payload::Syncing);
 
     let justified_checkpoint = rig.head_info().current_justified_checkpoint;
@@ -305,7 +308,9 @@ fn pre_finalized_latest_valid_hash() {
 
     let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
-    let blocks = rig.build_blocks(num_blocks, Payload::Syncing);
+    let mut blocks = vec![];
+    blocks.push(rig.import_block(Payload::Valid)); // Import a valid transition block.
+    blocks.extend(rig.build_blocks(num_blocks - 1, Payload::Syncing));
 
     assert_eq!(rig.head_info().finalized_checkpoint.epoch, finalized_epoch);
 
@@ -330,7 +335,11 @@ fn pre_finalized_latest_valid_hash() {
     for i in E::slots_per_epoch() * finalized_epoch..num_blocks {
         let slot = Slot::new(i);
         let root = rig.block_root_at_slot(slot).unwrap();
-        assert!(rig.execution_status(root).is_not_verified());
+        if slot == 1 {
+            assert!(rig.execution_status(root).is_valid());
+        } else {
+            assert!(rig.execution_status(root).is_not_verified());
+        }
     }
 }
 
@@ -344,7 +353,10 @@ fn latest_valid_hash_will_validate() {
 
     let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
-    let blocks = rig.build_blocks(4, Payload::Syncing);
+
+    let mut blocks = vec![];
+    blocks.push(rig.import_block(Payload::Valid)); // Import a valid transition block.
+    blocks.extend(rig.build_blocks(4, Payload::Syncing));
 
     let latest_valid_root = rig
         .block_root_at_slot(Slot::new(LATEST_VALID_SLOT))
@@ -357,7 +369,7 @@ fn latest_valid_hash_will_validate() {
 
     assert_eq!(rig.head_info().slot, LATEST_VALID_SLOT);
 
-    for slot in 0..=4 {
+    for slot in 0..=5 {
         let slot = Slot::new(slot);
         let root = if slot > 0 {
             // If not the genesis slot, check the blocks we just produced.
@@ -386,7 +398,9 @@ fn latest_valid_hash_is_junk() {
 
     let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
-    let blocks = rig.build_blocks(num_blocks, Payload::Syncing);
+    let mut blocks = vec![];
+    blocks.push(rig.import_block(Payload::Valid)); // Import a valid transition block.
+    blocks.extend(rig.build_blocks(num_blocks, Payload::Syncing));
 
     assert_eq!(rig.head_info().finalized_checkpoint.epoch, finalized_epoch);
 
@@ -408,7 +422,11 @@ fn latest_valid_hash_is_junk() {
     for i in E::slots_per_epoch() * finalized_epoch..num_blocks {
         let slot = Slot::new(i);
         let root = rig.block_root_at_slot(slot).unwrap();
-        assert!(rig.execution_status(root).is_not_verified());
+        if slot == 1 {
+            assert!(rig.execution_status(root).is_valid());
+        } else {
+            assert!(rig.execution_status(root).is_not_verified());
+        }
     }
 }
 
@@ -421,6 +439,7 @@ fn invalidates_all_descendants() {
 
     let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
+    rig.import_block(Payload::Valid); // Import a valid transition block.
     let blocks = rig.build_blocks(num_blocks, Payload::Syncing);
 
     assert_eq!(rig.head_info().finalized_checkpoint.epoch, finalized_epoch);
@@ -493,6 +512,7 @@ fn switches_heads() {
 
     let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
+    rig.import_block(Payload::Valid); // Import a valid transition block.
     let blocks = rig.build_blocks(num_blocks, Payload::Syncing);
 
     assert_eq!(rig.head_info().finalized_checkpoint.epoch, finalized_epoch);
@@ -571,8 +591,9 @@ fn invalid_during_processing() {
 
 #[test]
 fn invalid_after_optimistic_sync() {
-    let mut rig = InvalidPayloadRig::new();
+    let mut rig = InvalidPayloadRig::new().enable_attestations();
     rig.move_to_terminal_block();
+    rig.import_block(Payload::Valid); // Import a valid transition block.
 
     let mut roots = vec![
         rig.import_block(Payload::Syncing),

beacon_node/execution_layer/src/engine_api.rs

@@ -110,7 +110,7 @@ pub struct ExecutionBlock {
 #[derive(Clone, Copy, Debug)]
 pub struct PayloadAttributes {
     pub timestamp: u64,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     pub suggested_fee_recipient: Address,
 }
 

beacon_node/execution_layer/src/engine_api/http.rs

@@ -288,7 +288,7 @@ mod test {
             "stateRoot": HASH_01,
             "receiptsRoot": HASH_00,
             "logsBloom": LOGS_BLOOM_01,
-            "random": HASH_01,
+            "prevRandao": HASH_01,
             "blockNumber": "0x0",
             "gasLimit": "0x1",
             "gasUsed": "0x2",
@@ -441,7 +441,7 @@ mod test {
                             },
                             Some(PayloadAttributes {
                                 timestamp: 5,
-                                random: Hash256::zero(),
+                                prev_randao: Hash256::zero(),
                                 suggested_fee_recipient: Address::repeat_byte(0),
                             }),
                         )
@@ -458,7 +458,7 @@ mod test {
                     },
                     {
                         "timestamp":"0x5",
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "suggestedFeeRecipient": ADDRESS_00
                     }]
                 }),
@@ -495,7 +495,7 @@ mod test {
                             state_root: Hash256::repeat_byte(1),
                             receipts_root: Hash256::repeat_byte(0),
                             logs_bloom: vec![1; 256].into(),
-                            random: Hash256::repeat_byte(1),
+                            prev_randao: Hash256::repeat_byte(1),
                             block_number: 0,
                             gas_limit: 1,
                             gas_used: 2,
@@ -517,7 +517,7 @@ mod test {
                         "stateRoot": HASH_01,
                         "receiptsRoot": HASH_00,
                         "logsBloom": LOGS_BLOOM_01,
-                        "random": HASH_01,
+                        "prevRandao": HASH_01,
                         "blockNumber": "0x0",
                         "gasLimit": "0x1",
                         "gasUsed": "0x2",
@@ -596,7 +596,7 @@ mod test {
                             },
                             Some(PayloadAttributes {
                                 timestamp: 5,
-                                random: Hash256::zero(),
+                                prev_randao: Hash256::zero(),
                                 suggested_fee_recipient: Address::from_str("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b").unwrap(),
                             })
                         )
@@ -613,7 +613,7 @@ mod test {
                     },
                     {
                         "timestamp":"0x5",
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "suggestedFeeRecipient":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
                     }]
                 })
@@ -643,7 +643,7 @@ mod test {
                             },
                             Some(PayloadAttributes {
                                 timestamp: 5,
-                                random: Hash256::zero(),
+                                prev_randao: Hash256::zero(),
                                 suggested_fee_recipient: Address::from_str("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b").unwrap(),
                             })
                         )
@@ -687,7 +687,7 @@ mod test {
                         "stateRoot":"0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
                         "receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                         "logsBloom": LOGS_BLOOM_00,
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "blockNumber":"0x1",
                         "gasLimit":"0x1c95111",
                         "gasUsed":"0x0",
@@ -710,7 +710,7 @@ mod test {
                             state_root: Hash256::from_str("0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45").unwrap(),
                             receipts_root: Hash256::from_str("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap(),
                             logs_bloom: vec![0; 256].into(),
-                            random: Hash256::zero(),
+                            prev_randao: Hash256::zero(),
                             block_number: 1,
                             gas_limit: u64::from_str_radix("1c95111",16).unwrap(),
                             gas_used: 0,
@@ -735,7 +735,7 @@ mod test {
                             state_root: Hash256::from_str("0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45").unwrap(),
                             receipts_root: Hash256::from_str("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap(),
                             logs_bloom: vec![0; 256].into(),
-                            random: Hash256::zero(),
+                            prev_randao: Hash256::zero(),
                             block_number: 1,
                             gas_limit: u64::from_str_radix("1c9c380",16).unwrap(),
                             gas_used: 0,
@@ -757,7 +757,7 @@ mod test {
                         "stateRoot":"0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
                         "receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                         "logsBloom": LOGS_BLOOM_00,
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "blockNumber":"0x1",
                         "gasLimit":"0x1c9c380",
                         "gasUsed":"0x0",