Stop adding bad proposed block to bad block manager #5082
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
…he bad block manager Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
… manager Signed-off-by: Gabriel Fukushima <[email protected]>
…e bad block manager Signed-off-by: Gabriel Fukushima <[email protected]>
gfukushima
changed the title
gfukushima
changed the title
Signed-off-by: Gabriel Fukushima <[email protected]>
… into dont-report-proposed-bad-blocks
Signed-off-by: Gabriel Fukushima <[email protected]>
siladu
reviewed
Feb 15, 2023
Contributor
siladu
left a comment
siladu
left a comment
There was a problem hiding this comment.
LGTM but I'm too close to this, would like someone else to approve
...src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| @Test | ||
| public void shouldNotRecordProposedBadBlockToBadBlockManager() |
Contributor
There was a problem hiding this comment.
Is there a test already to ensure that an invalid block we received does get added to the bad blocks?
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java
Outdated
Show resolved
Hide resolved
macfarla
approved these changes
Feb 16, 2023
Contributor
macfarla
left a comment
macfarla
left a comment
There was a problem hiding this comment.
LGTM. some suggestions on test names
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java
Outdated
Show resolved
Hide resolved
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
Outdated
Show resolved
Hide resolved
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
Outdated
Show resolved
Hide resolved
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
Outdated
Show resolved
Hide resolved
jframe
reviewed
Feb 16, 2023
...src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java
Outdated
Show resolved
Hide resolved
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java
Outdated
Show resolved
Hide resolved
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
Outdated
Show resolved
Hide resolved
Contributor
|
pining @jflo since he worked on this before |
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
gfukushima
changed the title
jflo
approved these changes
Feb 21, 2023
ensi321
pushed a commit
to ensi321/besu
that referenced
this pull request
Mar 6, 2023
* Add flag to distinguish when bad block is a proposed block Signed-off-by: Gabriel Fukushima <[email protected]> * Add flag to distinguish when bad block is a proposed block Signed-off-by: Gabriel Fukushima <[email protected]> * javadoc Signed-off-by: Gabriel Fukushima <[email protected]> * Add shouldRecordBadBlock flag to stop adding proposed bad blocks to the bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add overload to validateAndProcessBlock with shouldRecordBadBlock flag Signed-off-by: Gabriel Fukushima <[email protected]> * Add unit test to ensure flag is being used to add blocks to bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add unit test to ensure we don't add our own proposed bad block to the bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add debug log when badBlock is not added Signed-off-by: Gabriel Fukushima <[email protected]> * Undo change done in the first approach Signed-off-by: Gabriel Fukushima <[email protected]> * Improve log Signed-off-by: Gabriel Fukushima <[email protected]> * Improve test names Signed-off-by: Gabriel Fukushima <[email protected]> * Improve javadoc of validateProposedBlock method Signed-off-by: Gabriel Fukushima <[email protected]> * Remove method from interface Signed-off-by: Gabriel Fukushima <[email protected]> * Change validateProposedBlock access modifier to private Signed-off-by: Gabriel Fukushima <[email protected]> --------- Signed-off-by: Gabriel Fukushima <[email protected]>
elenduuche
pushed a commit
to elenduuche/besu
that referenced
this pull request
Aug 16, 2023
* Add flag to distinguish when bad block is a proposed block Signed-off-by: Gabriel Fukushima <[email protected]> * Add flag to distinguish when bad block is a proposed block Signed-off-by: Gabriel Fukushima <[email protected]> * javadoc Signed-off-by: Gabriel Fukushima <[email protected]> * Add shouldRecordBadBlock flag to stop adding proposed bad blocks to the bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add overload to validateAndProcessBlock with shouldRecordBadBlock flag Signed-off-by: Gabriel Fukushima <[email protected]> * Add unit test to ensure flag is being used to add blocks to bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add unit test to ensure we don't add our own proposed bad block to the bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add debug log when badBlock is not added Signed-off-by: Gabriel Fukushima <[email protected]> * Undo change done in the first approach Signed-off-by: Gabriel Fukushima <[email protected]> * Improve log Signed-off-by: Gabriel Fukushima <[email protected]> * Improve test names Signed-off-by: Gabriel Fukushima <[email protected]> * Improve javadoc of validateProposedBlock method Signed-off-by: Gabriel Fukushima <[email protected]> * Remove method from interface Signed-off-by: Gabriel Fukushima <[email protected]> * Change validateProposedBlock access modifier to private Signed-off-by: Gabriel Fukushima <[email protected]> --------- Signed-off-by: Gabriel Fukushima <[email protected]>
eum602
pushed a commit
to lacchain/besu
that referenced
this pull request
Nov 3, 2023
* Add flag to distinguish when bad block is a proposed block Signed-off-by: Gabriel Fukushima <[email protected]> * Add flag to distinguish when bad block is a proposed block Signed-off-by: Gabriel Fukushima <[email protected]> * javadoc Signed-off-by: Gabriel Fukushima <[email protected]> * Add shouldRecordBadBlock flag to stop adding proposed bad blocks to the bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add overload to validateAndProcessBlock with shouldRecordBadBlock flag Signed-off-by: Gabriel Fukushima <[email protected]> * Add unit test to ensure flag is being used to add blocks to bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add unit test to ensure we don't add our own proposed bad block to the bad block manager Signed-off-by: Gabriel Fukushima <[email protected]> * Add debug log when badBlock is not added Signed-off-by: Gabriel Fukushima <[email protected]> * Undo change done in the first approach Signed-off-by: Gabriel Fukushima <[email protected]> * Improve log Signed-off-by: Gabriel Fukushima <[email protected]> * Improve test names Signed-off-by: Gabriel Fukushima <[email protected]> * Improve javadoc of validateProposedBlock method Signed-off-by: Gabriel Fukushima <[email protected]> * Remove method from interface Signed-off-by: Gabriel Fukushima <[email protected]> * Change validateProposedBlock access modifier to private Signed-off-by: Gabriel Fukushima <[email protected]> --------- Signed-off-by: Gabriel Fukushima <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Signed-off-by: Gabriel Fukushima [email protected]
PR description
This PR uses a new parameter to distinguish between bad imported blocks vs bad proposed blocks.
Main objective is stop adding proposed bad blocks to the badBlockManager.
Tested on local devnet beku + txfuzzer
Tested on sepolia + teku w/ validators proposing blocks (20/02)
Fixed Issue(s)
Fixes #5058
Documentation
doc-change-requiredlabel to this PR ifupdates are required.
Acceptance Tests (Non Mainnet)
./gradlew acceptanceTestNonMainnetlocally if my PR affects non-mainnet modules.Changelog