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.

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

Use JSON format instead of binary. #303

Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
6013c8f
Update version to 1.2.5-SNAPSHOT (#42)
EdJoJob Sep 24, 2019
a2cd973
Merge remote-tracking branch 'upstream/master'
AbdelStark Sep 24, 2019
4e8c08c
Merge remote-tracking branch 'upstream/master'
AbdelStark Sep 25, 2019
7702fdc
Merge remote-tracking branch 'upstream/master'
AbdelStark Sep 25, 2019
fd1933d
Merge remote-tracking branch 'upstream/master'
AbdelStark Sep 25, 2019
5359f4a
Merge remote-tracking branch 'upstream/master'
AbdelStark Sep 27, 2019
3c4d915
Merge branch 'master' of https://github.com/abdelhamidbakhta/besu
AbdelStark Oct 1, 2019
3e54311
Merge branch 'master' of https://github.com/abdelhamidbakhta/besu
AbdelStark Oct 4, 2019
53182d6
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 7, 2019
eb40a5d
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 9, 2019
8ca3516
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 14, 2019
5aceb67
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 16, 2019
1590ec2
Merge branch 'master' of https://github.com/abdelhamidbakhta/besu
AbdelStark Oct 16, 2019
effe747
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 17, 2019
356a80e
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 18, 2019
512dda1
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 28, 2019
2be4cbf
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 29, 2019
f21ee6f
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 30, 2019
62aafe0
Merge remote-tracking branch 'upstream/master'
AbdelStark Oct 31, 2019
bfd7da8
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 5, 2019
4bc551c
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 6, 2019
0503283
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 7, 2019
e94be49
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 8, 2019
c763f71
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 15, 2019
86ddfb9
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 18, 2019
f1db8b4
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 19, 2019
cd77742
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 25, 2019
99b1ab9
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 26, 2019
76fb888
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 26, 2019
a86320b
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 27, 2019
9e3ea84
Merge remote-tracking branch 'upstream/master'
AbdelStark Nov 28, 2019
6bed693
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 2, 2019
fa5845d
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 3, 2019
9026bbf
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 6, 2019
f81bc0b
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 12, 2019
7541869
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 16, 2019
b85581e
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 17, 2019
5d170b1
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 19, 2019
908c61a
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 20, 2019
7e48b39
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 23, 2019
1130dfa
Merge remote-tracking branch 'upstream/master'
AbdelStark Dec 24, 2019
113c85c
Merge remote-tracking branch 'upstream/master'
AbdelStark Jan 6, 2020
994f0fa
Merge remote-tracking branch 'upstream/master'
AbdelStark Jan 7, 2020
023473b
Merge remote-tracking branch 'upstream/master'
AbdelStark Jan 7, 2020
4e6dad0
Merge remote-tracking branch 'upstream/master'
AbdelStark Jan 9, 2020
8e3093e
Merge branch 'master' of https://github.com/abdelhamidbakhta/besu
AbdelStark Jan 14, 2020
bd553aa
Use JSON format instead of binary.
AbdelStark Jan 14, 2020
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
Prev Previous commit
Use JSON format instead of binary.
Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net>
  • Loading branch information
AbdelStark committed Jan 14, 2020
commit bd553aa419fb2b155f46ac9018129ed2caee0233
2 changes: 1 addition & 1 deletion besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending.PendingTransactionSubscriptionService;
import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscriptionService;
import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.MiningParameters;
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
import org.hyperledger.besu.ethereum.core.Synchronizer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
*/
package org.hyperledger.besu.chainimport;

import org.hyperledger.besu.chainimport.internal.BlockData;
import org.hyperledger.besu.chainimport.internal.ChainData;
import org.hyperledger.besu.config.GenesisConfigOptions;
import org.hyperledger.besu.controller.BesuController;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.ProtocolContext;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.internal.BlockData;
import org.hyperledger.besu.ethereum.chain.internal.ChainData;
import org.hyperledger.besu.ethereum.core.Address;
import org.hyperledger.besu.ethereum.core.Block;
import org.hyperledger.besu.ethereum.core.BlockHeader;
Expand All @@ -27,6 +28,7 @@
import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.ethereum.core.WorldState;
import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -52,23 +54,47 @@ public class JsonBlockImporter<C> {
private static final Logger LOG = LogManager.getLogger();

private final ObjectMapper mapper;
private final BesuController<C> controller;
private final GenesisConfigOptions genesisConfigOptions;
private final ProtocolSchedule<C> protocolSchedule;
private final ProtocolContext<C> protocolContext;
private final MiningCoordinator miningCoordinator;
private List<Block> importedBlocks;

public JsonBlockImporter(final BesuController<C> controller) {
this.controller = controller;
mapper = new ObjectMapper();
this(
controller.getGenesisConfigOptions(),
controller.getProtocolSchedule(),
controller.getProtocolContext(),
controller.getMiningCoordinator());
}

public JsonBlockImporter(
final GenesisConfigOptions genesisConfigOptions,
final ProtocolSchedule<C> protocolSchedule,
final ProtocolContext<C> protocolContext,
final MiningCoordinator miningCoordinator) {
this.genesisConfigOptions = genesisConfigOptions;
this.protocolSchedule = protocolSchedule;
this.protocolContext = protocolContext;
this.miningCoordinator = miningCoordinator;
this.mapper = getMapper();
}

private static ObjectMapper getMapper() {
final ObjectMapper mapper = new ObjectMapper();
// Jdk8Module allows us to easily parse {@code Optional} values from json
mapper.registerModule(new Jdk8Module());
// Ignore casing of properties
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
return mapper;
}

public void importChain(final String chainJson) throws IOException {
warnIfDatabaseIsNotEmpty();

final ChainData chainData = mapper.readValue(chainJson, ChainData.class);

final List<Block> importedBlocks = new ArrayList<>();
importedBlocks = new ArrayList<>();
for (final BlockData blockData : chainData.getBlocks()) {
final BlockHeader parentHeader = getParentHeader(blockData, importedBlocks);
final Block importedBlock = processBlockData(blockData, parentHeader);
Expand All @@ -85,11 +111,7 @@ private Block processBlockData(final BlockData blockData, final BlockHeader pare
parentHeader.getHash());

final WorldState worldState =
controller
.getProtocolContext()
.getWorldStateArchive()
.get(parentHeader.getStateRoot())
.get();
protocolContext.getWorldStateArchive().get(parentHeader.getStateRoot()).get();
final List<Transaction> transactions =
blockData.streamTransactions(worldState).collect(Collectors.toList());

Expand All @@ -104,12 +126,10 @@ private Block createBlock(
final BlockData blockData,
final BlockHeader parentHeader,
final List<Transaction> transactions) {
final MiningCoordinator miner = controller.getMiningCoordinator();
final GenesisConfigOptions genesisConfigOptions = controller.getGenesisConfigOptions();
setOptionalFields(miner, blockData, genesisConfigOptions);
setOptionalFields(miningCoordinator, blockData, genesisConfigOptions);

// Some MiningCoordinator's (specific to consensus type) do not support block-level imports
return miner
return miningCoordinator
.createBlock(parentHeader, transactions, Collections.emptyList())
.orElseThrow(
() ->
Expand Down Expand Up @@ -144,13 +164,10 @@ private void setOptionalFields(

private void importBlock(final Block block) {
final BlockImporter<C> importer =
controller
.getProtocolSchedule()
.getByBlockNumber(block.getHeader().getNumber())
.getBlockImporter();
protocolSchedule.getByBlockNumber(block.getHeader().getNumber()).getBlockImporter();

final boolean imported =
importer.importBlock(controller.getProtocolContext(), block, HeaderValidationMode.NONE);
importer.importBlock(protocolContext, block, HeaderValidationMode.NONE);
if (imported) {
LOG.info(
"Successfully created and imported block at height {} ({})",
Expand All @@ -175,8 +192,7 @@ private void assertAllTransactionsIncluded(
}

private void warnIfDatabaseIsNotEmpty() {
final long chainHeight =
controller.getProtocolContext().getBlockchain().getChainHead().getHeight();
final long chainHeight = protocolContext.getBlockchain().getChainHead().getHeight();
if (chainHeight > BlockHeader.GENESIS_BLOCK_NUMBER) {
LOG.warn(
"Importing to a non-empty database with chain height {}. This may cause imported blocks to be considered non-canonical.",
Expand All @@ -190,8 +206,7 @@ private void warnIfImportedBlocksAreNotOnCanonicalChain(final List<Block> import
.map(Block::getHeader)
.filter(
header ->
controller
.getProtocolContext()
protocolContext
.getBlockchain()
.getBlockHeader(header.getNumber())
.map(c -> !c.equals(header))
Expand All @@ -213,8 +228,7 @@ private void warnIfImportedBlocksAreNotOnCanonicalChain(final List<Block> import
private BlockHeader getParentHeader(final BlockData blockData, final List<Block> importedBlocks) {
if (blockData.getParentHash().isPresent()) {
final Hash parentHash = blockData.getParentHash().get();
return controller
.getProtocolContext()
return protocolContext
.getBlockchain()
.getBlockHeader(parentHash)
.orElseThrow(
Expand Down Expand Up @@ -247,11 +261,14 @@ private BlockHeader getParentHeader(final BlockData blockData, final List<Block>
throw new IllegalArgumentException("Invalid block number: " + blockNumber + 1);
}

return controller
.getProtocolContext()
return protocolContext
.getBlockchain()
.getBlockHeader(blockNumber)
.orElseThrow(
() -> new IllegalArgumentException("Unable to locate block parent at " + blockNumber));
}

public List<Block> getImportedBlocks() {
return importedBlocks;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.MiningParameters;
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
import org.hyperledger.besu.ethereum.core.Synchronizer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
import org.hyperledger.besu.ethereum.ProtocolContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.GenesisState;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
import org.hyperledger.besu.ethereum.core.Hash;
import org.hyperledger.besu.ethereum.core.MiningParameters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
import org.hyperledger.besu.ethereum.ProtocolContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Address;
import org.hyperledger.besu.ethereum.core.BlockHeader;
import org.hyperledger.besu.ethereum.core.MiningParameters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory;
import org.hyperledger.besu.ethereum.ProtocolContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
import org.hyperledger.besu.ethereum.core.Address;
import org.hyperledger.besu.ethereum.core.BlockHeader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import org.hyperledger.besu.consensus.ibftlegacy.protocol.Istanbul64Protocol;
import org.hyperledger.besu.consensus.ibftlegacy.protocol.Istanbul64ProtocolManager;
import org.hyperledger.besu.ethereum.ProtocolContext;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.blockcreation.NoopMiningCoordinator;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.BlockHeader;
import org.hyperledger.besu.ethereum.core.MiningParameters;
import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import org.hyperledger.besu.ethereum.blockcreation.DefaultBlockScheduler;
import org.hyperledger.besu.ethereum.blockcreation.EthHashMinerExecutor;
import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.MiningParameters;
import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import org.hyperledger.besu.consensus.ibft.IbftProcessor;
import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead;
import org.hyperledger.besu.consensus.ibft.statemachine.IbftController;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
import org.hyperledger.besu.ethereum.chain.Blockchain;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Address;
import org.hyperledger.besu.ethereum.core.Block;
import org.hyperledger.besu.ethereum.core.BlockHeader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.hyperledger.besu.ethereum.api.graphql;

import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Synchronizer;
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
import org.hyperledger.besu.ethereum.api.query.LogsQuery;
import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Account;
import org.hyperledger.besu.ethereum.core.Address;
import org.hyperledger.besu.ethereum.core.Hash;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Address;

import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Wei;

public class EthGasPrice implements JsonRpcMethod {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed;
import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;

public class EthMining implements JsonRpcMethod {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Hash;
import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Address;

public class MinerSetCoinbase implements JsonRpcMethod {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.CoinbaseNotSetException;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;

public class MinerStart implements JsonRpcMethod {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;

public class MinerStop implements JsonRpcMethod {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.Synchronizer;
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.RpcModules;
import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
import org.hyperledger.besu.ethereum.core.Synchronizer;
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerSetEtherbase;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerStart;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerStop;
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
import org.hyperledger.besu.ethereum.chain.MiningCoordinator;

import java.util.Map;

Expand Down
Loading