Update consensus-spec-tests to v1.6.1

Author: hangleang

helper_functions/src/fork.rs

@@ -841,6 +841,11 @@ pub fn upgrade_to_gloas<P: Preset>(
         epoch,
     };
 
+    let latest_execution_payload_bid = ExecutionPayloadBid {
+        block_hash: latest_execution_payload_header.block_hash,
+        ..Default::default()
+    };
+
     GloasBeaconState {
         // > Versioning
         genesis_time,
@@ -877,7 +882,7 @@ pub fn upgrade_to_gloas<P: Preset>(
         current_sync_committee,
         next_sync_committee,
         // > Execution
-        latest_execution_payload_bid: ExecutionPayloadBid::default(),
+        latest_execution_payload_bid,
         // > Withdrawals
         next_withdrawal_index,
         next_withdrawal_validator_index,

scripts/download_spec_tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-SPEC_VERSION="${SPEC_VERSION:-v1.6.0}"
+SPEC_VERSION="${SPEC_VERSION:-v1.6.1}"
 TESTS_DIR="consensus-spec-tests"
 VERSION_FILE="${TESTS_DIR}/.version"
 BASE_URL="https://github.com/ethereum/consensus-specs/releases/download/${SPEC_VERSION}"

transition_functions/src/gloas/block_processing.rs

@@ -7,7 +7,8 @@ use helper_functions::{
     accessors::{
         self, attestation_epoch, get_attestation_participation_flags, get_base_reward,
         get_base_reward_per_increment, get_beacon_proposer_index, get_current_epoch,
-        get_indexed_payload_attestation, get_previous_epoch, initialize_shuffled_indices,
+        get_indexed_payload_attestation, get_previous_epoch, get_randao_mix,
+        initialize_shuffled_indices,
     },
     electra::{
         get_attesting_indices, get_indexed_attestation, is_fully_withdrawable_validator,
@@ -482,6 +483,7 @@ fn validate_execution_payload_bid<P: Preset>(
         slot,
         parent_block_hash,
         parent_block_root,
+        prev_randao,
         ..
     } = signed_bid.message;
     let builder = state.validators().get(builder_index)?;
@@ -511,6 +513,7 @@ fn validate_execution_payload_bid<P: Preset>(
         );
     }
 
+    // > Check that the builder is active, non-slashed
     let current_epoch = get_current_epoch(state);
     ensure!(
         is_active_validator(builder, current_epoch),
@@ -527,7 +530,7 @@ fn validate_execution_payload_bid<P: Preset>(
         }
     );
 
-    // > Check that the builder is active, non-slashed, and has funds to cover the bid
+    // > Check that builder has funds to cover the bid
     let builder_balance = *state.balances().get(builder_index)?;
     let pending_withdrawals = state
         .builder_pending_withdrawals()
@@ -579,6 +582,16 @@ fn validate_execution_payload_bid<P: Preset>(
         }
     );
 
+    // > Verify prev_randao
+    let in_state = get_randao_mix(state, current_epoch);
+    ensure!(
+        prev_randao == in_state,
+        Error::<P>::BidPrevRandaoMismatch {
+            in_bid: prev_randao,
+            in_state,
+        },
+    );
+
     Ok(())
 }
 
@@ -596,6 +609,7 @@ pub fn process_execution_payload_bid<P: Preset>(
         fee_recipient,
         ..
     } = signed_bid.message;
+
     validate_execution_payload_bid(config, pubkey_cache, state, block)?;
 
     // > Record the pending payment if there is some payment

transition_functions/src/gloas/epoch_processing.rs

@@ -75,6 +75,8 @@ pub fn process_epoch(
     unphased::process_eth1_data_reset(state);
     electra::process_pending_deposits(config, pubkey_cache, state)?;
     electra::process_pending_consolidations(state)?;
+
+    process_builder_pending_payments(config, state)?;
     electra::process_effective_balance_updates(state);
     unphased::process_slashings_reset(state);
     unphased::process_randao_mixes_reset(state);
@@ -87,8 +89,6 @@ pub fn process_epoch(
 
     fulu::process_proposer_lookahead(config, state)?;
 
-    process_builder_pending_payments(config, state)?;
-
     state.cache.advance_epoch();
 
     Ok(())

transition_functions/src/gloas/execution_payload_processing.rs

@@ -1,7 +1,7 @@
 use anyhow::{ensure, Result};
 use execution_engine::ExecutionEngine;
 use helper_functions::{
-    accessors::{get_current_epoch, get_randao_mix},
+    accessors::get_current_epoch,
     error::SignatureKind,
     misc::{self, compute_timestamp_at_slot, kzg_commitment_to_versioned_hash},
     mutators::compute_exit_epoch_and_update_churn,
@@ -130,6 +130,13 @@ pub fn validate_execution_payload<P: Preset>(
         }
     );
 
+    let in_state = committed_bid.prev_randao;
+    let in_block = payload.prev_randao;
+    ensure!(
+        in_state == in_block,
+        Error::<P>::ExecutionPayloadPrevRandaoMismatch { in_state, in_block },
+    );
+
     // > Verify the withdrawals root
     let in_payload = payload.withdrawals.hash_tree_root();
     let in_state = state.latest_withdrawals_root();
@@ -171,14 +178,6 @@ pub fn validate_execution_payload<P: Preset>(
         Error::<P>::ExecutionPayloadParentHashMismatch { in_state, in_block },
     );
 
-    // > Verify prev_randao
-    let in_state = get_randao_mix(state, get_current_epoch(state));
-    let in_block = payload.prev_randao;
-    ensure!(
-        in_state == in_block,
-        Error::<P>::ExecutionPayloadPrevRandaoMismatch { in_state, in_block },
-    );
-
     Ok(())
 }
 

transition_functions/src/unphased/error.rs

@@ -50,6 +50,8 @@ pub enum Error<P: Preset> {
     },
     #[error("bid parent block root ({in_bid:?}) does not match in block ({in_block:?})")]
     BidParentBlockRootMismatch { in_bid: H256, in_block: H256 },
+    #[error("bid prev randao ({in_bid:?}) does not match in state ({in_state:?})")]
+    BidPrevRandaoMismatch { in_bid: H256, in_state: H256 },
     #[error("block is not newer than latest block header ({block_slot} <= {block_header_slot})")]
     BlockNotNewerThanLatestBlockHeader {
         block_slot: Slot,

types/src/gloas/containers.rs

@@ -95,6 +95,7 @@ pub struct ExecutionPayloadBid {
     pub parent_block_hash: ExecutionBlockHash,
     pub parent_block_root: H256,
     pub block_hash: ExecutionBlockHash,
+    pub prev_randao: H256,
     pub fee_recipient: ExecutionAddress,
     #[serde(with = "serde_utils::string_or_native")]
     pub gas_limit: Gas,
@@ -104,6 +105,8 @@ pub struct ExecutionPayloadBid {
     pub slot: Slot,
     #[serde(with = "serde_utils::string_or_native")]
     pub value: Gwei,
+    #[serde(with = "serde_utils::string_or_native")]
+    pub execution_payment: Gwei,
     pub blob_kzg_commitments_root: H256,
 }