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

[NIT-2672] Merge v1.13.15 #342

Merged
merged 9 commits into from
Jul 22, 2024
Merged

[NIT-2672] Merge v1.13.15 #342

merged 9 commits into from
Jul 22, 2024

Conversation

amsanghi
Copy link
Contributor

@amsanghi amsanghi commented Jul 16, 2024

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

nitro PR- OffchainLabs/nitro#2496

Testing done

geth and nitro tests pass

rjl493456442 and others added 6 commits April 17, 2024 07:22
* eth/protocols/snap: skip retrieval for completed storages

* eth/protocols/snap: address comments from peter

* eth/protocols/snap: add comments
This PR adds a limit of 1000 to the "inner" topics in a filter-criteria
…mplement gentrie (#29313)

This pull request defines a gentrie for snap sync purpose.

The stackTrie is used to generate the merkle tree nodes upon receiving a state batch. Several additional options have been added into stackTrie to handle incomplete states (either missing states before or after).

In this pull request, these options have been relocated from stackTrie to genTrie, which serves as a wrapper for stackTrie specifically for snap sync purposes.

Further, the logic for managing incomplete state has been enhanced in this change. Originally, there are two cases handled:

-    boundary node filtering
-    internal (covered by extension node) node clearing

This changes adds one more:

- Clearing leftover nodes on the boundaries.

This feature is necessary if there are leftover trie nodes in database, otherwise node inconsistency may break the state healing.
Copy link

cla-bot bot commented Jul 16, 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 marked this pull request as ready for review July 16, 2024 14:13
@amsanghi amsanghi changed the title Merge v1.13.15 [NIT-2672] Merge v1.13.15 Jul 16, 2024
Base automatically changed from merge-v1.13.14 to master July 17, 2024 23:00
Copy link

cla-bot bot commented Jul 17, 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

Tristan-Wilson
Tristan-Wilson previously approved these changes Jul 18, 2024
Copy link
Member

@Tristan-Wilson Tristan-Wilson left a comment

Choose a reason for hiding this comment

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

Looks like a clean merge and I don't see anything concerning in the release notes.

@tsahee
Copy link
Contributor

tsahee commented Jul 20, 2024

need to solve these ci errors.. possibly a go mod update or something?

Copy link

cla-bot bot commented Jul 22, 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
Copy link
Contributor Author

need to solve these ci errors.. possibly a go mod update or something?

Fixed the linter (GitHub workflow needed to be updated)

Copy link

cla-bot bot commented Jul 22, 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

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 48de203 into master Jul 22, 2024
5 of 6 checks passed
@tsahee tsahee deleted the merge-v1.13.15 branch July 22, 2024 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants