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

chore: upstream sync #156

Merged
merged 31 commits into from
Nov 3, 2023
Merged

chore: upstream sync #156

merged 31 commits into from
Nov 3, 2023

Conversation

refcell
Copy link
Collaborator

@refcell refcell commented Nov 3, 2023

Description

Merges in upstream changes into the clabby/op-reth branch and resolves two small conflicts.

In rpc transactions mod, kept both changes where an added optimism section conflicted.

In the optimism basic payload builder, update the effective_tip_per_gas call to pass an Option<u64> argument instead of u64 - simply wrapped the u64 arg in a Some(...).

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: joshieDo <93316087+joshieDo@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…digmxyz#5258)

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

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

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Alexey Shekhirin <a.shekhirin@gmail.com>
…ns together (paradigmxyz#5144)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@refcell refcell self-assigned this Nov 3, 2023
@refcell refcell merged commit 7e87683 into clabby/op-reth Nov 3, 2023
10 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.