Merge of #5287

Author: mergify[bot]

beacon_node/client/src/address_change_broadcast.rs

@@ -1,4 +1,3 @@
-use crate::address_change_broadcast::broadcast_address_changes_at_capella;
 use crate::compute_light_client_updates::{
     compute_light_client_updates, LIGHT_CLIENT_SERVER_CHANNEL_CAPACITY,
 };
@@ -920,25 +919,6 @@ where
                         beacon_chain.slot_clock.clone(),
                     );
                 }
-
-                // Spawn a service to publish BLS to execution changes at the Capella fork.
-                if let Some(network_senders) = self.network_senders.clone() {
-                    let inner_chain = beacon_chain.clone();
-                    let broadcast_context =
-                        runtime_context.service_context("addr_bcast".to_string());
-                    let log = broadcast_context.log().clone();
-                    broadcast_context.executor.spawn(
-                        async move {
-                            broadcast_address_changes_at_capella(
-                                &inner_chain,
-                                network_senders.network_send(),
-                                &log,
-                            )
-                            .await
-                        },
-                        "addr_broadcast",
-                    );
-                }
             }
 
             // Spawn service to publish light_client updates at some interval into the slot.

beacon_node/client/src/builder.rs

@@ -1,6 +1,5 @@
 extern crate slog;
 
-mod address_change_broadcast;
 mod compute_light_client_updates;
 pub mod config;
 mod metrics;