From 6878abe0fff5aa8715d09814331a6eb2098af4fc Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Thu, 28 Sep 2023 17:03:45 +0300 Subject: [PATCH] lint --- beacon_node/beacon_chain/src/beacon_chain.rs | 11 +++++++++-- beacon_node/http_api/src/version.rs | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index a0d613c4920..f4b71c8a9ac 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -58,6 +58,7 @@ use crate::validator_monitor::{ }; use crate::validator_pubkey_cache::ValidatorPubkeyCache; use crate::{metrics, BeaconChainError, BeaconForkChoiceStore, BeaconSnapshot, CachedHead}; +use eth2::lighthouse::StandardBlockReward; use eth2::types::{EventKind, SseBlock, SseExtendedPayloadAttributes, SyncDuty}; use execution_layer::{ BlockProposalContents, BlockProposalContentsType, BuilderParams, ChainHealth, ExecutionLayer, @@ -4746,9 +4747,15 @@ impl BeaconChain { let consensus_block_value = self .compute_beacon_block_reward(inner_block.to_ref(), Hash256::zero(), &mut state.clone()) - .unwrap() + .unwrap_or(StandardBlockReward { + proposer_index: 0, + total: 0, + attestations: 0, + sync_aggregate: 0, + proposer_slashings: 0, + attester_slashings: 0, + }) .total; - per_block_processing( &mut state, diff --git a/beacon_node/http_api/src/version.rs b/beacon_node/http_api/src/version.rs index 460dc0ed33e..cb56d37dab6 100644 --- a/beacon_node/http_api/src/version.rs +++ b/beacon_node/http_api/src/version.rs @@ -1,7 +1,8 @@ use crate::api_types::fork_versioned_response::ExecutionOptimisticFinalizedForkVersionedResponse; use crate::api_types::EndpointVersion; use eth2::{ - CONSENSUS_VERSION_HEADER, EXECUTION_PAYLOAD_BLINDED_HEADER, EXECUTION_PAYLOAD_VALUE_HEADER, CONSENSUS_PAYLOAD_VALUE_HEADER, + CONSENSUS_PAYLOAD_VALUE_HEADER, CONSENSUS_VERSION_HEADER, EXECUTION_PAYLOAD_BLINDED_HEADER, + EXECUTION_PAYLOAD_VALUE_HEADER, }; use serde::Serialize; use types::{ForkName, ForkVersionedResponse, InconsistentFork, Uint256};