check types before providing a PowMiningCoordinator (hyperledger#3548)

Signed-off-by: Justin Florentine <justin+github@florentine.us>
garyschulte · May 2, 2022 · c883cf5 · c883cf5
1 parent 38af1db
commit c883cf5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/ethereum/stratum/build.gradle b/ethereum/stratum/build.gradle
@@ -36,6 +36,7 @@ dependencies {
  implementation project(':ethereum:core')
  implementation project(':ethereum:blockcreation')
  implementation project(':metrics:core')
+ implementation project(':consensus:merge')
 
  implementation 'com.google.guava:guava'
  implementation 'io.vertx:vertx-core'

diff --git a/...stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java b/...stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.stratum;
 
+import org.hyperledger.besu.consensus.merge.blockcreation.TransitionCoordinator;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -52,13 +53,19 @@ public class Stratum1EthProxyProtocol implements StratumProtocol {
  private final EpochCalculator epochCalculator;
 
  public Stratum1EthProxyProtocol(final MiningCoordinator miningCoordinator) {
- if (!(miningCoordinator instanceof PoWMiningCoordinator)) {
+
+ MiningCoordinator maybePowMiner = miningCoordinator;
+ if (maybePowMiner instanceof TransitionCoordinator) {
+ maybePowMiner = ((TransitionCoordinator) maybePowMiner).getPreMergeObject();
+ }
+
+ if (!(maybePowMiner instanceof PoWMiningCoordinator)) {
  throw new IllegalArgumentException(
  "Stratum1 Proxies require an PoWMiningCoordinator not "
- + ((miningCoordinator == null) ? "null" : miningCoordinator.getClass().getName()));
+ + ((maybePowMiner == null) ? "null" : maybePowMiner.getClass().getName()));
  }
- this.miningCoordinator = miningCoordinator;
- this.epochCalculator = ((PoWMiningCoordinator) miningCoordinator).getEpochCalculator();
+ this.miningCoordinator = maybePowMiner;
+ this.epochCalculator = ((PoWMiningCoordinator) maybePowMiner).getEpochCalculator();
  }
 
  @Override

diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.stratum;
 
+import org.hyperledger.besu.consensus.merge.blockcreation.TransitionCoordinator;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -82,16 +83,21 @@ public Stratum1Protocol(final String extranonce, final MiningCoordinator miningC
  final MiningCoordinator miningCoordinator,
  final Supplier<String> jobIdSupplier,
  final Supplier<String> subscriptionIdCreator) {
- if (!(miningCoordinator instanceof PoWMiningCoordinator)) {
+ MiningCoordinator maybePowMiner = miningCoordinator;
+ if (maybePowMiner instanceof TransitionCoordinator) {
+ maybePowMiner = ((TransitionCoordinator) maybePowMiner).getPreMergeObject();
+ }
+
+ if (!(maybePowMiner instanceof PoWMiningCoordinator)) {
  throw new IllegalArgumentException(
  "Stratum1 requires an PoWMiningCoordinator not "
- + ((miningCoordinator == null) ? "null" : miningCoordinator.getClass().getName()));
+ + ((maybePowMiner == null) ? "null" : maybePowMiner.getClass().getName()));
  }
  this.extranonce = extranonce;
- this.miningCoordinator = miningCoordinator;
+ this.miningCoordinator = maybePowMiner;
  this.jobIdSupplier = jobIdSupplier;
  this.subscriptionIdCreator = subscriptionIdCreator;
- this.epochCalculator = ((PoWMiningCoordinator) miningCoordinator).getEpochCalculator();
+ this.epochCalculator = ((PoWMiningCoordinator) maybePowMiner).getEpochCalculator();
  }
 
  @Override