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

Merge v0.34.23-alpha.agoric.4 #5

Merged
merged 6 commits into from
Nov 6, 2023
Merged

Conversation

mhofman
Copy link

@mhofman mhofman commented Nov 2, 2023

Description

Merge v0.34.23-alpha.agoric.4 which pulls in agoric-labs/tendermint#36, a mitigation for asa-2023-002.

Also fixes the Agoric specific changelog.


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use
    unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

CHANGELOG-Agoric.md Outdated Show resolved Hide resolved
@mhofman mhofman marked this pull request as draft November 6, 2023 19:48
@mhofman
Copy link
Author

mhofman commented Nov 6, 2023

Moving to draft as we're landing this change on the tendermint fork first, and will merge that change here instead.

@mhofman mhofman changed the title chore: lower default BlockParams.MaxBytes Merge v0.34.23-alpha.agoric.4 Nov 6, 2023
@mhofman mhofman marked this pull request as ready for review November 6, 2023 20:42
Comment on lines +43 to +46
## [v0.34.23-alpha.agoric.4]

* Lower default `BlockParams.MaxBytes` to 5MB to mitigate asa-2023-002

Choose a reason for hiding this comment

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

Drop this since we won't be adding this tag to this repository, but move this description up to line 41.

Copy link
Author

Choose a reason for hiding this comment

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

This is a merge of the tendermint commit. We should only resolve merge conflicts, not introduce content changes. Is there a reason to exclude this version from the log when other changes that agoric made are included, associated to the respective version where the change was originally made?

Regarding ordering, they're purposely not in "version order" to make clear that v0.34.27-alpha.agoric.2 doesn't include this change.

Choose a reason for hiding this comment

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

This is a bit of a gray area, so proceed if you feel strongly, but I'd rather see this as its own commit since we're no longer lifting tendermint changes into cometbft.

Copy link
Author

Choose a reason for hiding this comment

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

In general I prefer to merge instead of cherry-picking or porting, as it's clearer what is and isn't integrated.

@mhofman mhofman merged commit ce2777f into Agoric Nov 6, 2023
18 of 19 checks passed
@mhofman mhofman deleted the mhofman/8483-max-block-size branch November 6, 2023 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants