From 13942bf7fe8c6cd4e82271d79e75c83a7cee3deb Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Fri, 24 Nov 2023 07:19:52 -0800 Subject: [PATCH] remove block v3 fallback to v2 --- validator_client/src/block_service.rs | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/validator_client/src/block_service.rs b/validator_client/src/block_service.rs index 496d47b3ee6..30f53ffe38d 100644 --- a/validator_client/src/block_service.rs +++ b/validator_client/src/block_service.rs @@ -359,36 +359,13 @@ impl BlockService { match result { Ok(_) => {} - Err(BlockError::Recoverable(e)) => { + Err(BlockError::Recoverable(e)) | Err(BlockError::Irrecoverable(e)) => { error!( log, "Error whilst producing block"; "error" => ?e, "block_slot" => ?slot, - "info" => "block v3 proposal failed, attempting full block v2" - ); - if let Err(e) = service - .publish_block::>(slot, validator_pubkey) - .await - { - // Log a `crit` since a full block v2 - // (non-builder) proposal failed. - crit!( - log, - "Error whilst producing block"; - "error" => ?e, - "block_slot" => ?slot, - "info" => "full block v2 attempted after a block v3 failure", - ); - } - } - Err(BlockError::Irrecoverable(e)) => { - error!( - log, - "Error whilst producing block"; - "error" => ?e, - "block_slot" => ?slot, - "info" => "this error may or may not result in a missed block", + "info" => "block v3 proposal failed, this error may or may not result in a missed block" ); } }