Skip to content
This repository has been archived by the owner on Nov 5, 2023. It is now read-only.

chore: upstream sync #117

Merged
merged 24 commits into from
Sep 6, 2023
Merged

chore: upstream sync #117

merged 24 commits into from
Sep 6, 2023

Conversation

refcell
Copy link
Collaborator

@refcell refcell commented Sep 5, 2023

Description

Upstream sync.

Resolved a few small conflicts surrounding the payload attributes parent beacon block root. Everything else should be untouched.

Rjected and others added 24 commits September 2, 2023 18:41
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…king tasks within blocking tasks (paradigmxyz#4461)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…4280)

Co-authored-by: Alexey Shekhirin <a.shekhirin@gmail.com>
…ons` (paradigmxyz#4455)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…igmxyz#4471)

Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
@refcell refcell requested a review from clabby September 5, 2023 22:02
@refcell refcell self-assigned this Sep 5, 2023
@clabby clabby merged commit a956013 into clabby/op-reth Sep 6, 2023
8 of 21 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.