This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
Fix estimate gas RPC failing for clique when no blocks have been created #1528
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ajsutton
approved these changes
Jun 6, 2019
| @@ -23,6 +23,7 @@ | |||
| import java.util.function.Supplier; | |||
|
|
|||
| public class CliqueBlockHashing { | |||
| private static final Address ADDRESS_ZERO = Address.extract(Hash.ZERO); | |||
There was a problem hiding this comment.
I suspect we should just introduce Address.ZERO = Address.fromHexString('0x0') in the Address class.
| @@ -48,6 +49,9 @@ public static Hash calculateDataHashForProposerSeal( | |||
| */ | |||
| public static Address recoverProposerAddress( | |||
| final BlockHeader header, final CliqueExtraData cliqueExtraData) { | |||
| if (header.getNumber() == 0) { | |||
There was a problem hiding this comment.
Suggested change
| if (header.getNumber() == 0) { | |
| if (header.getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) { |
Please don't ever hard code 0 as the genesis block number. One day we're going to have to support variable genesis block numbers.
rain-on
reviewed
Jun 6, 2019
| @@ -48,6 +47,9 @@ public static Hash calculateDataHashForProposerSeal( | |||
| */ | |||
| public static Address recoverProposerAddress( | |||
| final BlockHeader header, final CliqueExtraData cliqueExtraData) { | |||
| if (header.getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) { | |||
There was a problem hiding this comment.
nit: Personally, I'd move this inside the "isPresent" check - just to minimise the conditionals executed on every check ... its probably a minor benefit at best.
CjHare
approved these changes
Jun 6, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description
Fixes issue when using Clique, if the chain height is still at 0 then the estimateGas rpc fails with a internal server error.
This change special cases block 0 so we return address 0 for the proposer in this case instead of failing with an IllegalArgumentException as the genesis block does not have proposer seals.
Fixed Issue(s)