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

Port v0.79.1 changes to main branch #4773

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Conversation

conorsch
Copy link
Contributor

Describe your changes

The v0.79.1 release contained two bug fixes: https://github.com/penumbra-zone/penumbra/releases/tag/v0.79.1 Those changes were committed directly to the release/v0.79.x branch:

Typically, we prepare fixes for the main branch, then backport them via cherry-pick into the relevant release branch. That process wasn't adhered to for 0.79.1, so I'm following up to ensure we have all the relevant changes we need in main.

Checklist before requesting a review

  • If this code contains consensus-breaking changes, I have added the "consensus-breaking" label. Otherwise, I declare my belief that there are not consensus-breaking changes, for the following reason:

    These changes have already been released, as part of v0.79.1 (and therefore v0.79.2), so pulling them into main just ensures we don't inadvertently unship them.

## Describe your changes

Uses saturating_sub as a defense in depth mechanism

## Issue ticket number and link

## Checklist before requesting a review

- [x] If this code contains consensus-breaking changes, I have added the
"consensus-breaking" label. Otherwise, I declare my belief that there
are not consensus-breaking changes, for the following reason:

  > defense in depth in a codepath that has not been executed

(cherry picked from commit f9f7028)
This commit ports the ics23 upgrade from the v0.79.x release branch into
main, so it's present going forward.

Updates to `ics23` `0.11.3`

- [x] If this code contains consensus-breaking changes, I have added the
"consensus-breaking" label. Otherwise, I declare my belief that there
are not consensus-breaking changes, for the following reason:

> No effect on consensus state as no IBC transactions have occurred and
no changes in library other than bug fixes.

(cherry picked from commit e8bc0e0)
@conorsch conorsch merged commit dd9efd6 into main Jul 26, 2024
13 checks passed
@conorsch conorsch deleted the port-0_79_1-changes-to-main branch July 26, 2024 00:25
Copy link
Member

@hdevalence hdevalence left a comment

Choose a reason for hiding this comment

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

LGTM

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.

4 participants