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.

Sign up for GitHub

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

Port v0.79.1 changes to main branch #4773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64457d7
gov: use saturating_sub as a defence-in-depth (#4716)
hdevalence Jul 17, 2024
9b3a21d
deps: update to ics23 0.11.3 (#4718)
hdevalence Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion crates/core/component/governance/src/component/view.rs
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
71 changes: 57 additions & 14 deletions tools/proto-compiler/Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
Loading