[NO MERGE] PoC Dagger DI as a system builder

build.gradle

@@ -214,7 +214,7 @@ allprojects {
 
     options.errorprone {
       enabled = !'true'.equalsIgnoreCase(System.getProperty('avt.disableErrorProne'))
-      disableWarningsInGeneratedCode
+      disableWarningsInGeneratedCode = true
 
       // Our equals need to be symmetric, this checker doesn't respect that
       check('EqualsGetClass', net.ltgt.gradle.errorprone.CheckSeverity.OFF)

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/OperationsReOrgManager.java

@@ -43,7 +43,7 @@ public class OperationsReOrgManager implements ChainHeadChannel {
   private final OperationPool<AttesterSlashing> attesterSlashingPool;
   private final AttestationManager attestationManager;
   private final AggregatingAttestationPool attestationPool;
-  private final MappedOperationPool<SignedBlsToExecutionChange> blsToExecutionOperationPool;
+  private final OperationPool<SignedBlsToExecutionChange> blsToExecutionOperationPool;
   private final RecentChainData recentChainData;
 
   public OperationsReOrgManager(
@@ -52,7 +52,7 @@ public OperationsReOrgManager(
       final OperationPool<SignedVoluntaryExit> exitPool,
       final AggregatingAttestationPool attestationPool,
       final AttestationManager attestationManager,
-      final MappedOperationPool<SignedBlsToExecutionChange> blsToExecutionOperationPool,
+      final OperationPool<SignedBlsToExecutionChange> blsToExecutionOperationPool,
       final RecentChainData recentChainData) {
     this.exitPool = exitPool;
     this.proposerSlashingPool = proposerSlashingPool;

infrastructure/events/src/main/java/tech/pegasys/teku/infrastructure/events/EventChannelSubscriber.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.infrastructure.events;
+
+public interface EventChannelSubscriber<T extends ChannelInterface> {
+
+  void subscribe(T listener);
+}

infrastructure/events/src/main/java/tech/pegasys/teku/infrastructure/events/EventChannels.java

@@ -84,6 +84,11 @@ public <T extends ChannelInterface> EventChannels subscribe(
     return subscribeMultithreaded(channelInterface, subscriber, 1);
   }
 
+  public <T extends ChannelInterface> EventChannelSubscriber<T> createSubscriber(
+      final Class<T> channelInterface) {
+    return createSubscriberMultithreaded(channelInterface, 1);
+  }
+
   /**
    * Adds a subscriber to this channel where events are handled by multiple threads concurrently.
    *
@@ -99,10 +104,16 @@ public <T extends ChannelInterface> EventChannels subscribe(
    */
   public <T extends ChannelInterface> EventChannels subscribeMultithreaded(
       final Class<T> channelInterface, final T subscriber, final int requestedParallelism) {
-    getChannel(channelInterface).subscribeMultithreaded(subscriber, requestedParallelism);
+    createSubscriberMultithreaded(channelInterface, requestedParallelism).subscribe(subscriber);
     return this;
   }
 
+  public <T extends ChannelInterface> EventChannelSubscriber<T> createSubscriberMultithreaded(
+      final Class<T> channelInterface, final int requestedParallelism) {
+    return listener ->
+        getChannel(channelInterface).subscribeMultithreaded(listener, requestedParallelism);
+  }
+
   @SuppressWarnings("unchecked")
   private <T extends ChannelInterface> EventChannel<T> getChannel(final Class<T> channelInterface) {
     return (EventChannel<T>) channels.computeIfAbsent(channelInterface, eventChannelFactory);

services/beaconchain/build.gradle

@@ -34,6 +34,9 @@ dependencies {
   implementation project(':validator:api')
   implementation project(':validator:client')
 
+  implementation 'com.google.dagger:dagger:2.51.1'
+  annotationProcessor 'com.google.dagger:dagger-compiler:2.51.1'
+
   testImplementation testFixtures(project(':storage'))
   testImplementation testFixtures(project(':ethereum:spec'))
   testImplementation testFixtures(project(':ethereum:statetransition'))
@@ -43,4 +46,12 @@ dependencies {
   testImplementation testFixtures(project(':infrastructure:metrics'))
 
   implementation 'io.libp2p:jvm-libp2p'
+}
+
+tasks.withType(JavaCompile) {
+  options.compilerArgs += [
+          '-Adagger.formatGeneratedSource=enabled',
+          '-Adagger.fullBindingGraphValidation=ERROR',
+          '-Adagger.ignoreProvisionKeyWildcards=ENABLED'
+  ]
 }

services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainControllerFacade.java

@@ -19,6 +19,7 @@
 import tech.pegasys.teku.infrastructure.async.AsyncRunnerFactory;
 import tech.pegasys.teku.infrastructure.time.TimeProvider;
 import tech.pegasys.teku.networking.eth2.Eth2P2PNetwork;
+import tech.pegasys.teku.service.serviceutils.ServiceFacade;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoice;
 import tech.pegasys.teku.statetransition.validation.signatures.SignatureVerificationService;
@@ -29,7 +30,7 @@
  * CAUTION: this API is unstable and primarily intended for debugging and testing purposes this API
  * might be changed in any version in backward incompatible way
  */
-public interface BeaconChainControllerFacade {
+public interface BeaconChainControllerFacade extends ServiceFacade {
 
   Spec getSpec();
 

services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainControllerFactory.java

@@ -14,15 +14,26 @@
 package tech.pegasys.teku.services.beaconchain;
 
 import tech.pegasys.teku.service.serviceutils.ServiceConfig;
+import tech.pegasys.teku.services.beaconchain.init.DaggerBeaconChainControllerComponent;
+import tech.pegasys.teku.services.beaconchain.init.ExternalDependenciesModule;
 
 /**
  * CAUTION: this API is unstable and primarily intended for debugging and testing purposes this API
  * might be changed in any version in backward incompatible way
  */
 public interface BeaconChainControllerFactory {
 
-  BeaconChainControllerFactory DEFAULT = BeaconChainController::new;
+  BeaconChainControllerFactory DEFAULT =
+      LateInitDelegateBeaconChainController.createLateInitFactory(
+          (serviceConfig, beaconConfig) ->
+              DaggerBeaconChainControllerComponent.builder()
+                  .externalDependenciesModule(
+                      new ExternalDependenciesModule(serviceConfig, beaconConfig))
+                  .build()
+                  .beaconChainController());
 
-  BeaconChainController create(
+  BeaconChainControllerFactory OLD = BeaconChainControllerOld::new;
+
+  BeaconChainControllerFacade create(
       final ServiceConfig serviceConfig, final BeaconChainConfiguration beaconConfig);
 }

services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java → services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainControllerOld.java

@@ -216,7 +216,7 @@
  * initialization behavior (see {@link BeaconChainControllerFactory}} however this class may change
  * in a backward incompatible manner and either break compilation or runtime behavior
  */
-public class BeaconChainController extends Service implements BeaconChainControllerFacade {
+public class BeaconChainControllerOld extends Service implements BeaconChainControllerFacade {
 
   private static final Logger LOG = LogManager.getLogger();
 
@@ -292,7 +292,7 @@ public class BeaconChainController extends Service implements BeaconChainControl
   protected IntSupplier rejectedExecutionCountSupplier;
   protected DebugDataDumper debugDataDumper;
 
-  public BeaconChainController(
+  public BeaconChainControllerOld(
       final ServiceConfig serviceConfig, final BeaconChainConfiguration beaconConfig) {
     final Eth2NetworkConfiguration eth2NetworkConfig = beaconConfig.eth2NetworkConfig();
     final DataDirLayout dataDirLayout = serviceConfig.getDataDirLayout();
@@ -406,11 +406,13 @@ protected SafeFuture<?> doStop() {
   }
 
   protected SafeFuture<?> initialize() {
+
+    timerService = new TimerService(this::onTick);
+
     final StoreConfig storeConfig = beaconConfig.storeConfig();
     coalescingChainHeadChannel =
         new CoalescingChainHeadChannel(
             eventChannels.getPublisher(ChainHeadChannel.class), EVENT_LOG);
-    timerService = new TimerService(this::onTick);
 
     final CombinedStorageChannel combinedStorageChannel =
         eventChannels.getPublisher(CombinedStorageChannel.class, beaconAsyncRunner);
@@ -889,7 +891,8 @@ protected void initSubnetSubscriber() {
   public void initExecutionLayerBlockProductionManager() {
     LOG.debug("BeaconChainController.initExecutionLayerBlockProductionManager()");
     this.executionLayerBlockProductionManager =
-        ExecutionLayerBlockManagerFactory.create(executionLayer, eventChannels);
+        ExecutionLayerBlockManagerFactory.create(
+            executionLayer, eventChannels.createSubscriber(SlotEventsChannel.class));
   }
 
   public void initRewardCalculator() {

services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainService.java

@@ -19,7 +19,7 @@
 
 public class BeaconChainService extends Service implements BeaconChainServiceFacade {
 
-  private final BeaconChainController controller;
+  private final BeaconChainControllerFacade controller;
 
   public BeaconChainService(
       final ServiceConfig serviceConfig, final BeaconChainConfiguration beaconConfig) {
@@ -38,7 +38,7 @@ protected SafeFuture<?> doStop() {
   }
 
   @Override
-  public BeaconChainController getBeaconChainController() {
+  public BeaconChainControllerFacade getBeaconChainController() {
     return controller;
   }
 }

services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/LateInitDelegateBeaconChainController.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright Consensys Software Inc., 2022
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.services.beaconchain;
+
+import java.util.Optional;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import tech.pegasys.teku.beacon.sync.SyncService;
+import tech.pegasys.teku.beaconrestapi.BeaconRestApi;
+import tech.pegasys.teku.infrastructure.async.AsyncRunnerFactory;
+import tech.pegasys.teku.infrastructure.async.SafeFuture;
+import tech.pegasys.teku.infrastructure.time.TimeProvider;
+import tech.pegasys.teku.networking.eth2.Eth2P2PNetwork;
+import tech.pegasys.teku.service.serviceutils.Service;
+import tech.pegasys.teku.service.serviceutils.ServiceConfig;
+import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.statetransition.forkchoice.ForkChoice;
+import tech.pegasys.teku.statetransition.validation.signatures.SignatureVerificationService;
+import tech.pegasys.teku.storage.client.CombinedChainDataClient;
+import tech.pegasys.teku.storage.client.RecentChainData;
+
+public class LateInitDelegateBeaconChainController extends Service
+    implements BeaconChainControllerFacade {
+
+  public static BeaconChainControllerFactory createLateInitFactory(
+      final BeaconChainControllerFactory delegateFactory) {
+    return (serviceConfig, beaconConfig) ->
+        new LateInitDelegateBeaconChainController(serviceConfig, beaconConfig, delegateFactory);
+  }
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final ServiceConfig serviceConfig;
+  private final BeaconChainConfiguration beaconConfig;
+  private final BeaconChainControllerFactory delegateFactory;
+
+  private volatile BeaconChainControllerFacade delegate;
+
+  public LateInitDelegateBeaconChainController(
+      final ServiceConfig serviceConfig,
+      final BeaconChainConfiguration beaconConfig,
+      final BeaconChainControllerFactory delegateFactory) {
+    this.serviceConfig = serviceConfig;
+    this.beaconConfig = beaconConfig;
+    this.delegateFactory = delegateFactory;
+  }
+
+  @Override
+  protected SafeFuture<?> doStart() {
+    LOG.info("Starting BeaconChainController...");
+    this.delegate = delegateFactory.create(serviceConfig, beaconConfig);
+
+    SafeFuture<?> startFuture = this.delegate.start();
+    LOG.info("BeaconChainController start complete");
+
+    return startFuture;
+  }
+
+  @Override
+  protected SafeFuture<?> doStop() {
+    return this.delegate.stop();
+  }
+
+  @Override
+  public Spec getSpec() {
+    return delegate.getSpec();
+  }
+
+  @Override
+  public TimeProvider getTimeProvider() {
+    return delegate.getTimeProvider();
+  }
+
+  @Override
+  public AsyncRunnerFactory getAsyncRunnerFactory() {
+    return delegate.getAsyncRunnerFactory();
+  }
+
+  @Override
+  public SignatureVerificationService getSignatureVerificationService() {
+    return delegate.getSignatureVerificationService();
+  }
+
+  @Override
+  public RecentChainData getRecentChainData() {
+    return delegate.getRecentChainData();
+  }
+
+  @Override
+  public CombinedChainDataClient getCombinedChainDataClient() {
+    return delegate.getCombinedChainDataClient();
+  }
+
+  @Override
+  public Eth2P2PNetwork getP2pNetwork() {
+    return delegate.getP2pNetwork();
+  }
+
+  @Override
+  public Optional<BeaconRestApi> getBeaconRestAPI() {
+    return delegate.getBeaconRestAPI();
+  }
+
+  @Override
+  public SyncService getSyncService() {
+    return delegate.getSyncService();
+  }
+
+  @Override
+  public ForkChoice getForkChoice() {
+    return delegate.getForkChoice();
+  }
+}