From dd9efd6d47796bae2804df2daf7d1734d0ebebb9 Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Thu, 25 Jul 2024 17:25:28 -0700 Subject: [PATCH] Port v0.79.1 changes to main branch (#4773) ## 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: * https://github.com/penumbra-zone/penumbra/pull/4716 * https://github.com/penumbra-zone/penumbra/pull/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 --- Cargo.lock | 4 +- Cargo.toml | 2 +- .../src/gen/proto_descriptor.bin.no_lfs | Bin 102002 -> 99489 bytes .../governance/src/component/view.rs | 2 +- .../proto/src/gen/proto_descriptor.bin.no_lfs | Bin 549573 -> 547060 bytes tools/proto-compiler/Cargo.lock | 71 ++++++++++++++---- tools/proto-compiler/Cargo.toml | 2 +- 7 files changed, 62 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2ce05e88f..208726b8a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3135,9 +3135,9 @@ dependencies = [ [[package]] name = "ics23" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3b8be84e7285c73b88effdc3294b552277d6b0ec728ee016c861b7b9a2c19c" +checksum = "18798160736c1e368938ba6967dbcb3c7afb3256b442a5506ba5222eebb68a5a" dependencies = [ "anyhow", "blake2", diff --git a/Cargo.toml b/Cargo.toml index 5a2a32b58c..e72e686681 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] } diff --git a/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs b/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs index f41da7426e0409c58117d4e9d6a186a1632aff36..6e23fc5c3fa90b2ae6af49ab1a84a133ac4ac9bb 100644 GIT binary patch delta 21358 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 delta 23732 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 diff --git a/crates/core/component/governance/src/component/view.rs b/crates/core/component/governance/src/component/view.rs index d05a8b5911..24caf49a14 100644 --- a/crates/core/component/governance/src/component/view.rs +++ b/crates/core/component/governance/src/component/view.rs @@ -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. diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index 3734b128d3ae278c962ada23961532ffe80c875c..0a63961d63d66df23d2894acc3734741c8e32f51 100644 GIT binary patch delta 21592 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 delta 24043 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 JBkq?~{~ItH7ZLyf diff --git a/tools/proto-compiler/Cargo.lock b/tools/proto-compiler/Cargo.lock index 4f554bba17..02560aace3 100644 --- a/tools/proto-compiler/Cargo.lock +++ b/tools/proto-compiler/Cargo.lock @@ -32,6 +32,18 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "async-stream" version = "0.3.5" @@ -131,12 +143,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.4" @@ -155,6 +161,28 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "blake3" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -197,6 +225,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "cpufeatures" version = "0.2.9" @@ -233,6 +267,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -478,7 +513,7 @@ version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4222cfac37f21da28292db0f2673fdb8455284895891ff09979680243efb9a20" dependencies = [ - "base64 0.21.4", + "base64", "bytes", "flex-error", "ics23", @@ -490,11 +525,13 @@ dependencies = [ [[package]] name = "ics23" -version = "0.11.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" +checksum = "18798160736c1e368938ba6967dbcb3c7afb3256b442a5506ba5222eebb68a5a" dependencies = [ "anyhow", + "blake2", + "blake3", "bytes", "hex", "informalsystems-pbjson", @@ -527,11 +564,11 @@ dependencies = [ [[package]] name = "informalsystems-pbjson" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eecd90f87bea412eac91c6ef94f6b1e390128290898cbe14f2b926787ae1fb" +checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d" dependencies = [ - "base64 0.13.1", + "base64", "serde", ] @@ -668,7 +705,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90" dependencies = [ - "base64 0.21.4", + "base64", "serde", ] @@ -1061,6 +1098,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "subtle-encoding" version = "0.5.1" @@ -1215,7 +1258,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.4", + "base64", "bytes", "h2", "http", diff --git a/tools/proto-compiler/Cargo.toml b/tools/proto-compiler/Cargo.toml index 0ffbc4b396..43dc1cab78 100644 --- a/tools/proto-compiler/Cargo.toml +++ b/tools/proto-compiler/Cargo.toml @@ -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"