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

[BESU-1919] Add proper support for eth_hashrate #1063

Merged
merged 15 commits into from
Jun 15, 2020
Merged

[BESU-1919] Add proper support for eth_hashrate #1063

merged 15 commits into from
Jun 15, 2020

Conversation

matkt
Copy link
Contributor

@matkt matkt commented Jun 9, 2020 •
edited
Loading

PR description

  • Implemented submitHashrate endpoint which is by default limited to 1000 sealers. Adding a 1001 will remove the oldest from the list (0x0 hashrate is refused)
  • Updated eth_hashrateendpoint so that it returns the cumulative hashrate of all sealers if the list is not empty. Otherwise it returns the local hashrate
  • Added hashrate submission with Stratum1EthProxyProtocol and Stratum1Protocol
  • Added CLI Option to modify the number of sealers limit

Tested

  • Tested the hashrate submission with stratum
  • Tested the hashrate submission with json rpc api
{"id":1,"jsonrpc":"2.0","method":"eth_submitHashrate","params":["0x00","0x01"]}

{"id":1,"jsonrpc":"2.0","method":"eth_submitHashrate","params":["0x01","0x01"]}
  • Tested with CPU and GPU mining
  • Tested submission TTL

matkt added 3 commits June 9, 2020 15:17
@matkt
add eth_submithashrate implementation
50f331f 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
add missing files
d23c690 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
remove useless modification
988ce60 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt matkt added the doc-change-required Indicates an issue or PR that requires doc to be updated label Jun 9, 2020
@matkt matkt linked an issue Jun 9, 2020 that may be closed by this pull request
Add proper support for eth_hashrate #1019
Closed
matkt added 2 commits June 9, 2020 17:27
@matkt
add test for stratum
628602a 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
spotless apply
4592ef6 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt matkt mentioned this pull request Jun 9, 2020
Closed
matkt added 3 commits June 9, 2020 17:38
@matkt
Merge branch 'upstream/master' into feature/besu-1919-eth-hashrate
08e5280 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
clean code
93d48dd 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
fix merge issue
973e240 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt matkt marked this pull request as ready for review June 9, 2020 16:08
shemnon
shemnon reviewed Jun 11, 2020
View reviewed changes
Copy link
Contributor

@shemnon shemnon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to move the hashrate logic out of the AbstractMiningCoordinator into EthashMiningCoordinator and not expose the SealerInfo map and instead expose the aggregate hashrate.

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java Outdated Show resolved Hide resolved
...ion/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java Outdated Show resolved Hide resolved
...ion/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java Outdated
@@ -215,4 +232,28 @@ public void setExtraData(final Bytes extraData) {

protected abstract boolean newChainHeadInvalidatesMiningOperation(
final BlockHeader newChainHeadHeader);

@Override
public Map<String, SealerInfo> getSealerInfos() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to move all the logic around submitting hashrate and storing the sealerInfo down into the EthashMiningCoordinator. IBFT and Clique will never use these.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

...ockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java Outdated Show resolved Hide resolved
@matkt
Merge branch 'upstream/master' into feature/besu-1919-eth-hashrate
d20adae 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
resolve review issues
c00bcf9 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
resolve last review issues
e285f9c 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
clean code
71d60a7 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
add cli option for hashrate time to live
c4ad87b 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
fix command test
ae8c451 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt
Merge branch 'upstream/master' into feature/besu-1919-eth-hashrate
ecd1d4b 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
@matkt matkt merged commit 165be86 into hyperledger:master Jun 15, 2020
@MadelineMurray MadelineMurray mentioned this pull request Jun 23, 2020
Closed
@MadelineMurray
Copy link
Contributor

Raised hyperledger/besu-docs#414 to doc this so this can be closed.

@matkt matkt deleted the feature/besu-1919-eth-hashrate branch June 29, 2020 08:30
@bgravenorst bgravenorst removed the doc-change-required Indicates an issue or PR that requires doc to be updated label Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shemnon shemnon shemnon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add proper support for eth_hashrate
4 participants
@matkt @MadelineMurray @shemnon @bgravenorst