Skip to content

Commit

Permalink
Port v0.79.1 changes to main branch (#4773)
Browse files Browse the repository at this point in the history
## 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:

* #4716
* #4718

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

- [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:

> 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.

---------

Co-authored-by: Henry de Valence <[email protected]>
  • Loading branch information
conorsch and hdevalence committed Jul 26, 2024
1 parent 3b21ac8 commit dd9efd6
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ humantime = { version = "2.1" }
ibc-proto = { default-features = false, version = "0.41.0" }
ibc-types = { default-features = false, version = "0.12.0" }
ibig = { version = "0.3" }
ics23 = { version = "0.11.0" }
ics23 = { version = "0.11.3" }
im = { version = "^15.1.0" }
indicatif = { version = "0.16" }
jmt = { version = "0.10", features = ["migration"] }
Expand Down
Binary file modified crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs
Binary file not shown.
2 changes: 1 addition & 1 deletion crates/core/component/governance/src/component/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ pub trait StateReadExt: StateRead + penumbra_stake::StateReadExt {
// proposal start, minus the total voting power used by delegators to that validator
// who have voted. Their votes will be added back in below, re-assigning their
// voting power to their chosen votes.
let effective_power = power - delegator_tally.total();
let effective_power = power.saturating_sub(delegator_tally.total());
tally += (vote, effective_power).into();
}
// Add the delegator votes in, regardless of if the validator has voted.
Expand Down
Binary file modified crates/proto/src/gen/proto_descriptor.bin.no_lfs
Binary file not shown.
71 changes: 57 additions & 14 deletions tools/proto-compiler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/proto-compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
[dependencies]
anyhow = "1"
ibc-proto = { version = "0.40.0" }
ics23 = "0.11.0"
ics23 = "0.11.3"
pbjson = "0.6"
pbjson-build = "0.6"
pbjson-types = "0.6"
Expand Down

0 comments on commit dd9efd6

Please sign in to comment.