IF: use the same way to determine if instant finality is active #2043
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
heifner
reviewed
Jan 5, 2024
heifner
reviewed
Jan 5, 2024
libraries/chain/controller.cpp
Outdated
| trx_mroot = calculate_trx_merkle( b->transactions, !hs_active ); | ||
| EOS_ASSERT( b->transaction_mroot == trx_mroot, block_validate_exception, | ||
| "invalid block transaction merkle root ${b} != ${c}", ("b", b->transaction_mroot)("c", trx_mroot) ); | ||
| } |
There was a problem hiding this comment.
This opens up an attack vector as you can create a block with invalid mroot that will pass this validation. I think we can go with your first implementation. There is a small race condition at time of activation, but even if that is tripped and the block is considered invalid, the node will attempt to sync the block in the future and succeed; that is what I meant by re-try.
There was a problem hiding this comment.
Thanks for your insight!
|
Note:start |
heifner
approved these changes
Jan 6, 2024
greg7mdp
approved these changes
Jan 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#2028 reports
transaction_mrootdifference between when it is first calculated and when it is recreated increate_block_state_i. The difference is caused by the way howhs_activeis determined for mroot calculation. Whentransaction_mrootis first created,hs_lib > 0is used as an indication ofhs_active; increate_block_state_i, only presence ofinstant_finality_extensionis used.This inconsistency causes integration test failures too.
This PR changes to use the same
hs_lib > 0as the indication.Resolved #2028