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

[ETCM-177] Fix Ommers pool #724

Merged
merged 4 commits into from
Oct 7, 2020
Merged

Conversation

mirkoAlic
Copy link
Contributor

@mirkoAlic mirkoAlic commented Oct 5, 2020

Description

Fix ommers calculation at pool level and remove addition of mined blocks that are not imported.

Up to discussion

As a future improvement it would be nice to make the Ommers pool a more "independent" component that handle the removal of ommers by its own.

Important Changes Introduced

  • Query by parentBlockHash instead of blockNumber

Testing

Unit tests should passed + we monitoring this at testnet level.

- Fix ommers calculation at pool level
- Query by parentBlockHash instead of blockNumber
- Remove Block inclusion as ommer for mined blocks that are not been imported (Testnet issue)
- Increase OmmersPool test coverage
@mirkoAlic mirkoAlic force-pushed the ETCM-177-Improve-ommers-pool-handling branch from 7abfcc2 to 4fe8dfd Compare October 6, 2020 14:43
@@ -63,8 +63,6 @@ class BlockImporter(
case MinedBlock(block) =>
if (!state.importing) {
importMinedBlock(block, state)
} else {
ommersPool ! AddOmmers(block.header)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this plus how ommers pool previously behave, it was the Testnet issue.

@mirkoAlic mirkoAlic force-pushed the ETCM-177-Improve-ommers-pool-handling branch from 886bbe4 to f15127e Compare October 6, 2020 19:17
@mirkoAlic mirkoAlic marked this pull request as ready for review October 6, 2020 19:17
@mirkoAlic mirkoAlic requested a review from mmrozek October 6, 2020 19:26
@mirkoAlic mirkoAlic added the bug Something isn't working label Oct 6, 2020
@mirkoAlic mirkoAlic changed the title [ETCM-177] Improve Ommers pool [ETCM-177] Fix Ommers pool Oct 6, 2020
@mirkoAlic mirkoAlic merged commit 8e45269 into develop Oct 7, 2020
@mirkoAlic mirkoAlic deleted the ETCM-177-Improve-ommers-pool-handling branch October 7, 2020 18:48
@mirkoAlic
Copy link
Contributor Author

mirkoAlic commented Oct 7, 2020

I merged given is needed for experimental testnet purposes. cc @jmendiola222 , @mmrozek

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants