-
Notifications
You must be signed in to change notification settings - Fork 0
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
Conversation
Mitigation for asa-2023-002
Moving to draft as we're landing this change on the tendermint fork first, and will merge that change here instead. |
BlockParams.MaxBytes
404eb7b
to
1b4ae52
Compare
## [v0.34.23-alpha.agoric.4] | ||
|
||
* Lower default `BlockParams.MaxBytes` to 5MB to mitigate asa-2023-002 | ||
|
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
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
.changelog
(we useunclog to manage our changelog)
docs/
orspec/
) and code comments