From dc81641c5832175b560579b144873267c71ef4cd Mon Sep 17 00:00:00 2001
From: Justin Florentine <justin+github@florentine.us>
Date: Tue, 19 Nov 2024 08:15:09 -0500
Subject: [PATCH] narrows dependencies of BlockchainService (#7882)

Signed-off-by: jflo <justin+github@florentine.us>
---
 .../dsl/node/ThreadBesuNodeRunner.java         |  4 +++-
 .../org/hyperledger/besu/cli/BesuCommand.java  |  2 +-
 .../besu/services/BlockchainServiceImpl.java   | 18 +++++++-----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
index fc2a7d372e..4544872d5c 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
@@ -327,7 +327,9 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
     @Singleton
     BlockchainServiceImpl provideBlockchainService(final BesuController besuController) {
       BlockchainServiceImpl retval = new BlockchainServiceImpl();
-      retval.init(besuController.getProtocolContext(), besuController.getProtocolSchedule());
+      retval.init(
+          besuController.getProtocolContext().getBlockchain(),
+          besuController.getProtocolSchedule());
       return retval;
     }
 
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
index 8f4a1472fb..9126bc8a2a 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -1233,7 +1233,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
 
   private void startPlugins(final Runner runner) {
     blockchainServiceImpl.init(
-        besuController.getProtocolContext(), besuController.getProtocolSchedule());
+        besuController.getProtocolContext().getBlockchain(), besuController.getProtocolSchedule());
     transactionSimulationServiceImpl.init(
         besuController.getProtocolContext().getBlockchain(),
         new TransactionSimulator(
diff --git a/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java
index e981a3e78d..76b4d7e150 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java
@@ -16,7 +16,6 @@ package org.hyperledger.besu.services;
 
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
@@ -40,7 +39,6 @@ import java.util.stream.Collectors;
 @Unstable
 public class BlockchainServiceImpl implements BlockchainService {
 
-  private ProtocolContext protocolContext;
   private ProtocolSchedule protocolSchedule;
   private MutableBlockchain blockchain;
 
@@ -50,13 +48,12 @@ public class BlockchainServiceImpl implements BlockchainService {
   /**
    * Initialize the Blockchain service.
    *
-   * @param protocolContext the protocol context
+   * @param blockchain the blockchain
    * @param protocolSchedule the protocol schedule
    */
-  public void init(final ProtocolContext protocolContext, final ProtocolSchedule protocolSchedule) {
-    this.protocolContext = protocolContext;
+  public void init(final MutableBlockchain blockchain, final ProtocolSchedule protocolSchedule) {
     this.protocolSchedule = protocolSchedule;
-    this.blockchain = protocolContext.getBlockchain();
+    this.blockchain = blockchain;
   }
 
   /**
@@ -67,25 +64,24 @@ public class BlockchainServiceImpl implements BlockchainService {
    */
   @Override
   public Optional<BlockContext> getBlockByNumber(final long number) {
-    return protocolContext
-        .getBlockchain()
+    return blockchain
         .getBlockByNumber(number)
         .map(block -> blockContext(block::getHeader, block::getBody));
   }
 
   @Override
   public Hash getChainHeadHash() {
-    return protocolContext.getBlockchain().getChainHeadHash();
+    return blockchain.getChainHeadHash();
   }
 
   @Override
   public BlockHeader getChainHeadHeader() {
-    return protocolContext.getBlockchain().getChainHeadHeader();
+    return blockchain.getChainHeadHeader();
   }
 
   @Override
   public Optional<Wei> getNextBlockBaseFee() {
-    final var chainHeadHeader = protocolContext.getBlockchain().getChainHeadHeader();
+    final var chainHeadHeader = blockchain.getChainHeadHeader();
     final var protocolSpec =
         protocolSchedule.getForNextBlockHeader(chainHeadHeader, System.currentTimeMillis());
     return Optional.of(protocolSpec.getFeeMarket())