[r3.5] execution/stagedsync: AuRa genesis bypass for parallel-exec emptyRemoval#21931
Merged
Merged
Conversation
Mirror serial's txtask.Execute rules-clobber (rules = &chain.Rules{} at
block 0) at the parallel normalizeWriteSet callsite. Without this, the
AuRa CreateAccount(ZeroAddress) placeholder is treated as EIP-161-empty
in parallel, emitted as SelfDestructPath=true, and turned into a
DeleteUpdate by calc_state — diverging from serial's full-account
UPDATE and producing the wrong trie root reported in #21712.
Fixes #21712
AskAlexSharov
approved these changes
Jun 22, 2026
mh0lt
added a commit
that referenced
this pull request
Jun 22, 2026
…ss in all EIP-161 empty-removal paths (#21938) Cherry-pick of #21937 to release/3.5. Completes the AuRa EIP-161 family on r3.5: #21931 (already merged) shipped the block-0 ZeroAddress-at-genesis carve-out (chiado #21712); this PR adds the SystemAddress carve-out for AuRa across all empty-account-removal sites. ## r3.5-specific adaptations - Dropped intermediate `TestAsBlockAccessList_Selfdestructed*` tests from `versionedio_test.go` that exist only on main. - Updated my `TestNormalizeWriteSet_GenesisBypass*` / `TestNormalizeWriteSet_PostGenesisEmptyAccountTriggersEIP161` (landed in r3.5 via #21931) to pass the new `isAura bool` arg. ## Verification - All new + existing `TestNormalize|TestFlushToUpdates|TestApplyWrites|TestSD|TestEIP161EmptyRemoval` tests green on r3.5. - `make lint` + `make erigon` clean. - The end-to-end "fixes gnosis tip-tracking dep-0 wedge" evidence is described in the main PR (#21937) — verified against the exact same diff applied to a r3.5 wedged datadir. Fixes the gnosis tip-tracking failure observed on release/3.5 QA runs (e.g. https://github.com/erigontech/erigon/actions/runs/27832904647). Co-authored-by: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Cherry-pick of #21930 to release/3.5.
Fixes #21712.