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.

Sign up for GitHub

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

Jump to bottom

Merge 1.14.0 #345

Merged
merged 31 commits into from
Nov 6, 2024
Merged

Merge 1.14.0 #345

merged 31 commits into from
Nov 6, 2024

Conversation

amsanghi
Copy link
Contributor

@amsanghi amsanghi commented Jul 18, 2024 •
edited by tsahee
Loading

fixes: NIT-2673

Merge upstream geth's v1.14.0 release into our geth fork:https://github.com/ethereum/go-ethereum/releases/tag/v1.14.0

nitro PR- OffchainLabs/nitro#2517

Testing done

geth and nitro tests pass

@cla-bot cla-bot
Copy link

cla-bot bot commented Jul 18, 2024

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

@amsanghi amsanghi mentioned this pull request Jul 18, 2024
Closed
@amsanghi amsanghi changed the base branch from master to merge-v1.13.15 July 18, 2024 11:57
@cla-bot cla-bot bot added the s CLA signed label Jul 18, 2024
Base automatically changed from merge-v1.13.15 to master July 22, 2024 23:30
@amsanghi amsanghi mentioned this pull request Jul 24, 2024
Merged
@amsanghi amsanghi marked this pull request as ready for review July 29, 2024 10:57
tsahee
tsahee requested changes Aug 6, 2024
View reviewed changes
Copy link
Contributor

@tsahee tsahee left a comment

Choose a reason for hiding this comment

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

comment on blockchain.go
question about transaction_arg.go

internal/ethapi/transaction_args.go Show resolved Hide resolved
core/blockchain.go Outdated Show resolved Hide resolved
@amsanghi amsanghi requested a review from tsahee August 22, 2024 15:59
@eljobe eljobe self-requested a review October 13, 2024 14:36
eljobe
eljobe previously approved these changes Oct 13, 2024
View reviewed changes
Copy link
Member

@eljobe eljobe left a comment

Choose a reason for hiding this comment

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

LGTM

@PlasmaPower PlasmaPower mentioned this pull request Oct 29, 2024
Merged
tsahee
tsahee requested changes Oct 31, 2024
View reviewed changes
core/blockchain.go Outdated Show resolved Hide resolved
core/blockchain.go Outdated Show resolved Hide resolved
tsahee
tsahee requested changes Nov 1, 2024
View reviewed changes
core/state/state_object.go Show resolved Hide resolved
tsahee
tsahee requested changes Nov 1, 2024
View reviewed changes
metrics/sample_test.go Show resolved Hide resolved
@amsanghi amsanghi requested a review from tsahee November 5, 2024 11:17
tsahee
tsahee reviewed Nov 5, 2024
View reviewed changes
Copy link
Contributor

@tsahee tsahee left a comment

Choose a reason for hiding this comment

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

LGTM.
seems like nitro still has CI problems, waiting for that before merging

tsahee
tsahee approved these changes Nov 6, 2024
View reviewed changes
Copy link
Contributor

@tsahee tsahee left a comment

Choose a reason for hiding this comment

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

LGTM

@tsahee tsahee merged commit cccbae5 into master Nov 6, 2024
7 checks passed
@tsahee tsahee deleted the merge-1.14.0 branch November 6, 2024 01:07
@PlasmaPower PlasmaPower mentioned this pull request Nov 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tsahee tsahee tsahee approved these changes

@eljobe eljobe eljobe left review comments

@Tristan-Wilson Tristan-Wilson Awaiting requested review from Tristan-Wilson

Assignees
No one assigned
Labels
design-approved s CLA signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@amsanghi @eljobe @tsahee @gligneul @PlasmaPower