update block service to match unstable

Author: shane-moore

common/eth2/src/lib.rs

@@ -2217,6 +2217,7 @@ impl BeaconNodeHttpClient {
     }
 
     /// returns `GET v3/validator/blocks/{slot}` or `GET v4/validator/blocks/{slot}` URL path
+    #[allow(clippy::too_many_arguments)]
     pub async fn get_validator_blocks_v3_and_v4_path(
         &self,
         version: EndpointVersion,

validator_client/validator_services/src/block_service.rs

@@ -346,11 +346,11 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
                 async move {
                     let result = if service.chain_spec.fork_name_at_epoch(current_epoch).gloas_enabled() {
                         service
-                            .publish_block_gloas(slot, validator_pubkey, builder_boost_factor)
+                            .get_validator_block_and_publish_block_gloas(slot, validator_pubkey, builder_boost_factor)
                             .await
                     } else {
                         service
-                            .publish_block(slot, validator_pubkey, builder_boost_factor)
+                            .get_validator_block_and_publish_block(slot, validator_pubkey, builder_boost_factor)
                             .await
                     };
 
@@ -445,6 +445,7 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
     }
 
     #[allow(clippy::too_many_arguments)]
+    #[instrument(skip_all, fields(%slot, ?validator_pubkey))]
     async fn sign_and_publish_block_gloas(
         &self,
         proposer_fallback: ProposerFallback<T>,
@@ -458,6 +459,7 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
         let res = self
             .validator_store
             .sign_block_gloas(*validator_pubkey, unsigned_block, slot)
+            .instrument(info_span!("sign_block"))
             .await;
 
         let signed_block = match res {
@@ -515,7 +517,12 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
 
     // TODO(EIP-7732): Remove this sometime after gloas is live and make publish_block_gloas the default
     // TODO(EIP-7732): Seems like block production testing is done through `simulator`. Discuss with team if that is sufficient for all this new gloas code.
-    async fn publish_block(
+    #[instrument(
+        name = "block_proposal_duty_cycle",
+        skip_all,
+        fields(%slot, ?validator_pubkey)
+    )]
+    async fn get_validator_block_and_publish_block(
         self,
         slot: Slot,
         validator_pubkey: PublicKeyBytes,
@@ -658,7 +665,12 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
         Ok(())
     }
 
-    async fn publish_block_gloas(
+    #[instrument(
+        name = "block_proposal_duty_cycle",
+        skip_all,
+        fields(%slot, ?validator_pubkey)
+    )]
+    async fn get_validator_block_and_publish_block_gloas(
         self,
         slot: Slot,
         validator_pubkey: PublicKeyBytes,
@@ -855,6 +867,7 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> BlockService<S, T> {
         Ok::<_, BlockError>(())
     }
 
+    #[instrument(skip_all)]
     async fn publish_signed_block_contents_gloas(
         &self,
         signed_block: &Arc<SignedBeaconBlock<S::E>>,