use qbft context in qbft core. fixes runtime and ATs

Signed-off-by: Jason Frame <[email protected]>
hyperledger · Jan 20, 2025 · 3a3560d · 3a3560d
1 parent d731783
commit 3a3560d
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
@@ -49,11 +49,14 @@
 import org.hyperledger.besu.consensus.qbft.adaptor.BlockUtil;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockCreatorFactoryImpl;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockEncoderImpl;
+import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockInterfaceImpl;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftExtraDataProviderImpl;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftFinalStateImpl;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftProtocolScheduleImpl;
 import org.hyperledger.besu.consensus.qbft.blockcreation.QbftBlockCreatorFactory;
 import org.hyperledger.besu.consensus.qbft.core.api.QbftBlockEncoder;
+import org.hyperledger.besu.consensus.qbft.core.api.QbftBlockInterface;
+import org.hyperledger.besu.consensus.qbft.core.api.QbftContext;
 import org.hyperledger.besu.consensus.qbft.core.api.QbftFinalState;
 import org.hyperledger.besu.consensus.qbft.core.api.QbftMinedBlockObserver;
 import org.hyperledger.besu.consensus.qbft.core.api.QbftProtocolSchedule;
@@ -208,6 +211,15 @@ protected MiningCoordinator createMiningCoordinator(
     final ValidatorProvider validatorProvider =
         protocolContext.getConsensusContext(BftContext.class).getValidatorProvider();
 
+    final QbftBlockInterface qbftBlockInterface = new QbftBlockInterfaceImpl(bftBlockInterface);
+    final QbftContext qbftContext = new QbftContext(validatorProvider, qbftBlockInterface);
+    final ProtocolContext qbftProtocolContext =
+        new ProtocolContext(
+            blockchain,
+            protocolContext.getWorldStateArchive(),
+            qbftContext,
+            protocolContext.getBadBlockManager());
+
     final ProposerSelector proposerSelector =
         new ProposerSelector(blockchain, bftBlockInterface, true, validatorProvider);
 
@@ -236,7 +248,7 @@ protected MiningCoordinator createMiningCoordinator(
             clock);
 
     final MessageValidatorFactory messageValidatorFactory =
-        new MessageValidatorFactory(proposerSelector, qbftProtocolSchedule, protocolContext);
+        new MessageValidatorFactory(proposerSelector, qbftProtocolSchedule, qbftProtocolContext);
 
     final Subscribers<QbftMinedBlockObserver> minedBlockObservers = Subscribers.create();
     minedBlockObservers.subscribe(
@@ -276,7 +288,7 @@ protected MiningCoordinator createMiningCoordinator(
                 finalState,
                 new QbftRoundFactory(
                     qbftFinalState,
-                    protocolContext,
+                    qbftProtocolContext,
                     qbftProtocolSchedule,
                     minedBlockObservers,
                     messageValidatorFactory,