Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check types before providing a PowMiningCoordinator #3548

Merged
merged 2 commits into from
Mar 9, 2022
Merged

check types before providing a PowMiningCoordinator #3548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
854c0e7
check types before providing a PowMiningCoordinator
jflo Mar 9, 2022
e3bf721
Merge branch 'main' into 3541-narrow-pre-merge-coord
jflo Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ethereum/stratum/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
15 changes: 11 additions & 4 deletions ...stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
14 changes: 10 additions & 4 deletions ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down