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

Skip bonus blocks applying atomic ops from trie to shared memory #409

Merged
merged 4 commits into from Dec 1, 2023

Conversation

darioush
Copy link
Collaborator

@darioush darioush commented Dec 1, 2023

Why this should be merged

The bonus block atomic ops were not meant to be indexed in the trie, however due to a regression their inclusion in the trie is blocking state sync. This workaround unblocks state sync while we canonicalize the trie representation.

How this works

Skips the bonus block heights in applying the operations from the trie to the shared memory.

How this was tested

CI, testing with mainnet in progress

@darioush darioush changed the title Skip bonus blocks applying atomic ops from trie to shared mem Skip bonus blocks applying atomic ops from trie to shared memory Dec 1, 2023
@darioush darioush marked this pull request as ready for review December 1, 2023 18:24
Copy link
Contributor

@StephenButtolph StephenButtolph left a comment

Choose a reason for hiding this comment

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

lgtm

StephenButtolph
StephenButtolph previously approved these changes Dec 1, 2023
patrick-ogrady
patrick-ogrady previously approved these changes Dec 1, 2023
@darioush darioush enabled auto-merge (squash) December 1, 2023 19:41
plugin/evm/atomic_backend.go Outdated Show resolved Hide resolved
Signed-off-by: Darioush Jalali <darioush.jalali@avalabs.org>
@StephenButtolph StephenButtolph merged commit 0a6a7a3 into master Dec 1, 2023
8 checks passed
@StephenButtolph StephenButtolph deleted the atomic-sync-client-workaround branch December 1, 2023 20:09
joshua-kim added a commit that referenced this pull request Dec 6, 2023
commit abde8d6
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Wed Dec 6 13:39:32 2023 -0500

    Update avalanchego dependency to v1.10.18-rc.0 (#415)

commit bed4cf7
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Fri Dec 1 16:48:28 2023 -0500

    Clarify bonus block inclusion in atomic trie (#412)

commit 631a5bd
Author: Darioush Jalali <darioush.jalali@avalabs.org>
Date:   Fri Dec 1 13:33:07 2023 -0800

    Fix trie reuse after Commit in atomic sync (#411)

    Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
    Co-authored-by: Stephen Buttolph <stephen@avalabs.org>

commit 6d7e6b8
Author: Darioush Jalali <darioush.jalali@avalabs.org>
Date:   Fri Dec 1 12:39:07 2023 -0800

    Fix overwriting of atomic trie roots (#407)

commit 0a6a7a3
Author: Darioush Jalali <darioush.jalali@avalabs.org>
Date:   Fri Dec 1 12:09:32 2023 -0800

    Skip bonus blocks applying atomic ops from trie to shared memory (#409)

commit 0eef20a
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Fri Dec 1 13:21:45 2023 -0500

    Improve logging of unexpected state sync errors (#410)

commit f6899f9
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Fri Dec 1 13:10:26 2023 -0500

    Simplify atomic root acceptance (#406)

    Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>

commit 8e388ba
Author: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
Date:   Wed Nov 29 20:45:05 2023 -0500

    Use `p2p.Network` (#384)

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
darioush pushed a commit that referenced this pull request Apr 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants