-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Amend incarnation logic #8954
Merged
Amend incarnation logic #8954
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
2d57f66
Check incarnation in accountsEqual
yperbasis 3ee08c7
Amend incarnation logic
yperbasis 4d733da
Merge branch 'devel' into phoenix
yperbasis c57cfbb
Merge branch 'devel' into phoenix
yperbasis 82a2846
Merge branch 'devel' into phoenix
yperbasis e796b30
trace logging
yperbasis bac9c5a
sort keys for logging
yperbasis f8d3fa6
log incarnation
yperbasis 228f383
rework PrevIncarnation logic
yperbasis 09703f4
Merge branch 'devel' into phoenix
yperbasis 7c88a7d
Update IncarnationMap for resurrected accounts
yperbasis 8e4f5e6
Revert "log incarnation"
yperbasis 4361b50
Revert "sort keys for logging"
yperbasis c96e535
Revert "trace logging"
yperbasis 0be4c98
Merge branch 'devel' into phoenix
yperbasis 44137c9
Merge branch 'devel' into phoenix
yperbasis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not
if original.Incarnation > account.Incarnation {
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that in that case
IncarnationMap
isn't too relevant. My understanding is thatIncarnationMap
is relevant when a contract is self-destructed and then recreated as a smart contract. Within a block,IntraBlockState
rather thanIncarnationMap
is used to determine the right incarnation. But here we're treating a special corner case when at the end of the block a contract is destroyed and then re-recreated as a non-smart account (account.Incarnation == 0
).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here the lines I'm adding to
UpdateAccountData
are copy-pasted fromDeleteAccount
.